fixup! refactor!: hoist bufferChainSyncEvent to projection package

input-output-hk · Sep 24, 2024 · 37436b1 · 37436b1
1 parent 22e6824
commit 37436b1
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 52 deletions.
diff --git a/packages/cardano-services/src/Projection/createTypeormProjection.ts b/packages/cardano-services/src/Projection/createTypeormProjection.ts
@@ -1,7 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable prefer-spread */
-import { Bootstrap, ProjectionEvent, logProjectionProgress, requestNext } from '@cardano-sdk/projection';
-import { Cardano, ObservableCardanoNode } from '@cardano-sdk/core';
+import {
+  Bootstrap,
+  ObservableCardanoNode,
+  ProjectionEvent,
+  logProjectionProgress,
+  requestNext
+} from '@cardano-sdk/projection';
+import { Cardano } from '@cardano-sdk/core';
 import { Logger } from 'ts-log';
 import { Observable, concat, defer, groupBy, mergeMap, take, takeWhile } from 'rxjs';
 import {

diff --git a/packages/cardano-services/src/TxSubmit/NodeTxSubmitProvider.ts b/packages/cardano-services/src/TxSubmit/NodeTxSubmitProvider.ts
@@ -5,7 +5,6 @@ import {
   HandleOwnerChangeError,
   HandleProvider,
   HealthCheckResponse,
-  ObservableCardanoNode,
   ProviderError,
   ProviderFailure,
   SubmitTxArgs,
@@ -14,6 +13,7 @@ import {
 } from '@cardano-sdk/core';
 import { InMemoryCache } from '../InMemoryCache';
 import { Logger } from 'ts-log';
+import { ObservableCardanoNode } from '@cardano-sdk/projection';
 import { WithLogger } from '@cardano-sdk/util';
 
 type ObservableTxSubmitter = Pick<ObservableCardanoNode, 'healthCheck$' | 'submitTx'>;

diff --git a/packages/ogmios/src/tsconfig.json b/packages/ogmios/src/tsconfig.json
@@ -10,6 +10,9 @@
     {
       "path": "../../util-rxjs/src"
     },
+    {
+      "path": "../../projection/src"
+    },
     {
       "path": "../../crypto/src"
     }

diff --git a/packages/projection/package.json b/packages/projection/package.json
@@ -2,24 +2,24 @@
   "name": "@cardano-sdk/projection",
   "version": "0.11.36",
   "description": "Chain Sync event projection",
-  "engines": {
-    "node": ">=16.20.2"
-  },
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "repository": "https://github.com/input-output-hk/cardano-js-sdk",
+  "license": "Apache-2.0",
+  "sideEffects": false,
   "exports": {
     ".": {
       "development": "./src/index.ts",
       "import": "./dist/esm/index.js",
       "require": "./dist/cjs/index.js"
     }
   },
-  "repository": "https://github.com/input-output-hk/cardano-js-sdk",
-  "publishConfig": {
-    "access": "public"
-  },
-  "sideEffects": false,
-  "license": "Apache-2.0",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "files": [
+    "dist/*",
+    "!dist/tsconfig.tsbuildinfo",
+    "LICENSE",
+    "NOTICE"
+  ],
   "scripts": {
     "build": "yarn build:cjs && tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020 && tsc-alias -p src/tsconfig.json --outDir ./dist/esm && cp ../../build/esm-package.json ./dist/esm/package.json",
     "build:cjs": "tsc --build src && cp ../../build/cjs-package.json ./dist/cjs/package.json",
@@ -49,7 +49,6 @@
     "tsc-alias": "^1.8.10"
   },
   "devDependencies": {
-    "@cardano-sdk/ogmios": "workspace:~",
     "@cardano-sdk/util-dev": "workspace:~",
     "eslint": "^7.32.0",
     "jest": "^28.1.3",
@@ -58,10 +57,10 @@
     "ts-jest": "^28.0.7",
     "typescript": "^4.7.4"
   },
-  "files": [
-    "dist/*",
-    "!dist/tsconfig.tsbuildinfo",
-    "LICENSE",
-    "NOTICE"
-  ]
+  "engines": {
+    "node": ">=16.20.2"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
 }
diff --git a/packages/util-dev/package.json b/packages/util-dev/package.json
@@ -2,27 +2,27 @@
   "name": "@cardano-sdk/util-dev",
   "version": "0.22.10",
   "description": "Utilities for tests in other packages",
-  "engines": {
-    "node": ">=16.20.2"
-  },
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "repository": "https://github.com/input-output-hk/cardano-js-sdk",
+  "license": "Apache-2.0",
+  "sideEffects": false,
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
       "require": "./dist/cjs/index.js"
     }
   },
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
   "browser": {
     "./dist/cjs/docker.js": false,
     "./dist/esm/docker.js": false
   },
