@remit/drizzle-service 0.0.102 → 0.0.104

package/src/repos/i4-account-config.test.ts

@@ -1,124 +1,4 @@
-import assert from "node:assert";
-import { after, before, describe, test } from "node:test";
-import { createTestDb, randomId, type TestDb } from "../test-db.js";
-import { AccountRepo } from "./i4-account.js";
-import { AccountConfigRepo } from "./i4-account-config.js";
-import { AddressRepo } from "./i4-address.js";
+import { openSqliteTestStores } from "../test-stores.js";
+import { accountConfigRepoSuite } from "./i4-account-config.suite.js";
 
-describe("AccountConfigRepo", () => {
-	let db: TestDb;
-	let close: () => Promise<void>;
-	let repo: AccountConfigRepo;
-
-	before(async () => {
-		({ db, close } = await createTestDb());
-		repo = new AccountConfigRepo(db as never, db as never);
-	});
-
-	after(async () => {
-		await close();
-	});
-
-	test("create and get", async () => {
-		const userId = randomId();
-		const cfg = await repo.create({ userId, name: "My Config" });
-
-		assert.ok(cfg.accountConfigId);
-		assert.equal(cfg.userId, userId);
-		assert.equal(cfg.name, "My Config");
-		assert.equal(cfg.state, "active");
-
-		const fetched = await repo.get(cfg.accountConfigId);
-		assert.equal(fetched.accountConfigId, cfg.accountConfigId);
-
-		await repo.delete(cfg.accountConfigId);
-	});
-
-	test("batchGet: WHERE id = ANY($1)", async () => {
-		const userId = randomId();
-		const c1 = await repo.create({ userId });
-		const c2 = await repo.create({ userId });
-
-		const results = await repo.get([c1.accountConfigId, c2.accountConfigId]);
-		assert.equal(results.length, 2);
-
-		await repo.deleteMany([c1.accountConfigId, c2.accountConfigId]);
-	});
-
-	test("batchGet empty array returns []", async () => {
-		const results = await repo.get([]);
-		assert.deepEqual(results, []);
-	});
-
-	test("get throws for missing config", async () => {
-		await assert.rejects(repo.get(randomId()), /not found/i);
-	});
-
-	test("describe assembles collection (accountConfig + account + address)", async () => {
-		const userId = randomId();
-		const cfg = await repo.create({ userId });
-
-		const accountRepo = new AccountRepo(db as never, db as never);
-		const addrRepo = new AddressRepo(db as never);
-
-		await accountRepo.create({
-			accountConfigId: cfg.accountConfigId,
-			username: "u",
-			email: "u@test.com",
-			isActive: true,
-			imapHost: "imap.test.com",
-			imapPort: 993,
-			imapTls: true,
-			imapStartTls: false,
-			connectionState: "not_authenticated",
-		});
-
-		await addrRepo.createAddress({
-			addressId: randomId(),
-			accountConfigId: cfg.accountConfigId,
-			localPart: "u",
-			domain: "test.com",
-			normalizedEmail: "u@test.com",
-			normalizedCompound: "u@test.com:u",
-		});
-
-		const desc = await repo.describe(cfg.accountConfigId);
-		assert.equal(desc.accountConfig.length, 1);
-		assert.equal(desc.account.length, 1);
-		assert.equal(desc.address.length, 1);
-
-		await repo.delete(cfg.accountConfigId);
-	});
-
-	test("listAll returns all configs", async () => {
-		const userId = randomId();
-		const c1 = await repo.create({ userId });
-		const c2 = await repo.create({ userId });
-
-		const all = await repo.listAll();
-		const ids = new Set(all.map((c) => c.accountConfigId));
-		assert.ok(ids.has(c1.accountConfigId));
-		assert.ok(ids.has(c2.accountConfigId));
-
-		await repo.deleteMany([c1.accountConfigId, c2.accountConfigId]);
-	});
-
-	describe("continuation token rejection (#172)", () => {
-		for (const [label, token] of [
-			["an unparseable", "not-a-cursor"],
-			["a bare number", Buffer.from("123").toString("base64url")],
-			["a JSON array", Buffer.from("[1,2]").toString("base64url")],
-		] as const) {
-			test(`${label} token is rejected as a 400`, async () => {
-				await assert.rejects(
-					() => repo.listByUser(randomId(), { continuationToken: token }),
-					(error: unknown) => {
-						assert.equal((error as { statusCode?: number }).statusCode, 400);
-						assert.equal((error as Error).name, "BadRequestError");
-						return true;
-					},
-				);
-			});
-		}
-	});
-});
+accountConfigRepoSuite(openSqliteTestStores);

