Skip to content

fix: Ensure rest parameter starts consuming at segment start #183

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
webJose merged 1 commit into from
Dec 11, 2025
Merged

fix: Ensure rest parameter starts consuming at segment start #183

Show file tree
Hide file tree
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
38 changes: 33 additions & 5 deletions src/lib/kernel/RouteHelper.svelte.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,17 +289,17 @@ describe('RouteHelper', () => {
test.each([
{
pattern: '/files/*',
expectedRegex: '^\\/files(?<rest>.*)$',
expectedRegex: '^\\/files(?<rest>\\/.*)$',
description: 'rest parameter'
},
{
pattern: '/api/v1/*',
expectedRegex: '^\\/api\\/v1(?<rest>.*)$',
expectedRegex: '^\\/api\\/v1(?<rest>\\/.*)$',
description: 'rest parameter in nested path'
},
{
pattern: '/*',
expectedRegex: '^(?<rest>.*)$',
expectedRegex: '^(?<rest>\\/.*)$',
description: 'root rest parameter'
}
])('Should create correct regex for $description .', ({ pattern, expectedRegex }) => {
Expand Down Expand Up @@ -543,11 +543,39 @@ describe('RouteHelper', () => {
},
{
testPath: '/files/docs/readme.txt',
regex: /^\/files\/(?<rest>.*)$/,
regex: /^\/files(?<rest>\/.*)/,
expectedMatch: true,
expectedParams: { rest: 'docs/readme.txt' },
expectedParams: { rest: '/docs/readme.txt' },
description: 'rest parameter matching'
},
{
testPath: 'files-v2/docs/readme.txt',
regex: /^\/files(?<rest>\/.*)/,
expectedMatch: false,
expectedParams: undefined,
description: 'rest param + similar text in path (#182)'
},
{
testPath: '/abc/def',
regex: /^(?<rest>\/.*)/,
expectedMatch: true,
expectedParams: { rest: '/abc/def' },
description: 'root path regex (#182)'
},
{
testPath: '/',
regex: /^(?<rest>\/.*)/,
expectedMatch: true,
expectedParams: { rest: '/' },
description: 'root path regex + root test path (#182)'
},
{
testPath: '/abc/def/ghi/jkl',
regex: /^\/abc(?<rest>\/.*)\/(?<last>[^/]+)/,
expectedMatch: true,
expectedParams: { rest: '/def/ghi', last: 'jkl' },
description: 'rest parameter in middle of path'
},
{
testPath: '/different',
regex: /^\/user\/(?<id>\d+)$/,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/kernel/RouteHelper.svelte.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export class RouteHelper {
);
}
);
regexPattern = regexPattern.replace(restParamRegex, `(?<rest>.*)`);
regexPattern = regexPattern.replace(restParamRegex, '(?<rest>\\/.*)');
return {
regex: new RegExp(`^${regexPattern}$`, routeInfo.caseSensitive ? undefined : 'i'),
and: routeInfo.and,
Expand Down