@remit/drizzle-service 0.0.101 → 0.0.103

package/src/repos/thread-message.ts

@@ -23,8 +23,8 @@ import {
 	type SQLWrapper,
 	sql,
 } 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 { NotFoundError } from "../error.js";
 import { deterministicBase36Id } from "../id.js";
 import { decodeToken } from "../pagination.js";
@@ -34,6 +34,7 @@ import type {
 	SearchIndex,
 	SearchPosition,
 } from "../search/thread-message-search.js";
+import { inList } from "./in-list.js";
 import {
 	bodyMatch,
 	fromMatch,
@@ -43,6 +44,8 @@ import {
 	subjectMatch,
 } from "./thread-search-predicates.js";
 
+type DB = RepositoryDb<Record<string, unknown>>;
+
 export const deriveThreadMessageId = (
 	threadId: string,
 	messageId: string,
@@ -325,10 +328,16 @@ function sentDateCursorCond(
 export class DrizzleThreadMessageRepository
 	implements IThreadMessageRepository
 {
+	private readonly db: DB;
+	private readonly batch: WriteBatch;
+
 	constructor(
-		private readonly db: Db<Record<string, unknown>>,
+		store: SqliteStore<Record<string, unknown>>,
 		private readonly search: SearchIndex,
-	) {}
+	) {
+		this.db = store.db;
+		this.batch = store.batch;
+	}
 
 	/**
 	 * One page of rows in date order (ranked first when asked). Without a text
@@ -579,7 +588,7 @@ export class DrizzleThreadMessageRepository
 				.where(
 					and(
 						eq(threadMessageTable.accountConfigId, accountConfigId),
-						inArray(threadMessageTable.threadMessageId, threadMessageId),
+						inList(threadMessageTable.threadMessageId, threadMessageId),
 					),
 				);
 			return rows.map(toItem);
@@ -678,7 +687,7 @@ export class DrizzleThreadMessageRepository
 			.where(
 				and(
 					eq(threadMessageTable.accountConfigId, accountConfigId),
-					inArray(threadMessageTable.threadMessageId, ids),
+					inList(threadMessageTable.threadMessageId, ids),
 				),
 			);
 		await this.search.sync(ids);
@@ -1081,7 +1090,7 @@ export class DrizzleThreadMessageRepository
 					.returning({ threadMessageId: threadMessageTable.threadMessageId }),
 			];
 		});
-		const results = await runBatch(this.db, items);
+		const results = await this.batch(items);
 		await this.search.sync(
 			rows.flatMap((row) => [
 				row.threadMessageId,

package/src/search/thread-message-search.sqlite.test.ts

@@ -3,8 +3,9 @@ import { after, before, describe, test } from "node:test";
 import type { CreateThreadMessageInput } from "@remit/data-ports";
 import Database from "better-sqlite3";
 import { drizzle } from "drizzle-orm/better-sqlite3";
+import { syncStore } from "../databases.js";
 import type { Db } from "../db.js";
-import { DrizzleThreadMessageRepository } from "../repos/thread-message.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { applyMigrationSet } from "../test-shipped-sqlite-schema.js";
 import {
 	SearchIndex,
@@ -48,8 +49,12 @@ const open = (set: "mail" | "search") => {
 describe("the thread-message search index in its own database", () => {
 	const mail = open("mail");
 	const search = open("search");
-	const index = new SearchIndex(mail.db, search.db);
-	const repo = new DrizzleThreadMessageRepository(mail.db, index);
+	const index = new SearchIndex(mail.db, syncStore(search.db));
+	const repo = createSqliteRepositories({
+		app: mail.db,
+		mail: mail.db,
+		search: search.db,
+	}).threadMessage;
 
 	const found = async (query: string): Promise<string[]> =>
 		(await repo.searchByMailboxWindow(ACCOUNT, MAILBOX, { query })).items.map(

package/src/search/thread-message-search.ts

@@ -12,8 +12,8 @@ import {
 	sql,
 } from "drizzle-orm";
 import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
-import { runBatch, type SqliteBatchItem } from "../batch.js";
-import type { Db } from "../db.js";
+import type { SqliteBatchItem, WriteBatch } from "../batch.js";
+import type { RepositoryDb, SqliteStore } from "../db.js";
 import { threadMessageTable } from "../schema/thread-message.js";
 
 // The FTS5 trigram table the search migration set creates
@@ -32,7 +32,7 @@ export const threadMessageSearchTable = sqliteTable("thread_message_fts", {
 	body: text("body").notNull(),
 });
 
-type AnyDb = Db<Record<string, unknown>>;
+type AnyDb = RepositoryDb<Record<string, unknown>>;
 
 type SearchDocument = typeof threadMessageSearchTable.$inferInsert;
 
@@ -138,10 +138,16 @@ export interface CandidateQuery {
  * only, so no statement carries more ids than a page holds.
  */
 export class SearchIndex {
+	private readonly search: AnyDb;
+	private readonly batch: WriteBatch;
+
 	constructor(
 		private readonly mail: AnyDb,
-		private readonly search: AnyDb,
-	) {}
+		store: SqliteStore<Record<string, unknown>>,
+	) {
+		this.search = store.db;
+		this.batch = store.batch;
+	}
 
 	/** Make the index match the mail database for these thread messages. */
 	async sync(threadMessageIds: readonly string[]): Promise<void> {
@@ -165,7 +171,7 @@ export class SearchIndex {
 						.values(rows.map(toDocument)),
 				);
 			}
-			await runBatch(this.search, items);
+			await this.batch(items);
 		}
 	}
 
@@ -256,8 +262,7 @@ export class SearchIndex {
 				.limit(DOCUMENTS_PER_REBUILD_PAGE);
 			const last = rows.at(-1);
 			if (!last) return indexed;
-			await runBatch(
-				this.search,
+			await this.batch(
 				chunk(rows, DOCUMENTS_PER_STATEMENT).map((slice) =>
 					this.search
 						.insert(threadMessageSearchTable)

package/src/sqlite-repositories.ts

@@ -1,4 +1,8 @@
-import type { SqliteDatabases } from "./databases.js";
+import {
+	type SqliteDatabases,
+	type SqliteStores,
+	syncStores,
+} from "./databases.js";
 import { CalendarCollectionRepo } from "./repos/calendar-collection.js";
 import { CalendarEventIndexRepo } from "./repos/calendar-event-index.js";
 import { CalendarFeedTokenRepo } from "./repos/calendar-feed-token.js";
@@ -31,45 +35,57 @@ import { SyncWarningRepo } from "./repos/sync-warning.js";
 import { DrizzleThreadMessageRepository } from "./repos/thread-message.js";
 import { SearchIndex } from "./search/thread-message-search.js";
 
-// Every repo over the database that holds its tables (#1420).
-export const createSqliteRepositories = ({
+export const composeSqliteRepositories = ({
 	app,
 	mail,
 	search,
-}: SqliteDatabases) => {
-	const searchIndex = new SearchIndex(mail, search);
+}: SqliteStores) => {
+	const searchIndex = new SearchIndex(mail.db, search);
+	const accountSetting = new AccountSettingRepo(app.db);
+	const address = new AddressRepo(mail.db);
+	const mailbox = new MailboxRepo(mail, searchIndex);
+	const account = new AccountRepo(app.db, mailbox);
+	const calendarSuggestion = new CalendarSuggestionRepo(mail.db);
 	return {
-		accountConfig: new AccountConfigRepo(app, mail),
-		account: new AccountRepo(app, mail),
-		accountSetting: new AccountSettingRepo(app),
-		address: new AddressRepo(mail),
-		mailbox: new MailboxRepo(mail, searchIndex),
-		mailboxSpecialUse: new MailboxSpecialUseRepo(app, mail),
-		mailboxLock: new MailboxLockRepo(mail),
+		accountConfig: new AccountConfigRepo(app.db, address),
+		account,
+		accountSetting,
+		address,
+		mailbox,
+		mailboxSpecialUse: new MailboxSpecialUseRepo(
+			mail.db,
+			account,
+			accountSetting,
+		),
+		mailboxLock: new MailboxLockRepo(mail.db),
 		message: new DrizzleMessageRepository(mail, searchIndex),
-		messageFlag: new DrizzleMessageFlagRepository(mail),
-		outboxMessage: new OutboxMessageRepo(mail),
+		messageFlag: new DrizzleMessageFlagRepository(mail.db),
+		outboxMessage: new OutboxMessageRepo(mail.db),
 		outboxAttachment: new OutboxAttachmentRepo(mail),
 		threadMessage: new DrizzleThreadMessageRepository(mail, searchIndex),
 		envelope: new DrizzleEnvelopeRepository(mail),
-		accountExportRequest: new AccountExportRequestRepo(app),
-		configImport: new ConfigImportRepo(app),
-		quarantine: new QuarantineRepo(mail),
-		syncWarning: new SyncWarningRepo(mail),
-		organizeJobRequest: new OrganizeJobRequestRepo(mail),
-		placementMove: new MessagePlacementMoveRepo(mail),
-		flagPush: new MessageFlagPushRepo(mail),
-		filter: new FilterRepo(app),
-		label: new LabelRepo(app),
-		messageLabel: new MessageLabelRepo(mail),
-		senderSignerStanding: new SenderSignerStandingRepo(mail),
-		calendarCollection: new CalendarCollectionRepo(app),
-		calendarObject: new CalendarObjectRepo(app),
-		calendarEventIndex: new CalendarEventIndexRepo(app),
-		calendarFeedToken: new CalendarFeedTokenRepo(app),
-		calendarSuggestion: new CalendarSuggestionRepo(mail),
-		calendarStore: new DrizzleCalendarStore(app, mail),
+		accountExportRequest: new AccountExportRequestRepo(app.db),
+		configImport: new ConfigImportRepo(app.db),
+		quarantine: new QuarantineRepo(mail.db),
+		syncWarning: new SyncWarningRepo(mail.db),
+		organizeJobRequest: new OrganizeJobRequestRepo(mail.db),
+		placementMove: new MessagePlacementMoveRepo(mail.db),
+		flagPush: new MessageFlagPushRepo(mail.db),
+		filter: new FilterRepo(app.db),
+		label: new LabelRepo(app.db),
+		messageLabel: new MessageLabelRepo(mail.db),
+		senderSignerStanding: new SenderSignerStandingRepo(mail.db),
+		calendarCollection: new CalendarCollectionRepo(app.db),
+		calendarObject: new CalendarObjectRepo(app.db),
+		calendarEventIndex: new CalendarEventIndexRepo(app.db),
+		calendarFeedToken: new CalendarFeedTokenRepo(app.db),
+		calendarSuggestion,
+		calendarStore: new DrizzleCalendarStore(app, calendarSuggestion),
 	};
 };
 
-export type SqliteRepositories = ReturnType<typeof createSqliteRepositories>;
+export type SqliteRepositories = ReturnType<typeof composeSqliteRepositories>;
+
+export const createSqliteRepositories = (
+	databases: SqliteDatabases,
+): SqliteRepositories => composeSqliteRepositories(syncStores(databases));