diff --git a/src/domain/analysisSearch.test.ts b/src/domain/analysisSearch.test.ts index 0bd142f762..da44ea6451 100644 --- a/src/domain/analysisSearch.test.ts +++ b/src/domain/analysisSearch.test.ts @@ -3,6 +3,7 @@ import { expect, it } from "vitest"; import { analysisSearchPredicate, literalSubstringPredicate, + matchProcedureNames, } from "./analysisSearch.js"; it("uses Unicode simple case folding for literal substrings", () => { @@ -85,3 +86,18 @@ it("keeps explicit regex semantics and invalid-pattern input errors", () => { "search", ); }); + +it("preserves single-alias matches, primary fallback and duplicate ordering", () => { + const row = { value: "qualified::name" }; + const matches = (name: string) => name.includes("name"); + expect(matchProcedureNames(row, ["other"], matches)).toBe(row); + expect(matchProcedureNames(row, [row.value], matches)).toBe(row); + expect(matchProcedureNames(row, ["name"], matches)).toEqual({ + value: row.value, + matched_aliases: ["name"], + }); + expect(matchProcedureNames(row, ["name", "name2", "name"], matches)).toEqual({ + value: row.value, + matched_aliases: ["name", "name2"], + }); +}); diff --git a/src/domain/analysisSearch.ts b/src/domain/analysisSearch.ts index a41e370501..554caf9f88 100644 --- a/src/domain/analysisSearch.ts +++ b/src/domain/analysisSearch.ts @@ -55,12 +55,15 @@ export const matchProcedureNames = ( aliases: readonly string[], matches: (value: string) => boolean, ): (Row & { readonly matched_aliases?: string[] }) | undefined => { - const matched = - aliases.length === 0 - ? [] - : [...new Set(aliases)].filter( - (alias) => alias !== row.value && matches(alias), - ); - if (matched.length > 0) return { ...row, matched_aliases: matched }; + if (aliases.length === 1) { + const alias = aliases[0]!; + if (alias !== row.value && matches(alias)) + return { ...row, matched_aliases: [alias] }; + } else if (aliases.length > 1) { + const matched = [...new Set(aliases)].filter( + (alias) => alias !== row.value && matches(alias), + ); + if (matched.length > 0) return { ...row, matched_aliases: matched }; + } return matches(row.value) ? row : undefined; };