@remit/backend 0.0.115 → 0.0.116

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/backend",
-  "version": "0.0.115",
+  "version": "0.0.116",
   "description": "Remit Mail Inspector API backend",
   "license": "MIT",
   "author": "",

package/src/handlers/unified-threads.test.ts

@@ -467,6 +467,7 @@ describe("executeUnifiedThreadListing", () => {
 						: [
 								mailbox("m2-inbox", "a2", "INBOX"),
 								mailbox("m2-archive", "a2", "Archive"),
+								mailbox("m2-trash", "a2", "Trash", ["Trash"]),
 							],
 			},
 			accountSetting: { listByAccountConfig: async () => [] },
@@ -730,4 +731,52 @@ describe("executeUnifiedThreadListing", () => {
 		assert.deepEqual(response.items, []);
 		assert.equal(response.count, 0);
 	});
+
+	// #313: the Spam offer stated the junk share of the page the client had
+	// loaded, offered as a folder total. A count of one folder under the search's
+	// own criteria is what makes that number the folder's.
+	test("a folder scope narrows the search and the count to that folder", async () => {
+		const calls: Call[] = [];
+		const response = await executeUnifiedThreadListing(
+			buildListingClient(calls, 12),
+			CONFIG_ID,
+			{ ...params({ mailboxId: "m2-archive", count: true }), searchText: "x" },
+		);
+
+		const searching = calls.find((call) => call.mode === "searchByDate");
+		const counting = calls.find((call) => call.mode === "count");
+		assert.deepEqual([...(searching?.mailboxIds ?? [])], ["m2-archive"]);
+		assert.deepEqual([...(counting?.mailboxIds ?? [])], ["m2-archive"]);
+		assert.equal(response.count, 12);
+	});
+
+	test("a folder scope intersects the account scope rather than replacing it", async () => {
+		const calls: Call[] = [];
+		const response = await executeUnifiedThreadListing(
+			buildListingClient(calls, 99),
+			CONFIG_ID,
+			{
+				...params({ accountId: "a1", mailboxId: "m2-archive", count: true }),
+				searchText: "x",
+			},
+		);
+
+		assert.deepEqual(calls, []);
+		assert.equal(response.count, 0);
+	});
+
+	// Trash is the one folder the unscoped search never reaches, so a caller
+	// asking what it holds of a search is asking about mail the search does not
+	// see. Answering with the folder's own contents would widen the scope.
+	test("a folder the search scope excludes matches nothing", async () => {
+		const calls: Call[] = [];
+		const response = await executeUnifiedThreadListing(
+			buildListingClient(calls, 99),
+			CONFIG_ID,
+			{ ...params({ mailboxId: "m2-trash", count: true }), searchText: "x" },
+		);
+
+		assert.deepEqual(calls, []);
+		assert.equal(response.count, 0);
+	});
 });

package/src/handlers/unified-threads.ts

@@ -391,6 +391,29 @@ export const scopeToAccount = (
 	);
 };
 
+/**
+ * Narrow a mailbox scope to one folder.
+ *
+ * Intersects rather than replaces: a folder the mode's own scope does not hold —
+ * Trash, a muted folder, one of a muted account, one of another account when
+ * `accountId` narrowed first — leaves the empty set and matches nothing. A
+ * caller asking what one folder holds of a search must not be handed a folder
+ * the search itself does not reach.
+ *
+ * This is what makes a per-folder count of a cross-account search exact. The
+ * spam offer states how much of the search sits in a junk folder; before the
+ * parameter existed the only number available was the junk share of the page
+ * the client had loaded, which is a page length presented as a folder total
+ * (#313).
+ */
+export const scopeToMailbox = (
+	mailboxIds: Set<string>,
+	mailboxId: string | undefined,
+): Set<string> => {
+	if (mailboxId === undefined) return mailboxIds;
+	return new Set(mailboxIds.has(mailboxId) ? [mailboxId] : []);
+};
+
 /**
  * Minimal client surface `executeUnifiedThreadListing` needs, declared
  * structurally (like `ThreadSearchClient`) so the mode selection, the row
@@ -428,6 +451,7 @@ export type UnifiedThreadParams = {
 	from?: string;
 	subject?: string;
 	accountId?: string;
+	mailboxId?: string;
 	category?: MessageCategory[];
 	unread?: boolean;
 	attachments?: boolean;
@@ -462,10 +486,15 @@ export const executeUnifiedThreadListing = async (
 		virtualCopyMailboxIds,
 	} = await buildInboxMailboxMap(accountConfigId, client);
 
-	// The account scope applies before the mode picks a set, so the listing, the
-	// search and the count all narrow by the same rule.
+	// The account and folder scopes apply before the mode picks a set, so the
+	// listing, the search and the count all narrow by the same rule. Account
+	// first, folder second: the folder intersects what the account left, so a
+	// folder of another account narrows to nothing rather than reinstating one.
 	const narrow = (mailboxIds: Set<string>): Set<string> =>
-		scopeToAccount(mailboxIds, mailboxIdToAccountId, params.accountId);
+		scopeToMailbox(
+			scopeToAccount(mailboxIds, mailboxIdToAccountId, params.accountId),
+			params.mailboxId,
+		);
 	const inboxMailboxIds = narrow(everyInboxMailboxId);
 	const starredMailboxIds = narrow(everyStarredMailboxId);
 	const searchMailboxIds = narrow(everySearchMailboxId);
@@ -581,6 +610,7 @@ export const UnifiedThreadOperations: Record<
 			from,
 			subject,
 			accountId,
+			mailboxId,
 			category,
 			unread,
 			attachments,
@@ -596,6 +626,7 @@ export const UnifiedThreadOperations: Record<
 			from?: string;
 			subject?: string;
 			accountId?: string;
+			mailboxId?: string;
 			category?: MessageCategory | MessageCategory[];
 			unread?: boolean | string;
 			attachments?: boolean | string;
@@ -624,6 +655,7 @@ export const UnifiedThreadOperations: Record<
 			from: fromText || undefined,
 			subject: subjectText || undefined,
 			accountId: accountId || undefined,
+			mailboxId: mailboxId || undefined,
 			category: toArray(category),
 			unread: toBoolean(unread),
 			attachments: toBoolean(attachments),