fix(matcher): correctly resolve empty paths with optional params

posva · posva · commit 4d5182a3e8e7 · 2022-07-19T12:42:04.000+02:00
Fix #1475
diff --git a/packages/router/__tests__/matcher/resolve.spec.ts b/packages/router/__tests__/matcher/resolve.spec.ts
@@ -797,6 +797,11 @@ describe('RouterMatcher.resolve', () => {
         { name: 'h' },
         { name: 'h', path: '/', params: {} }
       )
+      assertRecordMatch(
+        { path: '/:tab?/:other?', name: 'h', components },
+        { name: 'h' },
+        { name: 'h', path: '/', params: {} }
+      )
     })
   })
 
diff --git a/packages/router/src/matcher/pathParserRanker.ts b/packages/router/src/matcher/pathParserRanker.ts
@@ -255,9 +255,8 @@ export function tokensToParser(
             : (param as string)
           if (!text) {
             if (optional) {
-              // if we have more than one optional param like /:a?-static and there are more segments, we don't need to
-              // care about the optional param
-              if (segment.length < 2 && segments.length > 1) {
+              // if we have more than one optional param like /:a?-static we don't need to care about the optional param
+              if (segment.length < 2) {
                 // remove the last slash as we could be at the end
                 if (path.endsWith('/')) path = path.slice(0, -1)
                 // do not append a slash on the next iteration
@@ -270,7 +269,8 @@ export function tokensToParser(
       }
     }
 
-    return path
+    // avoid empty path when we have multiple optional params
+    return path || '/'
   }
 
   return {

Original file line number	Diff line number	Diff line change
`@@ -255,9 +255,8 @@ export function tokensToParser(`
`255`	`255`	`: (param as string)`
`256`	`256`	`if (!text) {`
`257`	`257`	`if (optional) {`
`258`		`- // if we have more than one optional param like /:a?-static and there are more segments, we don't need to`
`259`		`- // care about the optional param`
`260`		`- if (segment.length < 2 && segments.length > 1) {`
	`258`	`+ // if we have more than one optional param like /:a?-static we don't need to care about the optional param`
	`259`	`+ if (segment.length < 2) {`
`261`	`260`	`// remove the last slash as we could be at the end`
`262`	`261`	`if (path.endsWith('/')) path = path.slice(0, -1)`
`263`	`262`	`// do not append a slash on the next iteration`
`@@ -270,7 +269,8 @@ export function tokensToParser(`
`270`	`269`	`}`
`271`	`270`	`}`
`272`	`271`
`273`		`- return path`
	`272`	`+ // avoid empty path when we have multiple optional params`
	`273`	`+ return path \|\| '/'`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`return {`