@remit/drizzle-service 0.0.101 → 0.0.102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.101",
+  "version": "0.0.102",
   "description": "Drizzle ORM service over SQLite",
   "type": "module",
   "main": "src/index.ts",

package/src/repos/calendar-suggestion.ts

@@ -7,11 +7,12 @@ import type {
 } from "@remit/data-ports";
 import { deriveCalendarSuggestionId } from "@remit/data-ports/id";
 import { CalendarSuggestionState } from "@remit/domain-enums";
-import { and, asc, desc, eq, gte, inArray, lt, or } from "drizzle-orm";
+import { and, asc, desc, eq, gte, lt, or } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { decodeToken, resultList } from "../pagination.js";
 import { calendarSuggestionTable } from "../schema.js";
+import { inList } from "./in-list.js";
 
 type DB = Db<Record<string, unknown>>;
 
@@ -111,7 +112,7 @@ export class CalendarSuggestionRepo implements ICalendarSuggestionRepository {
 			.where(
 				and(
 					eq(calendarSuggestionTable.accountConfigId, accountConfigId),
-					inArray(
+					inList(
 						calendarSuggestionTable.acceptedCalendarObjectId,
 						calendarObjectIds,
 					),

package/src/repos/cascade-delete.ts

@@ -1,4 +1,3 @@
-import { and, eq, inArray, or, type SQL } from "drizzle-orm";
 import { runBatch, type SqliteBatchItem } from "../batch.js";
 import {
 	openSqliteDatabases,
@@ -17,6 +16,7 @@ import { quarantineTable } from "../schema/quarantine.js";
 import { syncWarningTable } from "../schema/sync-warning.js";
 import { threadMessageTable } from "../schema/thread-message.js";
 import { SearchIndex } from "../search/thread-message-search.js";
+import { inList, pairInList } from "./in-list.js";
 import { deleteMessageSubtree } from "./message.js";
 
 export interface CascadeEntity {
@@ -107,7 +107,7 @@ export const runDrizzleCascadeDelete = async (
 		items.push(
 			mail
 				.delete(threadMessageTable)
-				.where(inArray(threadMessageTable.threadMessageId, threadMessageIds)),
+				.where(inList(threadMessageTable.threadMessageId, threadMessageIds)),
 		);
 	}
 
@@ -116,12 +116,12 @@ export const runDrizzleCascadeDelete = async (
 		items.push(
 			mail
 				.delete(syncWarningTable)
-				.where(inArray(syncWarningTable.mailboxId, mailboxIds)),
+				.where(inList(syncWarningTable.mailboxId, mailboxIds)),
 		);
 		items.push(
 			mail
 				.delete(mailboxTable)
-				.where(inArray(mailboxTable.mailboxId, mailboxIds)),
+				.where(inList(mailboxTable.mailboxId, mailboxIds)),
 		);
 	}
 
@@ -132,19 +132,21 @@ export const runDrizzleCascadeDelete = async (
 		items.push(
 			mail
 				.delete(outboxMessageTable)
-				.where(inArray(outboxMessageTable.outboxMessageId, outboxMessageIds)),
+				.where(inList(outboxMessageTable.outboxMessageId, outboxMessageIds)),
 		);
 	}
 
 	const lockKeys = grouped.get("MailboxLock") ?? [];
 	if (lockKeys.length > 0) {
-		const conditions: SQL[] = lockKeys.map((k) =>
-			and(
-				eq(mailboxLockTable.mailboxId, k.mailboxId),
-				eq(mailboxLockTable.eventName, k.eventName),
+		items.push(
+			mail.delete(mailboxLockTable).where(
+				pairInList(
+					mailboxLockTable.mailboxId,
+					mailboxLockTable.eventName,
+					lockKeys.map((k) => [k.mailboxId, k.eventName]),
+				),
 			),
-		) as SQL[];
-		items.push(mail.delete(mailboxLockTable).where(or(...conditions)));
+		);
 	}
 
 	const accountSettingIds = (grouped.get("AccountSetting") ?? []).map(
@@ -154,9 +156,7 @@ export const runDrizzleCascadeDelete = async (
 		appItems.push(
 			app
 				.delete(accountSettingTable)
-				.where(
-					inArray(accountSettingTable.accountSettingId, accountSettingIds),
-				),
+				.where(inList(accountSettingTable.accountSettingId, accountSettingIds)),
 		);
 	}
 
@@ -165,7 +165,7 @@ export const runDrizzleCascadeDelete = async (
 		items.push(
 			mail
 				.delete(addressTable)
-				.where(inArray(addressTable.addressId, addressIds)),
+				.where(inList(addressTable.addressId, addressIds)),
 		);
 	}
 
@@ -178,17 +178,17 @@ export const runDrizzleCascadeDelete = async (
 		items.push(
 			mail
 				.delete(quarantineTable)
-				.where(inArray(quarantineTable.accountId, accountIds)),
+				.where(inList(quarantineTable.accountId, accountIds)),
 		);
 		items.push(
 			mail
 				.delete(syncWarningTable)
-				.where(inArray(syncWarningTable.accountId, accountIds)),
+				.where(inList(syncWarningTable.accountId, accountIds)),
 		);
 		appItems.push(
 			app
 				.delete(accountTable)
-				.where(inArray(accountTable.accountId, accountIds)),
+				.where(inList(accountTable.accountId, accountIds)),
 		);
 	}
 
@@ -200,23 +200,22 @@ export const runDrizzleCascadeDelete = async (
 			mail
 				.delete(messagePlacementMoveTable)
 				.where(
-					inArray(messagePlacementMoveTable.messageId, placementMoveMessageIds),
+					inList(messagePlacementMoveTable.messageId, placementMoveMessageIds),
 				),
 		);
 	}
 
-	// Composite key (messageId, flagName) — a message can carry an
-	// independent pending read-state marker and pending star marker at once
-	// (issue #1273), so a single-column inArray cannot target one row.
 	const flagPushKeys = grouped.get("MessageFlagPush") ?? [];
 	if (flagPushKeys.length > 0) {
-		const conditions: SQL[] = flagPushKeys.map((k) =>
-			and(
-				eq(messageFlagPushTable.messageId, k.messageId),
-				eq(messageFlagPushTable.flagName, k.flagName),
+		items.push(
+			mail.delete(messageFlagPushTable).where(
+				pairInList(
+					messageFlagPushTable.messageId,
+					messageFlagPushTable.flagName,
+					flagPushKeys.map((k) => [k.messageId, k.flagName]),
+				),
 			),
-		) as SQL[];
-		items.push(mail.delete(messageFlagPushTable).where(or(...conditions)));
+		);
 	}
 	await runBatch(mail, items);
 	await runBatch(app, appItems);

package/src/repos/envelope.ts

@@ -8,7 +8,7 @@ import type {
 	MessageReferenceInput,
 	UpdateEnvelopeInput,
 } from "@remit/data-ports";
-import { eq, inArray } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 import { runBatch } from "../batch.js";
 import type { Db } from "../db.js";
 import {
@@ -34,6 +34,7 @@ import {
 	messageTable,
 	rawMessageStorageTable,
 } from "../schema/message-data.js";
+import { inList } from "./in-list.js";
 import {
 	toBodyPartItem,
 	toBodyPartParameterItem,
@@ -235,7 +236,7 @@ export class DrizzleEnvelopeRepository implements IEnvelopeRepository {
 
 		await this.db
 			.delete(envelopeTable)
-			.where(inArray(envelopeTable.envelopeId, envelopeIds));
+			.where(inList(envelopeTable.envelopeId, envelopeIds));
 	}
 
 	async createEnvelope(input: CreateEnvelopeInput): Promise<EnvelopeItem> {
@@ -293,7 +294,7 @@ export class DrizzleEnvelopeRepository implements IEnvelopeRepository {
 			const rows = await this.db
 				.select()
 				.from(envelopeTable)
-				.where(inArray(envelopeTable.envelopeId, envelopeId));
+				.where(inList(envelopeTable.envelopeId, envelopeId));
 			return rows.map(toEnvelopeItem);
 		}
 
@@ -353,6 +354,6 @@ export class DrizzleEnvelopeRepository implements IEnvelopeRepository {
 		if (messageIds.length === 0) return;
 		await this.db
 			.delete(bodyStructureRefetchTable)
-			.where(inArray(bodyStructureRefetchTable.messageId, messageIds));
+			.where(inList(bodyStructureRefetchTable.messageId, messageIds));
 	}
 }

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

@@ -6,7 +6,7 @@ import type {
 	ResultList,
 	UpdateAccountConfigInput,
 } from "@remit/data-ports";
-import { and, asc, eq, gt, inArray, or } from "drizzle-orm";
+import { and, asc, eq, gt, or } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
@@ -18,6 +18,7 @@ import {
 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>>;
 
@@ -71,7 +72,7 @@ export class AccountConfigRepo implements IAccountConfigRepository {
 			const rows = await this.db
 				.select()
 				.from(accountConfigTable)
-				.where(inArray(accountConfigTable.accountConfigId, accountConfigId));
+				.where(inList(accountConfigTable.accountConfigId, accountConfigId));
 			return rows.map(rowToAccountConfig);
 		}
 		const [row] = await this.db
@@ -116,7 +117,7 @@ export class AccountConfigRepo implements IAccountConfigRepository {
 		if (accountConfigIds.length === 0) return;
 		await this.db
 			.delete(accountConfigTable)
-			.where(inArray(accountConfigTable.accountConfigId, accountConfigIds));
+			.where(inList(accountConfigTable.accountConfigId, accountConfigIds));
 	}
 
 	async listByUser(

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

@@ -5,9 +5,10 @@ import type {
 	IAccountSettingRepository,
 	UpsertAccountSettingInput,
 } from "@remit/data-ports";
-import { and, eq, inArray } from "drizzle-orm";
+import { and, eq } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { accountSettingTable } from "../schema/i4-account-setting.js";
+import { inList } from "./in-list.js";
 
 type DB = Db<Record<string, unknown>>;
 
@@ -63,8 +64,8 @@ export class AccountSettingRepo implements IAccountSettingRepository {
 			.from(accountSettingTable)
 			.where(
 				and(
-					inArray(accountSettingTable.accountConfigId, [...accountConfigIds]),
-					inArray(accountSettingTable.name, [...names]),
+					inList(accountSettingTable.accountConfigId, accountConfigIds),
+					inList(accountSettingTable.name, names),
 				),
 			);
 		return rows.map(rowToAccountSetting);

package/src/repos/i4-account.ts

@@ -9,7 +9,7 @@ import type {
 	UpdateAccountInput,
 } from "@remit/data-ports";
 import { AccountService, SyncPhase } from "@remit/domain-enums";
-import { and, asc, eq, gt, inArray, like, or, sql } from "drizzle-orm";
+import { and, asc, eq, gt, like, or, sql } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
@@ -17,6 +17,7 @@ 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>>;
 
@@ -129,7 +130,7 @@ export class AccountRepo implements IAccountRepository {
 			const rows = await this.db
 				.select()
 				.from(accountTable)
-				.where(inArray(accountTable.accountId, accountId));
+				.where(inList(accountTable.accountId, accountId));
 			return rows.map(rowToAccount);
 		}
 		const [row] = await this.db
@@ -187,7 +188,7 @@ export class AccountRepo implements IAccountRepository {
 		if (accountIds.length === 0) return;
 		await this.db
 			.delete(accountTable)
-			.where(inArray(accountTable.accountId, accountIds));
+			.where(inList(accountTable.accountId, accountIds));
 	}
 
 	async list(

package/src/repos/i4-address.ts

@@ -19,7 +19,6 @@ import {
 	eq,
 	getTableColumns,
 	gt,
-	inArray,
 	type SQL,
 	sql,
 } from "drizzle-orm";
@@ -43,6 +42,7 @@ import {
 	addressRecency,
 	addressSearchMatch,
 } from "./address-search-predicates.js";
+import { inList } from "./in-list.js";
 
 type DB = Db<Record<string, unknown>>;
 
@@ -400,7 +400,7 @@ export class AddressRepo implements IAddressRepository {
 				.where(
 					and(
 						eq(addressTable.accountConfigId, accountConfigId),
-						inArray(addressTable.addressId, addressId),
+						inList(addressTable.addressId, addressId),
 					),
 				);
 			return rows.map(rowToAddress);
@@ -666,7 +666,7 @@ export class AddressRepo implements IAddressRepository {
 			.where(
 				and(
 					eq(addressTable.accountConfigId, accountConfigId),
-					inArray(addressTable.addressId, addressIds),
+					inList(addressTable.addressId, addressIds),
 				),
 			);
 	}
@@ -856,7 +856,7 @@ export class AddressRepo implements IAddressRepository {
 				.select()
 				.from(envelopeAddressTable)
 				.where(
-					inArray(envelopeAddressTable.envelopeAddressId, envelopeAddressId),
+					inList(envelopeAddressTable.envelopeAddressId, envelopeAddressId),
 				);
 			return rows.map(rowToEnvelopeAddress);
 		}
@@ -884,7 +884,7 @@ export class AddressRepo implements IAddressRepository {
 		await this.db
 			.delete(envelopeAddressTable)
 			.where(
-				inArray(envelopeAddressTable.envelopeAddressId, envelopeAddressIds),
+				inList(envelopeAddressTable.envelopeAddressId, envelopeAddressIds),
 			);
 	}
 }

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

@@ -14,12 +14,13 @@ import {
 	type UnappointedRoleResolution,
 } from "@remit/data-ports/folder-role";
 import { CanonicalMailboxRole } from "@remit/domain-enums";
-import { eq, inArray } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 import type { Db } 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>>;
 
@@ -269,7 +270,7 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 				accountConfigId: accountTable.accountConfigId,
 			})
 			.from(accountTable)
-			.where(inArray(accountTable.accountId, [...accountIds]));
+			.where(inList(accountTable.accountId, accountIds));
 		if (accounts.length === 0) return new Map();
 
 		const wanted = new Map<string, string>();
@@ -303,14 +304,14 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 		const rows = await this.db
 			.select()
 			.from(mailboxTable)
-			.where(inArray(mailboxTable.accountId, [...accountIds]));
+			.where(inList(mailboxTable.accountId, accountIds));
 		if (rows.length === 0) return new Map();
 
 		const entries = await this.db
 			.select()
 			.from(mailboxSpecialUseTable)
 			.where(
-				inArray(
+				inList(
 					mailboxSpecialUseTable.mailboxId,
 					rows.map((row) => row.mailboxId),
 				),
@@ -397,7 +398,7 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 			.select()
 			.from(mailboxSpecialUseTable)
 			.where(
-				inArray(
+				inList(
 					mailboxSpecialUseTable.mailboxId,
 					rows.map((row) => row.mailboxId),
 				),

package/src/repos/i4-mailbox.ts

@@ -44,6 +44,7 @@ import { messageTable } from "../schema/message-data.js";
 import { syncWarningTable } from "../schema/sync-warning.js";
 import { threadMessageTable } from "../schema/thread-message.js";
 import type { SearchIndex } from "../search/thread-message-search.js";
+import { inList } from "./in-list.js";
 import { deleteMessageSubtree } from "./message.js";
 
 const base36Translator = shortUuid.createTranslator(
@@ -207,7 +208,7 @@ export class MailboxRepo implements IMailboxRepository {
 				.where(
 					and(
 						eq(mailboxTable.accountId, accountId),
-						inArray(mailboxTable.mailboxId, mailboxId),
+						inList(mailboxTable.mailboxId, mailboxId),
 					),
 				);
 			return rows.map(rowToMailbox);
@@ -384,7 +385,7 @@ export class MailboxRepo implements IMailboxRepository {
 				.where(
 					and(
 						eq(syncWarningTable.accountId, accountId),
-						inArray(syncWarningTable.mailboxId, mailboxIds),
+						inList(syncWarningTable.mailboxId, mailboxIds),
 					),
 				),
 			this.db
@@ -392,7 +393,7 @@ export class MailboxRepo implements IMailboxRepository {
 				.where(
 					and(
 						eq(mailboxTable.accountId, accountId),
-						inArray(mailboxTable.mailboxId, mailboxIds),
+						inList(mailboxTable.mailboxId, mailboxIds),
 					),
 				),
 		]);
@@ -551,7 +552,7 @@ export class MailboxRepo implements IMailboxRepository {
 			const listings = await this.db
 				.select({ threadMessageId: threadMessageTable.threadMessageId })
 				.from(threadMessageTable)
-				.where(inArray(threadMessageTable.messageId, messageIds));
+				.where(inList(threadMessageTable.messageId, messageIds));
 
 			// The primitive the rest of the codebase deletes mail with: nine
 			// per-message child tables. A bespoke table list would orphan them.
@@ -559,7 +560,7 @@ export class MailboxRepo implements IMailboxRepository {
 				...deleteMessageSubtree(this.db, messageIds),
 				this.db
 					.delete(threadMessageTable)
-					.where(inArray(threadMessageTable.messageId, messageIds)),
+					.where(inList(threadMessageTable.messageId, messageIds)),
 			]);
 			await this.search.sync(listings.map((row) => row.threadMessageId));
 		}

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

@@ -6,11 +6,12 @@ import type {
 	ReserveOutboxAttachmentResult,
 } from "@remit/data-ports";
 import { holdsRoom } from "@remit/data-ports";
-import { and, eq, gt, gte, inArray, lt, or, sum } from "drizzle-orm";
+import { and, eq, gt, gte, lt, or, sum } from "drizzle-orm";
 import { runBatch } from "../batch.js";
 import type { Db } 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>>;
 
@@ -218,10 +219,7 @@ export class OutboxAttachmentRepo implements IOutboxAttachmentRepository {
 			.where(
 				and(
 					eq(outboxAttachmentTable.accountConfigId, accountConfigId),
-					inArray(
-						outboxAttachmentTable.outboxAttachmentId,
-						outboxAttachmentIds,
-					),
+					inList(outboxAttachmentTable.outboxAttachmentId, outboxAttachmentIds),
 				),
 			);
 	}

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

@@ -5,11 +5,12 @@ import type {
 	ResultList,
 	UpdateOutboxMessageInput,
 } from "@remit/data-ports";
-import { and, desc, eq, inArray, lt, or } from "drizzle-orm";
+import { and, desc, eq, lt, or } from "drizzle-orm";
 import type { Db } 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>>;
 
@@ -99,7 +100,7 @@ export class OutboxMessageRepo implements IOutboxMessageRepository {
 				.where(
 					and(
 						eq(outboxMessageTable.accountConfigId, accountConfigId),
-						inArray(outboxMessageTable.outboxMessageId, outboxMessageId),
+						inList(outboxMessageTable.outboxMessageId, outboxMessageId),
 					),
 				);
 			return rows.map(rowToOutboxMessage);
@@ -264,7 +265,7 @@ export class OutboxMessageRepo implements IOutboxMessageRepository {
 			.where(
 				and(
 					eq(outboxMessageTable.accountConfigId, accountConfigId),
-					inArray(outboxMessageTable.outboxMessageId, outboxMessageIds),
+					inList(outboxMessageTable.outboxMessageId, outboxMessageIds),
 				),
 			);
 	}
@@ -298,7 +299,7 @@ export class OutboxMessageRepo implements IOutboxMessageRepository {
 			.from(outboxMessageTable)
 			.where(
 				and(
-					inArray(outboxMessageTable.accountId, accountIds),
+					inList(outboxMessageTable.accountId, accountIds),
 					after
 						? or(
 								lt(outboxMessageTable.createdAt, after.createdAt),

package/src/repos/in-list.sqlite.test.ts

@@ -0,0 +1,61 @@
+import assert from "node:assert/strict";
+import { after, before, describe, test } from "node:test";
+import { calendarTable } from "../schema.js";
+import { createSqliteTestDb, type SqliteTestDb } from "../test-db-sqlite.js";
+import { inList } from "./in-list.js";
+
+const SCHEMA = { calendars: calendarTable };
+
+const calendar = (calendarId: string): typeof calendarTable.$inferInsert => ({
+	calendarId,
+	accountConfigId: "account-config-in-list",
+	urlSegment: calendarId,
+	displayName: calendarId,
+	color: "Cal1",
+	componentSet: "VeventOnly",
+	source: "UserCreated",
+	timezone: "",
+	subscriptionUrl: "",
+	subscriptionEnabled: false,
+	syncSequence: 0,
+	createdAt: 0,
+	updatedAt: 0,
+});
+
+describe("inList on better-sqlite3", () => {
+	let db: SqliteTestDb<typeof SCHEMA>;
+	let close: () => Promise<void>;
+	const allIds = Array.from({ length: 150 }, (_, index) => `calendar-${index}`);
+
+	before(async () => {
+		({ db, close } = await createSqliteTestDb(SCHEMA));
+		await db.insert(calendarTable).values(allIds.map(calendar));
+	});
+
+	after(() => close());
+
+	test("binds a single parameter for 150 ids", () => {
+		const query = db
+			.select({ calendarId: calendarTable.calendarId })
+			.from(calendarTable)
+			.where(inList(calendarTable.calendarId, allIds))
+			.toSQL();
+		assert.equal(query.params.length, 1);
+	});
+
+	test("matches only the listed ids", async () => {
+		const rows = await db
+			.select({ calendarId: calendarTable.calendarId })
+			.from(calendarTable)
+			.where(inList(calendarTable.calendarId, ["calendar-3", "missing"]));
+		assert.deepEqual(rows, [{ calendarId: "calendar-3" }]);
+	});
+
+	test("matches nothing for an empty list", async () => {
+		const rows = await db
+			.select({ calendarId: calendarTable.calendarId })
+			.from(calendarTable)
+			.where(inList(calendarTable.calendarId, []));
+		assert.deepEqual(rows, []);
+	});
+});

package/src/repos/in-list.ts

@@ -0,0 +1,14 @@
+import { type Column, type SQL, sql } from "drizzle-orm";
+
+export const inList = <T extends Column>(
+	column: T,
+	values: readonly T["_"]["data"][],
+): SQL =>
+	sql`${column} in (select value from json_each(${JSON.stringify(values)}))`;
+
+export const pairInList = <A extends Column, B extends Column>(
+	first: A,
+	second: B,
+	pairs: readonly (readonly [A["_"]["data"], B["_"]["data"]])[],
+): SQL =>
+	sql`(${first}, ${second}) in (select value->>0, value->>1 from json_each(${JSON.stringify(pairs)}))`;

package/src/repos/message-flag.ts

@@ -4,13 +4,14 @@ import type {
 	IMessageFlagRepository,
 	MessageFlagItem,
 } from "@remit/data-ports";
-import { and, eq, inArray } from "drizzle-orm";
+import { and, eq } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import {
 	type MessageDataSchema,
 	messageFlagTable,
 } from "../schema/message-data.js";
+import { inList } from "./in-list.js";
 
 type DB = Db<MessageDataSchema>;
 
@@ -58,7 +59,7 @@ export class DrizzleMessageFlagRepository implements IMessageFlagRepository {
 			const rows = await this.db
 				.select()
 				.from(messageFlagTable)
-				.where(inArray(messageFlagTable.messageFlagId, idOrIds));
+				.where(inList(messageFlagTable.messageFlagId, idOrIds));
 			return rows.map(rowToMessageFlag);
 		}
 		const [row] = await this.db
@@ -79,7 +80,7 @@ export class DrizzleMessageFlagRepository implements IMessageFlagRepository {
 		if (messageFlagIds.length === 0) return;
 		await this.db
 			.delete(messageFlagTable)
-			.where(inArray(messageFlagTable.messageFlagId, messageFlagIds));
+			.where(inList(messageFlagTable.messageFlagId, messageFlagIds));
 	}
 
 	async getFlags(messageId: string): Promise<MessageFlagItem[]> {
@@ -155,7 +156,7 @@ export class DrizzleMessageFlagRepository implements IMessageFlagRepository {
 			.where(
 				and(
 					eq(messageFlagTable.messageId, messageId),
-					inArray(messageFlagTable.flagName, flagNames),
+					inList(messageFlagTable.flagName, flagNames),
 				),
 			);
 	}

package/src/repos/message-label.ts

@@ -3,10 +3,11 @@ import type {
 	IMessageLabelRepository,
 	MessageLabelItem,
 } from "@remit/data-ports";
-import { and, desc, eq, inArray } from "drizzle-orm";
+import { and, desc, eq } from "drizzle-orm";
 import type { Db } 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>>;
 
@@ -82,7 +83,7 @@ export class MessageLabelRepo implements IMessageLabelRepository {
 		const rows = await this.db
 			.select()
 			.from(messageLabelTable)
-			.where(inArray(messageLabelTable.messageId, messageIds));
+			.where(inList(messageLabelTable.messageId, messageIds));
 		return rows.map(rowToMessageLabel);
 	}
 

package/src/repos/message.ts

@@ -45,6 +45,7 @@ import {
 } from "../schema/message-data.js";
 import { threadMessageTable } from "../schema/thread-message.js";
 import type { SearchIndex } from "../search/thread-message-search.js";
+import { inList } from "./in-list.js";
 import {
 	toBodyPartItem,
 	toBodyPartParameterItem,
@@ -129,36 +130,36 @@ export function deleteMessageSubtree(
 	return [
 		db
 			.delete(messageFlagTable)
-			.where(and(inArray(messageFlagTable.messageId, messageIds), guard)),
+			.where(and(inList(messageFlagTable.messageId, messageIds), guard)),
 		db
 			.delete(messageReferenceTable)
-			.where(and(inArray(messageReferenceTable.messageId, messageIds), guard)),
+			.where(and(inList(messageReferenceTable.messageId, messageIds), guard)),
 		db
 			.delete(envelopeAddressTable)
-			.where(and(inArray(envelopeAddressTable.messageId, messageIds), guard)),
+			.where(and(inList(envelopeAddressTable.messageId, messageIds), guard)),
 		db
 			.delete(bodyPartParameterTable)
-			.where(and(inArray(bodyPartParameterTable.messageId, messageIds), guard)),
+			.where(and(inList(bodyPartParameterTable.messageId, messageIds), guard)),
 		db
 			.delete(bodyPartStorageTable)
-			.where(and(inArray(bodyPartStorageTable.messageId, messageIds), guard)),
+			.where(and(inList(bodyPartStorageTable.messageId, messageIds), guard)),
 		db
 			.delete(rawMessageStorageTable)
-			.where(and(inArray(rawMessageStorageTable.messageId, messageIds), guard)),
+			.where(and(inList(rawMessageStorageTable.messageId, messageIds), guard)),
 		db
 			.delete(bodyPartTable)
-			.where(and(inArray(bodyPartTable.messageId, messageIds), guard)),
+			.where(and(inList(bodyPartTable.messageId, messageIds), guard)),
 		db
 			.delete(bodyStructureRefetchTable)
 			.where(
-				and(inArray(bodyStructureRefetchTable.messageId, messageIds), guard),
+				and(inList(bodyStructureRefetchTable.messageId, messageIds), guard),
 			),
 		db
 			.delete(envelopeTable)
-			.where(and(inArray(envelopeTable.messageId, messageIds), guard)),
+			.where(and(inList(envelopeTable.messageId, messageIds), guard)),
 		db
 			.delete(messageTable)
-			.where(and(inArray(messageTable.messageId, messageIds), guard))
+			.where(and(inList(messageTable.messageId, messageIds), guard))
 			.returning({ messageId: messageTable.messageId }),
 	];
 }
@@ -275,7 +276,7 @@ export class DrizzleMessageRepository implements IMessageRepository {
 			const rows = await this.db
 				.select()
 				.from(messageTable)
-				.where(inArray(messageTable.messageId, messageId));
+				.where(inList(messageTable.messageId, messageId));
 			return rows.map(toMessageItem);
 		}
 
@@ -547,18 +548,18 @@ export class DrizzleMessageRepository implements IMessageRepository {
 					or(
 						and(
 							eq(messageTable.status, "moving"),
-							inArray(messageTable.originalMailboxId, ids),
+							inList(messageTable.originalMailboxId, ids),
 							isNotNull(messageTable.originalUid),
 						),
 						and(
 							eq(messageTable.status, "deleting"),
-							inArray(messageTable.mailboxId, ids),
+							inList(messageTable.mailboxId, ids),
 						),
 						and(
 							eq(messageTable.status, "moving"),
 							eq(messageTable.uid, 0),
 							isNull(messageTable.originalUid),
-							inArray(messageTable.mailboxId, ids),
+							inList(messageTable.mailboxId, ids),
 						),
 					),
 				),

package/src/repos/sync-warning.ts

@@ -5,9 +5,10 @@ import type {
 	SyncWarningKey,
 } from "@remit/data-ports";
 import { deriveSyncWarningId } from "@remit/data-ports/id";
-import { and, count, desc, eq, gte, inArray, sql } from "drizzle-orm";
+import { and, count, desc, eq, gte, sql } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { syncWarningTable } from "../schema/sync-warning.js";
+import { inList } from "./in-list.js";
 
 type DB = Db<Record<string, unknown>>;
 
@@ -71,6 +72,6 @@ export class SyncWarningRepo implements ISyncWarningRepository {
 		if (syncWarningIds.length === 0) return;
 		await this.db
 			.delete(syncWarningTable)
-			.where(inArray(syncWarningTable.syncWarningId, syncWarningIds));
+			.where(inList(syncWarningTable.syncWarningId, syncWarningIds));
 	};
 }

package/src/repos/thread-message.ts

@@ -34,6 +34,7 @@ import type {
 	SearchIndex,
 	SearchPosition,
 } from "../search/thread-message-search.js";
+import { inList } from "./in-list.js";
 import {
 	bodyMatch,
 	fromMatch,
@@ -579,7 +580,7 @@ export class DrizzleThreadMessageRepository
 				.where(
 					and(
 						eq(threadMessageTable.accountConfigId, accountConfigId),
-						inArray(threadMessageTable.threadMessageId, threadMessageId),
+						inList(threadMessageTable.threadMessageId, threadMessageId),
 					),
 				);
 			return rows.map(toItem);
@@ -678,7 +679,7 @@ export class DrizzleThreadMessageRepository
 			.where(
 				and(
 					eq(threadMessageTable.accountConfigId, accountConfigId),
-					inArray(threadMessageTable.threadMessageId, ids),
+					inList(threadMessageTable.threadMessageId, ids),
 				),
 			);
 		await this.search.sync(ids);