@remit/search-index-worker 0.0.1 → 0.0.2

package/package.json

@@ -1,50 +1,54 @@
 {
-	"name": "@remit/search-index-worker",
-	"version": "0.0.1",
-	"type": "module",
-	"main": "dist/index.js",
-	"exports": {
-		".": {
-			"types": "./src/index.ts",
-			"default": "./src/index.ts"
-		}
-	},
-	"scripts": {
-		"test:typecheck": "tsgo --noEmit",
-		"test:run": "node --env-file=../../localhost-test-unit.env --import tsx --test 'src/**/*.test.ts'",
-		"test:integ": "RUN_INTEG_TESTS=1 node --env-file=../../localhost-test-unit.env --import tsx --test 'src/**/*.integ.test.ts'",
-		"test": "npm run test:typecheck && npm run test:run"
-	},
-	"dependencies": {
-		"@remit/outbox-relay": "*",
-		"p-map": "*",
-		"pg": "^8.0.0"
-	},
-	"devDependencies": {
-		"@aws-sdk/client-dynamodb": "*",
-		"@aws-sdk/client-sqs": "*",
-		"@aws-sdk/core": "*",
-		"@aws-sdk/lib-dynamodb": "*",
-		"@remit/data-ports": "*",
-		"@remit/drizzle-service": "*",
-		"better-sqlite3": "^12.11.1",
-		"@remit/logger-lambda": "*",
-		"@remit/search-service": "*",
-		"@remit/sqs-client": "*",
-		"@remit/storage-service": "*",
-		"@types/aws-lambda": "*",
-		"@types/pg": "^8.0.0",
-		"expect-env": "*",
-		"tsx": "*",
-		"zod": "*"
-	},
-	"license": "MIT",
-	"publishConfig": {
-		"access": "public"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/remit-mail/remit.git",
-		"directory": "packages/search-index-worker"
-	}
+  "name": "@remit/search-index-worker",
+  "version": "0.0.2",
+  "type": "module",
+  "main": "dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./src/index.ts",
+      "default": "./src/index.ts"
+    },
+    "./data-ports": {
+      "types": "./src/data-ports.ts",
+      "default": "./src/data-ports.ts"
+    }
+  },
+  "scripts": {
+    "test:typecheck": "tsgo --noEmit",
+    "test:run": "node --env-file=../../localhost-test-unit.env --import tsx --test 'src/**/*.test.ts'",
+    "test:integ": "RUN_INTEG_TESTS=1 node --env-file=../../localhost-test-unit.env --import tsx --test 'src/**/*.integ.test.ts'",
+    "test": "npm run test:typecheck && npm run test:run"
+  },
+  "dependencies": {
+    "@remit/outbox-relay": "*",
+    "p-map": "*",
+    "pg": "^8.0.0"
+  },
+  "devDependencies": {
+    "@aws-sdk/client-dynamodb": "*",
+    "@aws-sdk/client-sqs": "*",
+    "@aws-sdk/core": "*",
+    "@aws-sdk/lib-dynamodb": "*",
+    "@remit/data-ports": "*",
+    "@remit/drizzle-service": "*",
+    "better-sqlite3": "^12.11.1",
+    "@remit/logger-lambda": "*",
+    "@remit/search-service": "*",
+    "@remit/sqs-client": "*",
+    "@remit/storage-service": "*",
+    "@types/aws-lambda": "*",
+    "@types/pg": "^8.0.0",
+    "expect-env": "*",
+    "tsx": "*",
+    "zod": "*"
+  },
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/remit-mail/remit.git",
+    "directory": "packages/search-index-worker"
+  }
 }

package/src/data-ports.test.ts

@@ -1,14 +1,10 @@
 import assert from "node:assert/strict";
-import { existsSync } from "node:fs";
 import { afterEach, test } from "node:test";
