Skip to content

refactor(router): compare tail and prefix segments in place #199

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

Merged
dinwwwh merged 1 commit into from
Oct 29, 2026
Merged

refactor(router): compare tail and prefix segments in place #199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions packages/router/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,9 @@ export function createPrefixMatcher(prefix: `/${string}`): (pathname: `/${string
end = pathname.length
}

if (!matchesSegment(expected, decode(pathname.slice(start, end)))) {
// `undefined` stands for a param, which needs a non-empty segment.
const segment = decode(pathname.slice(start, end))
if (expected === undefined ? segment === '' : segment !== expected) {
return false
}

Expand Down Expand Up @@ -627,18 +629,17 @@ function matchesCatchAll(
}

for (let i = 0; i < tail.length; i++) {
if (!matchesSegment(tail[i], segments[end + i]!)) {
const expected = tail[i]
const segment = segments[end + i]!
// `undefined` stands for a param, which needs a non-empty segment.
if (expected === undefined ? segment === '' : segment !== expected) {
return false
}
}

return true
}

function matchesSegment(expected: string | undefined, segment: string): boolean {
return expected === undefined ? segment !== '' : segment === expected
}

// `params` is spread only for a param named `__proto__`, not on every pass.
/* oxlint-disable oxc/no-accumulating-spread */
function toParams<T>(route: Route<T>, segments: readonly string[]): Record<string, string> {
Expand Down
Loading