-  "repository": "https://github.com/input-output-hk/cardano-js-sdk",
-  "publishConfig": {
-    "access": "public"
-  },
-  "sideEffects": false,
-  "license": "Apache-2.0",
+  "files": [
+    "dist/*",
+    "!dist/tsconfig.tsbuildinfo",
+    "LICENSE",
+    "NOTICE"
+  ],
   "scripts": {
     "build": "yarn build:cjs && tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020 && tsc-alias -p src/tsconfig.json --outDir ./dist/esm && cp ./esm-package.json ./dist/esm/package.json && cp -rf src/chainSync/data dist/esm/chainSync/",
     "build:cjs": "tsc --build src && cp ../../build/cjs-package.json ./dist/cjs/package.json && cp -rf src/chainSync/data dist/cjs/chainSync/",
@@ -40,18 +40,6 @@
     "test:debug": "DEBUG=true yarn test",
     "test:e2e": "echo 'test:e2e' command not implemented yet"
   },
-  "devDependencies": {
-    "@types/dockerode": "^3.3.8",
-    "@types/jest": "^26.0.24",
-    "@types/k6": "^0.53.1",
-    "eslint": "^7.32.0",
-    "jest": "^28.1.3",
-    "madge": "^5.0.1",
-    "npm-run-all": "^4.1.5",
-    "ts-jest": "^28.0.7",
-    "tsc-alias": "^1.8.10",
-    "typescript": "^4.7.4"
-  },
   "dependencies": {
     "@cardano-sdk/core": "workspace:~",
     "@cardano-sdk/crypto": "workspace:~",
@@ -70,10 +58,23 @@
     "rxjs": "^7.4.0",
     "ts-log": "^2.2.4"
   },
-  "files": [
-    "dist/*",
-    "!dist/tsconfig.tsbuildinfo",
-    "LICENSE",
-    "NOTICE"
-  ]
+  "devDependencies": {
+    "@cardano-sdk/projection": "workspace:~",
+    "@types/dockerode": "^3.3.8",
+    "@types/jest": "^26.0.24",
+    "@types/k6": "^0.53.1",
+    "eslint": "^7.32.0",
+    "jest": "^28.1.3",
+    "madge": "^5.0.1",
+    "npm-run-all": "^4.1.5",
+    "ts-jest": "^28.0.7",
+    "tsc-alias": "^1.8.10",
+    "typescript": "^4.7.4"
+  },
+  "engines": {
+    "node": ">=16.20.2"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
 }
diff --git a/packages/util-dev/src/chainSync/index.ts b/packages/util-dev/src/chainSync/index.ts
@@ -9,14 +9,14 @@ import {
   GeneralCardanoNodeError,
   GeneralCardanoNodeErrorCode,
   Intersection,
-  ObservableCardanoNode,
   Point,
   PointOrOrigin
 } from '@cardano-sdk/core';
 import { Observable, of, throwError } from 'rxjs';
 import { fromSerializableObject } from '@cardano-sdk/util';
 import { genesisToEraSummary } from './genesisToEraSummary';
 import memoize from 'lodash/memoize.js';
+import type { ObservableCardanoNode } from '@cardano-sdk/projection';
 
 export type SerializedChainSyncEvent =
   | Omit<ChainSyncRollForward, 'requestNext'>

diff --git a/packages/util-dev/src/tsconfig.json b/packages/util-dev/src/tsconfig.json
@@ -6,6 +6,9 @@
   "references": [
     {
       "path": "../../core/src"
+    },
+    {
+      "path": "../../projection/src"
     }
   ]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -3923,7 +3923,6 @@ __metadata:
   dependencies:
     "@cardano-sdk/core": "workspace:~"
     "@cardano-sdk/crypto": "workspace:~"
-    "@cardano-sdk/ogmios": "workspace:~"
     "@cardano-sdk/util": "workspace:~"
     "@cardano-sdk/util-dev": "workspace:~"
     "@cardano-sdk/util-rxjs": "workspace:~"
@@ -3976,6 +3975,7 @@ __metadata:
     "@cardano-sdk/core": "workspace:~"
     "@cardano-sdk/crypto": "workspace:~"
     "@cardano-sdk/key-management": "workspace:~"
+    "@cardano-sdk/projection": "workspace:~"
     "@cardano-sdk/util": "workspace:~"
     "@types/dockerode": ^3.3.8
     "@types/jest": ^26.0.24