-import { fileURLToPath } from "node:url";
-import { buildDataPortsFromEnv } from "./data-ports.js";
-
-// The DynamoDB composition module is stripped from the open-core tree; the
-// DynamoDB-path cases skip there and run where the module ships.
-const hasDynamoComposition = existsSync(
-	fileURLToPath(new URL("./compose-dynamodb.ts", import.meta.url)),
-);
+import {
+	buildDataPortsFromEnv,
+	type SearchIndexDataPorts,
+	setSearchIndexDataPorts,
+} from "./data-ports.js";
 
 const withEnv = async (
 	overrides: Record<string, string | undefined>,
@@ -34,38 +30,26 @@ afterEach(() => {
 	delete process.env.DATA_BACKEND;
 });
 
-test(
-	"without DATA_BACKEND builds DynamoDB (electrodb) ports and no resolveAccountId hook",
-	{ skip: !hasDynamoComposition },
-	async () => {
-		await withEnv(
-			{ DATA_BACKEND: undefined, DYNAMODB_TABLE_NAME: "remit-test" },
-			async () => {
-				const ports = await buildDataPortsFromEnv();
-				assert.ok(ports.account, "account port must be defined");
-				assert.ok(ports.threadMessage, "threadMessage port must be defined");
-				assert.equal(
-					ports.resolveAccountId,
-					undefined,
-					"DynamoDB messages already carry a real accountId — no resolution hook",
-				);
-			},
+test("without DATA_BACKEND and no registered ports, throws (DynamoDB path is injected)", async () => {
+	await withEnv({ DATA_BACKEND: undefined }, async () => {
+		await assert.rejects(
+			() => buildDataPortsFromEnv(),
+			/no DynamoDB search-index data ports registered/,
 		);
-	},
-);
+	});
+});
 
-test(
-	"without DATA_BACKEND and no DYNAMODB_TABLE_NAME throws",
-	{ skip: !hasDynamoComposition },
-	async () => {
-		await withEnv(
-			{ DATA_BACKEND: undefined, DYNAMODB_TABLE_NAME: undefined },
-			async () => {
-				await assert.rejects(() => buildDataPortsFromEnv());
-			},
-		);
-	},
-);
+test("without DATA_BACKEND returns the injected DynamoDB ports", async () => {
+	const injected = {
+		account: {},
+		threadMessage: {},
+	} as unknown as SearchIndexDataPorts;
+	setSearchIndexDataPorts(injected);
+	await withEnv({ DATA_BACKEND: undefined }, async () => {
+		const ports = await buildDataPortsFromEnv();
+		assert.equal(ports, injected);
+	});
+});
 
 test("DATA_BACKEND=postgres builds Drizzle ports with a resolveAccountId hook, without connecting", async () => {
 	await withEnv(

package/src/data-ports.ts

@@ -119,24 +119,29 @@ const buildSqliteDataPorts = async (): Promise<SearchIndexDataPorts> => {
  * - otherwise → ElectroDB services over `DYNAMODB_TABLE_NAME` (unchanged from
  *   the pre-convergence worker — this is the production path).
  *
- * Each branch loads its composition module through a dynamic `import()`, so the
- * DynamoDB path — the sole importer of the closed `@remit/remit-electrodb-
- * service` (`./compose-dynamodb.js`) — is never loaded on the relational
- * (open-core) tree, where that module is not shipped. esbuild still bundles it
- * into the Lambda because the specifier is a relative import, not an `external`.
+ * The DynamoDB ports are injected by the composition root, which lives outside
+ * this shared, open-core module and is never imported here.
  */
+let injectedDataPorts: SearchIndexDataPorts | null = null;
+
+/**
+ * Register the DynamoDB-backed search-index data ports from the composition
+ * root. The relational backends compose in-package above and never touch this
+ * seam.
+ */
+export const setSearchIndexDataPorts = (ports: SearchIndexDataPorts): void => {
+	injectedDataPorts = ports;
+};
+
 export const buildDataPortsFromEnv =
 	async (): Promise<SearchIndexDataPorts> => {
 		if (process.env.DATA_BACKEND === "postgres")
 			return buildPostgresDataPorts();
 		if (process.env.DATA_BACKEND === "sqlite") return buildSqliteDataPorts();
-		// `as string` stops tsgo resolving the module in the open-core tree, which
-		// strips it; the named contract keeps the call site typed rather than `any`.
-		type ComposeDynamoDBModule = {
-			buildDynamoDBDataPorts: () => SearchIndexDataPorts;
-		};
-		const { buildDynamoDBDataPorts } = (await import(
-			"./compose-dynamodb.js" as string
-		)) as ComposeDynamoDBModule;
-		return buildDynamoDBDataPorts();
+		if (!injectedDataPorts) {
+			throw new Error(
+				"no DynamoDB search-index data ports registered — register them with setSearchIndexDataPorts() from your composition root",
+			);
+		}
+		return injectedDataPorts;
 	};

package/src/services.ts

@@ -1,4 +1,7 @@
-import { createSearchService, type SearchService } from "@remit/search-service";
+import {
+	createSearchService,
+	type SearchService,
+} from "@remit/search-service";
 import {
 	buildEmbeddingServiceFromEnv,
 	buildVectorStoreFromEnv,