@remit/drizzle-service 0.0.99 → 0.0.101

package/src/repos/filter.test.ts

@@ -1,6 +1,7 @@
 import assert from "node:assert";
 import { after, before, describe, test } from "node:test";
 import {
+	FilterClauseField,
 	FilterDisabledReason,
 	FilterScope,
 	FilterState,
@@ -9,6 +10,8 @@ import { NotFoundError } from "../error.js";
 import { createTestDb, randomId, type TestDb } from "../test-db.js";
 import { FilterRepo } from "./filter.js";
 
+const CLAUSES = [{ field: FilterClauseField.Subject, value: "booking" }];
+
 describe("FilterRepo", () => {
 	let db: TestDb;
 	let close: () => Promise<void>;
@@ -29,12 +32,12 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Booking confirmations",
 			scope: FilterScope.Standing,
+			literalClauses: CLAUSES,
 		});
 
 		assert.equal(filter.state, FilterState.Active);
 		assert.equal(filter.disabledReason, FilterDisabledReason.None);
-		assert.equal(filter.hasAnchor, false);
-		assert.equal(filter.literalClauses.length, 0);
+		assert.deepEqual(filter.literalClauses, CLAUSES);
 		assert.equal(filter.actionLabelId, "None");
 		assert.equal(filter.actionMailboxId, "None");
 		assert.ok(
@@ -55,6 +58,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Invoices",
 			scope: FilterScope.Standing,
+			literalClauses: CLAUSES,
 			state: FilterState.Disabled,
 			disabledReason: FilterDisabledReason.AwaitingFolder,
 		});
@@ -88,6 +92,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Until my trip",
 			scope: FilterScope.Temporary,
+			literalClauses: CLAUSES,
 			expiresAt,
 			ttl,
 		});
@@ -124,6 +129,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Newsletter admin",
 			scope: FilterScope.Standing,
+			literalClauses: CLAUSES,
 		});
 
 		const renamed = await repo.update(accountConfigId, filter.filterId, {
@@ -149,6 +155,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Move to archive",
 			scope: FilterScope.Standing,
+			literalClauses: CLAUSES,
 		});
 
 		await new Promise((resolve) => setTimeout(resolve, 1100));
@@ -173,6 +180,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Trip out-of-office",
 			scope: FilterScope.Standing,
+			literalClauses: CLAUSES,
 		});
 
 		await new Promise((resolve) => setTimeout(resolve, 1100));
@@ -205,6 +213,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Until my trip",
 			scope: FilterScope.Temporary,
+			literalClauses: CLAUSES,
 			expiresAt: initialExpiresAt,
 			ttl: Math.floor(new Date(initialExpiresAt).getTime() / 1000),
 		});
@@ -236,6 +245,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Until my trip",
 			scope: FilterScope.Temporary,
+			literalClauses: CLAUSES,
 			expiresAt,
 			ttl: Math.floor(new Date(expiresAt).getTime() / 1000),
 		});
@@ -268,11 +278,13 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Standing",
 			scope: FilterScope.Standing,
+			literalClauses: CLAUSES,
 		});
 		await repo.create({
 			accountConfigId: other,
 			name: "Foreign",
 			scope: FilterScope.Standing,
+			literalClauses: CLAUSES,
 		});
 
 		const all = await repo.listByAccountConfig(accountConfigId);
@@ -299,6 +311,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Standing",
 			scope: FilterScope.Standing,
+			literalClauses: CLAUSES,
 		});
 
 		const result = await repo.refreshExpiry(filter);
@@ -312,6 +325,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Until tomorrow",
 			scope: FilterScope.Temporary,
+			literalClauses: CLAUSES,
 			expiresAt: future,
 			ttl: Math.floor(new Date(future).getTime() / 1000),
 		});
@@ -327,6 +341,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Until yesterday, awaiting its folder",
 			scope: FilterScope.Temporary,
+			literalClauses: CLAUSES,
 			expiresAt: past,
 			ttl: Math.floor(new Date(past).getTime() / 1000) + 172_800,
 			state: FilterState.Disabled,
@@ -345,6 +360,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "Until yesterday",
 			scope: FilterScope.Temporary,
+			literalClauses: CLAUSES,
 			expiresAt: past,
 			ttl: Math.floor(new Date(past).getTime() / 1000) + 172_800,
 		});
