Skip to content

fix(router): fix = not parsed in router segment name #47332

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

Closed
DW8Reaper wants to merge 4 commits into from
+41 −2
Closed

fix(router): fix = not parsed in router segment name #47332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9646ffe
fix(router): fix = not parsed in router segment name
DW8Reaper Aug 27, 2022
28d8ca1
fixup! fix(router): fix = not parsed in router segment name
DW8Reaper Oct 2, 2022
6b35bf8
revert "fixup! fix(router): fix = not parsed in router segment name"
DW8Reaper Jan 18, 2023
d9b8e69
fixup! revert "fixup! fix(router): fix = not parsed in router segment…
DW8Reaper Apr 8, 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
3 changes: 3 additions & 0 deletions packages/core/test/bundling/router/bundle.golden_symbols.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@
{
"name": "LocationStrategy"
},
{
"name": "MATRIX_PARAM_SEGMENT_RE"
},
{
"name": "MODIFIER_KEYS"
},
Expand Down
10 changes: 8 additions & 2 deletions packages/router/src/url_tree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,12 +513,18 @@ function serializeQueryParams(params: {[key: string]: any}): string {
return strParams.length ? `?${strParams.join('&')}` : '';
}

const SEGMENT_RE = /^[^\/()?;=#]+/;
const SEGMENT_RE = /^[^\/()?;#]+/;
function matchSegments(str: string): string {
const match = str.match(SEGMENT_RE);
return match ? match[0] : '';
}

const MATRIX_PARAM_SEGMENT_RE = /^[^\/()?;=#]+/;
function matchMatrixKeySegments(str: string): string {
const match = str.match(MATRIX_PARAM_SEGMENT_RE);
return match ? match[0] : '';
}

const QUERY_PARAM_RE = /^[^=?&#]+/;
// Return the name of the query param at the start of the string or an empty string
function matchQueryParams(str: string): string {
Expand Down Expand Up @@ -624,7 +630,7 @@ class UrlParser {
}

private parseParam(params: {[key: string]: string}): void {
const key = matchSegments(this.remaining);
const key = matchMatrixKeySegments(this.remaining);
if (!key) {
return;
}
Expand Down
30 changes: 30 additions & 0 deletions packages/router/test/url_serializer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,36 @@ describe('url serializer', () => {
expect(url.serialize(tree)).toEqual('/one/two(left:three//right:four)');
});

it('should parse secondary segments with an = in the name', () => {
const tree = url.parse('/path/to/some=file');
expect(tree.root.children.primary.segments[2].path).toEqual('some=file');
});

it('should parse segments with matrix parameters when the name contains an =', () => {
const tree = url.parse('/path/to/some=file;test=11');
expect(tree.root.children.primary.segments[2].path).toEqual('some=file');
expect(tree.root.children.primary.segments[2].parameterMap.keys).toHaveSize(1);
expect(tree.root.children.primary.segments[2].parameterMap.get('test')).toEqual('11');
});

it('should parse segments that end with an =', () => {
const tree = url.parse('/password/de/MDAtMNTk=');
expect(tree.root.children.primary.segments[2].path).toEqual('MDAtMNTk=');
});

it('should parse segments that only contain an =', () => {
const tree = url.parse('example.com/prefix/=');
expect(tree.root.children.primary.segments[2].path).toEqual('=');
});

it('should parse segments with matrix parameter values containing an =', () => {
const tree = url.parse('/path/to/something;query=file=test;query2=test2');
expect(tree.root.children.primary.segments[2].path).toEqual('something');
expect(tree.root.children.primary.segments[2].parameterMap.keys).toHaveSize(2);
expect(tree.root.children.primary.segments[2].parameterMap.get('query')).toEqual('file=test');
expect(tree.root.children.primary.segments[2].parameterMap.get('query2')).toEqual('test2');
});

it('should parse top-level nodes with only secondary segment', () => {
const tree = url.parse('/(left:one)');

Expand Down