revert "fixup! fix(router): fix = not parsed in router segment name" (#47332)

DW8Reaper · AndrewKushnir · commit ee816e171f23 · 2023-04-11T09:16:31.000-07:00
This reverts commit 2279f4d4620eba083a9832ed096890b69a25ec42. Reverting that commit based off PR feedback that this change should only affect the parsing of sergments and node encoding of the url PR Close #47332
diff --git a/packages/core/test/bundling/router/bundle.golden_symbols.json b/packages/core/test/bundling/router/bundle.golden_symbols.json
@@ -1682,9 +1682,6 @@
   {
     "name": "match"
   },
-  {
-    "name": "matchMatrixParamSegments"
-  },
   {
     "name": "matchSegments"
   },
diff --git a/packages/router/src/url_tree.ts b/packages/router/src/url_tree.ts
@@ -445,8 +445,7 @@ function encodeUriString(s: string): string {
       .replace(/%40/g, '@')
       .replace(/%3A/gi, ':')
       .replace(/%24/g, '$')
-      .replace(/%2C/gi, ',')
-      .replace(/%3D/gi, '=');
+      .replace(/%2C/gi, ',');
 }
 
 /**
@@ -521,7 +520,7 @@ function matchSegments(str: string): string {
 }
 
 const MATRIX_PARAM_SEGMENT_RE = /^[^\/()?;=#]+/;
-function matchMatrixParamSegments(str: string): string {
+function matchMatrixKeySegments(str: string): string {
   const match = str.match(MATRIX_PARAM_SEGMENT_RE);
   return match ? match[0] : '';
 }
@@ -631,14 +630,14 @@ class UrlParser {
   }
 
   private parseParam(params: {[key: string]: string}): void {
-    const key = matchMatrixParamSegments(this.remaining);
+    const key = matchMatrixKeySegments(this.remaining);
     if (!key) {
       return;
     }
     this.capture(key);
     let value: any = '';
     if (this.consumeOptional('=')) {
-      const valueMatch = matchMatrixParamSegments(this.remaining);
+      const valueMatch = matchSegments(this.remaining);
       if (valueMatch) {
         value = valueMatch;
         this.capture(value);
diff --git a/packages/router/test/url_serializer.spec.ts b/packages/router/test/url_serializer.spec.ts
@@ -56,6 +56,14 @@ describe('url serializer', () => {
     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)');
 
@@ -266,9 +274,9 @@ describe('url serializer', () => {
     });
 
     it('should encode query params leaving sub-delimiters intact', () => {
-      const percentChars = '/?#&+[] ';
-      const percentCharsEncoded = '%2F%3F%23%26%2B%5B%5D%20';
-      const intactChars = '!$\'()*,;:=';
+      const percentChars = '/?#&+=[] ';
+      const percentCharsEncoded = '%2F%3F%23%26%2B%3D%5B%5D%20';
+      const intactChars = '!$\'()*,;:';
       const params = percentChars + intactChars;
       const paramsEncoded = percentCharsEncoded + intactChars;
       const mixedCaseString = 'sTrInG';
@@ -339,9 +347,9 @@ describe('url serializer', () => {
     const unreserved = `abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~`;
 
     it('should encode a minimal set of special characters in queryParams', () => {
-      const notEncoded = unreserved + `:@!$'*,();=`;
-      const encode = ` +%&#[]/?`;
-      const encoded = `%20%2B%25%26%23%5B%5D%2F%3F`;
+      const notEncoded = unreserved + `:@!$'*,();`;
+      const encode = ` +%&=#[]/?`;
+      const encoded = `%20%2B%25%26%3D%23%5B%5D%2F%3F`;
 
       const parsed = url.parse('/foo');
 
@@ -364,20 +372,21 @@ describe('url serializer', () => {
 
     it('should encode minimal special characters plus parens and semi-colon in matrix params',
        () => {
-         const notEncoded = unreserved + `:@!$'*,&=`;
-         const encode = ` /%#()[];?+`;
-         const encoded = `%20%2F%25%23%28%29%5B%5D%3B%3F%2B`;
+         const notEncoded = unreserved + `:@!$'*,&`;
+         const encode = ` /%=#()[];?+`;
+         const encoded = `%20%2F%25%3D%23%28%29%5B%5D%3B%3F%2B`;
 
          const parsed = url.parse('/foo');
 
          parsed.root.children[PRIMARY_OUTLET].segments[0].parameters = {notEncoded, encode};
+
          expect(url.serialize(parsed)).toBe(`/foo;notEncoded=${notEncoded};encode=${encoded}`);
        });
 
     it('should encode special characters in the path the same as matrix params', () => {
-      const notEncoded = unreserved + `:@!$'*,&=`;
-      const encode = ` /%#()[];?+`;
-      const encoded = `%20%2F%25%23%28%29%5B%5D%3B%3F%2B`;
+      const notEncoded = unreserved + `:@!$'*,&`;
+      const encode = ` /%=#()[];?+`;
+      const encoded = `%20%2F%25%3D%23%28%29%5B%5D%3B%3F%2B`;
 
       const parsed = url.parse('/foo');
 
@@ -386,14 +395,6 @@ describe('url serializer', () => {
       expect(url.serialize(parsed)).toBe(`/${notEncoded}${encoded}`);
     });
 
-    it('should preserve = when encoding segments', () => {
-      const testUrl = '/foo===bar';
-
-      const parsed = url.parse(testUrl);
-
-      expect(url.serialize(parsed)).toBe(testUrl);
-    });
-
     it('should correctly encode ampersand in segments', () => {
       const testUrl = '/parent&child';
 

Original file line number	Diff line number	Diff line change
`@@ -1682,9 +1682,6 @@`
`1682`	`1682`	`{`
`1683`	`1683`	`"name": "match"`
`1684`	`1684`	`},`
`1685`		`- {`
`1686`		`- "name": "matchMatrixParamSegments"`
`1687`		`- },`
`1688`	`1685`	`{`
`1689`	`1686`	`"name": "matchSegments"`
`1690`	`1687`	`},`