@@ -368,6 +384,7 @@ describe("FilterRepo", () => {
 			accountConfigId,
 			name: "To delete",
 			scope: FilterScope.Standing,
+			literalClauses: CLAUSES,
 		});
 
 		await repo.delete(accountConfigId, filter.filterId);
@@ -385,16 +402,19 @@ describe("FilterRepo", () => {
 				accountConfigId,
 				name: "One",
 				scope: FilterScope.Standing,
+				literalClauses: CLAUSES,
 			}),
 			repo.create({
 				accountConfigId,
 				name: "Two",
 				scope: FilterScope.Standing,
+				literalClauses: CLAUSES,
 			}),
 			repo.create({
 				accountConfigId,
 				name: "Three",
 				scope: FilterScope.Standing,
+				literalClauses: CLAUSES,
 			}),
 		]);
 

package/src/repos/filter.ts

@@ -21,7 +21,6 @@ import { filterTable } from "../schema.js";
 type DB = Db<Record<string, unknown>>;
 
 const RULE_ASSERTION_FIELDS = [
-	"hasAnchor",
 	"matchOperator",
 	"literalClauses",
 	"actionLabelId",
@@ -37,7 +36,6 @@ const RULE_ASSERTION_FIELDS = [
  * narrower signal `selectMoveWinner` reads for exclusive-move precedence.
  */
 const ACTION_ASSERTION_FIELDS = [
-	"hasAnchor",
 	"matchOperator",
 	"literalClauses",
 	"actionLabelId",
@@ -81,7 +79,6 @@ function rowToFilter(row: typeof filterTable.$inferSelect): FilterItem {
 		ttl: row.ttl ?? undefined,
 		state: row.state,
 		disabledReason: row.disabledReason,
-		hasAnchor: row.hasAnchor,
 		ruleChangedAt: row.ruleChangedAt,
 		actionChangedAt: row.actionChangedAt,
 		matchOperator: row.matchOperator,
@@ -115,11 +112,10 @@ export class FilterRepo implements IFilterRepository {
 				ttl: input.ttl ?? null,
 				state: input.state ?? FilterState.Active,
 				disabledReason: input.disabledReason ?? FilterDisabledReason.None,
-				hasAnchor: input.hasAnchor ?? false,
 				ruleChangedAt: createdRuleChangedAt,
 				actionChangedAt: createdRuleChangedAt,
 				matchOperator: input.matchOperator ?? FilterMatchOperator.And,
-				literalClauses: input.literalClauses ?? [],
+				literalClauses: input.literalClauses,
 				actionLabelId: input.actionLabelId ?? "None",
 				actionMailboxId: input.actionMailboxId ?? "None",
 				createdAt: now,

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

@@ -12,7 +12,7 @@ describe("AccountConfigRepo", () => {
 
 	before(async () => {
 		({ db, close } = await createTestDb());
-		repo = new AccountConfigRepo(db as never);
+		repo = new AccountConfigRepo(db as never, db as never);
 	});
 
 	after(async () => {
@@ -58,7 +58,7 @@ describe("AccountConfigRepo", () => {
 		const userId = randomId();
 		const cfg = await repo.create({ userId });
 
-		const accountRepo = new AccountRepo(db as never);
+		const accountRepo = new AccountRepo(db as never, db as never);
 		const addrRepo = new AddressRepo(db as never);
 
 		await accountRepo.create({

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

@@ -37,7 +37,10 @@ function rowToAccountConfig(
 }
 
 export class AccountConfigRepo implements IAccountConfigRepository {
-	constructor(private db: DB) {}
+	constructor(
+		private db: DB,
+		private mail: DB,
+	) {}
 
 	async create(input: CreateAccountConfigInput): Promise<AccountConfigItem> {
 		const now = Date.now();
@@ -179,7 +182,7 @@ export class AccountConfigRepo implements IAccountConfigRepository {
 				.select()
 				.from(accountTable)
 				.where(eq(accountTable.accountConfigId, accountConfigId)),
-			this.db
+			this.mail
 				.select()
 				.from(addressTable)
 				.where(eq(addressTable.accountConfigId, accountConfigId)),

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

@@ -1,5 +1,6 @@
 import assert from "node:assert";
 import { after, before, describe, test } from "node:test";
+import { SearchIndex } from "../search/thread-message-search.js";
 import { createTestDb, randomId, type TestDb } from "../test-db.js";
 import { AccountRepo } from "./i4-account.js";
 import { MailboxRepo } from "./i4-mailbox.js";
@@ -26,7 +27,7 @@ describe("AccountRepo", () => {
 
 	before(async () => {
 		({ db, close } = await createTestDb());
-		repo = new AccountRepo(db as never);
+		repo = new AccountRepo(db as never, db as never);
 	});
 
 	after(async () => {
@@ -160,7 +161,10 @@ describe("AccountRepo", () => {
 		const accountConfigId = randomId();
 		const account = await repo.create(makeAccountInput(accountConfigId));
 
-		const mailboxRepo = new MailboxRepo(db as never);
+		const mailboxRepo = new MailboxRepo(
+			db as never,
+			new SearchIndex(db as never, db as never),
+		);
 		mailboxCreated(
 			await mailboxRepo.create({
 				accountId: account.accountId,

package/src/repos/i4-account.ts

@@ -4,6 +4,7 @@ import type {
 	AccountSchedulerPage,
 	CreateAccountInput,
 	IAccountRepository,
+	RemovableAccountField,
 	ResultList,
 	UpdateAccountInput,
 } from "@remit/data-ports";
@@ -70,7 +71,10 @@ export function rowToAccount(
 }
 
 export class AccountRepo implements IAccountRepository {
-	constructor(private db: DB) {}
+	constructor(
+		private db: DB,
+		private mail: DB,
+	) {}
 
 	async create(input: CreateAccountInput): Promise<AccountItem> {
 		const now = Date.now();
@@ -107,6 +111,7 @@ export class AccountRepo implements IAccountRepository {
 				syncPhase: input.syncPhase,
 				mailboxCountTotal: input.mailboxCountTotal,
 				mailboxCountSynced: input.mailboxCountSynced,
+				deletedAt: input.deletedAt,
 				createdAt: now,
 				updatedAt: now,
 			})
@@ -138,63 +143,14 @@ export class AccountRepo implements IAccountRepository {
 	async update(
 		accountId: string,
 		input: UpdateAccountInput,
-		remove?: (keyof UpdateAccountInput)[],
+		remove?: RemovableAccountField[],
 	): Promise<AccountItem> {
-		const now = Date.now();
 		const updates: Partial<typeof accountTable.$inferInsert> = {
-			updatedAt: now,
+			...input,
+			lastError: clampLastError(input.lastError),
+			updatedAt: Date.now(),
 		};
-
-		if (input.username !== undefined) updates.username = input.username;
-		if (input.email !== undefined) updates.email = input.email;
-		if (input.authType !== undefined) updates.authType = input.authType;
-		if (input.syncedServices !== undefined)
-			updates.syncedServices = input.syncedServices;
-		if (input.grantedScopes !== undefined)
-			updates.grantedScopes = input.grantedScopes;
-		if (input.passwordHash !== undefined)
-			updates.passwordHash = input.passwordHash;
-		if (input.oauthRefreshTokenHash !== undefined)
-			updates.oauthRefreshTokenHash = input.oauthRefreshTokenHash;
-		if (input.oauthTokenUpdatedAt !== undefined)
-			updates.oauthTokenUpdatedAt = input.oauthTokenUpdatedAt;
-		if (input.imapHost !== undefined) updates.imapHost = input.imapHost;
-		if (input.imapPort !== undefined) updates.imapPort = input.imapPort;
-		if (input.imapTls !== undefined) updates.imapTls = input.imapTls;
-		if (input.imapStartTls !== undefined)
-			updates.imapStartTls = input.imapStartTls;
-		if (input.smtpEnabled !== undefined)
-			updates.smtpEnabled = input.smtpEnabled;
-		if (input.smtpHost !== undefined) updates.smtpHost = input.smtpHost;
-		if (input.smtpPort !== undefined) updates.smtpPort = input.smtpPort;
-		if (input.smtpTls !== undefined) updates.smtpTls = input.smtpTls;
-		if (input.smtpStartTls !== undefined)
-			updates.smtpStartTls = input.smtpStartTls;
-		if (input.smtpUsername !== undefined)
-			updates.smtpUsername = input.smtpUsername;
-		if (input.isActive !== undefined) updates.isActive = input.isActive;
-		if (input.connectionState !== undefined)
-			updates.connectionState = input.connectionState;
-		if (input.lastConnectedAt !== undefined)
-			updates.lastConnectedAt = input.lastConnectedAt;
-		if (input.lastSyncAt !== undefined) updates.lastSyncAt = input.lastSyncAt;
-		if (input.lastError !== undefined)
-			updates.lastError = clampLastError(input.lastError);
-		if (input.syncPhase !== undefined) updates.syncPhase = input.syncPhase;
-		if (input.mailboxCountTotal !== undefined)
-			updates.mailboxCountTotal = input.mailboxCountTotal;
-		if (input.mailboxCountSynced !== undefined)
-			updates.mailboxCountSynced = input.mailboxCountSynced;
-
-		// Handle field removal (set to null)
-		if (remove) {
-			for (const field of remove) {
-				if (field === "lastError") updates.lastError = null;
-				if (field === "lastConnectedAt") updates.lastConnectedAt = null;
-				if (field === "lastSyncAt") updates.lastSyncAt = null;
-				if (field === "syncPhase") updates.syncPhase = null;
-			}
-		}
+		for (const field of remove ?? []) updates[field] = null;
 
 		const [row] = await this.db
 			.update(accountTable)
@@ -312,7 +268,7 @@ export class AccountRepo implements IAccountRepository {
 				.select()
 				.from(accountTable)
 				.where(eq(accountTable.accountId, accountId)),
-			this.db
+			this.mail
 				.select()
 				.from(mailboxTable)
 				.where(eq(mailboxTable.accountId, accountId)),

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

@@ -124,7 +124,7 @@ 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);
+		specialUse = new MailboxSpecialUseRepo(db as never, db as never);
 	});
 
 	/**

package/src/repos/i4-address-merge-flags.sqlite.test.ts

@@ -2,7 +2,6 @@ import assert from "node:assert/strict";
 import { after, before, describe, test } from "node:test";
 import type { AddressFlags } from "@remit/data-ports";
 import { createTestDb, randomId, type TestDb } from "../test-db.js";
-import { serializeSqliteWrites } from "../tx.js";
 import { AddressRepo } from "./i4-address.js";
 
 const FLAG_KEYS = [
@@ -25,7 +24,7 @@ describe("concurrent flag merges on one address", () => {
 
 	before(async () => {
 		({ db, close } = await createTestDb());
-		repo = new AddressRepo(serializeSqliteWrites(db) as never);
+		repo = new AddressRepo(db as never);
 	});
 
 	after(async () => {

package/src/repos/i4-address.ts

@@ -35,7 +35,6 @@ import {
 } from "../repair/junk-only-address.js";
 import { addressTable } from "../schema/i4-address.js";
 import { envelopeAddressTable } from "../schema/message-data.js";
-import { runInTransaction } from "../tx.js";
 import {
 	addressCorrespondence,
 	addressListable,
@@ -53,29 +52,26 @@ type AddressUpdate = Partial<{
 		| SQL;
 }>;
 
-const MERGE_FLAGS_ATTEMPTS = 8;
+/** The stored flags as a JSON object: a row harvested before the column existed carries `''`. */
+const storedFlags = sql<string>`coalesce(nullif(${addressTable.flags}, ''), '{}')`;
 
-/**
- * The stored flags exactly as they sit in the column, so a merge can guard its
- * write on the bytes it read rather than on a re-serialization of them.
- */
-const storedFlagsSql = sql<string>`cast(${addressTable.flags} as text)`;
+const flagPath = (key: string): string => `$.${key}`;
 
-/** A row harvested before the column existed carries `''`, not `'{}'`. */
-const parseStoredFlags = (stored: string): AddressFlags =>
-	stored === "" ? {} : (JSON.parse(stored) as AddressFlags);
+const withFlag = (flags: SQL, key: string, value: unknown): SQL =>
+	sql`json_set(${flags}, ${flagPath(key)}, json(${JSON.stringify(value)}))`;
 
-type MergeAttempt =
-	| { outcome: "merged"; address: AddressItem }
-	| { outcome: "missing" }
-	| { outcome: "contended" };
+const withoutFlag = (flags: SQL, key: string): SQL =>
+	sql`json_remove(${flags}, ${flagPath(key)})`;
+
+const flagRaised = (flags: SQL, key: string): SQL =>
+	sql`json_extract(${flags}, ${`$.${key}.value`}) = 1`;
 
 /**
  * `blocked` and `neverSpam` are two directly contradictory statements about
  * where a sender's mail belongs (issue #605), so a row asserting both is not a
  * tie to break — it is a row that should not exist. This is the only place that
  * sees both keys at once: `buildFlagsPatch` stays a pure per-key translation,
- * and the merge fold is the read-modify-write of the whole map.
+ * and the merge expression is the one write that sees the whole map.
  *
  * The flag the patch just raised wins, so the instruction the user gave last is
  * the one that stands. A patch raising both resolves to `blocked` — the same
@@ -89,20 +85,18 @@ type MergeAttempt =
  * healed the next time either key is written.
  */
 const dropContradictedPlacementFlag = (
-	next: AddressFlags,
+	flags: SQL,
 	patch: FlagsMergePatch,
-): AddressFlags => {
-	if (next.blocked?.value !== true || next.neverSpam?.value !== true)
-		return next;
-	if (patch.blocked?.value === true) {
-		const { neverSpam: _neverSpam, ...rest } = next;
-		return rest;
-	}
-	if (patch.neverSpam?.value === true) {
-		const { blocked: _blocked, ...rest } = next;
-		return rest;
-	}
-	return next;
+): SQL => {
+	const kept =
+		patch.blocked?.value === true
+			? "blocked"
+			: patch.neverSpam?.value === true
+				? "neverSpam"
+				: undefined;
+	if (kept === undefined) return flags;
+	const dropped = kept === "blocked" ? "neverSpam" : "blocked";
+	return sql`case when ${flagRaised(flags, kept)} and ${flagRaised(flags, dropped)} then ${withoutFlag(flags, dropped)} else ${flags} end`;
 };
 
 /**
@@ -463,54 +457,28 @@ export class AddressRepo implements IAddressRepository {
 	}
 
 	/**
-	 * Read the flags, fold `merge` over them, and write the result back only if
-	 * the column still holds the bytes the read returned. Read and write share
-	 * one serialized unit, so the only writer that can slip between them is the
-	 * junk-only reconcile, which runs its raw statement outside the write queue;
-	 * that write fails the guard and the merge folds again over the winner
-	 * instead of overwriting it. The unit never throws, so a reconcile statement
-	 * landing inside its savepoint is never rolled back with it.
+	 * Fold a change into the stored flags in the one UPDATE that writes them:
+	 * the change is a JSON expression over the column, so two concurrent merges
+	 * each apply to what the other left and neither overwrites the other.
 	 */
 	private async mergeStoredFlags(
 		accountConfigId: string,
 		addressId: string,
-		merge: (current: AddressFlags) => AddressFlags,
+		flags: SQL,
 		extra: AddressUpdate = {},
 	): Promise<AddressItem> {
-		const key = and(
-			eq(addressTable.accountConfigId, accountConfigId),
-			eq(addressTable.addressId, addressId),
-		);
-		for (let attempt = 0; attempt < MERGE_FLAGS_ATTEMPTS; attempt++) {
-			const result = await runInTransaction(
-				this.db,
-				async (tx): Promise<MergeAttempt> => {
-					const [current] = await tx
-						.select({ stored: storedFlagsSql })
-						.from(addressTable)
-						.where(key);
-					if (!current) return { outcome: "missing" };
-					const [row] = await tx
-						.update(addressTable)
-						.set({
-							...extra,
-							flags: merge(parseStoredFlags(current.stored)) as never,
-							updatedAt: Date.now(),
-						})
-						.where(and(key, eq(storedFlagsSql, current.stored)))
-						.returning();
-					return row
-						? { outcome: "merged", address: rowToAddress(row) }
-						: { outcome: "contended" };
-				},
-			);
-			if (result.outcome === "merged") return result.address;
-			if (result.outcome === "missing")
-				throw new NotFoundError(`Address not found: ${addressId}`);
-		}
-		throw new Error(
-			`Address flags stayed contended after ${MERGE_FLAGS_ATTEMPTS} attempts: ${addressId}`,
-		);
+		const [row] = await this.db
+			.update(addressTable)
+			.set({ ...extra, flags: flags as never, updatedAt: Date.now() })
+			.where(
+				and(
+					eq(addressTable.accountConfigId, accountConfigId),
+					eq(addressTable.addressId, addressId),
+				),
+			)
+			.returning();
+		if (!row) throw new NotFoundError(`Address not found: ${addressId}`);
+		return rowToAddress(row);
 	}
 
 	async mergeFlags(
@@ -518,21 +486,16 @@ export class AddressRepo implements IAddressRepository {
 		addressId: string,
 		patch: FlagsMergePatch,
 	): Promise<AddressItem> {
-		return this.mergeStoredFlags(accountConfigId, addressId, (current) => {
-			const next: AddressFlags = { ...current };
-			for (const [key, value] of Object.entries(patch) as [
-				keyof AddressFlags,
-				AddressFlags[keyof AddressFlags] | null | undefined,
-			][]) {
-				if (value === undefined) continue;
-				if (value === null) {
-					delete next[key];
-					continue;
-				}
-				(next[key] as AddressFlags[keyof AddressFlags]) = value;
-			}
-			return dropContradictedPlacementFlag(next, patch);
-		});
+		const merged = Object.entries(patch).reduce<SQL>((flags, [key, value]) => {
+			if (value === undefined) return flags;
+			if (value === null) return withoutFlag(flags, key);
+			return withFlag(flags, key, value);
+		}, storedFlags);
+		return this.mergeStoredFlags(
+			accountConfigId,
+			addressId,
+			dropContradictedPlacementFlag(merged, patch),
+		);
 	}
 
 	async promoteWellknownByUser(
@@ -540,10 +503,15 @@ export class AddressRepo implements IAddressRepository {
 		addressId: string,
 		now: number,
 	): Promise<AddressItem> {
-		return this.mergeStoredFlags(accountConfigId, addressId, (current) => ({
-			...current,
-			wellknown: { value: true, setAt: now, setBy: "user-junk-rescue" },
-		}));
+		return this.mergeStoredFlags(
+			accountConfigId,
+			addressId,
+			withFlag(storedFlags, "wellknown", {
+				value: true,
+				setAt: now,
+				setBy: "user-junk-rescue",
+			}),
+		);
 	}
 
 	async demoteSenderTrust(
@@ -554,7 +522,7 @@ export class AddressRepo implements IAddressRepository {
 		return this.mergeStoredFlags(
 			accountConfigId,
 			addressId,
-			({ wellknown: _w, vip: _v, ...rest }) => rest,
+			withoutFlag(withoutFlag(storedFlags, "wellknown"), "vip"),
 			{ inboundCount: 0, replyCount: 0 },
 		);
 	}

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

@@ -12,6 +12,7 @@ import {
 	mailboxSpecialUseTable,
 	mailboxTable,
 } from "../schema.js";
+import { SearchIndex } from "../search/thread-message-search.js";
 import { createSqliteTestDb } from "../test-db-sqlite.js";
 import { AccountSettingRepo } from "./i4-account-setting.js";
 import { MailboxRepo } from "./i4-mailbox.js";
@@ -56,8 +57,11 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 		});
 		close = testDb.close;
 		db = testDb.db;
-		repo = new MailboxSpecialUseRepo(testDb.db as never);
-		mailboxes = new MailboxRepo(testDb.db as never);
+		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);
 	});
 

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

@@ -90,8 +90,11 @@ function rowToSpecialUse(
 export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 	private readonly accountSetting: AccountSettingRepo;
 
-	constructor(private db: DB) {
-		this.accountSetting = new AccountSettingRepo(db);
+	constructor(
+		private app: DB,
+		private db: DB,
+	) {
+		this.accountSetting = new AccountSettingRepo(app);
 	}
 
 	async create(
@@ -199,7 +202,7 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 	async resolveJunkRolesForConfig(
 		accountConfigId: string,
 	): Promise<JunkRoleMailboxes> {
-		const accounts = await this.db
+		const accounts = await this.app
 			.select({ accountId: accountTable.accountId })
 			.from(accountTable)
 			.where(eq(accountTable.accountConfigId, accountConfigId));
@@ -213,7 +216,7 @@ 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.db
+		const accounts = await this.app
 			.select({ accountId: accountTable.accountId })
 			.from(accountTable);
 		return this.resolveJunkRoles(accounts.map((row) => row.accountId));
@@ -260,7 +263,7 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 		accountIds: readonly string[],
 		roles: readonly CanonicalMailboxRoleValue[],
 	): Promise<Map<string, string>> {
-		const accounts = await this.db
+		const accounts = await this.app
 			.select({
 				accountId: accountTable.accountId,
 				accountConfigId: accountTable.accountConfigId,
@@ -363,7 +366,7 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 		accountId: string,
 		role: CanonicalMailboxRoleValue,
 	): Promise<string | undefined> {
-		const [account] = await this.db
+		const [account] = await this.app
 			.select({ accountConfigId: accountTable.accountConfigId })
 			.from(accountTable)
 			.where(eq(accountTable.accountId, accountId));