@remit/drizzle-service 0.0.102 → 0.0.103

package/src/repos/envelope.ts

@@ -9,8 +9,8 @@ import type {
 	UpdateEnvelopeInput,
 } from "@remit/data-ports";
 import { eq } from "drizzle-orm";
-import { runBatch } from "../batch.js";
-import type { Db } from "../db.js";
+import type { WriteBatch } from "../batch.js";
+import type { RepositoryDb, SqliteStore } from "../db.js";
 import {
 	CreateFailedConflictError,
 	isUniqueViolation,
@@ -29,7 +29,6 @@ import {
 	bodyStructureRefetchTable,
 	envelopeAddressTable,
 	envelopeTable,
-	type MessageDataSchema,
 	messageReferenceTable,
 	messageTable,
 	rawMessageStorageTable,
@@ -45,7 +44,7 @@ import {
 	toRawMessageStorageItem,
 } from "./mappers.js";
 
-type DB = Db<MessageDataSchema>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function dedupeById<T>(rows: T[], getId: (row: T) => string): T[] {
 	const byId = new Map<string, T>();
@@ -56,7 +55,13 @@ function dedupeById<T>(rows: T[], getId: (row: T) => string): T[] {
 }
 
 export class DrizzleEnvelopeRepository implements IEnvelopeRepository {
-	constructor(private db: DB) {}
+	private readonly db: DB;
+	private readonly batch: WriteBatch;
+
+	constructor(store: SqliteStore<Record<string, unknown>>) {
+		this.db = store.db;
+		this.batch = store.batch;
+	}
 
 	async getMessageData(messageId: string): Promise<MessageData> {
 		const [
@@ -183,10 +188,10 @@ export class DrizzleEnvelopeRepository implements IEnvelopeRepository {
 				set: { updatedAt: now },
 			});
 		if (dedupedParameterRows.length === 0) {
-			await runBatch(this.db, [insertParts]);
+			await this.batch([insertParts]);
 			return;
 		}
-		await runBatch(this.db, [
+		await this.batch([
 			insertParts,
 			this.db
 				.insert(bodyPartParameterTable)
@@ -211,10 +216,10 @@ export class DrizzleEnvelopeRepository implements IEnvelopeRepository {
 			.delete(messageReferenceTable)
 			.where(eq(messageReferenceTable.messageId, messageId));
 		if (references.length === 0) {
-			await runBatch(this.db, [clear]);
+			await this.batch([clear]);
 			return;
 		}
-		await runBatch(this.db, [
+		await this.batch([
 			clear,
 			this.db.insert(messageReferenceTable).values(
 				references.map((reference) => ({

package/src/repos/filter.ts

@@ -12,13 +12,13 @@ import {
 	FilterState,
 } from "@remit/domain-enums";
 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";
 import { filterTable } from "../schema.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 const RULE_ASSERTION_FIELDS = [
 	"matchOperator",

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

@@ -1,9 +1,8 @@
 import assert from "node:assert";
 import { after, before, describe, test } from "node:test";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 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 type { AccountConfigRepo } from "./i4-account-config.js";
 
 describe("AccountConfigRepo", () => {
 	let db: TestDb;
@@ -12,7 +11,11 @@ describe("AccountConfigRepo", () => {
 
 	before(async () => {
 		({ db, close } = await createTestDb());
-		repo = new AccountConfigRepo(db as never, db as never);
+		repo = createSqliteRepositories({
+			app: db,
+			mail: db,
+			search: db,
+		}).accountConfig;
 	});
 
 	after(async () => {
@@ -58,8 +61,9 @@ describe("AccountConfigRepo", () => {
 		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);
+		const repos = createSqliteRepositories({ app: db, mail: db, search: db });
+		const accountRepo = repos.account;
+		const addrRepo = repos.address;
 
 		await accountRepo.create({
 			accountConfigId: cfg.accountConfigId,

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.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.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> {

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

@@ -7,12 +7,12 @@ import {
 	type UpdateConfigImportInput,
 } from "@remit/data-ports";
 import { desc, 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 { configImportTable } from "../schema/i4-config-import.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 type StoredRef = Omit<ConfigImportUnresolvedRefItem, "mailboxId"> & {
 	mailboxId?: string;

package/src/repos/i4-mailbox-lock.ts

@@ -4,11 +4,11 @@ import type {
 	WithMailboxLockResult,
 } from "@remit/data-ports";
 import { and, eq, lt } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { randomId } from "../id.js";
 import { mailboxLockTable } from "../schema/i4-mailbox-lock.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 const TTL_SECONDS = 3600;
 

package/src/repos/i4-mailbox-special-use.sqlite.test.ts

@@ -12,11 +12,11 @@ import {
 	mailboxSpecialUseTable,
 	mailboxTable,
 } from "../schema.js";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createSqliteTestDb } from "../test-db-sqlite.js";
-import { AccountSettingRepo } from "./i4-account-setting.js";
-import { MailboxRepo } from "./i4-mailbox.js";
-import { MailboxSpecialUseRepo } from "./i4-mailbox-special-use.js";
+import type { AccountSettingRepo } from "./i4-account-setting.js";
+import type { MailboxRepo } from "./i4-mailbox.js";
+import type { MailboxSpecialUseRepo } from "./i4-mailbox-special-use.js";
 import { mailboxCreated } from "./test-helpers.js";
 
 const makeMailboxInput = (
@@ -57,12 +57,14 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 		});
 		close = testDb.close;
 		db = testDb.db;
-		repo = new MailboxSpecialUseRepo(testDb.db as never, testDb.db as never);
-		mailboxes = new MailboxRepo(
-			testDb.db as never,
-			new SearchIndex(testDb.db as never, testDb.db as never),
-		);
-		accountSettings = new AccountSettingRepo(testDb.db as never);
+		const repos = createSqliteRepositories({
+			app: testDb.db,
+			mail: testDb.db,
+			search: testDb.db,
+		});
+		repo = repos.mailboxSpecialUse;
+		mailboxes = repos.mailbox;
+		accountSettings = repos.accountSetting;
 	});
 
 	after(async () => {

package/src/repos/i4-mailbox-special-use.ts

@@ -1,4 +1,7 @@
 import type {
+	AccountItem,
+	IAccountRepository,
+	IAccountSettingRepository,
 	IMailboxSpecialUseRepository,
 	MailboxSpecialUseItem,
 	MailboxSpecialUseValue,
@@ -15,14 +18,21 @@ import {
 } from "@remit/data-ports/folder-role";
 import { CanonicalMailboxRole } from "@remit/domain-enums";
 import { eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { randomId } from "../id.js";
-import { accountTable } from "../schema/i4-account-config.js";
 import { mailboxSpecialUseTable, mailboxTable } from "../schema/i4-mailbox.js";
-import { AccountSettingRepo } from "./i4-account-setting.js";
 import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
+
+type AccountReader = Pick<
+	IAccountRepository,
+	"get" | "listAllByAccountConfig" | "listAll"
+>;
+
+type AppointmentReader = Pick<IAccountSettingRepository, "get" | "getMany">;
+
+type AppointedAccount = Pick<AccountItem, "accountId" | "accountConfigId">;
 
 const JUNK_ROLES: readonly CanonicalMailboxRoleValue[] = [
 	CanonicalMailboxRole.Junk,
@@ -89,14 +99,11 @@ function rowToSpecialUse(
 }
 
 export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
-	private readonly accountSetting: AccountSettingRepo;
-
 	constructor(
-		private app: DB,
 		private db: DB,
-	) {
-		this.accountSetting = new AccountSettingRepo(app);
-	}
+		private accounts: AccountReader,
+		private accountSetting: AppointmentReader,
+	) {}
 
 	async create(
 		mailboxId: string,
@@ -203,11 +210,9 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 	async resolveJunkRolesForConfig(
 		accountConfigId: string,
 	): Promise<JunkRoleMailboxes> {
-		const accounts = await this.app
-			.select({ accountId: accountTable.accountId })
-			.from(accountTable)
-			.where(eq(accountTable.accountConfigId, accountConfigId));
-		return this.resolveJunkRoles(accounts.map((row) => row.accountId));
+		return this.resolveJunkRoles(
+			await this.accounts.listAllByAccountConfig(accountConfigId),
+		);
 	}
 
 	/**
@@ -217,21 +222,19 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 	 * run one pass over the address table instead of one per config.
 	 */
 	async resolveJunkRolesForInstance(): Promise<JunkRoleMailboxes> {
-		const accounts = await this.app
-			.select({ accountId: accountTable.accountId })
-			.from(accountTable);
-		return this.resolveJunkRoles(accounts.map((row) => row.accountId));
+		return this.resolveJunkRoles(await this.accounts.listAll());
 	}
 
 	private async resolveJunkRoles(
-		accountIds: readonly string[],
+		accounts: readonly AppointedAccount[],
 	): Promise<JunkRoleMailboxes> {
-		if (accountIds.length === 0) {
+		if (accounts.length === 0) {
 			return { junkMailboxIds: [], trashMailboxIds: [] };
 		}
+		const accountIds = accounts.map((account) => account.accountId);
 		const [candidates, appointments] = await Promise.all([
 			this.roleCandidatesFor(accountIds),
-			this.appointedMailboxIds(accountIds, JUNK_ROLES),
+			this.appointedMailboxIds(accounts, JUNK_ROLES),
 		]);
 
 		const junkMailboxIds: string[] = [];
@@ -255,24 +258,13 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 	}
 
 	/**
-	 * Each account's appointment for each role, in two reads. Same precedence
-	 * input as `appointedMailboxId`, batched: an account row missing is a caller
-	 * racing a delete, and leaves the account with no appointment rather than
-	 * failing the lookup.
+	 * Each account's appointment for each role, in one read. Same precedence
+	 * input as `appointedMailboxId`, batched.
 	 */
 	private async appointedMailboxIds(
-		accountIds: readonly string[],
+		accounts: readonly AppointedAccount[],
 		roles: readonly CanonicalMailboxRoleValue[],
 	): Promise<Map<string, string>> {
-		const accounts = await this.app
-			.select({
-				accountId: accountTable.accountId,
-				accountConfigId: accountTable.accountConfigId,
-			})
-			.from(accountTable)
-			.where(inList(accountTable.accountId, accountIds));
-		if (accounts.length === 0) return new Map();
-
 		const wanted = new Map<string, string>();
 		for (const account of accounts) {
 			for (const role of roles) {
@@ -367,10 +359,7 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 		accountId: string,
 		role: CanonicalMailboxRoleValue,
 	): Promise<string | undefined> {
-		const [account] = await this.app
-			.select({ accountConfigId: accountTable.accountConfigId })
-			.from(accountTable)
-			.where(eq(accountTable.accountId, accountId));
+		const [account] = await this.accounts.get([accountId]);
 		if (!account) return undefined;
 
 		const setting = await this.accountSetting.get(

package/src/repos/i4-mailbox.sqlite.test.ts

@@ -5,13 +5,13 @@ import { MailboxSyncStatus } from "@remit/domain-enums";
 import Database from "better-sqlite3";
 import { drizzle } from "drizzle-orm/better-sqlite3";
 import { mailboxTable } from "../schema.js";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createSqliteTestDb } from "../test-db-sqlite.js";
 import {
 	applyMigrationSet,
 	shippedTableDdl,
 } from "../test-shipped-sqlite-schema.js";
-import { MailboxRepo } from "./i4-mailbox.js";
+import type { MailboxRepo } from "./i4-mailbox.js";
 import { mailboxCreated } from "./test-helpers.js";
 
 function makeMailboxInput(accountId: string, fullPath = "INBOX") {
@@ -41,10 +41,11 @@ describe("MailboxRepo (sqlite)", () => {
 	before(async () => {
 		const testDb = await createSqliteTestDb({ mailbox: mailboxTable });
 		close = testDb.close;
-		repo = new MailboxRepo(
-			testDb.db as never,
-			new SearchIndex(testDb.db as never, testDb.db as never),
-		);
+		repo = createSqliteRepositories({
+			app: testDb.db,
+			mail: testDb.db,
+			search: testDb.db,
+		}).mailbox;
 	});
 
 	after(async () => {
@@ -210,10 +211,11 @@ describe("MailboxRepo (sqlite, shipped migrations)", () => {
 		const sqlite = new Database(":memory:");
 		applyMigrationSet(sqlite, "mail");
 		const db = drizzle(sqlite, { schema: { mailbox: mailboxTable } });
-		repo = new MailboxRepo(
-			db as never,
-			new SearchIndex(db as never, db as never),
-		);
+		repo = createSqliteRepositories({
+			app: db,
+			mail: db,
+			search: db,
+		}).mailbox;
 		close = async () => {
 			sqlite.close();
 		};