@remit/drizzle-service 0.0.10 → 0.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Drizzle ORM service parameterized by dialect (Postgres / SQLite)",
   "type": "module",
   "main": "src/index.ts",

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

@@ -209,6 +209,57 @@ describe("AddressRepo", () => {
 		await repo.deleteManyAddresses(accountConfigId, created);
 	});
 
+	test("listByAccountConfig resolves a search by exact email even when the sender has a display name", async () => {
+		const accountConfigId = randomId();
+		const created = await repo.createAddress({
+			...makeAddressInput(accountConfigId, "support@npmjs.com"),
+			displayName: "npm support",
+			// How message-sync writes it: display name first, then the email.
+			normalizedCompound: "npm support support@npmjs.com",
+		});
+
+		const byEmail = await repo.listByAccountConfig({
+			accountConfigId,
+			search: "support@npmjs.com",
+		});
+		assert.deepEqual(
+			byEmail.items.map((a) => a.addressId),
+			[created.addressId],
+			"an exact-address lookup must resolve the row",
+		);
+
+		const byDisplayName = await repo.listByAccountConfig({
+			accountConfigId,
+			search: "npm",
+		});
+		assert.deepEqual(
+			byDisplayName.items.map((a) => a.addressId),
+			[created.addressId],
+			"display-name search keeps working",
+		);
+
+		await repo.deleteManyAddresses(accountConfigId, [created.addressId]);
+	});
+
+	test("listByAccountConfig treats LIKE metacharacters in a search term literally", async () => {
+		const accountConfigId = randomId();
+		const plain = await repo.createAddress(
+			makeAddressInput(accountConfigId, "ab@x.com"),
+		);
+
+		const result = await repo.listByAccountConfig({
+			accountConfigId,
+			search: "a_@x.com",
+		});
+		assert.equal(
+			result.items.length,
+			0,
+			"`_` must not act as a single-character wildcard",
+		);
+
+		await repo.deleteManyAddresses(accountConfigId, [plain.addressId]);
+	});
+
 	test("cross-tenant: getAddress refuses a foreign accountConfig", async () => {
 		const addr = await repo.createAddress(makeAddressInput(randomId()));
 		const other = randomId();

package/src/repos/i4-address.ts

@@ -20,6 +20,31 @@ import { shouldPromoteWellknown } from "./i4-address-wellknown.js";
 
 type DB = Db<Record<string, unknown>>;
 
+/**
+ * Escape the LIKE metacharacters so a term containing `%` or `_` (both legal in
+ * an email local part) matches literally instead of as a wildcard.
+ */
+const escapeLikeTerm = (term: string): string =>
+	term.replace(/[\\%_]/g, (char) => `\\${char}`);
+
+/**
+ * Match an address search term as a prefix of either the display-name compound
+ * or the normalized email.
+ *
+ * `normalizedCompound` is stored as `"<display name> <email>"`, so a prefix
+ * match on it only ever answers display-name queries — an exact-address lookup
+ * such as `support@npmjs.com` can never match a row whose sender has a display
+ * name. Matching `normalizedEmail` in the same predicate is what makes address
+ * resolution by email work at all (issue #51).
+ */
+const addressSearchPredicate = (term: string) => {
+	const pattern = `${escapeLikeTerm(term)}%`;
+	return or(
+		sql`${addressTable.normalizedCompound} LIKE ${pattern} ESCAPE '\\'`,
+		sql`${addressTable.normalizedEmail} LIKE ${pattern} ESCAPE '\\'`,
+	);
+};
+
 export function rowToAddress(
 	row: typeof addressTable.$inferSelect,
 ): AddressItem {
@@ -454,11 +479,11 @@ export class AddressRepo implements IAddressRepository {
 
 	async listByAccountConfig(input: {
 		accountConfigId: string;
-		normalizedCompound?: string;
+		search?: string;
 		cursor?: string;
 		limit?: number;
 	}): Promise<ResultList<AddressItem>> {
-		const { accountConfigId, normalizedCompound, cursor, limit = 100 } = input;
+		const { accountConfigId, search, cursor, limit = 100 } = input;
 		const decoded = cursor ? decodeToken(cursor) : undefined;
 		const after = decoded
 			? {
@@ -473,9 +498,7 @@ export class AddressRepo implements IAddressRepository {
 			.where(
 				and(
 					eq(addressTable.accountConfigId, accountConfigId),
-					normalizedCompound
-						? sql`${addressTable.normalizedCompound} LIKE ${`${normalizedCompound}%`}`
-						: undefined,
+					search ? addressSearchPredicate(search) : undefined,
 					after
 						? or(
 								gt(addressTable.normalizedCompound, after.normalizedCompound),