@remit/drizzle-service 0.0.102 → 0.0.103

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

@@ -2,7 +2,7 @@ import assert from "node:assert";
 import { after, before, describe, test } from "node:test";
 import { MailboxSyncStatus } from "@remit/domain-enums";
 import { eq } from "drizzle-orm";
-import { runBatch } from "../batch.js";
+import { syncBatch } from "../batch.js";
 import {
 	envelopeId as deriveEnvelopeId,
 	rootBodyPartId as deriveRootBodyPartId,
@@ -10,14 +10,13 @@ import {
 import {
 	filterTable,
 	mailboxSpecialUseTable,
-	mailboxTable,
 	messageTable,
 	threadMessageTable,
 } from "../schema.js";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createTestDb, randomId, type TestDb } from "../test-db.js";
-import { MailboxRepo } from "./i4-mailbox.js";
-import { DrizzleMessageRepository, deleteMessageSubtree } from "./message.js";
+import type { MailboxRepo } from "./i4-mailbox.js";
+import { deleteMessageSubtree } from "./message.js";
 import { mailboxCreated } from "./test-helpers.js";
 
 /** Every state a row can carry, for a transition that decides against none. */
@@ -55,10 +54,11 @@ describe("MailboxRepo", () => {
 
 	before(async () => {
 		({ db, close } = await createTestDb());
-		repo = new MailboxRepo(
-			db as never,
-			new SearchIndex(db as never, db as never),
-		);
+		repo = createSqliteRepositories({
+			app: db,
+			mail: db,
+			search: db,
+		}).mailbox;
 	});
 
 	after(async () => {
@@ -543,10 +543,11 @@ describe("MailboxRepo", () => {
 	describe("deleteMailboxWithMail — the folder's mail goes with it (D8)", () => {
 		const seedMessage = async (mailboxId: string, uid: number) => {
 			const messageId = randomId();
-			await new DrizzleMessageRepository(
-				db as never,
-				new SearchIndex(db as never, db as never),
-			).create({
+			await createSqliteRepositories({
+				app: db,
+				mail: db,
+				search: db,
+			}).message.create({
 				messageId,
 				mailboxId,
 				uid,
@@ -674,7 +675,7 @@ describe("MailboxRepo", () => {
 
 			// The shape an interruption leaves: one message's rows already gone,
 			// the mailbox row still there and still `deleting`.
-			await runBatch(db, deleteMessageSubtree(db, [first]));
+			await syncBatch(db)(deleteMessageSubtree(db, [first]));
 			await repo.transition(accountId, mailbox.mailboxId, {
 				from: EVERY_STATE,
 				to: MailboxSyncStatus.deleting,

package/src/repos/i4-mailbox.ts

@@ -27,8 +27,8 @@ import {
 	sql,
 } from "drizzle-orm";
 import shortUuid from "short-uuid";
-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 { decodeToken, resultList } from "../pagination.js";
 import {
@@ -52,7 +52,7 @@ const base36Translator = shortUuid.createTranslator(
 );
 const generateMailboxId = () => base36Translator.fromUUID(randomUUID());
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 /**
  * Message subtrees removed per batch by {@link MailboxRepo.deleteMailboxWithMail},
@@ -149,10 +149,16 @@ export function rowToMailbox(
 }
 
 export class MailboxRepo implements IMailboxRepository {
+	private readonly db: DB;
+	private readonly batch: WriteBatch;
+
 	constructor(
-		private db: DB,
+		store: SqliteStore<Record<string, unknown>>,
 		private search: SearchIndex,
-	) {}
+	) {
+		this.db = store.db;
+		this.batch = store.batch;
+	}
 
 	async create(input: CreateMailboxInput): Promise<CreateMailboxResult> {
 		const now = Date.now();
@@ -379,7 +385,7 @@ export class MailboxRepo implements IMailboxRepository {
 
 	async deleteMany(accountId: string, mailboxIds: string[]): Promise<void> {
 		if (mailboxIds.length === 0) return;
-		await runBatch(this.db, [
+		await this.batch([
 			this.db
 				.delete(syncWarningTable)
 				.where(
@@ -556,7 +562,7 @@ export class MailboxRepo implements IMailboxRepository {
 
 			// The primitive the rest of the codebase deletes mail with: nine
 			// per-message child tables. A bespoke table list would orphan them.
-			await runBatch(this.db, [
+			await this.batch([
 				...deleteMessageSubtree(this.db, messageIds),
 				this.db
 					.delete(threadMessageTable)

package/src/repos/i4-message-flag-push.ts

@@ -3,10 +3,10 @@ import type {
 	PutMessageFlagPushInput,
 } from "@remit/data-ports";
 import { and, eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { messageFlagPushTable } from "../schema/i4-message-flag-push.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 export type { MessageFlagPushItem, PutMessageFlagPushInput };
 export type FlagPushOperation = MessageFlagPushItem["operation"];

package/src/repos/i4-message-placement-move.ts

@@ -3,10 +3,10 @@ import type {
 	PutMessagePlacementMoveInput,
 } from "@remit/data-ports";
 import { eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { messagePlacementMoveTable } from "../schema/i4-message-placement-move.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 export type { MessagePlacementMoveItem, PutMessagePlacementMoveInput };
 export type MessagePlacementMoveState = MessagePlacementMoveItem["state"];

package/src/repos/i4-organize-job-request.ts

@@ -6,13 +6,13 @@ import type {
 	UpdateOrganizeJobRequestInput,
 } 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 { organizeJobRequestTable } from "../schema/i4-organize-job-request.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function rowToItem(
 	row: typeof organizeJobRequestTable.$inferSelect,

package/src/repos/i4-outbox-attachment.test.ts

@@ -1,7 +1,8 @@
 import assert from "node:assert";
 import { after, before, describe, test } from "node:test";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createTestDb, randomId } from "../test-db.js";
-import { OutboxAttachmentRepo } from "./i4-outbox-attachment.js";
+import type { OutboxAttachmentRepo } from "./i4-outbox-attachment.js";
 
 const CAP = { maxTotalBytes: 1000, maxCount: 3, nowSeconds: 1_000_000 };
 
@@ -27,7 +28,11 @@ const input = (
 
 before(async () => {
 	harness = await createTestDb();
-	repo = new OutboxAttachmentRepo(harness.db);
+	repo = createSqliteRepositories({
+		app: harness.db,
+		mail: harness.db,
+		search: harness.db,
+	}).outboxAttachment;
 });
 
 after(async () => {

package/src/repos/i4-outbox-attachment.ts

@@ -7,13 +7,13 @@ import type {
 } from "@remit/data-ports";
 import { holdsRoom } from "@remit/data-ports";
 import { and, eq, gt, gte, lt, or, sum } 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 { outboxAttachmentTable } from "../schema/i4-outbox-attachment.js";
 import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function rowToOutboxAttachment(
 	row: typeof outboxAttachmentTable.$inferSelect,
@@ -35,7 +35,13 @@ function rowToOutboxAttachment(
 }
 
 export class OutboxAttachmentRepo implements IOutboxAttachmentRepository {
-	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;
+	}
 
 	/**
 	 * The per-message cap. The insert, the read of the draft's live rows and a
@@ -60,7 +66,7 @@ export class OutboxAttachmentRepo implements IOutboxAttachmentRepository {
 				gte(outboxAttachmentTable.reservationExpiresAt, cap.nowSeconds),
 			),
 		);
-		const [inserted, rows, removed] = await runBatch(this.db, [
+		const [inserted, rows, removed] = await this.batch([
 			this.db
 				.insert(outboxAttachmentTable)
 				.values({

package/src/repos/i4-outbox-message.ts

@@ -6,13 +6,13 @@ import type {
 	UpdateOutboxMessageInput,
 } from "@remit/data-ports";
 import { and, desc, eq, lt, or } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { ForbiddenError, NotFoundError } from "../error.js";
 import { decodeToken, resultList } from "../pagination.js";
 import { outboxMessageTable } from "../schema/i4-outbox-message.js";
 import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function rowToOutboxMessage(
 	row: typeof outboxMessageTable.$inferSelect,

package/src/repos/i4-sender-signer-standing.ts

@@ -4,11 +4,11 @@ import type {
 	SenderSignerStandingItem,
 } from "@remit/data-ports";
 import { and, eq, sql } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { senderSignerStandingTable } from "../schema.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function rowToStanding(
 	row: typeof senderSignerStandingTable.$inferSelect,

package/src/repos/label.ts

@@ -6,13 +6,13 @@ import type {
 	UpdateLabelInput,
 } 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";
 import { labelTable } from "../schema.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 const normalize = (name: string): string => name.trim().toLowerCase();
 

package/src/repos/message-flag.ts

@@ -5,15 +5,12 @@ import type {
 	MessageFlagItem,
 } from "@remit/data-ports";
 import { and, eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { NotFoundError } from "../error.js";
-import {
-	type MessageDataSchema,
-	messageFlagTable,
-} from "../schema/message-data.js";
+import { messageFlagTable } from "../schema/message-data.js";
 import { inList } from "./in-list.js";
 
-type DB = Db<MessageDataSchema>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function rowToMessageFlag(
 	row: typeof messageFlagTable.$inferSelect,

package/src/repos/message-label.ts

@@ -4,12 +4,12 @@ import type {
 	MessageLabelItem,
 } from "@remit/data-ports";
 import { and, desc, eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { deterministicBase36Id } from "../id.js";
 import { messageLabelTable } from "../schema.js";
 import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function rowToMessageLabel(
 	row: typeof messageLabelTable.$inferSelect,

package/src/repos/message.sqlite.test.ts

@@ -6,9 +6,9 @@ import {
 } from "../id.js";
 import { messageDataSchema } from "../schema/message-data.js";
 import { threadMessageTable } from "../schema/thread-message.js";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createSqliteTestDb, type SqliteTestDb } from "../test-db-sqlite.js";
-import { DrizzleMessageRepository } from "./message.js";
+import type { DrizzleMessageRepository } from "./message.js";
 
 const SCHEMA = { ...messageDataSchema, threadMessages: threadMessageTable };
 
@@ -43,7 +43,7 @@ describe("DrizzleMessageRepository (sqlite)", () => {
 
 	before(async () => {
 		({ db, close } = await createSqliteTestDb(SCHEMA));
-		repo = new DrizzleMessageRepository(db, new SearchIndex(db, db));
+		repo = createSqliteRepositories({ app: db, mail: db, search: db }).message;
 	});
 
 	after(async () => {

package/src/repos/message.test.ts

@@ -4,9 +4,9 @@ import {
 	envelopeId as deriveEnvelopeId,
 	rootBodyPartId as deriveRootBodyPartId,
 } from "../id.js";
-import { SearchIndex } from "../search/thread-message-search.js";
-import { DrizzleEnvelopeRepository } from "./envelope.js";
-import { DrizzleMessageRepository } from "./message.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
+import type { DrizzleEnvelopeRepository } from "./envelope.js";
+import type { DrizzleMessageRepository } from "./message.js";
 import { createTestDb, type TestDb } from "./test-helpers.js";
 
 describe("DrizzleMessageRepository", () => {
@@ -37,8 +37,9 @@ describe("DrizzleMessageRepository", () => {
 
 	before(async () => {
 		({ db, stop } = await createTestDb());
-		messageRepo = new DrizzleMessageRepository(db, new SearchIndex(db, db));
-		envelopeRepo = new DrizzleEnvelopeRepository(db);
+		const repos = createSqliteRepositories({ app: db, mail: db, search: db });
+		messageRepo = repos.message;
+		envelopeRepo = repos.envelope;
 	});
 
 	after(async () => {

package/src/repos/message.ts

@@ -18,8 +18,8 @@ import {
 	or,
 	type SQL,
 } from "drizzle-orm";
-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 {
 	CreateFailedConflictError,
 	isUniqueViolation,
@@ -37,7 +37,6 @@ import {
 	bodyStructureRefetchTable,
 	envelopeAddressTable,
 	envelopeTable,
-	type MessageDataSchema,
 	messageFlagTable,
 	messageReferenceTable,
 	messageTable,
@@ -56,7 +55,7 @@ import {
 	toRawMessageStorageItem,
 } from "./mappers.js";
 
-type DB = Db<MessageDataSchema>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function toMessageItem(row: typeof messageTable.$inferSelect): MessageItem {
 	return {
@@ -112,7 +111,7 @@ function toMessageItem(row: typeof messageTable.$inferSelect): MessageItem {
 	};
 }
 
-export type SubtreeDb = Pick<Db<Record<string, unknown>>, "delete">;
+export type SubtreeDb = Pick<RepositoryDb<Record<string, unknown>>, "delete">;
 
 /**
  * The statements that delete a message and its whole per-message subtree by
@@ -193,10 +192,16 @@ const placementTerms = (expected: PlacementPredicate): SQL[] => {
 };
 
 export class DrizzleMessageRepository implements IMessageRepository {
+	private readonly db: DB;
+	private readonly batch: WriteBatch;
+
 	constructor(
-		private db: DB,
+		store: SqliteStore<Record<string, unknown>>,
 		private search: SearchIndex,
-	) {}
+	) {
+		this.db = store.db;
+		this.batch = store.batch;
+	}
 
 	private rowOf(input: CreateMessageInput) {
 		const now = Date.now();
@@ -462,7 +467,7 @@ export class DrizzleMessageRepository implements IMessageRepository {
 			.select({ threadMessageId: threadMessageTable.threadMessageId })
 			.from(threadMessageTable)
 			.where(eq(threadMessageTable.messageId, messageId));
-		const results = await runBatch(this.db, [
+		const results = await this.batch([
 			this.db
 				.delete(threadMessageTable)
 				.where(and(eq(threadMessageTable.messageId, messageId), placed)),
@@ -475,7 +480,7 @@ export class DrizzleMessageRepository implements IMessageRepository {
 
 	async deleteMany(messageIds: string[]): Promise<void> {
 		if (messageIds.length === 0) return;
-		await runBatch(this.db, deleteMessageSubtree(this.db, messageIds));
+		await this.batch(deleteMessageSubtree(this.db, messageIds));
 	}
 
 	async listByMailbox(
@@ -623,7 +628,7 @@ export class DrizzleMessageRepository implements IMessageRepository {
 			.select({ threadMessageId: threadMessageTable.threadMessageId })
 			.from(threadMessageTable)
 			.where(eq(threadMessageTable.messageId, messageId));
-		const [moved] = await runBatch(this.db, [
+		const [moved] = await this.batch([
 			this.db
 				.update(messageTable)
 				.set({

package/src/repos/quarantine.ts

@@ -6,10 +6,10 @@ import type {
 } from "@remit/data-ports";
 import { deriveQuarantineId } from "@remit/data-ports/id";
 import { desc, eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { quarantineTable } from "../schema/quarantine.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function rowToItem(row: typeof quarantineTable.$inferSelect): QuarantineItem {
 	return {

package/src/repos/sync-warning.ts

@@ -6,11 +6,11 @@ import type {
 } from "@remit/data-ports";
 import { deriveSyncWarningId } from "@remit/data-ports/id";
 import { and, count, desc, eq, gte, sql } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { syncWarningTable } from "../schema/sync-warning.js";
 import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 export class SyncWarningRepo implements ISyncWarningRepository {
 	constructor(private db: DB) {}

package/src/repos/thread-message-body-muted.sqlite.test.ts

@@ -12,10 +12,10 @@ import { after, before, describe, test } from "node:test";
 import type { CreateThreadMessageInput } from "@remit/data-ports";
 import { addressTable } from "../schema/i4-address.js";
 import { threadMessageTable } from "../schema/thread-message.js";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createSqliteTestDb } from "../test-db-sqlite.js";
 import { shippedIndexDdl } from "../test-shipped-sqlite-schema.js";
-import { DrizzleThreadMessageRepository } from "./thread-message.js";
+import type { DrizzleThreadMessageRepository } from "./thread-message.js";
 
 // The index the mail baseline creates for this predicate, read from the one
 // committed source so the plan assertion below is about the real object.
@@ -61,7 +61,11 @@ describe("thread-message body and muted-sender predicates (sqlite)", () => {
 			{ searchIndex: true },
 		));
 		sqlite.exec(mutedIndexDdl);
-		repo = new DrizzleThreadMessageRepository(db, new SearchIndex(db, db));
+		repo = createSqliteRepositories({
+			app: db,
+			mail: db,
+			search: db,
+		}).threadMessage;
 	});
 
 	after(async () => {

package/src/repos/thread-message-field-terms.sqlite.test.ts

@@ -2,10 +2,10 @@ import assert from "node:assert/strict";
 import { after, before, describe, test } from "node:test";
 import type { CreateThreadMessageInput } from "@remit/data-ports";
 import { threadMessageTable } from "../schema/thread-message.js";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createSqliteTestDb } from "../test-db-sqlite.js";
 import {
-	DrizzleThreadMessageRepository,
+	type DrizzleThreadMessageRepository,
 	THREAD_SEARCH_MAX_LIMIT,
 } from "./thread-message.js";
 
@@ -55,10 +55,11 @@ describe("DrizzleThreadMessageRepository.listByFieldTerms (sqlite, #459)", () =>
 			{ searchIndex: true },
 		);
 		close = created.close;
-		repo = new DrizzleThreadMessageRepository(
-			created.db,
-			new SearchIndex(created.db, created.db),
-		);
+		repo = createSqliteRepositories({
+			app: created.db,
+			mail: created.db,
+			search: created.db,
+		}).threadMessage;
 
 		await repo.create(
 			makeInput({

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

@@ -2,7 +2,7 @@ import assert from "node:assert/strict";
 import { after, before, describe, test } from "node:test";
 import type { CreateThreadMessageInput } from "@remit/data-ports";
 import { threadMessageTable } from "../schema/thread-message.js";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createSqliteTestDb } from "../test-db-sqlite.js";
 import {
 	BASE_DATE,
@@ -12,7 +12,7 @@ import {
 	totalRows,
 } from "./category-fixture.js";
 import {
-	DrizzleThreadMessageRepository,
+	type DrizzleThreadMessageRepository,
 	THREAD_SEARCH_MAX_LIMIT,
 } from "./thread-message.js";
 
@@ -58,7 +58,11 @@ describe("DrizzleThreadMessageRepository (sqlite)", () => {
 			},
 			{ searchIndex: true },
 		));
-		repo = new DrizzleThreadMessageRepository(db, new SearchIndex(db, db));
+		repo = createSqliteRepositories({
+			app: db,
+			mail: db,
+			search: db,
+		}).threadMessage;
 	});
 
 	after(async () => {

package/src/repos/thread-message.test.ts

@@ -3,11 +3,11 @@ import { after, before, describe, test } from "node:test";
 import type { CreateThreadMessageInput } from "@remit/data-ports";
 import shortUuid from "short-uuid";
 import { threadMessageTable } from "../schema/thread-message.js";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createSqliteTestDb } from "../test-db-sqlite.js";
 import {
 	clampThreadSearchLimit,
-	DrizzleThreadMessageRepository,
+	type DrizzleThreadMessageRepository,
 	deriveThreadMessageId,
 	THREAD_SEARCH_MAX_LIMIT,
 } from "./thread-message.js";
@@ -87,10 +87,11 @@ describe("DrizzleThreadMessageRepository.searchByMailboxWindow / countByMailbox"
 	before(async () => {
 		const harness = await setupDb();
 		close = harness.close;
-		repo = new DrizzleThreadMessageRepository(
-			harness.db,
-			new SearchIndex(harness.db, harness.db),
-		);
+		repo = createSqliteRepositories({
+			app: harness.db,
+			mail: harness.db,
+			search: harness.db,
+		}).threadMessage;
 	});
 
 	after(async () => {
@@ -391,10 +392,11 @@ describe("DrizzleThreadMessageRepository.searchByDate", () => {
 	before(async () => {
 		const harness = await setupDb();
 		close = harness.close;
-		repo = new DrizzleThreadMessageRepository(
-			harness.db,
-			new SearchIndex(harness.db, harness.db),
-		);
+		repo = createSqliteRepositories({
+			app: harness.db,
+			mail: harness.db,
+			search: harness.db,
+		}).threadMessage;
 	});
 
 	after(async () => {
@@ -921,10 +923,11 @@ describe("DrizzleThreadMessageRepository — native text search", () => {
 	before(async () => {
 		const harness = await setupDb();
 		close = harness.close;
-		repo = new DrizzleThreadMessageRepository(
-			harness.db,
-			new SearchIndex(harness.db, harness.db),
-		);
+		repo = createSqliteRepositories({
+			app: harness.db,
+			mail: harness.db,
+			search: harness.db,
+		}).threadMessage;
 	});
 
 	after(async () => {
@@ -1096,10 +1099,11 @@ describe("DrizzleThreadMessageRepository — core CRUD", () => {
 	before(async () => {
 		const harness = await setupDb();
 		close = harness.close;
-		repo = new DrizzleThreadMessageRepository(
-			harness.db,
-			new SearchIndex(harness.db, harness.db),
-		);
+		repo = createSqliteRepositories({
+			app: harness.db,
+			mail: harness.db,
+			search: harness.db,
+		}).threadMessage;
 	});
 
 	after(async () => {