Skip to content

fix: required parameters placed after missing optional parameters are no longer skipped #9331

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
Rich-Harris merged 2 commits into from
Mar 6, 2023
Merged

fix: required parameters placed after missing optional parameters are no longer skipped #9331

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
125ed47
fix: required parameters placed after missing optional parameters are…
glennsayers Mar 6, 2023
78a717e
Update .changeset/loud-ghosts-worry.md
glennsayers Mar 6, 2023
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
5 changes: 5 additions & 0 deletions .changeset/loud-ghosts-worry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': fix
Copy link
Member

@benmccann benmccann Mar 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi, this needed to be patch. releases are failing because this is an invalid value: #9365

---

fix: don't skip required parameters after missing optional parameters
2 changes: 1 addition & 1 deletion packages/kit/src/utils/routing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export function exec(match, params, matchers) {
// and the next value is defined, otherwise the buffer will cause us to skip values
const next_param = params[i + 1];
const next_value = values[i + 1];
if (next_param && !next_param.rest && next_value) {
if (next_param && !next_param.rest && next_param.optional && next_value) {
buffered = 0;
}
continue;
Expand Down
5 changes: 5 additions & 0 deletions packages/kit/src/utils/routing.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,11 @@ const exec_tests = [
route: '/[[slug1=doesntmatch]]/[[slug2=matches]]/constant/[[slug3=matches]]',
path: '/b/constant/c',
expected: { slug2: 'b', slug3: 'c' }
},
{
route: '/[[slug1=doesntmatch]]/[slug2=matches]/[slug3]',
path: '/a/b/c',
expected: undefined
}
];

Expand Down