refactor: adapt to new version

Author: posva

package.json

@@ -203,7 +203,7 @@
     "vitepress-plugin-llms": "^1.7.5",
     "vitest": "^3.2.4",
     "vue": "^3.5.21",
-    "vue-router": "https://pkg.pr.new/vue-router@3646b9c",
+    "vue-router": "https://pkg.pr.new/vue-router@be1679c",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",

playground-experimental/package.json

@@ -18,6 +18,6 @@
     "mande": "^2.0.9",
     "pinia": "^3.0.3",
     "vue": "^3.5.18",
-    "vue-router": "https://pkg.pr.new/vue-router@3646b9c"
+    "vue-router": "https://pkg.pr.new/vue-router@be1679c"
   }
 }

pnpm-lock.yaml

@@ -66,11 +66,10 @@ export function generateParamParserOptions(
     const { name, absolutePath } = paramParsers.get(param.parser)!
     const varName = `PARAM_PARSER__${name}`
     importsMap.add(absolutePath, { name: 'parser', as: varName })
-    return ` ...${varName}, `
+    return varName
   } else if (param.parser === 'int') {
     importsMap.add('vue-router/experimental', `PARAM_PARSER_INT`)
-    // the path params have more options, the query params are passed as an argument
-    return 'modifier' in param ? ` ...PARAM_PARSER_INT, ` : `PARAM_PARSER_INT`
+    return `PARAM_PARSER_INT`
   }
   return ''
 }
@@ -81,9 +80,22 @@ export function generatePathParamsOptions(
   paramParsers: ParamParsersMap
 ) {
   const paramOptions = params.map((param) => {
-    const repeatable = param.repeatable ? `repeat: true, ` : ''
+    // build a lean option list without any optional value
+    const optionList: string[] = []
+    const parser = generateParamParserOptions(param, importsMap, paramParsers)
+    optionList.push(parser || `/* no parser */`)
+    if (param.optional || param.repeatable) {
+      optionList.push(
+        `/* repeatable: ` + (param.repeatable ? `*/ true` : `false */`)
+      )
+    }
+    if (param.optional) {
+      optionList.push(
+        `/* optional: ` + (param.optional ? `*/ true` : `false */`)
+      )
+    }
     return `
-${param.paramName}: {${generateParamParserOptions(param, importsMap, paramParsers)}${repeatable}},
+${param.paramName}: [${optionList.join(', ')}],
 `.slice(1, -1)
   })
 

src/codegen/generateParamParsers.ts

@@ -60,7 +60,7 @@ describe('generateRouteRecordPath', () => {
       "path: new MatcherPatternPathDynamic(
           /^\\/a\\/([^/]+?)$/i,
           {
-            b: {},
+            b: [/* no parser */],
           },
           ["a",1],
         ),"
@@ -79,8 +79,8 @@ describe('generateRouteRecordPath', () => {
       "path: new MatcherPatternPathDynamic(
           /^\\/a\\/([^/]+?)\\/([^/]+?)$/i,
           {
-            b: {},
-            c: {},
+            b: [/* no parser */],
+            c: [/* no parser */],
           },
           ["a",1,1],
         ),"
@@ -95,7 +95,7 @@ describe('generateRouteRecordPath', () => {
       "path: new MatcherPatternPathDynamic(
           /^\\/a\\/([^/]+?)?$/i,
           {
-            b: {},
+            b: [/* no parser */, /* repeatable: false */, /* optional: */ true],
           },
           ["a",1],
         ),"
@@ -110,7 +110,7 @@ describe('generateRouteRecordPath', () => {
       "path: new MatcherPatternPathDynamic(
           /^\\/a\\/(.+?)$/i,
           {
-            b: {repeat: true, },
+            b: [/* no parser */, /* repeatable: */ true],
           },
           ["a",1],
         ),"
@@ -125,7 +125,7 @@ describe('generateRouteRecordPath', () => {
       "path: new MatcherPatternPathDynamic(
           /^\\/a\\/(.+?)?$/i,
           {
-            b: {repeat: true, },
+            b: [/* no parser */, /* repeatable: */ true, /* optional: */ true],
           },
           ["a",1],
         ),"
@@ -143,8 +143,8 @@ describe('generateRouteRecordPath', () => {
       "path: new MatcherPatternPathDynamic(
           /^\\/a\\/a-([^/]+?)-c-([^/]+?)$/i,
           {
-            b: {},
-            d: {},
+            b: [/* no parser */],
+            d: [/* no parser */],
           },
           ["a",["a-",0,"-c-",0]],
         ),"
@@ -162,7 +162,7 @@ describe('generateRouteRecordPath', () => {
       "path: new MatcherPatternPathDynamic(
           /^\\/(.*)$/i,
           {
-            all: {},
+            all: [/* no parser */],
           },
           [0],
         ),"
@@ -180,8 +180,8 @@ describe('generateRouteRecordPath', () => {
       "path: new MatcherPatternPathDynamic(
           /^\\/a\\/some-([^/]+?)\\/(.*)$/i,
           {
-            id: {},
-            all: {},
+            id: [/* no parser */],
+            all: [/* no parser */],
           },
           ["a",["some-",0],0],
         ),"