@remit/drizzle-service 0.0.51 → 0.0.53

package/package.json

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

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

@@ -1,8 +1,6 @@
 import type {
 	AccountConfigDescription,
 	AccountConfigItem,
-	AccountItem,
-	AddressItem,
 	CreateAccountConfigInput,
 	IAccountConfigRepository,
 	ResultList,
@@ -18,6 +16,8 @@ import {
 	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";
 
 type DB = Db<Record<string, unknown>>;
 
@@ -36,62 +36,6 @@ function rowToAccountConfig(
 	};
 }
 
-function rowToAccount(row: typeof accountTable.$inferSelect): AccountItem {
-	return {
-		accountId: row.accountId,
-		accountConfigId: row.accountConfigId,
-		username: row.username,
-		email: row.email,
-		authType: row.authType as AccountItem["authType"],
-		passwordHash: row.passwordHash ?? undefined,
-		oauthRefreshTokenHash: row.oauthRefreshTokenHash ?? undefined,
-		oauthTokenUpdatedAt: row.oauthTokenUpdatedAt ?? undefined,
-		imapHost: row.imapHost,
-		imapPort: row.imapPort,
-		imapTls: row.imapTls,
-		imapStartTls: row.imapStartTls,
-		smtpEnabled: row.smtpEnabled,
-		smtpHost: row.smtpHost,
-		smtpPort: row.smtpPort,
-		smtpTls: row.smtpTls,
-		smtpStartTls: row.smtpStartTls,
-		smtpUsername: row.smtpUsername,
-		smtpPasswordHash: row.smtpPasswordHash ?? undefined,
-		isActive: row.isActive,
-		connectionState: row.connectionState as AccountItem["connectionState"],
-		lastConnectedAt: row.lastConnectedAt ?? undefined,
-		lastSyncAt: row.lastSyncAt ?? undefined,
-		lastError: row.lastError ?? undefined,
-		syncPhase: (row.syncPhase as AccountItem["syncPhase"]) ?? undefined,
-		mailboxCountTotal: row.mailboxCountTotal ?? undefined,
-		mailboxCountSynced: row.mailboxCountSynced ?? undefined,
-		createdAt: row.createdAt,
-		updatedAt: row.updatedAt,
-		deletedAt: row.deletedAt ?? undefined,
-	};
-}
-
-function rowToAddress(row: typeof addressTable.$inferSelect): AddressItem {
-	return {
-		addressId: row.addressId,
-		accountConfigId: row.accountConfigId,
-		displayName: row.displayName ?? undefined,
-		localPart: row.localPart,
-		domain: row.domain,
-		normalizedEmail: row.normalizedEmail,
-		normalizedCompound: row.normalizedCompound,
-		flags: (row.flags ?? {}) as AddressItem["flags"],
-		inboundCount: row.inboundCount,
-		outboundCount: row.outboundCount,
-		replyCount: row.replyCount,
-		lastInboundAt: row.lastInboundAt,
-		lastOutboundAt: row.lastOutboundAt ?? undefined,
-		lastReplyAt: row.lastReplyAt,
-		createdAt: row.createdAt,
-		updatedAt: row.updatedAt,
-	};
-}
-
 export class AccountConfigRepo implements IAccountConfigRepository {
 	constructor(private db: DB) {}
 

package/src/repos/i4-address.ts

@@ -10,6 +10,7 @@ import type {
 	UpdateAddressInput,
 } from "@remit/data-ports";
 import { BadRequestError } from "@remit/data-ports/errors";
+import { shouldPromoteWellknown } from "@remit/data-ports/wellknown";
 import {
 	and,
 	asc,
@@ -39,7 +40,6 @@ import {
 	addressRecency,
 	addressSearchMatch,
 } from "./address-search-predicates.js";
-import { shouldPromoteWellknown } from "./i4-address-wellknown.js";
 
 type DB = Db<Record<string, unknown>>;
 

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

@@ -14,11 +14,15 @@ import { AccountSettingRepo } from "./i4-account-setting.js";
 import { MailboxRepo } from "./i4-mailbox.js";
 import { MailboxSpecialUseRepo } from "./i4-mailbox-special-use.js";
 
-const makeMailboxInput = (accountId: string, fullPath: string) => ({
+const makeMailboxInput = (
+	accountId: string,
+	fullPath: string,
+	hierarchyDelimiter = "/",
+) => ({
 	accountId,
 	namespaceType: "personal" as const,
 	namespacePrefix: "",
-	hierarchyDelimiter: "/",
+	hierarchyDelimiter,
 	fullPath,
 	uidValidity: 1,
 	uidNext: 1,
@@ -210,6 +214,59 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 		assert.equal(found?.mailboxId, spam.mailboxId);
 	});
 
+	test("resolves an INBOX-nested Trash folder that advertises no special use", async () => {
+		// #837: `findTrashMailbox` carried its own copy of the discarded
+		// whole-path rule, so `INBOX/Trash` resolved to nothing and a delete
+		// refused on an account that plainly has a Trash folder.
+		const { accountId } = await makeAccount();
+		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
+		const trash = await mailboxes.create(
+			makeMailboxInput(accountId, "INBOX/Trash"),
+		);
+
+		assert.equal(
+			(await repo.findTrashMailbox(accountId))?.mailboxId,
+			trash.mailboxId,
+		);
+		// Resolving the name widens where a delete FILES mail, never what an
+		// Empty Trash may expunge (#846): that still needs the flag or an
+		// appointment.
+		assert.equal(await repo.findConfirmedTrashMailbox(accountId), null);
+	});
+
+	test("resolves an INBOX-nested Archive folder that advertises no special use", async () => {
+		const { accountId } = await makeAccount();
+		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));
+		const archive = await mailboxes.create(
+			makeMailboxInput(accountId, "INBOX/Archive"),
+		);
+
+		assert.equal(
+			(await repo.findArchiveMailbox(accountId))?.mailboxId,
+			archive.mailboxId,
+		);
+	});
+
+	test("splits the leaf on the account's own delimiter, not on a slash", async () => {
+		const { accountId } = await makeAccount();
+		await mailboxes.create(makeMailboxInput(accountId, "INBOX", "."));
+		const trash = await mailboxes.create(
+			makeMailboxInput(accountId, "INBOX.Trash", "."),
+		);
+		const archive = await mailboxes.create(
+			makeMailboxInput(accountId, "INBOX.Archive", "."),
+		);
+
+		assert.equal(
+			(await repo.findTrashMailbox(accountId))?.mailboxId,
+			trash.mailboxId,
+		);
+		assert.equal(
+			(await repo.findArchiveMailbox(accountId))?.mailboxId,
+			archive.mailboxId,
+		);
+	});
+
 	test("answers null when the account has no Junk folder at all", async () => {
 		const { accountId } = await makeAccount();
 		await mailboxes.create(makeMailboxInput(accountId, "INBOX"));

package/src/repos/i4-address-wellknown.ts

@@ -1,31 +0,0 @@
-export const WELLKNOWN_INBOUND_THRESHOLD = 3;
-export const WELLKNOWN_REPLY_THRESHOLD = 1;
-export const WELLKNOWN_INBOUND_WINDOW_MS = 90 * 24 * 60 * 60 * 1000;
-
-export interface WellknownEngagementSnapshot {
-	inboundCount?: number;
-	replyCount?: number;
-	lastInboundAt?: number;
-	isBulk?: boolean;
-	flags?: { wellknown?: { value: boolean } | undefined };
-}
-
-export const shouldPromoteWellknown = (
-	snapshot: WellknownEngagementSnapshot,
-	now: number,
-): boolean => {
-	if (snapshot.flags?.wellknown?.value === true) return false;
-
-	const replyCount = snapshot.replyCount ?? 0;
-	const inboundCount = snapshot.inboundCount ?? 0;
-	const replied = replyCount >= WELLKNOWN_REPLY_THRESHOLD;
-	const inboundEnough =
-		!snapshot.isBulk && inboundCount >= WELLKNOWN_INBOUND_THRESHOLD;
-	if (!replied && !inboundEnough) return false;
-
-	const lastInboundAt = snapshot.lastInboundAt;
-	if (lastInboundAt === undefined) return false;
-	if (now - lastInboundAt > WELLKNOWN_INBOUND_WINDOW_MS) return false;
-
-	return true;
-};