@remit/web-client 0.0.194 → 0.0.196

package/src/lib/move-targets.ts

@@ -2,11 +2,8 @@ import type {
 	RemitImapFolderAppointment,
 	RemitImapMailboxResponse,
 } from "@remit/api-http-client/types.gen.ts";
-import {
-	buildMailboxRoleMap,
-	getMailboxDisplayName,
-	ROLE_PRIORITY,
-} from "./folder-roles.js";
+import { mailboxLeafName } from "@remit/data-ports/mailbox-name";
+import { buildMailboxRoleMap, ROLE_PRIORITY } from "./folder-roles.js";
 
 // Outbox has no IMAP special-use flag (RFC 6154 doesn't define one) and isn't
 // a canonical role (RFC 032 exclusive-folder-appointment) either — it's
@@ -27,7 +24,7 @@ const OUTBOX_LOCALE_NAMES: ReadonlySet<string> = new Set([
 ]);
 
 const isOutboxDestination = (mailbox: RemitImapMailboxResponse): boolean => {
-	const leaf = getMailboxDisplayName(mailbox.fullPath).trim().toLowerCase();
+	const leaf = mailboxLeafName(mailbox).trim().toLowerCase();
 	return OUTBOX_LOCALE_NAMES.has(leaf);
 };
 
@@ -65,10 +62,9 @@ export const buildMoveTargets = (
 			? ROLE_PRIORITY.indexOf(roleMap.get(b.mailboxId) ?? "inbox")
 			: NON_SYSTEM_PRIORITY;
 		if (aPriority !== bPriority) return aPriority - bPriority;
-		return getMailboxDisplayName(a.fullPath).localeCompare(
-			getMailboxDisplayName(b.fullPath),
-			undefined,
-			{ sensitivity: "base", numeric: true },
-		);
+		return mailboxLeafName(a).localeCompare(mailboxLeafName(b), undefined, {
+			sensitivity: "base",
+			numeric: true,
+		});
 	});
 };

package/src/lib/search-token-index.test.ts

@@ -209,3 +209,32 @@ describe("buildAccountSuggestionValues", () => {
 		);
 	});
 });
+
+describe("the server’s own delimiter (#877)", () => {
+	it("offers the leaf of a dot-delimited folder as its shortest spelling", () => {
+		const values = buildMailboxSuggestionValues([
+			[
+				mailbox({
+					mailboxId: "m1",
+					fullPath: "INBOX.Projects.Q3",
+					hierarchyDelimiter: ".",
+				}),
+			],
+		]);
+		assert.deepEqual(values, [{ value: "Q3", label: "Q3" }]);
+	});
+
+	it("resolves in: by the leaf of a dot-delimited folder", () => {
+		const index = buildMailboxNameIndex([
+			[
+				mailbox({
+					mailboxId: "m1",
+					fullPath: "INBOX.Projects.Q3",
+					hierarchyDelimiter: ".",
+				}),
+			],
+		]);
+		assert.equal(index.get("q3"), "m1");
+		assert.equal(index.get("inbox.projects.q3"), "m1");
+	});
+});

package/src/lib/search-token-index.ts

@@ -13,7 +13,7 @@ import type {
 	RemitImapAccountResponse,
 	RemitImapMailboxResponse,
 } from "@remit/api-http-client/types.gen.ts";
-import { getMailboxDisplayName } from "./folder-roles.js";
+import { mailboxLeafName } from "@remit/data-ports/mailbox-name";
 import type { SearchSuggestionValue } from "./search-suggestions.js";
 
 /**
@@ -52,11 +52,9 @@ export function buildMailboxNameIndex(
 		for (const mailbox of mailboxes) {
 			const fullPath = mailbox.fullPath?.toLowerCase();
 			if (!fullPath) continue;
-			const lastSegment = fullPath.split("/").pop();
+			const leaf = mailboxLeafName(mailbox).toLowerCase();
 			if (!index.has(fullPath)) index.set(fullPath, mailbox.mailboxId);
-			if (lastSegment && !index.has(lastSegment)) {
-				index.set(lastSegment, mailbox.mailboxId);
-			}
+			if (!index.has(leaf)) index.set(leaf, mailbox.mailboxId);
 		}
 	}
 	return index;
@@ -78,14 +76,14 @@ export function buildMailboxSuggestionValues(
 	const all = mailboxesByAccount.flat().filter((mailbox) => mailbox.fullPath);
 	const leafCounts = new Map<string, number>();
 	for (const mailbox of all) {
-		const leaf = getMailboxDisplayName(mailbox.fullPath).toLowerCase();
+		const leaf = mailboxLeafName(mailbox).toLowerCase();
 		leafCounts.set(leaf, (leafCounts.get(leaf) ?? 0) + 1);
 	}
 	const emailByAccountId = new Map(
 		accounts.map((account) => [account.accountId, account.email]),
 	);
 	return all.map((mailbox) => {
-		const leaf = getMailboxDisplayName(mailbox.fullPath);
+		const leaf = mailboxLeafName(mailbox);
 		const unique = leafCounts.get(leaf.toLowerCase()) === 1;
 		const hint =
 			accounts.length > 1 ? emailByAccountId.get(mailbox.accountId) : undefined;

package/src/routes/settings/folders.tsx

@@ -166,6 +166,7 @@ function AccountFolders({ account }: { account: RemitImapAccountResponse }) {
 	const candidates: CandidateFolder[] = mailboxes.map((mailbox) => ({
 		mailboxId: mailbox.mailboxId,
 		providerPath: mailbox.fullPath,
+		hierarchyDelimiter: mailbox.hierarchyDelimiter,
 		messageCount: mailbox.messageCount,
 	}));
 
@@ -241,7 +242,10 @@ function AccountFolders({ account }: { account: RemitImapAccountResponse }) {
 						translator,
 					)}
 					defaultLabel={labelForMailbox(
-						{ fullPath: renaming.fullPath },
+						{
+							fullPath: renaming.fullPath,
+							hierarchyDelimiter: renaming.hierarchyDelimiter,
+						},
 						roleMap.get(renaming.mailboxId),
 						translator,
 					)}