fix: router parameter matching for paths with /.* (#150)

useid · Mar 3, 2022 · be85643 · be85643
1 parent 56fe829
commit be85643
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/packages/dgt-utils/lib/router/router.spec.ts b/packages/dgt-utils/lib/router/router.spec.ts
@@ -122,6 +122,20 @@ describe('Router', () => {
 
     });
 
+    it('should not match greedy on /.* routes', async () => {
+
+      delete window.location;
+      (window.location as any) = new URL('http://localhost/onePart/12345/filler/testing?search=test#test');
+
+      const testRoute: Route = {
+        path: '/{{partOne}}/{{numbers}}/.*',
+        targets: [],
+      };
+
+      expect(urlVariables(testRoute).pathParams.get('numbers')).toBe('12345');
+
+    });
+
     it('should error when no match was found for every variable', () => {
 
       const invalidRoute: Route = {

diff --git a/packages/dgt-utils/lib/router/router.ts b/packages/dgt-utils/lib/router/router.ts
@@ -75,7 +75,7 @@ export const urlVariables = (route: Route): UrlVariables => {
   const searchParams = new URL(window.location.href).searchParams;
   const hash = new URL(window.location.href).hash;
 
-  const regex = new RegExp(`^${route.path.replace(/{{[^/]+}}/ig, '(.+)')}$`, 'i');
+  const regex = new RegExp(`^${route.path.replace(/{{[^/]+}}/ig, '(.+?)')}$`, 'i');
 
   const parts = route.path.split('/')
     .filter((part) => part.startsWith('{{') && part.endsWith('}}'));