@remit/drizzle-service 0.0.55 → 0.0.56

package/package.json

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

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

@@ -1,7 +1,10 @@
 import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
 import { after, before, describe, test } from "node:test";
-import { composeFolderRoleAppointmentName } from "@remit/data-ports/folder-role";
+import {
+	composeFolderRoleAppointmentName,
+	meetsTrashAssurance,
+} from "@remit/data-ports/folder-role";
 import { CanonicalMailboxRole } from "@remit/domain-enums";
 import {
 	accountSettingTable,
@@ -175,7 +178,9 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 			makeMailboxInput(accountId, "[Gmail]/Trash"),
 		);
 
-		assert.equal(await repo.findConfirmedTrashMailbox(accountId), null);
+		const proposal = await repo.resolveTrashRole(accountId);
+		assert.equal(proposal.kind, "proposed");
+		assert.equal(meetsTrashAssurance(proposal, "confirmed"), false);
 
 		await appoint(
 			accountConfigId,
@@ -183,9 +188,11 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 			CanonicalMailboxRole.Trash,
 			trash.mailboxId,
 		);
-		const confirmed = await repo.findConfirmedTrashMailbox(accountId);
-		assert.equal(confirmed?.mailboxId, trash.mailboxId);
-		assert.notEqual(confirmed?.mailboxId, keepsakes.mailboxId);
+		assert.deepEqual(await repo.resolveTrashRole(accountId), {
+			kind: "appointed",
+			mailbox: { mailboxId: trash.mailboxId, fullPath: "[Gmail]/Trash" },
+		});
+		assert.notEqual(trash.mailboxId, keepsakes.mailboxId);
 	});
 
 	test("keeps a stale Trash appointment visible instead of answering the fallback", async () => {
@@ -214,6 +221,17 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 				mailbox: { mailboxId: flagged.mailboxId, fullPath: "[Gmail]/Trash" },
 			},
 		});
+
+		// The flagged folder is where a delete files mail, and no evidence at all
+		// that the user meant it to be emptied.
+		assert.equal(
+			meetsTrashAssurance(await repo.resolveTrashRole(accountId), "confirmed"),
+			false,
+		);
+		assert.equal(
+			(await repo.findTrashMailbox(accountId))?.mailboxId,
+			flagged.mailboxId,
+		);
 	});
 
 	test("resolves an INBOX-nested Junk folder that advertises \\Junk", async () => {
@@ -259,7 +277,10 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 		// 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);
+		assert.equal(
+			meetsTrashAssurance(await repo.resolveTrashRole(accountId), "confirmed"),
+			false,
+		);
 	});
 
 	test("resolves an INBOX-nested Archive folder that advertises no special use", async () => {

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

@@ -8,7 +8,6 @@ import {
 	composeFolderRoleAppointmentName,
 	type RoleMailboxCandidate,
 	type RoleResolution,
-	resolveConfirmedMailboxForRole,
 	resolveMailboxForRole,
 	resolveRoleForAccount,
 	type UnappointedRoleResolution,
@@ -144,16 +143,6 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 		return this.findMailboxForRole(accountId, CanonicalMailboxRole.Trash);
 	}
 
-	findConfirmedTrashMailbox(
-		accountId: string,
-	): Promise<{ mailboxId: string; fullPath: string } | null> {
-		return this.findMailboxForRole(
-			accountId,
-			CanonicalMailboxRole.Trash,
-			resolveConfirmedMailboxForRole,
-		);
-	}
-
 	/**
 	 * Trash with its evidence, for the verbs that weigh it. Reads exactly what
 	 * `findMailboxForRole` reads — a `null` answer is thrown away there, and this
@@ -194,13 +183,12 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 	private async findMailboxForRole(
 		accountId: string,
 		role: CanonicalMailboxRoleValue,
-		resolve: typeof resolveMailboxForRole = resolveMailboxForRole,
 	): Promise<{ mailboxId: string; fullPath: string } | null> {
 		const [candidates, appointedMailboxId] = await Promise.all([
 			this.roleCandidates(accountId),
 			this.appointedMailboxId(accountId, role),
 		]);
-		const found = resolve(role, candidates, appointedMailboxId);
+		const found = resolveMailboxForRole(role, candidates, appointedMailboxId);
 		return found
 			? { mailboxId: found.mailboxId, fullPath: found.fullPath }
 			: null;