fix(unplugin): generate param types from override paths and stop inheritance on absolute overrides (#2646)

* test(unplugin): add path override params coverage

* fix(unplugin): extract params from path overrides

* refactor: tests and renames

---------

Co-authored-by: Eduardo San Martin Morote <posva13@gmail.com>

Author: G100my

packages/router/src/unplugin/codegen/generateRouteMap.spec.ts

@@ -463,6 +463,55 @@ describe('generateRouteNamedMap', () => {
     `)
   })
 
+  it('types params added by a path override', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    const node = tree.insert('users/profile', 'users/profile.vue')
+    node.value.setOverride('users/profile', { path: '/users/:id' })
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
+      "export interface RouteNamedMap {
+        '/users/profile': RouteRecordInfo<
+          '/users/profile',
+          '/users/:id',
+          { id: ParamValue<true> },
+          { id: ParamValue<false> },
+          | never
+        >,
+      }"
+    `)
+  })
+
+  it('does not inherit parent params on an absolute path override', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    tree.insert('org/[orgId]', 'org/[orgId].vue')
+    const child = tree.insert(
+      'org/[orgId]/dashboard',
+      'org/[orgId]/dashboard.vue'
+    )
+    child.value.setOverride('org/[orgId]/dashboard', { path: '/dash/:id' })
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
+      "export interface RouteNamedMap {
+        '/org/[orgId]': RouteRecordInfo<
+          '/org/[orgId]',
+          '/org/:orgId',
+          { orgId: ParamValue<true> },
+          { orgId: ParamValue<false> },
+          | '/org/[orgId]/dashboard'
+        >,
+        '/org/[orgId]/dashboard': RouteRecordInfo<
+          '/org/[orgId]/dashboard',
+          '/dash/:id',
+          { id: ParamValue<true> },
+          { id: ParamValue<false> },
+          | never
+        >,
+      }"
+    `)
+  })
+
   it('adds children route names', () => {
     const tree = new PrefixTree(DEFAULT_OPTIONS)
     tree.insert('parent', 'parent.vue')

packages/router/src/unplugin/codegen/generateRouteResolver.spec.ts

@@ -1419,6 +1419,90 @@ describe('generateRouteResolver', () => {
     expect(resolver).toMatchSnapshot()
   })
 
+  describe('path overrides', () => {
+    // FIXME: `node.regexp` and `node.matcherPatternPathDynamicParts` are built
+    // from the file segments and ignore `overrides.path`, while
+    // `node.pathParams` follows the override. `MatcherPatternPathDynamic`
+    // consumes them positionally, so they disagree today. The snapshots below
+    // are the wanted output and are marked as failing until the matcher honors
+    // overrides.
+    it.todo('builds the matcher regexp from an absolute path override', () => {
+      const tree = new PrefixTree(DEFAULT_OPTIONS)
+      const node = tree.insert('shop/[id]', 'shop/[id].vue')
+      node.value.setOverride('shop/[id]', { path: '/store/:slug' })
+
+      // the regexp still matches `/shop/:id` while the param is named `slug`
+      expect(
+        generateRouteResolver(
+          tree,
+          DEFAULT_OPTIONS,
+          new ImportsMap(),
+          new Map()
+        )
+        // FIXME: should the name change and be similar to the path?
+      ).toMatchInlineSnapshot(`
+        "
+        const __route_0 = normalizeRouteRecord({
+          name: '/shop/[id]',
+          path: new MatcherPatternPathDynamic(
+            /^\\/store\\/([^/]+?)$/i,
+            {
+              slug: [/* no parser */],
+            },
+            ["store",1],
+            /* trailingSlash */
+          ),
+          components: {
+            'default': () => import('shop/[id].vue')
+          },
+        })
+
+        export const resolver = createFixedResolver([
+          __route_0,  // /store/:slug
+        ])
+        "
+      `)
+    })
+
+    it.todo('builds one capture group per param of the override path', () => {
+      const tree = new PrefixTree(DEFAULT_OPTIONS)
+      const node = tree.insert('shop/[id]', 'shop/[id].vue')
+      node.value.setOverride('shop/[id]', { path: '/shop/:a/:b' })
+
+      // two params for a single capture group
+      expect(
+        generateRouteResolver(
+          tree,
+          DEFAULT_OPTIONS,
+          new ImportsMap(),
+          new Map()
+        )
+      ).toMatchInlineSnapshot(`
+        "
+        const __route_0 = normalizeRouteRecord({
+          name: '/shop/[id]',
+          path: new MatcherPatternPathDynamic(
+            /^\\/shop\\/([^/]+?)\\/([^/]+?)$/i,
+            {
+              a: [/* no parser */],
+              b: [/* no parser */],
+            },
+            ["shop",1,1],
+            /* trailingSlash */
+          ),
+          components: {
+            'default': () => import('shop/[id].vue')
+          },
+        })
+
+        export const resolver = createFixedResolver([
+          __route_0,  // /shop/:a/:b
+        ])
+        "
+      `)
+    })
+  })
+
   describe('aliases', () => {
     it('generates alias records for static alias paths', () => {
       const tree = new PrefixTree(DEFAULT_OPTIONS)

packages/router/src/unplugin/codegen/generateRouteResolver.ts

@@ -325,7 +325,7 @@ function generatePathCode(
     ${node.regexp},
     ${generatePathParamsOptions(params, importsMap, paramParsersMap)},
     ${JSON.stringify(node.matcherPatternPathDynamicParts)},
-    ${node.isSplat ? 'null,' : '/* trailingSlash */'}
+    ${node.endsWithSplat ? 'null,' : '/* trailingSlash */'}
   ),`
   } else {
     return `path: new MatcherPatternPathStatic(${toStringLiteral(node.fullPath)}),`