package/src/repos/i4-account-config.ts

@@ -3,11 +3,12 @@ import type {
 	AccountConfigItem,
 	CreateAccountConfigInput,
 	IAccountConfigRepository,
+	IAddressRepository,
 	ResultList,
 	UpdateAccountConfigInput,
 } from "@remit/data-ports";
 import { and, asc, eq, gt, or } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
@@ -15,12 +16,12 @@ import {
 	accountConfigTable,
 	accountTable,
 } from "../schema/i4-account-config.js";
-import { addressTable } from "../schema/i4-address.js";
 import { rowToAccount } from "./i4-account.js";
-import { rowToAddress } from "./i4-address.js";
 import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
+
+type AddressReader = Pick<IAddressRepository, "listAllByAccountConfig">;
 
 function rowToAccountConfig(
 	row: typeof accountConfigTable.$inferSelect,
@@ -40,7 +41,7 @@ function rowToAccountConfig(
 export class AccountConfigRepo implements IAccountConfigRepository {
 	constructor(
 		private db: DB,
-		private mail: DB,
+		private addresses: AddressReader,
 	) {}
 
 	async create(input: CreateAccountConfigInput): Promise<AccountConfigItem> {
@@ -183,10 +184,7 @@ export class AccountConfigRepo implements IAccountConfigRepository {
 				.select()
 				.from(accountTable)
 				.where(eq(accountTable.accountConfigId, accountConfigId)),
-			this.mail
-				.select()
-				.from(addressTable)
-				.where(eq(addressTable.accountConfigId, accountConfigId)),
+			this.addresses.listAllByAccountConfig(accountConfigId),
 		]);
 		if (configs.length === 0) {
 			throw new NotFoundError(`AccountConfig not found: ${accountConfigId}`);
@@ -194,7 +192,7 @@ export class AccountConfigRepo implements IAccountConfigRepository {
 		return {
 			accountConfig: configs.map(rowToAccountConfig),
 			account: accounts.map(rowToAccount),
-			address: addresses.map(rowToAddress),
+			address: addresses,
 		};
 	}
 

package/src/repos/i4-account-export-request.d1.test.ts

@@ -0,0 +1,4 @@
+import { openD1TestStores } from "../test-d1.js";
+import { accountExportRequestRepoSuite } from "./i4-account-export-request.suite.js";
+
+accountExportRequestRepoSuite(openD1TestStores);

package/src/repos/i4-account-export-request.suite.ts

@@ -0,0 +1,44 @@
+import assert from "node:assert/strict";
+import { after, before, describe, test } from "node:test";
+import { randomId } from "../id.js";
+import type { OpenTestStores } from "../test-stores.js";
+import { AccountExportRequestRepo } from "./i4-account-export-request.js";
+
+export const accountExportRequestRepoSuite = (open: OpenTestStores): void => {
+	describe("AccountExportRequestRepo", () => {
+		let close: () => Promise<void>;
+		let repo: AccountExportRequestRepo;
+
+		before(async () => {
+			const opened = await open();
+			close = opened.close;
+			repo = new AccountExportRequestRepo(opened.stores.app.db);
+		});
+
+		after(async () => {
+			await close();
+		});
+
+		describe("continuation token rejection (#172)", () => {
+			for (const [label, token] of [
+				["an unparseable", "not-a-cursor"],
+				["a bare number", Buffer.from("123").toString("base64url")],
+				["a JSON array", Buffer.from("[1,2]").toString("base64url")],
+			] as const) {
+				test(`${label} token is rejected as a 400`, async () => {
+					await assert.rejects(
+						() =>
+							repo.listByAccountConfig(randomId(), {
+								continuationToken: token,
+							}),
+						(error: unknown) => {
+							assert.equal((error as { statusCode?: number }).statusCode, 400);
+							assert.equal((error as Error).name, "BadRequestError");
+							return true;
+						},
+					);
+				});
+			}
+		});
+	});
+};

package/src/repos/i4-account-export-request.test.ts

@@ -1,41 +1,4 @@
-import assert from "node:assert/strict";
-import { after, before, describe, test } from "node:test";
-import { createTestDb, randomId, type TestDb } from "../test-db.js";
-import { AccountExportRequestRepo } from "./i4-account-export-request.js";
+import { openSqliteTestStores } from "../test-stores.js";
+import { accountExportRequestRepoSuite } from "./i4-account-export-request.suite.js";
 
-describe("AccountExportRequestRepo", () => {
-	let db: TestDb;
-	let close: () => Promise<void>;
-	let repo: AccountExportRequestRepo;
-
-	before(async () => {
-		({ db, close } = await createTestDb());
-		repo = new AccountExportRequestRepo(db as never);
-	});
-
-	after(async () => {
-		await close();
-	});
-
-	describe("continuation token rejection (#172)", () => {
-		for (const [label, token] of [
-			["an unparseable", "not-a-cursor"],
-			["a bare number", Buffer.from("123").toString("base64url")],
-			["a JSON array", Buffer.from("[1,2]").toString("base64url")],
-		] as const) {
-			test(`${label} token is rejected as a 400`, async () => {
-				await assert.rejects(
-					() =>
-						repo.listByAccountConfig(randomId(), {
-							continuationToken: token,
-						}),
-					(error: unknown) => {
-						assert.equal((error as { statusCode?: number }).statusCode, 400);
-						assert.equal((error as Error).name, "BadRequestError");
-						return true;
-					},
-				);
-			});
-		}
-	});
-});
+accountExportRequestRepoSuite(openSqliteTestStores);

package/src/repos/i4-account-export-request.ts

@@ -6,13 +6,13 @@ import type {
 	UpdateAccountExportRequestInput,
 } from "@remit/data-ports";
 import { eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
 import { accountExportRequestTable } from "../schema/i4-account-export-request.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function rowToItem(
 	row: typeof accountExportRequestTable.$inferSelect,

package/src/repos/i4-account-setting.d1.test.ts

@@ -0,0 +1,4 @@
+import { openD1TestStores } from "../test-d1.js";
+import { accountSettingRepoSuite } from "./i4-account-setting.suite.js";
+
+accountSettingRepoSuite(openD1TestStores);

package/src/repos/i4-account-setting.suite.ts

@@ -0,0 +1,100 @@
+import assert from "node:assert";
+import { after, before, describe, test } from "node:test";
+import { randomId } from "../id.js";
+import type { OpenTestStores } from "../test-stores.js";
+import { AccountSettingRepo } from "./i4-account-setting.js";
+
+export const accountSettingRepoSuite = (open: OpenTestStores): void => {
+	describe("AccountSettingRepo", () => {
+		let close: () => Promise<void>;
+		let repo: AccountSettingRepo;
+
+		before(async () => {
+			const opened = await open();
+			close = opened.close;
+			repo = new AccountSettingRepo(opened.stores.app.db);
+		});
+
+		after(async () => {
+			await close();
+		});
+
+		test("upsert and get", async () => {
+			const accountConfigId = randomId();
+			await repo.upsert({
+				accountConfigId,
+				name: "Theme",
+				value: { kind: "String", value: "dark" },
+			});
+
+			const setting = await repo.get(accountConfigId, "Theme");
+			assert.ok(setting);
+			assert.equal(setting.name, "Theme");
+			assert.deepEqual(setting.value, { kind: "String", value: "dark" });
+
+			await repo.delete(accountConfigId, "Theme");
+		});
+
+		test("upsert is idempotent (overwrites)", async () => {
+			const accountConfigId = randomId();
+			await repo.upsert({
+				accountConfigId,
+				name: "Density",
+				value: { kind: "String", value: "compact" },
+			});
+			await repo.upsert({
+				accountConfigId,
+				name: "Density",
+				value: { kind: "String", value: "comfortable" },
+			});
+
+			const setting = await repo.get(accountConfigId, "Density");
+			assert.deepEqual(setting?.value, {
+				kind: "String",
+				value: "comfortable",
+			});
+
+			await repo.delete(accountConfigId, "Density");
+		});
+
+		test("get returns null when setting absent", async () => {
+			const setting = await repo.get(randomId(), "Theme");
+			assert.equal(setting, null);
+		});
+
+		test("listByAccountConfig returns all settings ordered by name", async () => {
+			const accountConfigId = randomId();
+			await repo.upsert({
+				accountConfigId,
+				name: "Theme",
+				value: { kind: "String", value: "dark" },
+			});
+			await repo.upsert({
+				accountConfigId,
+				name: "Density",
+				value: { kind: "String", value: "compact" },
+			});
+
+			const settings = await repo.listByAccountConfig(accountConfigId);
+			assert.equal(settings.length, 2);
+			assert.equal(settings[0].name, "Density");
+			assert.equal(settings[1].name, "Theme");
+
+			await repo.delete(accountConfigId, "Theme");
+			await repo.delete(accountConfigId, "Density");
+		});
+
+		test("delete removes the setting", async () => {
+			const accountConfigId = randomId();
+			await repo.upsert({
+				accountConfigId,
+				name: "Theme",
+				value: { kind: "Boolean", value: true },
+			});
+			await repo.delete(accountConfigId, "Theme");
+
+			const setting = await repo.get(accountConfigId, "Theme");
+			assert.equal(setting, null);
+		});
+	});
+};

package/src/repos/i4-account-setting.test.ts

@@ -1,94 +1,4 @@
-import assert from "node:assert";
-import { after, before, describe, test } from "node:test";
-import { createTestDb, randomId, type TestDb } from "../test-db.js";
-import { AccountSettingRepo } from "./i4-account-setting.js";
+import { openSqliteTestStores } from "../test-stores.js";
+import { accountSettingRepoSuite } from "./i4-account-setting.suite.js";
 
-describe("AccountSettingRepo", () => {
-	let db: TestDb;
-	let close: () => Promise<void>;
-	let repo: AccountSettingRepo;
-
-	before(async () => {
-		({ db, close } = await createTestDb());
-		repo = new AccountSettingRepo(db as never);
-	});
-
-	after(async () => {
-		await close();
-	});
-
-	test("upsert and get", async () => {
-		const accountConfigId = randomId();
-		await repo.upsert({
-			accountConfigId,
-			name: "Theme",
-			value: { kind: "String", value: "dark" },
-		});
-
-		const setting = await repo.get(accountConfigId, "Theme");
-		assert.ok(setting);
-		assert.equal(setting.name, "Theme");
-		assert.deepEqual(setting.value, { kind: "String", value: "dark" });
-
-		await repo.delete(accountConfigId, "Theme");
-	});
-
-	test("upsert is idempotent (overwrites)", async () => {
-		const accountConfigId = randomId();
-		await repo.upsert({
-			accountConfigId,
-			name: "Density",
-			value: { kind: "String", value: "compact" },
-		});
-		await repo.upsert({
-			accountConfigId,
-			name: "Density",
-			value: { kind: "String", value: "comfortable" },
-		});
-
-		const setting = await repo.get(accountConfigId, "Density");
-		assert.deepEqual(setting?.value, { kind: "String", value: "comfortable" });
-
-		await repo.delete(accountConfigId, "Density");
-	});
-
-	test("get returns null when setting absent", async () => {
-		const setting = await repo.get(randomId(), "Theme");
-		assert.equal(setting, null);
-	});
-
-	test("listByAccountConfig returns all settings ordered by name", async () => {
-		const accountConfigId = randomId();
-		await repo.upsert({
-			accountConfigId,
-			name: "Theme",
-			value: { kind: "String", value: "dark" },
-		});
-		await repo.upsert({
-			accountConfigId,
-			name: "Density",
-			value: { kind: "String", value: "compact" },
-		});
-
-		const settings = await repo.listByAccountConfig(accountConfigId);
-		assert.equal(settings.length, 2);
-		assert.equal(settings[0].name, "Density");
-		assert.equal(settings[1].name, "Theme");
-
-		await repo.delete(accountConfigId, "Theme");
-		await repo.delete(accountConfigId, "Density");
-	});
-
-	test("delete removes the setting", async () => {
-		const accountConfigId = randomId();
-		await repo.upsert({
-			accountConfigId,
-			name: "Theme",
-			value: { kind: "Boolean", value: true },
-		});
-		await repo.delete(accountConfigId, "Theme");
-
-		const setting = await repo.get(accountConfigId, "Theme");
-		assert.equal(setting, null);
-	});
-});
+accountSettingRepoSuite(openSqliteTestStores);

package/src/repos/i4-account-setting.ts

@@ -6,11 +6,11 @@ import type {
 	UpsertAccountSettingInput,
 } from "@remit/data-ports";
 import { and, eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { accountSettingTable } from "../schema/i4-account-setting.js";
 import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 // The PG store derives its own deterministic id from the composite key. It is
 // stable within this backend but not byte-identical to the DDB base36 UUIDv5

package/src/repos/i4-account.test.ts

@@ -1,9 +1,8 @@
 import assert from "node:assert";
 import { after, before, describe, test } from "node:test";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createTestDb, randomId, type TestDb } from "../test-db.js";
-import { AccountRepo } from "./i4-account.js";
-import { MailboxRepo } from "./i4-mailbox.js";
+import type { AccountRepo } from "./i4-account.js";
 import { mailboxCreated } from "./test-helpers.js";
 
 function makeAccountInput(accountConfigId: string) {
@@ -27,7 +26,11 @@ describe("AccountRepo", () => {
 
 	before(async () => {
 		({ db, close } = await createTestDb());
-		repo = new AccountRepo(db as never, db as never);
+		repo = createSqliteRepositories({
+			app: db,
+			mail: db,
+			search: db,
+		}).account;
 	});
 
 	after(async () => {
@@ -161,10 +164,11 @@ describe("AccountRepo", () => {
 		const accountConfigId = randomId();
 		const account = await repo.create(makeAccountInput(accountConfigId));
 
-		const mailboxRepo = new MailboxRepo(
-			db as never,
-			new SearchIndex(db as never, db as never),
-		);
+		const mailboxRepo = createSqliteRepositories({
+			app: db,
+			mail: db,
+			search: db,
+		}).mailbox;
 		mailboxCreated(
 			await mailboxRepo.create({
 				accountId: account.accountId,

package/src/repos/i4-account.ts

@@ -4,22 +4,21 @@ import type {
 	AccountSchedulerPage,
 	CreateAccountInput,
 	IAccountRepository,
+	IMailboxRepository,
 	RemovableAccountField,
 	ResultList,
 	UpdateAccountInput,
 } from "@remit/data-ports";
 import { AccountService, SyncPhase } from "@remit/domain-enums";
 import { and, asc, eq, gt, like, or, sql } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { decodeToken, encodeToken, resultList } from "../pagination.js";
 import { accountTable } from "../schema/i4-account-config.js";
-import { mailboxTable } from "../schema/i4-mailbox.js";
-import { rowToMailbox } from "./i4-mailbox.js";
 import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 /**
  * A stored failure is a sentence the account card shows, not a transcript.
@@ -74,7 +73,7 @@ export function rowToAccount(
 export class AccountRepo implements IAccountRepository {
 	constructor(
 		private db: DB,
-		private mail: DB,
+		private mailboxes: Pick<IMailboxRepository, "listAllByAccount">,
 	) {}
 
 	async create(input: CreateAccountInput): Promise<AccountItem> {
@@ -269,17 +268,14 @@ export class AccountRepo implements IAccountRepository {
 				.select()
 				.from(accountTable)
 				.where(eq(accountTable.accountId, accountId)),
-			this.mail
-				.select()
-				.from(mailboxTable)
-				.where(eq(mailboxTable.accountId, accountId)),
+			this.mailboxes.listAllByAccount(accountId),
 		]);
 		if (accounts.length === 0) {
 			throw new NotFoundError(`Account not found: ${accountId}`);
 		}
 		return {
 			account: accounts.map(rowToAccount),
-			mailbox: mailboxes.map(rowToMailbox),
+			mailbox: mailboxes,
 		};
 	}
 

package/src/repos/i4-address-junk-move.sqlite.test.ts

@@ -1,9 +1,10 @@
 import assert from "node:assert/strict";
 import { after, before, beforeEach, describe, test } from "node:test";
 import type Database from "better-sqlite3";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createTestDb, type TestDb } from "../test-db.js";
 import { AddressRepo } from "./i4-address.js";
-import { MailboxSpecialUseRepo } from "./i4-mailbox-special-use.js";
+import type { MailboxSpecialUseRepo } from "./i4-mailbox-special-use.js";
 
 const CONFIG = "cfg-1";
 
@@ -124,7 +125,11 @@ describe("reconciling one message's addresses at the moment it moves", () => {
 	before(async () => {
 		({ db, sqlite, close } = await createTestDb());
 		repo = new AddressRepo(db as never);
-		specialUse = new MailboxSpecialUseRepo(db as never, db as never);
+		specialUse = createSqliteRepositories({
+			app: db,
+			mail: db,
+			search: db,
+		}).mailboxSpecialUse;
 	});
 
 	/**

package/src/repos/i4-address.ts

@@ -22,7 +22,7 @@ import {
 	type SQL,
 	sql,
 } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { envelopeAddressId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
@@ -44,7 +44,7 @@ import {
 } from "./address-search-predicates.js";
 import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 type AddressUpdate = Partial<{
 	[K in keyof typeof addressTable.$inferInsert]:
@@ -786,6 +786,16 @@ export class AddressRepo implements IAddressRepository {
 		);
 	}
 
+	async listAllByAccountConfig(
+		accountConfigId: string,
+	): Promise<AddressItem[]> {
+		const rows = await this.db
+			.select()
+			.from(addressTable)
+			.where(eq(addressTable.accountConfigId, accountConfigId));
+		return rows.map(rowToAddress);
+	}
+
 	async createEnvelopeAddress(
 		input: CreateEnvelopeAddressInput,
 	): Promise<EnvelopeAddressItem> {