Skip to content

Avoid duplicate trailing delimiter matches #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vibhor-aggr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoid duplicate trailing delimiter matches #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e324cc0
Avoid duplicate trailing delimiter matches
vibhor-aggr Jun 11, 2026
4137f2e
Move trailing delimiter logic into source generation
vibhor-aggr Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/cases.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,10 +389,7 @@ export const MATCH_TESTS: MatchTestSet[] = [
},
{ input: "/route", expected: false },
{ input: "/test", expected: false },
{
input: "/test//",
expected: { path: "/test//", params: {} },
},
{ input: "/test//", expected: false },
],
},
{
Expand Down Expand Up @@ -632,7 +629,7 @@ export const MATCH_TESTS: MatchTestSet[] = [
},
{
input: "/test//",
expected: { path: "/test//", params: {} },
expected: { path: "/test/", params: {} },
},
{
input: "/test/route",
Expand Down
11 changes: 8 additions & 3 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,21 +464,21 @@ export function pathToRegexp(
}

const data = typeof path === "object" ? path : parse(path, options);
const originalPath = data.originalPath;
flatten(data.tokens, 0, [], (tokens) => {
if (combinations >= 256) {
throw new PathError("Too many path combinations", data.originalPath);
throw new PathError("Too many path combinations", originalPath);
}

if (combinations > 0) source += "|";
source += toRegExpSource(tokens, delimiter, keys, data.originalPath);
source += toRegExpSource(tokens, delimiter, keys, originalPath, trailing);
combinations++;
});
}

process(path);

let pattern = `^(?:${source})`;
if (trailing) pattern += "(?:" + escape(delimiter) + "$)?";
pattern += end ? "$" : "(?=" + escape(delimiter) + "|$)";

return { regexp: new RegExp(pattern, sensitive ? "" : "i"), keys };
Expand Down Expand Up @@ -519,6 +519,7 @@ function toRegExpSource(
delimiter: string,
keys: Keys,
originalPath: string | undefined,
trailing: boolean,
): string {
let result = "";
let backtrack = "";
Expand Down Expand Up @@ -598,6 +599,10 @@ function toRegExpSource(
throw new TypeError(`Unknown token type: ${(token as any).type}`);
}

if (trailing && !backtrack.endsWith(delimiter)) {
result += "(?:" + escape(delimiter) + "$)?";
}

return result;
}

Expand Down