From b744abb6dd5f4bd94151f534fecca841e2de2b27 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 7 Aug 2025 17:45:55 +0200
Subject: [PATCH 01/81] feat: add new experimental option

---
 playground/vite.config.ts |    1 +
 pnpm-lock.yaml            | 1017 ++++++++++++++++++++-----------------
 src/options.ts            |   29 ++
 3 files changed, 595 insertions(+), 452 deletions(-)

diff --git a/playground/vite.config.ts b/playground/vite.config.ts
index 6f93f16b4..5d44cb03a 100644
--- a/playground/vite.config.ts
+++ b/playground/vite.config.ts
@@ -50,6 +50,7 @@ export default defineConfig({
       // getRouteName: getPascalCaseRouteName,
       experimental: {
         autoExportsDataLoaders: ['src/loaders/**/*', '@/loaders/**/*'],
+        paramMatchers: true,
       },
       extendRoute(route) {
         route.params.forEach((param) => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7596d5c61..79cf034ae 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -128,7 +128,7 @@ importers:
         version: 6.0.1
       rollup:
         specifier: ^4.52.0
-        version: 4.52.0
+        version: 4.52.2
       semver:
         specifier: ^7.7.2
         version: 7.7.2
@@ -146,25 +146,25 @@ importers:
         version: 20.1.0(@vueuse/core@12.5.0(typescript@5.9.2))
       unplugin-vue-markdown:
         specifier: ^29.1.0
-        version: 29.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
+        version: 29.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
       unplugin-vue-router:
         specifier: workspace:*
         version: 'link:'
       vite:
         specifier: ^7.1.6
-        version: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+        version: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       vite-plugin-vue-devtools:
         specifier: ^8.0.2
-        version: 8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+        version: 8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
       vitepress:
         specifier: ^1.6.4
-        version: 1.6.4(@algolia/client-search@5.20.0)(@types/node@22.18.6)(change-case@5.4.4)(fuse.js@7.1.0)(jwt-decode@4.0.0)(lightningcss@1.29.3)(postcss@8.5.6)(search-insights@2.17.2)(terser@5.40.0)(typescript@5.9.2)
+        version: 1.6.4(@algolia/client-search@5.20.0)(@types/node@22.18.6)(change-case@5.4.4)(fuse.js@7.1.0)(jwt-decode@4.0.0)(lightningcss@1.29.3)(postcss@8.5.6)(search-insights@2.17.2)(terser@5.43.1)(typescript@5.9.2)
       vitepress-plugin-llms:
         specifier: ^1.7.5
         version: 1.7.5
       vitest:
         specifier: ^3.2.4
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       vue:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
@@ -201,10 +201,10 @@ importers:
         version: 0.2.1(@pinia/colada@0.17.1(pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))))(magicast@0.3.5)
       '@pinia/nuxt':
         specifier: ^0.11.1
-        version: 0.11.1(magicast@0.3.5)(pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2)))
+        version: 0.11.2(magicast@0.3.5)(pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2)))
       nuxt:
         specifier: ^3.17.5
-        version: 3.17.6(@netlify/blobs@8.2.0)(@parcel/watcher@2.5.1)(@types/node@22.18.6)(@vue/compiler-sfc@3.5.21)(db0@0.3.2)(encoding@0.1.13)(ioredis@5.6.1)(lightningcss@1.29.3)(magicast@0.3.5)(meow@13.2.0)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.0)(terser@5.40.0)(typescript@5.9.2)(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue-tsc@2.2.10(typescript@5.9.2))(yaml@2.8.1)
+        version: 3.17.6(@netlify/blobs@8.2.0)(@parcel/watcher@2.5.1)(@types/node@24.3.0)(@vue/compiler-sfc@3.5.21)(db0@0.3.2)(encoding@0.1.13)(ioredis@5.6.1)(lightningcss@1.29.3)(magicast@0.3.5)(meow@13.2.0)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.2)(terser@5.43.1)(typescript@5.9.2)(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue-tsc@2.2.10(typescript@5.9.2))(yaml@2.8.1)
       unplugin-vue-router:
         specifier: workspace:*
         version: link:../..
@@ -232,7 +232,7 @@ importers:
         version: 5.89.0(@tanstack/vue-query@5.89.0(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
-        version: 6.0.1(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+        version: 6.0.1(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
       '@vue/compiler-sfc':
         specifier: ^3.5.21
         version: 3.5.21
@@ -247,7 +247,7 @@ importers:
         version: link:..
       vite:
         specifier: ^7.1.6
-        version: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+        version: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
 packages:
 
@@ -1410,6 +1410,9 @@ packages:
   '@jridgewell/gen-mapping@0.3.12':
     resolution: {integrity: sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==}
 
+  '@jridgewell/gen-mapping@0.3.13':
+    resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
+
   '@jridgewell/remapping@2.3.5':
     resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
 
@@ -1417,6 +1420,9 @@ packages:
     resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
     engines: {node: '>=6.0.0'}
 
+  '@jridgewell/source-map@0.3.11':
+    resolution: {integrity: sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==}
+
   '@jridgewell/source-map@0.3.6':
     resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
 
@@ -1429,6 +1435,9 @@ packages:
   '@jridgewell/trace-mapping@0.3.29':
     resolution: {integrity: sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==}
 
+  '@jridgewell/trace-mapping@0.3.30':
+    resolution: {integrity: sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==}
+
   '@kwsites/file-exists@1.1.1':
     resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==}
 
@@ -1530,6 +1539,10 @@ packages:
     resolution: {integrity: sha512-8PKRwoEF70IXVrpGEJZ4g4V2WtE9RjSMgSZLLa0HZCoyT+QczJcJe3kho/XKnJOnNnHep4WqciTD7p4qRRtBqw==}
     engines: {node: '>=18.12.0'}
 
+  '@nuxt/kit@3.18.1':
+    resolution: {integrity: sha512-z6w1Fzv27CIKFlhct05rndkJSfoslplWH5fJ9dtusEvpYScLXp5cATWIbWkte9e9zFSmQTgDQJjNs3geQHE7og==}
+    engines: {node: '>=18.12.0'}
+
   '@nuxt/schema@3.17.6':
     resolution: {integrity: sha512-ahm0yz6CrSaZ4pS0iuVod9lVRXNDNIidKWLLBx2naGNM6rW+sdFV9gxjvUS3+rLW+swa4HCKE6J5bjOl//oyqQ==}
     engines: {node: ^14.18.0 || >=16.10.0}
@@ -1647,8 +1660,8 @@ packages:
   '@oxc-project/types@0.75.1':
     resolution: {integrity: sha512-7ZJy+51qWpZRvynaQUezeYfjCtaSdiXIWFUZIlOuTSfDXpXqnSl/m1IUPLx6XrOy6s0SFv3CLE14vcZy63bz7g==}
 
-  '@oxc-project/types@0.89.0':
-    resolution: {integrity: sha512-yuo+ECPIW5Q9mSeNmCDC2im33bfKuwW18mwkaHMQh8KakHYDzj4ci/q7wxf2qS3dMlVVCIyrs3kFtH5LmnlYnw==}
+  '@oxc-project/types@0.92.0':
+    resolution: {integrity: sha512-PDLfCbwgXjGdTBxzcuDOUxJYNBl6P8dOp3eDKWw54dYvqONan9rwGDRQU0zrkdEMiItfXQQUOI17uOcMX5Zm7A==}
 
   '@parcel/watcher-android-arm64@2.5.1':
     resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==}
@@ -1754,8 +1767,8 @@ packages:
       pinia: ^2.2.6 || ^3.0.0
       vue: ^3.5.17
 
-  '@pinia/nuxt@0.11.1':
-    resolution: {integrity: sha512-tCD8ioWhhIHKwm8Y9VvyhBAV/kK4W5uGBIYbI5iM4N1t7duOqK6ECBUavrMxMolELayqqMLb9+evegrh3S7s2A==}
+  '@pinia/nuxt@0.11.2':
+    resolution: {integrity: sha512-CgvSWpbktxxWBV7ModhAcsExsQZqpPq6vMYEe9DexmmY6959ev8ukL4iFhr/qov2Nb9cQAWd7niFDnaWkN+FHg==}
     peerDependencies:
       pinia: ^3.0.3
 
@@ -1814,8 +1827,8 @@ packages:
   '@quansync/fs@0.1.5':
     resolution: {integrity: sha512-lNS9hL2aS2NZgNW7BBj+6EBl4rOf8l+tQ0eRY6JWCI8jI2kc53gSoqbjojU0OnAWhzoXiOjFyGsHcDGePB3lhA==}
 
-  '@rolldown/binding-android-arm64@1.0.0-beta.38':
-    resolution: {integrity: sha512-AE3HFQrjWCKLFZD1Vpiy+qsqTRwwoil1oM5WsKPSmfQ5fif/A+ZtOZetF32erZdsR7qyvns6qHEteEsF6g6rsQ==}
+  '@rolldown/binding-android-arm64@1.0.0-beta.40':
+    resolution: {integrity: sha512-9Ii9phC7QU6Lb+ncMfG1Xlosq0NBB1N/4sw+EGZ3y0BBWGy02TOb5ghWZalphAKv9rn1goqo5WkBjyd2YvsLmA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
@@ -1825,8 +1838,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@rolldown/binding-darwin-arm64@1.0.0-beta.38':
-    resolution: {integrity: sha512-RaoWOKc0rrFsVmKOjQpebMY6c6/I7GR1FBc25v7L/R7NlM0166mUotwGEv7vxu7ruXH4SJcFeVrfADFUUXUmmQ==}
+  '@rolldown/binding-darwin-arm64@1.0.0-beta.40':
+    resolution: {integrity: sha512-5O6d0y2tBQTL+ecQY3qXIwSnF1/Zik8q7LZMKeyF+VJ9l194d0IdMhl2zUF0cqWbYHuF4Pnxplk4OhurPQ/Z9Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
@@ -1836,8 +1849,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@rolldown/binding-darwin-x64@1.0.0-beta.38':
-    resolution: {integrity: sha512-Ymojqc2U35iUc8NFU2XX1WQPfBRRHN6xHcrxAf9WS8BFFBn8pDrH5QPvH1tYs3lDkw6UGGbanr1RGzARqdUp1g==}
+  '@rolldown/binding-darwin-x64@1.0.0-beta.40':
+    resolution: {integrity: sha512-izB9jygt3miPQbOTZfSu5K51isUplqa8ysByOKQqcJHgrBWmbTU8TM9eouv6tRmBR0kjcEcID9xhmA1CeZ1VIg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
@@ -1847,8 +1860,8 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@rolldown/binding-freebsd-x64@1.0.0-beta.38':
-    resolution: {integrity: sha512-0ermTQ//WzSI0nOL3z/LUWMNiE9xeM5cLGxjewPFEexqxV/0uM8/lNp9QageQ8jfc/VO1OURsGw34HYO5PaL8w==}
+  '@rolldown/binding-freebsd-x64@1.0.0-beta.40':
+    resolution: {integrity: sha512-2fdpEpKT+wwP0vig9dqxu+toTeWmVSjo3psJQVDeLJ51rO+GXcCJ1IkCXjhMKVEevNtZS7B8T8Z2vvmRV9MAdA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
@@ -1858,8 +1871,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.38':
-    resolution: {integrity: sha512-GADxzVUTCTp6EWI52831A29Tt7PukFe94nhg/SUsfkI33oTiNQtPxyLIT/3oRegizGuPSZSlrdBurkjDwxyEUQ==}
+  '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.40':
+    resolution: {integrity: sha512-HP2lo78OWULN+8TewpLbS9PS00jh0CaF04tA2u8z2I+6QgVgrYOYKvX+T0hlO5smgso4+qb3YchzumWJl3yCPQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
@@ -1869,8 +1882,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.38':
-    resolution: {integrity: sha512-SKO7Exl5Yem/OSNoA5uLHzyrptUQ8Hg70kHDxuwEaH0+GUg+SQe9/7PWmc4hFKBMrJGdQtii8WZ0uIz9Dofg5Q==}
+  '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.40':
+    resolution: {integrity: sha512-ng00gfr9BhA2NPAOU5RWAlTiL+JcwAD+L+4yUD1sbBy6tgHdLiNBOvKtHISIF9RM9/eQeS0tAiWOYZGIH9JMew==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
@@ -1880,8 +1893,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@rolldown/binding-linux-arm64-musl@1.0.0-beta.38':
-    resolution: {integrity: sha512-SOo6+WqhXPBaShLxLT0eCgH17d3Yu1lMAe4mFP0M9Bvr/kfMSOPQXuLxBcbBU9IFM9w3N6qP9xWOHO+oUJvi8Q==}
+  '@rolldown/binding-linux-arm64-musl@1.0.0-beta.40':
+    resolution: {integrity: sha512-mF0R1l9kLcaag/9cLEiYYdNZ4v1uuX4jklSDZ1s6vJE4RB3LirUney0FavdVRwCJ5sDvfvsPgXgtBXWYr2M2tQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
@@ -1891,8 +1904,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@rolldown/binding-linux-x64-gnu@1.0.0-beta.38':
-    resolution: {integrity: sha512-yvsQ3CyrodOX+lcoi+lejZGCOvJZa9xTsNB8OzpMDmHeZq3QzJfpYjXSAS6vie70fOkLVJb77UqYO193Cl8XBQ==}
+  '@rolldown/binding-linux-x64-gnu@1.0.0-beta.40':
+    resolution: {integrity: sha512-+wi08S7wT5iLPHRZb0USrS6n+T6m+yY++dePYedE5uvKIpWCJJioFTaRtWjpm0V6dVNLcq2OukrvfdlGtH9Wgg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
@@ -1902,14 +1915,14 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@rolldown/binding-linux-x64-musl@1.0.0-beta.38':
-    resolution: {integrity: sha512-84qzKMwUwikfYeOuJ4Kxm/3z15rt0nFGGQArHYIQQNSTiQdxGHxOkqXtzPFqrVfBJUdxBAf+jYzR1pttFJuWyg==}
+  '@rolldown/binding-linux-x64-musl@1.0.0-beta.40':
+    resolution: {integrity: sha512-W5qBGAemUocIBKCcOsDjlV9GUt28qhl/+M6etWBeLS5gQK0J6XDg0YVzfOQdvq57ZGjYNP0NvhYzqhOOnEx+4g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
 
-  '@rolldown/binding-openharmony-arm64@1.0.0-beta.38':
-    resolution: {integrity: sha512-QrNiWlce01DYH0rL8K3yUBu+lNzY+B0DyCbIc2Atan6/S6flxOL0ow5DLQvMamOI/oKhrJ4xG+9MkMb9dDHbLQ==}
+  '@rolldown/binding-openharmony-arm64@1.0.0-beta.40':
+    resolution: {integrity: sha512-vJwoDehtt+yqj2zacq1AqNc2uE/oh7mnRGqAUbuldV6pgvU01OSQUJ7Zu+35hTopnjFoDNN6mIezkYlGAv5RFA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
@@ -1919,8 +1932,8 @@ packages:
     engines: {node: '>=14.21.3'}
     cpu: [wasm32]
 
-  '@rolldown/binding-wasm32-wasi@1.0.0-beta.38':
-    resolution: {integrity: sha512-fnLtHyjwEsG4/aNV3Uv3Qd1ZbdH+CopwJNoV0RgBqrcQB8V6/Qdikd5JKvnO23kb3QvIpP+dAMGZMv1c2PJMzw==}
+  '@rolldown/binding-wasm32-wasi@1.0.0-beta.40':
+    resolution: {integrity: sha512-Oj3YyqVUPurr1FlMpEE/bJmMC+VWAWPM/SGUfklO5KUX97bk5Q/733nPg4RykK8q8/TluJoQYvRc05vL/B74dw==}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
 
@@ -1929,8 +1942,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.38':
-    resolution: {integrity: sha512-19cTfnGedem+RY+znA9J6ARBOCEFD4YSjnx0p5jiTm9tR6pHafRfFIfKlTXhun+NL0WWM/M0eb2IfPPYUa8+wg==}
+  '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.40':
+    resolution: {integrity: sha512-0ZtO6yN8XjVoFfN4HDWQj4nDu3ndMybr7jIM00DJqOmc+yFhly7rdOy7fNR9Sky3leCpBtsXfepVqRmVpYKPVA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
@@ -1940,8 +1953,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@rolldown/binding-win32-ia32-msvc@1.0.0-beta.38':
-    resolution: {integrity: sha512-HcICm4YzFJZV+fI0O0bFLVVlsWvRNo/AB9EfUXvNYbtAxakCnQZ15oq22deFdz6sfi9Y4/SagH2kPU723dhCFA==}
+  '@rolldown/binding-win32-ia32-msvc@1.0.0-beta.40':
+    resolution: {integrity: sha512-BPl1inoJXPpIe38Ja46E4y11vXlJyuleo+9Rmu//pYL5fIDYJkXUj/oAXqjSuwLcssrcwnuPgzvzvlz9++cr3w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
@@ -1951,8 +1964,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@rolldown/binding-win32-x64-msvc@1.0.0-beta.38':
-    resolution: {integrity: sha512-4Qx6cgEPXLb0XsCyLoQcUgYBpfL0sjugftob+zhUH0EOk/NVCAIT+h0NJhY+jn7pFpeKxhNMqhvTNx3AesxIAQ==}
+  '@rolldown/binding-win32-x64-msvc@1.0.0-beta.40':
+    resolution: {integrity: sha512-UguA4ltbAk+nbwHRxqaUP/etpTbR0HjyNlsu4Zjbh/ytNbFsbw8CA4tEBkwDyjgI5NIPea6xY11zpl7R2/ddVA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -1963,8 +1976,11 @@ packages:
   '@rolldown/pluginutils@1.0.0-beta.29':
     resolution: {integrity: sha512-NIJgOsMjbxAXvoGq/X0gD7VPMQ8j9g0BiDaNjVNVjvl+iKXxL3Jre0v31RmBYeLEmkbj2s02v8vFTbUXi5XS2Q==}
 
-  '@rolldown/pluginutils@1.0.0-beta.38':
-    resolution: {integrity: sha512-N/ICGKleNhA5nc9XXQG/kkKHJ7S55u0x0XUJbbkmdCnFuoRkM1Il12q9q0eX19+M7KKUEPw/daUPIRnxhcxAIw==}
+  '@rolldown/pluginutils@1.0.0-beta.33':
+    resolution: {integrity: sha512-she25NCG6NoEPC/SEB4pHs5STcnfI4VBFOzjeI63maSPrWME5J2XC8ogrBgp8NaE/xzj28/kbpSaebiMvFRj+w==}
+
+  '@rolldown/pluginutils@1.0.0-beta.40':
+    resolution: {integrity: sha512-s3GeJKSQOwBlzdUrj4ISjJj5SfSh+aqn0wjOar4Bx95iV1ETI7F6S/5hLcfAxZ9kXDcyrAkxPlqmd1ZITttf+w==}
 
   '@rollup/plugin-alias@5.1.1':
     resolution: {integrity: sha512-PR9zDb+rOzkRb2VD+EuKB7UC41vU5DIwZ5qqCpk0KJudcWAyi8rvYOhS7+L5aZCspw1stTViLgN5v6FF1p5cgQ==}
@@ -2038,113 +2054,113 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.52.0':
-    resolution: {integrity: sha512-VxDYCDqOaR7NXzAtvRx7G1u54d2kEHopb28YH/pKzY6y0qmogP3gG7CSiWsq9WvDFxOQMpNEyjVAHZFXfH3o/A==}
+  '@rollup/rollup-android-arm-eabi@4.52.2':
+    resolution: {integrity: sha512-o3pcKzJgSGt4d74lSZ+OCnHwkKBeAbFDmbEm5gg70eA8VkyCuC/zV9TwBnmw6VjDlRdF4Pshfb+WE9E6XY1PoQ==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.52.0':
-    resolution: {integrity: sha512-pqDirm8koABIKvzL59YI9W9DWbRlTX7RWhN+auR8HXJxo89m4mjqbah7nJZjeKNTNYopqL+yGg+0mhCpf3xZtQ==}
+  '@rollup/rollup-android-arm64@4.52.2':
+    resolution: {integrity: sha512-cqFSWO5tX2vhC9hJTK8WAiPIm4Q8q/cU8j2HQA0L3E1uXvBYbOZMhE2oFL8n2pKB5sOCHY6bBuHaRwG7TkfJyw==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.52.0':
-    resolution: {integrity: sha512-YCdWlY/8ltN6H78HnMsRHYlPiKvqKagBP1r+D7SSylxX+HnsgXGCmLiV3Y4nSyY9hW8qr8U9LDUx/Lo7M6MfmQ==}
+  '@rollup/rollup-darwin-arm64@4.52.2':
+    resolution: {integrity: sha512-vngduywkkv8Fkh3wIZf5nFPXzWsNsVu1kvtLETWxTFf/5opZmflgVSeLgdHR56RQh71xhPhWoOkEBvbehwTlVA==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.52.0':
-    resolution: {integrity: sha512-z4nw6y1j+OOSGzuVbSWdIp1IUks9qNw4dc7z7lWuWDKojY38VMWBlEN7F9jk5UXOkUcp97vA1N213DF+Lz8BRg==}
+  '@rollup/rollup-darwin-x64@4.52.2':
+    resolution: {integrity: sha512-h11KikYrUCYTrDj6h939hhMNlqU2fo/X4NB0OZcys3fya49o1hmFaczAiJWVAFgrM1NCP6RrO7lQKeVYSKBPSQ==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.52.0':
-    resolution: {integrity: sha512-Q/dv9Yvyr5rKlK8WQJZVrp5g2SOYeZUs9u/t2f9cQ2E0gJjYB/BWoedXfUT0EcDJefi2zzVfhcOj8drWCzTviw==}
+  '@rollup/rollup-freebsd-arm64@4.52.2':
+    resolution: {integrity: sha512-/eg4CI61ZUkLXxMHyVlmlGrSQZ34xqWlZNW43IAU4RmdzWEx0mQJ2mN/Cx4IHLVZFL6UBGAh+/GXhgvGb+nVxw==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.52.0':
-    resolution: {integrity: sha512-kdBsLs4Uile/fbjZVvCRcKB4q64R+1mUq0Yd7oU1CMm1Av336ajIFqNFovByipciuUQjBCPMxwJhCgfG2re3rg==}
+  '@rollup/rollup-freebsd-x64@4.52.2':
+    resolution: {integrity: sha512-QOWgFH5X9+p+S1NAfOqc0z8qEpJIoUHf7OWjNUGOeW18Mx22lAUOiA9b6r2/vpzLdfxi/f+VWsYjUOMCcYh0Ng==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.52.0':
-    resolution: {integrity: sha512-aL6hRwu0k7MTUESgkg7QHY6CoqPgr6gdQXRJI1/VbFlUMwsSzPGSR7sG5d+MCbYnJmJwThc2ol3nixj1fvI/zQ==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.52.2':
+    resolution: {integrity: sha512-kDWSPafToDd8LcBYd1t5jw7bD5Ojcu12S3uT372e5HKPzQt532vW+rGFFOaiR0opxePyUkHrwz8iWYEyH1IIQA==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.52.0':
-    resolution: {integrity: sha512-BTs0M5s1EJejgIBJhCeiFo7GZZ2IXWkFGcyZhxX4+8usnIo5Mti57108vjXFIQmmJaRyDwmV59Tw64Ap1dkwMw==}
+  '@rollup/rollup-linux-arm-musleabihf@4.52.2':
+    resolution: {integrity: sha512-gKm7Mk9wCv6/rkzwCiUC4KnevYhlf8ztBrDRT9g/u//1fZLapSRc+eDZj2Eu2wpJ+0RzUKgtNijnVIB4ZxyL+w==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.52.0':
-    resolution: {integrity: sha512-uj672IVOU9m08DBGvoPKPi/J8jlVgjh12C9GmjjBxCTQc3XtVmRkRKyeHSmIKQpvJ7fIm1EJieBUcnGSzDVFyw==}
+  '@rollup/rollup-linux-arm64-gnu@4.52.2':
+    resolution: {integrity: sha512-66lA8vnj5mB/rtDNwPgrrKUOtCLVQypkyDa2gMfOefXK6rcZAxKLO9Fy3GkW8VkPnENv9hBkNOFfGLf6rNKGUg==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.52.0':
-    resolution: {integrity: sha512-/+IVbeDMDCtB/HP/wiWsSzduD10SEGzIZX2945KSgZRNi4TSkjHqRJtNTVtVb8IRwhJ65ssI56krlLik+zFWkw==}
+  '@rollup/rollup-linux-arm64-musl@4.52.2':
+    resolution: {integrity: sha512-s+OPucLNdJHvuZHuIz2WwncJ+SfWHFEmlC5nKMUgAelUeBUnlB4wt7rXWiyG4Zn07uY2Dd+SGyVa9oyLkVGOjA==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-loong64-gnu@4.52.0':
-    resolution: {integrity: sha512-U1vVzvSWtSMWKKrGoROPBXMh3Vwn93TA9V35PldokHGqiUbF6erSzox/5qrSMKp6SzakvyjcPiVF8yB1xKr9Pg==}
+  '@rollup/rollup-linux-loong64-gnu@4.52.2':
+    resolution: {integrity: sha512-8wTRM3+gVMDLLDdaT6tKmOE3lJyRy9NpJUS/ZRWmLCmOPIJhVyXwjBo+XbrrwtV33Em1/eCTd5TuGJm4+DmYjw==}
     cpu: [loong64]
     os: [linux]
 
-  '@rollup/rollup-linux-ppc64-gnu@4.52.0':
-    resolution: {integrity: sha512-X/4WfuBAdQRH8cK3DYl8zC00XEE6aM472W+QCycpQJeLWVnHfkv7RyBFVaTqNUMsTgIX8ihMjCvFF9OUgeABzw==}
+  '@rollup/rollup-linux-ppc64-gnu@4.52.2':
+    resolution: {integrity: sha512-6yqEfgJ1anIeuP2P/zhtfBlDpXUb80t8DpbYwXQ3bQd95JMvUaqiX+fKqYqUwZXqdJDd8xdilNtsHM2N0cFm6A==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.52.0':
-    resolution: {integrity: sha512-xIRYc58HfWDBZoLmWfWXg2Sq8VCa2iJ32B7mqfWnkx5mekekl0tMe7FHpY8I72RXEcUkaWawRvl3qA55og+cwQ==}
+  '@rollup/rollup-linux-riscv64-gnu@4.52.2':
+    resolution: {integrity: sha512-sshYUiYVSEI2B6dp4jMncwxbrUqRdNApF2c3bhtLAU0qA8Lrri0p0NauOsTWh3yCCCDyBOjESHMExonp7Nzc0w==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-musl@4.52.0':
-    resolution: {integrity: sha512-mbsoUey05WJIOz8U1WzNdf+6UMYGwE3fZZnQqsM22FZ3wh1N887HT6jAOjXs6CNEK3Ntu2OBsyQDXfIjouI4dw==}
+  '@rollup/rollup-linux-riscv64-musl@4.52.2':
+    resolution: {integrity: sha512-duBLgd+3pqC4MMwBrKkFxaZerUxZcYApQVC5SdbF5/e/589GwVvlRUnyqMFbM8iUSb1BaoX/3fRL7hB9m2Pj8Q==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.52.0':
-    resolution: {integrity: sha512-qP6aP970bucEi5KKKR4AuPFd8aTx9EF6BvutvYxmZuWLJHmnq4LvBfp0U+yFDMGwJ+AIJEH5sIP+SNypauMWzg==}
+  '@rollup/rollup-linux-s390x-gnu@4.52.2':
+    resolution: {integrity: sha512-tzhYJJidDUVGMgVyE+PmxENPHlvvqm1KILjjZhB8/xHYqAGeizh3GBGf9u6WdJpZrz1aCpIIHG0LgJgH9rVjHQ==}
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.52.0':
-    resolution: {integrity: sha512-nmSVN+F2i1yKZ7rJNKO3G7ZzmxJgoQBQZ/6c4MuS553Grmr7WqR7LLDcYG53Z2m9409z3JLt4sCOhLdbKQ3HmA==}
+  '@rollup/rollup-linux-x64-gnu@4.52.2':
+    resolution: {integrity: sha512-opH8GSUuVcCSSyHHcl5hELrmnk4waZoVpgn/4FDao9iyE4WpQhyWJ5ryl5M3ocp4qkRuHfyXnGqg8M9oKCEKRA==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.52.0':
-    resolution: {integrity: sha512-2d0qRo33G6TfQVjaMR71P+yJVGODrt5V6+T0BDYH4EMfGgdC/2HWDVjSSFw888GSzAZUwuska3+zxNUCDco6rQ==}
+  '@rollup/rollup-linux-x64-musl@4.52.2':
+    resolution: {integrity: sha512-LSeBHnGli1pPKVJ79ZVJgeZWWZXkEe/5o8kcn23M8eMKCUANejchJbF/JqzM4RRjOJfNRhKJk8FuqL1GKjF5oQ==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-openharmony-arm64@4.52.0':
-    resolution: {integrity: sha512-A1JalX4MOaFAAyGgpO7XP5khquv/7xKzLIyLmhNrbiCxWpMlnsTYr8dnsWM7sEeotNmxvSOEL7F65j0HXFcFsw==}
+  '@rollup/rollup-openharmony-arm64@4.52.2':
+    resolution: {integrity: sha512-uPj7MQ6/s+/GOpolavm6BPo+6CbhbKYyZHUDvZ/SmJM7pfDBgdGisFX3bY/CBDMg2ZO4utfhlApkSfZ92yXw7Q==}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rollup/rollup-win32-arm64-msvc@4.52.0':
-    resolution: {integrity: sha512-YQugafP/rH0eOOHGjmNgDURrpYHrIX0yuojOI8bwCyXwxC9ZdTd3vYkmddPX0oHONLXu9Rb1dDmT0VNpjkzGGw==}
+  '@rollup/rollup-win32-arm64-msvc@4.52.2':
+    resolution: {integrity: sha512-Z9MUCrSgIaUeeHAiNkm3cQyst2UhzjPraR3gYYfOjAuZI7tcFRTOD+4cHLPoS/3qinchth+V56vtqz1Tv+6KPA==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.52.0':
-    resolution: {integrity: sha512-zYdUYhi3Qe2fndujBqL5FjAFzvNeLxtIqfzNEVKD1I7C37/chv1VxhscWSQHTNfjPCrBFQMnynwA3kpZpZ8w4A==}
+  '@rollup/rollup-win32-ia32-msvc@4.52.2':
+    resolution: {integrity: sha512-+GnYBmpjldD3XQd+HMejo+0gJGwYIOfFeoBQv32xF/RUIvccUz20/V6Otdv+57NE70D5pa8W/jVGDoGq0oON4A==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-gnu@4.52.0':
-    resolution: {integrity: sha512-fGk03kQylNaCOQ96HDMeT7E2n91EqvCDd3RwvT5k+xNdFCeMGnj5b5hEgTGrQuyidqSsD3zJDQ21QIaxXqTBJw==}
+  '@rollup/rollup-win32-x64-gnu@4.52.2':
+    resolution: {integrity: sha512-ApXFKluSB6kDQkAqZOKXBjiaqdF1BlKi+/eqnYe9Ee7U2K3pUDKsIyr8EYm/QDHTJIM+4X+lI0gJc3TTRhd+dA==}
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.52.0':
-    resolution: {integrity: sha512-6iKDCVSIUQ8jPMoIV0OytRKniaYyy5EbY/RRydmLW8ZR3cEBhxbWl5ro0rkUNe0ef6sScvhbY79HrjRm8i3vDQ==}
+  '@rollup/rollup-win32-x64-msvc@4.52.2':
+    resolution: {integrity: sha512-ARz+Bs8kY6FtitYM96PqPEVvPXqEZmPZsSkXvyX19YzDqkCaIlhCieLLMI5hxO9SRZ2XtCtm8wxhy0iJ2jxNfw==}
     cpu: [x64]
     os: [win32]
 
@@ -2302,12 +2318,15 @@ packages:
   '@types/ms@2.1.0':
     resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
 
-  '@types/node@20.19.4':
-    resolution: {integrity: sha512-OP+We5WV8Xnbuvw0zC2m4qfB/BJvjyCwtNjhHdJxV1639SGSKrLmJkc3fMnp2Qy8nJyHp8RO6umxELN/dS1/EA==}
+  '@types/node@20.19.11':
+    resolution: {integrity: sha512-uug3FEEGv0r+jrecvUUpbY8lLisvIjg6AAic6a2bSP5OEOLeJsDSnvhCDov7ipFFMXS3orMpzlmi0ZcuGkBbow==}
 
   '@types/node@22.18.6':
     resolution: {integrity: sha512-r8uszLPpeIWbNKtvWRt/DbVi5zbqZyj1PTmhRMqBMvDnaz1QpmSKujUtJLrqGZeoM8v72MfYggDceY4K1itzWQ==}
 
+  '@types/node@24.3.0':
+    resolution: {integrity: sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==}
+
   '@types/normalize-package-data@2.4.4':
     resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
 
@@ -2526,8 +2545,8 @@ packages:
   '@vue/devtools-api@7.7.6':
     resolution: {integrity: sha512-b2Xx0KvXZObePpXPYHvBRRJLDQn5nhKjXh7vUhMEtWxz1AYNFOVIsh5+HLP8xDGL7sy+Q7hXeUxPHB/KgbtsPw==}
 
-  '@vue/devtools-api@8.0.1':
-    resolution: {integrity: sha512-YBvjfpM7LEp5+b7ZDm4+mFrC+TgGjUmN8ff9lZcbHQ1MKhmftT/urCTZP0y1j26YQWr25l9TPaEbNLbILRiGoQ==}
+  '@vue/devtools-api@8.0.2':
+    resolution: {integrity: sha512-RdwsaYoSTumwZ7XOt5yIPP1/T4O0bTs+c5XaEjmUB6f9x+FvDSL9AekxW1vuhK1lmA9TfewpXVt2r5LIax3LHw==}
 
   '@vue/devtools-core@7.7.7':
     resolution: {integrity: sha512-9z9TLbfC+AjAi1PQyWX+OErjIaJmdFlbDHcD+cAMYKY6Bh5VlsAtCeGyRMrXwIlMEQPukvnWt3gZBLwTAIMKzQ==}
@@ -2542,18 +2561,12 @@ packages:
   '@vue/devtools-kit@7.7.7':
     resolution: {integrity: sha512-wgoZtxcTta65cnZ1Q6MbAfePVFxfM+gq0saaeytoph7nEa7yMXoi6sCPy4ufO111B9msnw0VOWjPEFCXuAKRHA==}
 
-  '@vue/devtools-kit@8.0.1':
-    resolution: {integrity: sha512-7kiPhgTKNtNeXltEHnJJjIDlndlJP4P+UJvCw54uVHNDlI6JzwrSiRmW4cxKTug2wDbc/dkGaMnlZghcwV+aWA==}
-
   '@vue/devtools-kit@8.0.2':
     resolution: {integrity: sha512-yjZKdEmhJzQqbOh4KFBfTOQjDPMrjjBNCnHBvnTGJX+YLAqoUtY2J+cg7BE+EA8KUv8LprECq04ts75wCoIGWA==}
 
   '@vue/devtools-shared@7.7.7':
     resolution: {integrity: sha512-+udSj47aRl5aKb0memBvcUG9koarqnxNM5yjuREvqwK6T3ap4mn3Zqqc17QrBFTqSMjr3HK1cvStEZpMDpfdyw==}
 
-  '@vue/devtools-shared@8.0.1':
-    resolution: {integrity: sha512-PqtWqPPRpMwZ9FjTzyugb5KeV9kmg2C3hjxZHwjl0lijT4QIJDd0z6AWcnbM9w2nayjDymyTt0+sbdTv3pVeNg==}
-
   '@vue/devtools-shared@8.0.2':
     resolution: {integrity: sha512-mLU0QVdy5Lp40PMGSixDw/Kbd6v5dkQXltd2r+mdVQV7iUog2NlZuLxFZApFZ/mObUBDhoCpf0T3zF2FWWdeHw==}
 
@@ -2604,9 +2617,6 @@ packages:
   '@vue/shared@3.5.18':
     resolution: {integrity: sha512-cZy8Dq+uuIXbxCZpuLd2GJdeSO/lIzIspC2WtkqIpje5QyFbvLaI5wZtdUjLHjGZrlVX6GilejatWwVYYRc8tA==}
 
-  '@vue/shared@3.5.19':
-    resolution: {integrity: sha512-IhXCOn08wgKrLQxRFKKlSacWg4Goi1BolrdEeLYn6tgHjJNXVrWJ5nzoxZqNwl5p88aLlQ8LOaoMa3AYvaKJ/Q==}
-
   '@vue/shared@3.5.21':
     resolution: {integrity: sha512-+2k1EQpnYuVuu3N7atWyG3/xoFWIVJZq4Mz8XNOdScFI0etES75fbny/oU4lKWk/577P1zmg0ioYvpGEDZ3DLw==}
 
@@ -2936,8 +2946,8 @@ packages:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
-  browserslist@4.25.0:
-    resolution: {integrity: sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==}
+  browserslist@4.25.2:
+    resolution: {integrity: sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
@@ -2978,6 +2988,14 @@ packages:
       magicast:
         optional: true
 
+  c12@3.2.0:
+    resolution: {integrity: sha512-ixkEtbYafL56E6HiFuonMm1ZjoKtIo7TH68/uiEq4DAwv9NcUX2nJ95F8TrbMeNjqIkZpruo3ojXQJ+MGG5gcQ==}
+    peerDependencies:
+      magicast: ^0.3.5
+    peerDependenciesMeta:
+      magicast:
+        optional: true
+
   cac@6.7.14:
     resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
     engines: {node: '>=8'}
@@ -2999,6 +3017,9 @@ packages:
   caniuse-lite@1.0.30001720:
     resolution: {integrity: sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==}
 
+  caniuse-lite@1.0.30001735:
+    resolution: {integrity: sha512-EV/laoX7Wq2J9TQlyIXRxTJqIw4sxfXS4OYgudGxBYRuTv0q7AM6yMEpU/Vo1I94thg9U6EZ2NfZx9GJq83u7w==}
+
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
 
@@ -3056,9 +3077,9 @@ packages:
     resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
     engines: {node: '>=18'}
 
-  cli-truncate@4.0.0:
-    resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==}
-    engines: {node: '>=18'}
+  cli-truncate@5.1.0:
+    resolution: {integrity: sha512-7JDGG+4Zp0CsknDCedl0DYdaeOhc46QNpXi3NLQblkZpXXgA6LncLDUUyvrjSvZeF3VRQa+KiMGomazQrC1V8g==}
+    engines: {node: '>=20'}
 
   clipboardy@4.0.0:
     resolution: {integrity: sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w==}
@@ -3556,6 +3577,10 @@ packages:
     resolution: {integrity: sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==}
     engines: {node: '>=12'}
 
+  dotenv@17.2.1:
+    resolution: {integrity: sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==}
+    engines: {node: '>=12'}
+
   dts-resolver@2.1.2:
     resolution: {integrity: sha512-xeXHBQkn2ISSXxbJWD828PFjtyg+/UrMDo7W4Ffcs7+YWCquxU8YjV1KoxuiL+eJ5pg3ll+bC6flVv61L3LKZg==}
     engines: {node: '>=20.18.0'}
@@ -3583,8 +3608,8 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  electron-to-chromium@1.5.161:
-    resolution: {integrity: sha512-hwtetwfKNZo/UlwHIVBlKZVdy7o8bIZxxKs0Mv/ROPiQQQmDgdm5a+KvKtBsxM8ZjFzTaCeLoodZ8jiBE3o9rA==}
+  electron-to-chromium@1.5.202:
+    resolution: {integrity: sha512-NxbYjRmiHcHXV1Ws3fWUW+SLb62isauajk45LUJ/HgIOkUA7jLZu/X2Iif+X9FBNK8QkF9Zb4Q2mcwXCcY30mg==}
 
   emoji-regex-xs@1.0.0:
     resolution: {integrity: sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==}
@@ -3619,8 +3644,8 @@ packages:
   end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
 
-  enhanced-resolve@5.18.1:
-    resolution: {integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==}
+  enhanced-resolve@5.18.3:
+    resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==}
     engines: {node: '>=10.13.0'}
 
   entities@4.5.0:
@@ -3816,6 +3841,14 @@ packages:
   fd-slicer@1.1.0:
     resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
 
+  fdir@6.4.6:
+    resolution: {integrity: sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
   fdir@6.5.0:
     resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
     engines: {node: '>=12.0.0'}
@@ -4222,10 +4255,6 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
-  is-fullwidth-code-point@4.0.0:
-    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
-    engines: {node: '>=12'}
-
   is-fullwidth-code-point@5.0.0:
     resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==}
     engines: {node: '>=18'}
@@ -4537,8 +4566,8 @@ packages:
     resolution: {integrity: sha512-I8oW2+QL5KJo8zXNWX046M134WchxsXC7SawLPvRQpogCbkyQIaFxPE89A2HiwR7vAK2Dm2ERBAmyjTYGYEpBg==}
     hasBin: true
 
-  listr2@9.0.3:
-    resolution: {integrity: sha512-0aeh5HHHgmq1KRdMMDHfhMWQmIT/m7nRDTlxlFqni2Sp0had9baqsjJRvDGdlvgd6NmPE0nPloOipiQJGFtTHQ==}
+  listr2@9.0.4:
+    resolution: {integrity: sha512-1wd/kpAdKRLwv7/3OKC8zZ5U8e/fajCfWMxacUvB79S5nLrYGPtUI/8chMQhn3LQjsRVErTb9i1ECAwW0ZIHnQ==}
     engines: {node: '>=20.0.0'}
 
   loader-runner@4.3.0:
@@ -4630,9 +4659,6 @@ packages:
   magic-string@0.30.17:
     resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
 
-  magic-string@0.30.18:
-    resolution: {integrity: sha512-yi8swmWbO17qHhwIBNeeZxTceJMeBvWJaId6dyvTSOwTipqeHhMhOrz6513r1sOKnpvQ7zkhlG8tPrpilwTxHQ==}
-
   magic-string@0.30.19:
     resolution: {integrity: sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==}
 
@@ -5543,8 +5569,8 @@ packages:
   proto-list@1.2.4:
     resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
 
-  protobufjs@7.5.0:
-    resolution: {integrity: sha512-Z2E/kOY1QjoMlCytmexzYfDm/w5fKAiRwpSzGtdnXW1zC88Z2yXazHHrOtwCzn+7wSxyE8PYM4rvVcMphF9sOA==}
+  protobufjs@7.5.3:
+    resolution: {integrity: sha512-sildjKwVqOI2kmFDiXQ6aEB0fjYTafpEvIBs8tOR8qI4spuL9OPROLVu2qZqi/xgCfsHIwVqlaF8JBjWFHnKbw==}
     engines: {node: '>=12.0.0'}
 
   protocols@2.0.2:
@@ -5715,8 +5741,8 @@ packages:
     engines: {node: 20 || >=22}
     hasBin: true
 
-  rolldown-plugin-dts@0.16.7:
-    resolution: {integrity: sha512-9iDzS4MHXMyieisFbWxuz96i/idGJNpvWILqCH06mrEZvn8Q2el3Q63xxjOt7HJjTOUNFhB1isvZFy4dA87lPQ==}
+  rolldown-plugin-dts@0.16.8:
+    resolution: {integrity: sha512-lsx7yrYA0ZXfARLEcPKgHIw8DX4fLQOhmMChgZbn5eFhqibY2Bav1+/Yn5WNm+ATtw+cefXYgEYO/7njeHsgAA==}
     engines: {node: '>=20.18.0'}
     peerDependencies:
       '@ts-macro/tsc': ^0.3.6
@@ -5738,8 +5764,8 @@ packages:
     resolution: {integrity: sha512-D+iim+DHIwK9kbZvubENmtnYFqHfFV0OKwzT8yU/W+xyUK1A71+iRFmJYBGqNUo3fJ2Ob4oIQfan63mhzh614A==}
     hasBin: true
 
-  rolldown@1.0.0-beta.38:
-    resolution: {integrity: sha512-58frPNX55Je1YsyrtPJv9rOSR3G5efUZpRqok94Efsj0EUa8dnqJV3BldShyI7A+bVPleucOtzXHwVpJRcR0kQ==}
+  rolldown@1.0.0-beta.40:
+    resolution: {integrity: sha512-VqEHbKpOgTPmQrZ4fVn4eshDQS/6g/fRpNE7cFSJY+eQLDZn4B9X61J6L+hnlt1u2uRI+pF7r1USs6S5fuWCvw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
@@ -5756,8 +5782,8 @@ packages:
       rollup:
         optional: true
 
-  rollup@4.52.0:
-    resolution: {integrity: sha512-+IuescNkTJQgX7AkIDtITipZdIGcWF0pnVvZTWStiazUmcGA2ag8dfg0urest2XlXUi9kuhfQ+qmdc5Stc3z7g==}
+  rollup@4.52.2:
+    resolution: {integrity: sha512-I25/2QgoROE1vYV+NQ1En9T9UFB9Cmfm2CJ83zZOlaDpvz29wGQSZXWKw7MiNXau7wYgB/T9fVIdIuEQ+KbiiA==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -5912,10 +5938,6 @@ packages:
     resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==}
     engines: {node: '>=14.16'}
 
-  slice-ansi@5.0.0:
-    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
-    engines: {node: '>=12'}
-
   slice-ansi@7.1.0:
     resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==}
     engines: {node: '>=18'}
@@ -5998,6 +6020,10 @@ packages:
     resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
     engines: {node: '>=18'}
 
+  string-width@8.1.0:
+    resolution: {integrity: sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==}
+    engines: {node: '>=20'}
+
   string_decoder@1.1.1:
     resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
 
@@ -6123,6 +6149,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  terser@5.43.1:
+    resolution: {integrity: sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   test-exclude@7.0.1:
     resolution: {integrity: sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==}
     engines: {node: '>=18'}
@@ -6300,6 +6331,9 @@ packages:
   undici-types@6.21.0:
     resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
+  undici-types@7.10.0:
+    resolution: {integrity: sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==}
+
   unenv@2.0.0-rc.18:
     resolution: {integrity: sha512-O0oVQVJ2X3Q8H4HITJr4e2cWxMYBeZ+p8S25yoKCxVCgDWtIJDcgwWNonYz12tI3ylVQCRyPV/Bdq0KJeXo7AA==}
 
@@ -6593,8 +6627,8 @@ packages:
       vite: ^6.0.0 || ^7.0.0
       vue: ^3.5.0
 
-  vite@5.4.20:
-    resolution: {integrity: sha512-j3lYzGC3P+B5Yfy/pfKNgVEg4+UtcIJcVRt2cDjIOmhLourAqPqf8P7acgxeiSgUB7E3p2P8/3gNIgDLpwzs4g==}
+  vite@5.4.19:
+    resolution: {integrity: sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -6624,8 +6658,8 @@ packages:
       terser:
         optional: true
 
-  vite@6.3.6:
-    resolution: {integrity: sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==}
+  vite@6.3.5:
+    resolution: {integrity: sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
     peerDependencies:
@@ -7129,7 +7163,7 @@ snapshots:
       '@babel/helper-compilation-targets': 7.27.2
       '@babel/helper-module-transforms': 7.27.3(@babel/core@7.27.4)
       '@babel/helpers': 7.27.4
-      '@babel/parser': 7.28.4
+      '@babel/parser': 7.28.3
       '@babel/template': 7.27.2
       '@babel/traverse': 7.27.4
       '@babel/types': 7.28.4
@@ -7145,8 +7179,8 @@ snapshots:
     dependencies:
       '@babel/parser': 7.28.4
       '@babel/types': 7.28.4
-      '@jridgewell/gen-mapping': 0.3.12
-      '@jridgewell/trace-mapping': 0.3.29
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.30
       jsesc: 3.1.0
 
   '@babel/helper-annotate-as-pure@7.27.1':
@@ -7157,7 +7191,7 @@ snapshots:
     dependencies:
       '@babel/compat-data': 7.27.2
       '@babel/helper-validator-option': 7.27.1
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       lru-cache: 5.1.1
       semver: 6.3.1
 
@@ -7290,14 +7324,14 @@ snapshots:
   '@babel/template@7.27.2':
     dependencies:
       '@babel/code-frame': 7.27.1
-      '@babel/parser': 7.28.4
+      '@babel/parser': 7.28.3
       '@babel/types': 7.28.4
 
   '@babel/traverse@7.27.4':
     dependencies:
       '@babel/code-frame': 7.27.1
       '@babel/generator': 7.28.3
-      '@babel/parser': 7.28.4
+      '@babel/parser': 7.28.3
       '@babel/template': 7.27.2
       '@babel/types': 7.28.4
       debug: 4.4.1(supports-color@5.5.0)
@@ -8034,7 +8068,7 @@ snapshots:
     dependencies:
       lodash.camelcase: 4.3.0
       long: 5.3.2
-      protobufjs: 7.5.0
+      protobufjs: 7.5.3
       yargs: 17.7.2
 
   '@hutson/parse-repository-url@5.0.0': {}
@@ -8070,26 +8104,41 @@ snapshots:
 
   '@jridgewell/gen-mapping@0.3.12':
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.5
+      '@jridgewell/sourcemap-codec': 1.5.0
       '@jridgewell/trace-mapping': 0.3.29
 
+  '@jridgewell/gen-mapping@0.3.13':
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+      '@jridgewell/trace-mapping': 0.3.30
+
   '@jridgewell/remapping@2.3.5':
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.12
-      '@jridgewell/trace-mapping': 0.3.29
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.30
 
   '@jridgewell/resolve-uri@3.1.2': {}
 
+  '@jridgewell/source-map@0.3.11':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.30
+
   '@jridgewell/source-map@0.3.6':
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.12
-      '@jridgewell/trace-mapping': 0.3.29
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.30
 
   '@jridgewell/sourcemap-codec@1.5.0': {}
 
   '@jridgewell/sourcemap-codec@1.5.5': {}
 
   '@jridgewell/trace-mapping@0.3.29':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.0
+
+  '@jridgewell/trace-mapping@0.3.30':
     dependencies:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -8167,12 +8216,12 @@ snapshots:
       uuid: 11.1.0
       write-file-atomic: 6.0.0
 
-  '@netlify/functions@3.1.10(encoding@0.1.13)(rollup@4.52.0)':
+  '@netlify/functions@3.1.10(encoding@0.1.13)(rollup@4.52.2)':
     dependencies:
       '@netlify/blobs': 9.1.2
       '@netlify/dev-utils': 2.2.0
       '@netlify/serverless-functions-api': 1.41.2
-      '@netlify/zip-it-and-ship-it': 12.1.1(encoding@0.1.13)(rollup@4.52.0)
+      '@netlify/zip-it-and-ship-it': 12.1.1(encoding@0.1.13)(rollup@4.52.2)
       cron-parser: 4.9.0
       decache: 4.6.2
       extract-zip: 2.0.1
@@ -8192,13 +8241,13 @@ snapshots:
 
   '@netlify/serverless-functions-api@1.41.2': {}
 
-  '@netlify/zip-it-and-ship-it@12.1.1(encoding@0.1.13)(rollup@4.52.0)':
+  '@netlify/zip-it-and-ship-it@12.1.1(encoding@0.1.13)(rollup@4.52.2)':
     dependencies:
-      '@babel/parser': 7.28.4
+      '@babel/parser': 7.28.3
       '@babel/types': 7.27.3
       '@netlify/binary-info': 1.0.0
       '@netlify/serverless-functions-api': 1.41.2
-      '@vercel/nft': 0.29.3(encoding@0.1.13)(rollup@4.52.0)
+      '@vercel/nft': 0.29.3(encoding@0.1.13)(rollup@4.52.2)
       archiver: 7.0.1
       common-path-prefix: 3.0.0
       copy-file: 11.0.0
@@ -8276,11 +8325,11 @@ snapshots:
 
   '@nuxt/devalue@2.0.2': {}
 
-  '@nuxt/devtools-kit@2.6.2(magicast@0.3.5)(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))':
+  '@nuxt/devtools-kit@2.6.2(magicast@0.3.5)(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))':
     dependencies:
-      '@nuxt/kit': 3.17.6(magicast@0.3.5)
+      '@nuxt/kit': 3.18.1(magicast@0.3.5)
       execa: 8.0.1
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - magicast
 
@@ -8295,12 +8344,12 @@ snapshots:
       prompts: 2.4.2
       semver: 7.7.2
 
-  '@nuxt/devtools@2.6.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))':
+  '@nuxt/devtools@2.6.2(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))':
     dependencies:
-      '@nuxt/devtools-kit': 2.6.2(magicast@0.3.5)(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
+      '@nuxt/devtools-kit': 2.6.2(magicast@0.3.5)(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
       '@nuxt/devtools-wizard': 2.6.2
       '@nuxt/kit': 3.17.6(magicast@0.3.5)
-      '@vue/devtools-core': 7.7.7(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))
+      '@vue/devtools-core': 7.7.7(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))
       '@vue/devtools-kit': 7.7.7
       birpc: 2.5.0
       consola: 3.4.2
@@ -8325,9 +8374,9 @@ snapshots:
       sirv: 3.0.1
       structured-clone-es: 1.0.0
       tinyglobby: 0.2.15
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
-      vite-plugin-inspect: 11.3.0(@nuxt/kit@3.17.6(magicast@0.3.5))(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
-      vite-plugin-vue-tracer: 1.0.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-plugin-inspect: 11.3.0(@nuxt/kit@3.17.6(magicast@0.3.5))(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
+      vite-plugin-vue-tracer: 1.0.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))
       which: 5.0.0
       ws: 8.18.3
     transitivePeerDependencies:
@@ -8363,9 +8412,36 @@ snapshots:
     transitivePeerDependencies:
       - magicast
 
+  '@nuxt/kit@3.18.1(magicast@0.3.5)':
+    dependencies:
+      c12: 3.2.0(magicast@0.3.5)
+      consola: 3.4.2
+      defu: 6.1.4
+      destr: 2.0.5
+      errx: 0.1.0
+      exsolve: 1.0.7
+      ignore: 7.0.5
+      jiti: 2.5.1
+      klona: 2.0.6
+      knitwork: 1.2.0
+      mlly: 1.8.0
+      ohash: 2.0.11
+      pathe: 2.0.3
+      pkg-types: 2.2.0
+      scule: 1.3.0
+      semver: 7.7.2
+      std-env: 3.9.0
+      tinyglobby: 0.2.15
+      ufo: 1.6.1
+      unctx: 2.4.1
+      unimport: 5.2.0
+      untyped: 2.0.0
+    transitivePeerDependencies:
+      - magicast
+
   '@nuxt/schema@3.17.6':
     dependencies:
-      '@vue/shared': 3.5.19
+      '@vue/shared': 3.5.18
       consola: 3.4.2
       defu: 6.1.4
       pathe: 2.0.3
@@ -8388,17 +8464,17 @@ snapshots:
     transitivePeerDependencies:
       - magicast
 
-  '@nuxt/vite-builder@3.17.6(@types/node@22.18.6)(lightningcss@1.29.3)(magicast@0.3.5)(meow@13.2.0)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.0)(terser@5.40.0)(typescript@5.9.2)(vue-tsc@2.2.10(typescript@5.9.2))(vue@3.5.18(typescript@5.9.2))(yaml@2.8.1)':
+  '@nuxt/vite-builder@3.17.6(@types/node@24.3.0)(lightningcss@1.29.3)(magicast@0.3.5)(meow@13.2.0)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.2)(terser@5.43.1)(typescript@5.9.2)(vue-tsc@2.2.10(typescript@5.9.2))(vue@3.5.18(typescript@5.9.2))(yaml@2.8.1)':
     dependencies:
       '@nuxt/kit': 3.17.6(magicast@0.3.5)
-      '@rollup/plugin-replace': 6.0.2(rollup@4.52.0)
-      '@vitejs/plugin-vue': 5.2.4(vite@6.3.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))
-      '@vitejs/plugin-vue-jsx': 4.2.0(vite@6.3.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))
+      '@rollup/plugin-replace': 6.0.2(rollup@4.52.2)
+      '@vitejs/plugin-vue': 5.2.4(vite@6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))
+      '@vitejs/plugin-vue-jsx': 4.2.0(vite@6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))
       autoprefixer: 10.4.21(postcss@8.5.6)
       consola: 3.4.2
       cssnano: 7.0.7(postcss@8.5.6)
       defu: 6.1.4
-      esbuild: 0.25.9
+      esbuild: 0.25.5
       escape-string-regexp: 5.0.0
       exsolve: 1.0.7
       externality: 1.0.2
@@ -8414,13 +8490,13 @@ snapshots:
       perfect-debounce: 1.0.0
       pkg-types: 2.2.0
       postcss: 8.5.6
-      rollup-plugin-visualizer: 6.0.3(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.0)
+      rollup-plugin-visualizer: 6.0.3(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.2)
       std-env: 3.9.0
       ufo: 1.6.1
       unenv: 2.0.0-rc.18
-      vite: 6.3.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
-      vite-node: 3.2.4(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
-      vite-plugin-checker: 0.9.3(meow@13.2.0)(typescript@5.9.2)(vite@6.3.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue-tsc@2.2.10(typescript@5.9.2))
+      vite: 6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-node: 3.2.4(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-plugin-checker: 0.9.3(meow@13.2.0)(typescript@5.9.2)(vite@6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue-tsc@2.2.10(typescript@5.9.2))
       vue: 3.5.18(typescript@5.9.2)
       vue-bundle-renderer: 2.1.1
     transitivePeerDependencies:
@@ -8505,7 +8581,7 @@ snapshots:
 
   '@oxc-project/types@0.75.1': {}
 
-  '@oxc-project/types@0.89.0': {}
+  '@oxc-project/types@0.92.0': {}
 
   '@parcel/watcher-android-arm64@2.5.1':
     optional: true
@@ -8586,13 +8662,13 @@ snapshots:
 
   '@pinia/colada@0.17.5(pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))':
     dependencies:
-      '@vue/devtools-api': 8.0.1
+      '@vue/devtools-api': 8.0.2
       pinia: 3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
       vue: 3.5.21(typescript@5.9.2)
 
-  '@pinia/nuxt@0.11.1(magicast@0.3.5)(pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2)))':
+  '@pinia/nuxt@0.11.2(magicast@0.3.5)(pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2)))':
     dependencies:
-      '@nuxt/kit': 3.17.6(magicast@0.3.5)
+      '@nuxt/kit': 3.18.1(magicast@0.3.5)
       pinia: 3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
     transitivePeerDependencies:
       - magicast
@@ -8646,64 +8722,64 @@ snapshots:
     dependencies:
       quansync: 0.2.11
 
-  '@rolldown/binding-android-arm64@1.0.0-beta.38':
+  '@rolldown/binding-android-arm64@1.0.0-beta.40':
     optional: true
 
   '@rolldown/binding-darwin-arm64@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-darwin-arm64@1.0.0-beta.38':
+  '@rolldown/binding-darwin-arm64@1.0.0-beta.40':
     optional: true
 
   '@rolldown/binding-darwin-x64@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-darwin-x64@1.0.0-beta.38':
+  '@rolldown/binding-darwin-x64@1.0.0-beta.40':
     optional: true
 
   '@rolldown/binding-freebsd-x64@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-freebsd-x64@1.0.0-beta.38':
+  '@rolldown/binding-freebsd-x64@1.0.0-beta.40':
     optional: true
 
   '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.38':
+  '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.40':
     optional: true
 
   '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.38':
+  '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.40':
     optional: true
 
   '@rolldown/binding-linux-arm64-musl@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-linux-arm64-musl@1.0.0-beta.38':
+  '@rolldown/binding-linux-arm64-musl@1.0.0-beta.40':
     optional: true
 
   '@rolldown/binding-linux-x64-gnu@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-linux-x64-gnu@1.0.0-beta.38':
+  '@rolldown/binding-linux-x64-gnu@1.0.0-beta.40':
     optional: true
 
   '@rolldown/binding-linux-x64-musl@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-linux-x64-musl@1.0.0-beta.38':
+  '@rolldown/binding-linux-x64-musl@1.0.0-beta.40':
     optional: true
 
-  '@rolldown/binding-openharmony-arm64@1.0.0-beta.38':
+  '@rolldown/binding-openharmony-arm64@1.0.0-beta.40':
     optional: true
 
   '@rolldown/binding-wasm32-wasi@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-wasm32-wasi@1.0.0-beta.38':
+  '@rolldown/binding-wasm32-wasi@1.0.0-beta.40':
     dependencies:
       '@napi-rs/wasm-runtime': 1.0.5
     optional: true
@@ -8711,34 +8787,37 @@ snapshots:
   '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.38':
+  '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.40':
     optional: true
 
   '@rolldown/binding-win32-ia32-msvc@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-win32-ia32-msvc@1.0.0-beta.38':
+  '@rolldown/binding-win32-ia32-msvc@1.0.0-beta.40':
     optional: true
 
   '@rolldown/binding-win32-x64-msvc@1.0.0-beta.10-commit.87188ed':
     optional: true
 
-  '@rolldown/binding-win32-x64-msvc@1.0.0-beta.38':
+  '@rolldown/binding-win32-x64-msvc@1.0.0-beta.40':
     optional: true
 
-  '@rolldown/pluginutils@1.0.0-beta.10-commit.87188ed': {}
+  '@rolldown/pluginutils@1.0.0-beta.10-commit.87188ed':
+    optional: true
 
   '@rolldown/pluginutils@1.0.0-beta.29': {}
 
-  '@rolldown/pluginutils@1.0.0-beta.38': {}
+  '@rolldown/pluginutils@1.0.0-beta.33': {}
 
-  '@rollup/plugin-alias@5.1.1(rollup@4.52.0)':
+  '@rolldown/pluginutils@1.0.0-beta.40': {}
+
+  '@rollup/plugin-alias@5.1.1(rollup@4.52.2)':
     optionalDependencies:
-      rollup: 4.52.0
+      rollup: 4.52.2
 
-  '@rollup/plugin-commonjs@28.0.6(rollup@4.52.0)':
+  '@rollup/plugin-commonjs@28.0.6(rollup@4.52.2)':
     dependencies:
-      '@rollup/pluginutils': 5.1.4(rollup@4.52.0)
+      '@rollup/pluginutils': 5.1.4(rollup@4.52.2)
       commondir: 1.0.1
       estree-walker: 2.0.2
       fdir: 6.5.0(picomatch@4.0.3)
@@ -8746,119 +8825,119 @@ snapshots:
       magic-string: 0.30.19
       picomatch: 4.0.3
     optionalDependencies:
-      rollup: 4.52.0
+      rollup: 4.52.2
 
-  '@rollup/plugin-inject@5.0.5(rollup@4.52.0)':
+  '@rollup/plugin-inject@5.0.5(rollup@4.52.2)':
     dependencies:
-      '@rollup/pluginutils': 5.1.4(rollup@4.52.0)
+      '@rollup/pluginutils': 5.1.4(rollup@4.52.2)
       estree-walker: 2.0.2
       magic-string: 0.30.19
     optionalDependencies:
-      rollup: 4.52.0
+      rollup: 4.52.2
 
-  '@rollup/plugin-json@6.1.0(rollup@4.52.0)':
+  '@rollup/plugin-json@6.1.0(rollup@4.52.2)':
     dependencies:
-      '@rollup/pluginutils': 5.1.4(rollup@4.52.0)
+      '@rollup/pluginutils': 5.1.4(rollup@4.52.2)
     optionalDependencies:
-      rollup: 4.52.0
+      rollup: 4.52.2
 
-  '@rollup/plugin-node-resolve@16.0.1(rollup@4.52.0)':
+  '@rollup/plugin-node-resolve@16.0.1(rollup@4.52.2)':
     dependencies:
-      '@rollup/pluginutils': 5.1.4(rollup@4.52.0)
+      '@rollup/pluginutils': 5.1.4(rollup@4.52.2)
       '@types/resolve': 1.20.2
       deepmerge: 4.3.1
       is-module: 1.0.0
       resolve: 1.22.10
     optionalDependencies:
-      rollup: 4.52.0
+      rollup: 4.52.2
 
-  '@rollup/plugin-replace@6.0.2(rollup@4.52.0)':
+  '@rollup/plugin-replace@6.0.2(rollup@4.52.2)':
     dependencies:
-      '@rollup/pluginutils': 5.1.4(rollup@4.52.0)
+      '@rollup/pluginutils': 5.1.4(rollup@4.52.2)
       magic-string: 0.30.19
     optionalDependencies:
-      rollup: 4.52.0
+      rollup: 4.52.2
 
-  '@rollup/plugin-terser@0.4.4(rollup@4.52.0)':
+  '@rollup/plugin-terser@0.4.4(rollup@4.52.2)':
     dependencies:
       serialize-javascript: 6.0.2
       smob: 1.5.0
       terser: 5.40.0
     optionalDependencies:
-      rollup: 4.52.0
+      rollup: 4.52.2
 
-  '@rollup/pluginutils@5.1.4(rollup@4.52.0)':
+  '@rollup/pluginutils@5.1.4(rollup@4.52.2)':
     dependencies:
       '@types/estree': 1.0.8
       estree-walker: 2.0.2
       picomatch: 4.0.3
     optionalDependencies:
-      rollup: 4.52.0
+      rollup: 4.52.2
 
-  '@rollup/rollup-android-arm-eabi@4.52.0':
+  '@rollup/rollup-android-arm-eabi@4.52.2':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.52.0':
+  '@rollup/rollup-android-arm64@4.52.2':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.52.0':
+  '@rollup/rollup-darwin-arm64@4.52.2':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.52.0':
+  '@rollup/rollup-darwin-x64@4.52.2':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.52.0':
+  '@rollup/rollup-freebsd-arm64@4.52.2':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.52.0':
+  '@rollup/rollup-freebsd-x64@4.52.2':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.52.0':
+  '@rollup/rollup-linux-arm-gnueabihf@4.52.2':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.52.0':
+  '@rollup/rollup-linux-arm-musleabihf@4.52.2':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.52.0':
+  '@rollup/rollup-linux-arm64-gnu@4.52.2':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.52.0':
+  '@rollup/rollup-linux-arm64-musl@4.52.2':
     optional: true
 
-  '@rollup/rollup-linux-loong64-gnu@4.52.0':
+  '@rollup/rollup-linux-loong64-gnu@4.52.2':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-gnu@4.52.0':
+  '@rollup/rollup-linux-ppc64-gnu@4.52.2':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.52.0':
+  '@rollup/rollup-linux-riscv64-gnu@4.52.2':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.52.0':
+  '@rollup/rollup-linux-riscv64-musl@4.52.2':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.52.0':
+  '@rollup/rollup-linux-s390x-gnu@4.52.2':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.52.0':
+  '@rollup/rollup-linux-x64-gnu@4.52.2':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.52.0':
+  '@rollup/rollup-linux-x64-musl@4.52.2':
     optional: true
 
-  '@rollup/rollup-openharmony-arm64@4.52.0':
+  '@rollup/rollup-openharmony-arm64@4.52.2':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.52.0':
+  '@rollup/rollup-win32-arm64-msvc@4.52.2':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.52.0':
+  '@rollup/rollup-win32-ia32-msvc@4.52.2':
     optional: true
 
-  '@rollup/rollup-win32-x64-gnu@4.52.0':
+  '@rollup/rollup-win32-x64-gnu@4.52.2':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.52.0':
+  '@rollup/rollup-win32-x64-msvc@4.52.2':
     optional: true
 
   '@sec-ant/readable-stream@0.4.1': {}
@@ -9073,7 +9152,7 @@ snapshots:
 
   '@types/ms@2.1.0': {}
 
-  '@types/node@20.19.4':
+  '@types/node@20.19.11':
     dependencies:
       undici-types: 6.21.0
 
@@ -9081,6 +9160,11 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
+  '@types/node@24.3.0':
+    dependencies:
+      undici-types: 7.10.0
+    optional: true
+
   '@types/normalize-package-data@2.4.4': {}
 
   '@types/parse-path@7.1.0':
@@ -9110,7 +9194,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.33.0(typescript@5.9.2)
       '@typescript-eslint/types': 8.33.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -9127,7 +9211,7 @@ snapshots:
       '@typescript-eslint/tsconfig-utils': 8.33.0(typescript@5.9.2)
       '@typescript-eslint/types': 8.33.0
       '@typescript-eslint/visitor-keys': 8.33.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.3
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -9144,7 +9228,7 @@ snapshots:
 
   '@typescript/vfs@1.6.1(typescript@5.9.2)':
     dependencies:
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.3
       typescript: 5.9.2
     transitivePeerDependencies:
       - supports-color
@@ -9157,10 +9241,10 @@ snapshots:
       unhead: 2.0.11
       vue: 3.5.18(typescript@5.9.2)
 
-  '@vercel/nft@0.29.3(encoding@0.1.13)(rollup@4.52.0)':
+  '@vercel/nft@0.29.3(encoding@0.1.13)(rollup@4.52.2)':
     dependencies:
       '@mapbox/node-pre-gyp': 2.0.0(encoding@0.1.13)
-      '@rollup/pluginutils': 5.1.4(rollup@4.52.0)
+      '@rollup/pluginutils': 5.1.4(rollup@4.52.2)
       acorn: 8.15.0
       acorn-import-attributes: 1.9.5(acorn@8.15.0)
       async-sema: 3.1.1
@@ -9176,10 +9260,10 @@ snapshots:
       - rollup
       - supports-color
 
-  '@vercel/nft@0.29.4(encoding@0.1.13)(rollup@4.52.0)':
+  '@vercel/nft@0.29.4(encoding@0.1.13)(rollup@4.52.2)':
     dependencies:
       '@mapbox/node-pre-gyp': 2.0.0(encoding@0.1.13)
-      '@rollup/pluginutils': 5.1.4(rollup@4.52.0)
+      '@rollup/pluginutils': 5.1.4(rollup@4.52.2)
       acorn: 8.15.0
       acorn-import-attributes: 1.9.5(acorn@8.15.0)
       async-sema: 3.1.1
@@ -9195,31 +9279,31 @@ snapshots:
       - rollup
       - supports-color
 
-  '@vitejs/plugin-vue-jsx@4.2.0(vite@6.3.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))':
+  '@vitejs/plugin-vue-jsx@4.2.0(vite@6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))':
     dependencies:
       '@babel/core': 7.27.4
       '@babel/plugin-transform-typescript': 7.27.1(@babel/core@7.27.4)
-      '@rolldown/pluginutils': 1.0.0-beta.10-commit.87188ed
+      '@rolldown/pluginutils': 1.0.0-beta.33
       '@vue/babel-plugin-jsx': 1.4.0(@babel/core@7.27.4)
-      vite: 6.3.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       vue: 3.5.18(typescript@5.9.2)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.2.4(vite@5.4.20(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.40.0))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue@5.2.4(vite@5.4.19(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.43.1))(vue@3.5.21(typescript@5.9.2))':
     dependencies:
-      vite: 5.4.20(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.40.0)
+      vite: 5.4.19(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.43.1)
       vue: 3.5.21(typescript@5.9.2)
 
-  '@vitejs/plugin-vue@5.2.4(vite@6.3.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))':
+  '@vitejs/plugin-vue@5.2.4(vite@6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))':
     dependencies:
-      vite: 6.3.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       vue: 3.5.18(typescript@5.9.2)
 
-  '@vitejs/plugin-vue@6.0.1(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue@6.0.1(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-beta.29
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       vue: 3.5.21(typescript@5.9.2)
 
   '@vitest/coverage-v8@3.2.4(vitest@3.2.4)':
@@ -9237,7 +9321,7 @@ snapshots:
       std-env: 3.9.0
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -9249,13 +9333,13 @@ snapshots:
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))':
+  '@vitest/mocker@3.2.4(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.19
     optionalDependencies:
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -9286,7 +9370,7 @@ snapshots:
       sirv: 3.0.1
       tinyglobby: 0.2.15
       tinyrainbow: 2.0.0
-      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
   '@vitest/utils@3.2.4':
     dependencies:
@@ -9338,7 +9422,7 @@ snapshots:
       '@babel/types': 7.28.4
       '@vue/babel-helper-vue-transform-on': 1.4.0
       '@vue/babel-plugin-resolve-type': 1.4.0(@babel/core@7.27.4)
-      '@vue/shared': 3.5.21
+      '@vue/shared': 3.5.18
     optionalDependencies:
       '@babel/core': 7.27.4
     transitivePeerDependencies:
@@ -9350,14 +9434,14 @@ snapshots:
       '@babel/core': 7.27.4
       '@babel/helper-module-imports': 7.27.1
       '@babel/helper-plugin-utils': 7.27.1
-      '@babel/parser': 7.28.4
+      '@babel/parser': 7.28.3
       '@vue/compiler-sfc': 3.5.21
     transitivePeerDependencies:
       - supports-color
 
   '@vue/compiler-core@3.5.18':
     dependencies:
-      '@babel/parser': 7.28.3
+      '@babel/parser': 7.28.0
       '@vue/shared': 3.5.18
       entities: 4.5.0
       estree-walker: 2.0.2
@@ -9401,7 +9485,7 @@ snapshots:
       '@vue/compiler-ssr': 3.5.21
       '@vue/shared': 3.5.21
       estree-walker: 2.0.2
-      magic-string: 0.30.18
+      magic-string: 0.30.19
       postcss: 8.5.6
       source-map-js: 1.2.1
 
@@ -9426,30 +9510,30 @@ snapshots:
     dependencies:
       '@vue/devtools-kit': 7.7.7
 
-  '@vue/devtools-api@8.0.1':
+  '@vue/devtools-api@8.0.2':
     dependencies:
-      '@vue/devtools-kit': 8.0.1
+      '@vue/devtools-kit': 8.0.2
 
-  '@vue/devtools-core@7.7.7(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))':
+  '@vue/devtools-core@7.7.7(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))':
     dependencies:
       '@vue/devtools-kit': 7.7.7
       '@vue/devtools-shared': 7.7.7
       mitt: 3.0.1
       nanoid: 5.1.5
       pathe: 2.0.3
-      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
+      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
       vue: 3.5.18(typescript@5.9.2)
     transitivePeerDependencies:
       - vite
 
-  '@vue/devtools-core@8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
+  '@vue/devtools-core@8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
     dependencies:
       '@vue/devtools-kit': 8.0.2
       '@vue/devtools-shared': 8.0.2
       mitt: 3.0.1
       nanoid: 5.1.5
       pathe: 2.0.3
-      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
+      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
       vue: 3.5.21(typescript@5.9.2)
     transitivePeerDependencies:
       - vite
@@ -9464,16 +9548,6 @@ snapshots:
       speakingurl: 14.0.1
       superjson: 2.2.2
 
-  '@vue/devtools-kit@8.0.1':
-    dependencies:
-      '@vue/devtools-shared': 8.0.1
-      birpc: 2.5.0
-      hookable: 5.5.3
-      mitt: 3.0.1
-      perfect-debounce: 1.0.0
-      speakingurl: 14.0.1
-      superjson: 2.2.2
-
   '@vue/devtools-kit@8.0.2':
     dependencies:
       '@vue/devtools-shared': 8.0.2
@@ -9488,10 +9562,6 @@ snapshots:
     dependencies:
       rfdc: 1.4.1
 
-  '@vue/devtools-shared@8.0.1':
-    dependencies:
-      rfdc: 1.4.1
-
   '@vue/devtools-shared@8.0.2':
     dependencies:
       rfdc: 1.4.1
@@ -9513,9 +9583,9 @@ snapshots:
   '@vue/language-core@3.0.7(typescript@5.9.2)':
     dependencies:
       '@volar/language-core': 2.4.23
-      '@vue/compiler-dom': 3.5.21
+      '@vue/compiler-dom': 3.5.18
       '@vue/compiler-vue2': 2.7.16
-      '@vue/shared': 3.5.21
+      '@vue/shared': 3.5.18
       alien-signals: 2.0.5
       muggle-string: 0.4.1
       path-browserify: 1.0.1
@@ -9569,8 +9639,6 @@ snapshots:
 
   '@vue/shared@3.5.18': {}
 
-  '@vue/shared@3.5.19': {}
-
   '@vue/shared@3.5.21': {}
 
   '@vue/test-utils@2.4.6':
@@ -9840,7 +9908,7 @@ snapshots:
 
   ast-kit@2.1.2:
     dependencies:
-      '@babel/parser': 7.28.4
+      '@babel/parser': 7.28.3
       pathe: 2.0.3
 
   ast-module-types@6.0.1: {}
@@ -9862,7 +9930,7 @@ snapshots:
 
   autoprefixer@10.4.21(postcss@8.5.6):
     dependencies:
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       caniuse-lite: 1.0.30001720
       fraction.js: 4.3.7
       normalize-range: 0.1.2
@@ -9925,12 +9993,12 @@ snapshots:
     dependencies:
       fill-range: 7.1.1
 
-  browserslist@4.25.0:
+  browserslist@4.25.2:
     dependencies:
-      caniuse-lite: 1.0.30001720
-      electron-to-chromium: 1.5.161
+      caniuse-lite: 1.0.30001735
+      electron-to-chromium: 1.5.202
       node-releases: 2.0.19
-      update-browserslist-db: 1.1.3(browserslist@4.25.0)
+      update-browserslist-db: 1.1.3(browserslist@4.25.2)
 
   buffer-crc32@0.2.13: {}
 
@@ -9970,6 +10038,23 @@ snapshots:
     optionalDependencies:
       magicast: 0.3.5
 
+  c12@3.2.0(magicast@0.3.5):
+    dependencies:
+      chokidar: 4.0.3
+      confbox: 0.2.2
+      defu: 6.1.4
+      dotenv: 17.2.1
+      exsolve: 1.0.7
+      giget: 2.0.0
+      jiti: 2.5.1
+      ohash: 2.0.11
+      pathe: 2.0.3
+      perfect-debounce: 1.0.0
+      pkg-types: 2.2.0
+      rc9: 2.1.2
+    optionalDependencies:
+      magicast: 0.3.5
+
   cac@6.7.14: {}
 
   call-bind-apply-helpers@1.0.2:
@@ -9986,13 +10071,15 @@ snapshots:
 
   caniuse-api@3.0.0:
     dependencies:
-      browserslist: 4.25.0
-      caniuse-lite: 1.0.30001720
+      browserslist: 4.25.2
+      caniuse-lite: 1.0.30001735
       lodash.memoize: 4.1.2
       lodash.uniq: 4.5.0
 
   caniuse-lite@1.0.30001720: {}
 
+  caniuse-lite@1.0.30001735: {}
+
   ccount@2.0.1: {}
 
   chai@5.2.0:
@@ -10051,10 +10138,10 @@ snapshots:
     dependencies:
       restore-cursor: 5.1.0
 
-  cli-truncate@4.0.0:
+  cli-truncate@5.1.0:
     dependencies:
-      slice-ansi: 5.0.0
-      string-width: 7.2.0
+      slice-ansi: 7.1.0
+      string-width: 8.1.0
 
   clipboardy@4.0.0:
     dependencies:
@@ -10334,7 +10421,7 @@ snapshots:
 
   cssnano-preset-default@7.0.7(postcss@8.5.6):
     dependencies:
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       css-declaration-sorter: 7.2.0(postcss@8.5.6)
       cssnano-utils: 5.0.1(postcss@8.5.6)
       postcss: 8.5.6
@@ -10537,6 +10624,8 @@ snapshots:
 
   dotenv@16.5.0: {}
 
+  dotenv@17.2.1: {}
+
   dts-resolver@2.1.2: {}
 
   dunder-proto@1.0.1:
@@ -10558,7 +10647,7 @@ snapshots:
 
   ee-first@1.1.1: {}
 
-  electron-to-chromium@1.5.161: {}
+  electron-to-chromium@1.5.202: {}
 
   emoji-regex-xs@1.0.0: {}
 
@@ -10585,7 +10674,7 @@ snapshots:
     dependencies:
       once: 1.4.0
 
-  enhanced-resolve@5.18.1:
+  enhanced-resolve@5.18.3:
     dependencies:
       graceful-fs: 4.2.11
       tapable: 2.2.2
@@ -10865,14 +10954,14 @@ snapshots:
 
   externality@1.0.2:
     dependencies:
-      enhanced-resolve: 5.18.1
+      enhanced-resolve: 5.18.3
       mlly: 1.8.0
       pathe: 1.1.2
       ufo: 1.6.1
 
   extract-zip@2.0.1:
     dependencies:
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.3
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
@@ -10912,6 +11001,10 @@ snapshots:
     dependencies:
       pend: 1.2.0
 
+  fdir@6.4.6(picomatch@4.0.3):
+    optionalDependencies:
+      picomatch: 4.0.3
+
   fdir@6.5.0(picomatch@4.0.3):
     optionalDependencies:
       picomatch: 4.0.3
@@ -11203,7 +11296,7 @@ snapshots:
 
   happy-dom@18.0.1:
     dependencies:
-      '@types/node': 20.19.4
+      '@types/node': 20.19.11
       '@types/whatwg-mimetype': 3.0.2
       whatwg-mimetype: 3.0.0
 
@@ -11262,7 +11355,7 @@ snapshots:
   https-proxy-agent@7.0.6:
     dependencies:
       agent-base: 7.1.3
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -11318,7 +11411,7 @@ snapshots:
     dependencies:
       '@ioredis/commands': 1.2.0
       cluster-key-slot: 1.1.2
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.3
       denque: 2.1.0
       lodash.defaults: 4.2.0
       lodash.isarguments: 3.1.0
@@ -11360,8 +11453,6 @@ snapshots:
 
   is-fullwidth-code-point@3.0.0: {}
 
-  is-fullwidth-code-point@4.0.0: {}
-
   is-fullwidth-code-point@5.0.0:
     dependencies:
       get-east-asian-width: 1.3.0
@@ -11628,7 +11719,7 @@ snapshots:
       commander: 14.0.0
       debug: 4.4.1(supports-color@5.5.0)
       lilconfig: 3.1.3
-      listr2: 9.0.3
+      listr2: 9.0.4
       micromatch: 4.0.8
       nano-spawn: 1.0.2
       pidtree: 0.6.0
@@ -11658,9 +11749,9 @@ snapshots:
       untun: 0.1.3
       uqr: 0.1.2
 
-  listr2@9.0.3:
+  listr2@9.0.4:
     dependencies:
-      cli-truncate: 4.0.0
+      cli-truncate: 5.1.0
       colorette: 2.0.20
       eventemitter3: 5.0.1
       log-update: 6.1.0
@@ -11753,10 +11844,6 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
-  magic-string@0.30.18:
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.5
-
   magic-string@0.30.19:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -12221,15 +12308,15 @@ snapshots:
   nitropack@2.11.13(@netlify/blobs@8.2.0)(encoding@0.1.13)(rolldown@1.0.0-beta.10-commit.87188ed):
     dependencies:
       '@cloudflare/kv-asset-handler': 0.4.0
-      '@netlify/functions': 3.1.10(encoding@0.1.13)(rollup@4.52.0)
-      '@rollup/plugin-alias': 5.1.1(rollup@4.52.0)
-      '@rollup/plugin-commonjs': 28.0.6(rollup@4.52.0)
-      '@rollup/plugin-inject': 5.0.5(rollup@4.52.0)
-      '@rollup/plugin-json': 6.1.0(rollup@4.52.0)
-      '@rollup/plugin-node-resolve': 16.0.1(rollup@4.52.0)
-      '@rollup/plugin-replace': 6.0.2(rollup@4.52.0)
-      '@rollup/plugin-terser': 0.4.4(rollup@4.52.0)
-      '@vercel/nft': 0.29.4(encoding@0.1.13)(rollup@4.52.0)
+      '@netlify/functions': 3.1.10(encoding@0.1.13)(rollup@4.52.2)
+      '@rollup/plugin-alias': 5.1.1(rollup@4.52.2)
+      '@rollup/plugin-commonjs': 28.0.6(rollup@4.52.2)
+      '@rollup/plugin-inject': 5.0.5(rollup@4.52.2)
+      '@rollup/plugin-json': 6.1.0(rollup@4.52.2)
+      '@rollup/plugin-node-resolve': 16.0.1(rollup@4.52.2)
+      '@rollup/plugin-replace': 6.0.2(rollup@4.52.2)
+      '@rollup/plugin-terser': 0.4.4(rollup@4.52.2)
+      '@vercel/nft': 0.29.4(encoding@0.1.13)(rollup@4.52.2)
       archiver: 7.0.1
       c12: 3.0.4(magicast@0.3.5)
       chokidar: 4.0.3
@@ -12244,7 +12331,7 @@ snapshots:
       defu: 6.1.4
       destr: 2.0.5
       dot-prop: 9.0.0
-      esbuild: 0.25.9
+      esbuild: 0.25.5
       escape-string-regexp: 5.0.0
       etag: 1.8.1
       exsolve: 1.0.7
@@ -12271,8 +12358,8 @@ snapshots:
       pkg-types: 2.2.0
       pretty-bytes: 6.1.1
       radix3: 1.1.2
-      rollup: 4.52.0
-      rollup-plugin-visualizer: 6.0.3(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.0)
+      rollup: 4.52.2
+      rollup-plugin-visualizer: 6.0.3(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.2)
       scule: 1.3.0
       semver: 7.7.2
       serve-placeholder: 2.0.2
@@ -12346,7 +12433,7 @@ snapshots:
 
   node-source-walk@7.0.1:
     dependencies:
-      '@babel/parser': 7.28.4
+      '@babel/parser': 7.28.3
 
   nodemon@3.1.10:
     dependencies:
@@ -12402,15 +12489,15 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nuxt@3.17.6(@netlify/blobs@8.2.0)(@parcel/watcher@2.5.1)(@types/node@22.18.6)(@vue/compiler-sfc@3.5.21)(db0@0.3.2)(encoding@0.1.13)(ioredis@5.6.1)(lightningcss@1.29.3)(magicast@0.3.5)(meow@13.2.0)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.0)(terser@5.40.0)(typescript@5.9.2)(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue-tsc@2.2.10(typescript@5.9.2))(yaml@2.8.1):
+  nuxt@3.17.6(@netlify/blobs@8.2.0)(@parcel/watcher@2.5.1)(@types/node@24.3.0)(@vue/compiler-sfc@3.5.21)(db0@0.3.2)(encoding@0.1.13)(ioredis@5.6.1)(lightningcss@1.29.3)(magicast@0.3.5)(meow@13.2.0)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.2)(terser@5.43.1)(typescript@5.9.2)(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue-tsc@2.2.10(typescript@5.9.2))(yaml@2.8.1):
     dependencies:
       '@nuxt/cli': 3.25.1(magicast@0.3.5)
       '@nuxt/devalue': 2.0.2
-      '@nuxt/devtools': 2.6.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))
+      '@nuxt/devtools': 2.6.2(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))
       '@nuxt/kit': 3.17.6(magicast@0.3.5)
       '@nuxt/schema': 3.17.6
       '@nuxt/telemetry': 2.6.6(magicast@0.3.5)
-      '@nuxt/vite-builder': 3.17.6(@types/node@22.18.6)(lightningcss@1.29.3)(magicast@0.3.5)(meow@13.2.0)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.0)(terser@5.40.0)(typescript@5.9.2)(vue-tsc@2.2.10(typescript@5.9.2))(vue@3.5.18(typescript@5.9.2))(yaml@2.8.1)
+      '@nuxt/vite-builder': 3.17.6(@types/node@24.3.0)(lightningcss@1.29.3)(magicast@0.3.5)(meow@13.2.0)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.2)(terser@5.43.1)(typescript@5.9.2)(vue-tsc@2.2.10(typescript@5.9.2))(vue@3.5.18(typescript@5.9.2))(yaml@2.8.1)
       '@unhead/vue': 2.0.11(vue@3.5.18(typescript@5.9.2))
       '@vue/shared': 3.5.18
       c12: 3.0.4(magicast@0.3.5)
@@ -12467,7 +12554,7 @@ snapshots:
       vue-router: 4.5.1(vue@3.5.21(typescript@5.9.2))
     optionalDependencies:
       '@parcel/watcher': 2.5.1
-      '@types/node': 22.18.6
+      '@types/node': 24.3.0
     transitivePeerDependencies:
       - '@azure/app-configuration'
       - '@azure/cosmos'
@@ -12772,7 +12859,7 @@ snapshots:
 
   postcss-colormin@7.0.3(postcss@8.5.6):
     dependencies:
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       caniuse-api: 3.0.0
       colord: 2.9.3
       postcss: 8.5.6
@@ -12780,7 +12867,7 @@ snapshots:
 
   postcss-convert-values@7.0.5(postcss@8.5.6):
     dependencies:
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
 
@@ -12809,7 +12896,7 @@ snapshots:
 
   postcss-merge-rules@7.0.5(postcss@8.5.6):
     dependencies:
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       caniuse-api: 3.0.0
       cssnano-utils: 5.0.1(postcss@8.5.6)
       postcss: 8.5.6
@@ -12829,7 +12916,7 @@ snapshots:
 
   postcss-minify-params@7.0.3(postcss@8.5.6):
     dependencies:
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       cssnano-utils: 5.0.1(postcss@8.5.6)
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
@@ -12871,7 +12958,7 @@ snapshots:
 
   postcss-normalize-unicode@7.0.3(postcss@8.5.6):
     dependencies:
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
 
@@ -12893,7 +12980,7 @@ snapshots:
 
   postcss-reduce-initial@7.0.3(postcss@8.5.6):
     dependencies:
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       caniuse-api: 3.0.0
       postcss: 8.5.6
 
@@ -12978,7 +13065,7 @@ snapshots:
 
   proto-list@1.2.4: {}
 
-  protobufjs@7.5.0:
+  protobufjs@7.5.3:
     dependencies:
       '@protobufjs/aspromise': 1.1.2
       '@protobufjs/base64': 1.1.2
@@ -13191,7 +13278,7 @@ snapshots:
       glob: 11.0.0
       package-json-from-dist: 1.0.0
 
-  rolldown-plugin-dts@0.16.7(rolldown@1.0.0-beta.38)(typescript@5.9.2)(vue-tsc@3.0.7(typescript@5.9.2)):
+  rolldown-plugin-dts@0.16.8(rolldown@1.0.0-beta.40)(typescript@5.9.2)(vue-tsc@3.0.7(typescript@5.9.2)):
     dependencies:
       '@babel/generator': 7.28.3
       '@babel/parser': 7.28.4
@@ -13202,7 +13289,7 @@ snapshots:
       dts-resolver: 2.1.2
       get-tsconfig: 4.10.1
       magic-string: 0.30.19
-      rolldown: 1.0.0-beta.38
+      rolldown: 1.0.0-beta.40
     optionalDependencies:
       typescript: 5.9.2
       vue-tsc: 3.0.7(typescript@5.9.2)
@@ -13231,28 +13318,28 @@ snapshots:
       '@rolldown/binding-win32-x64-msvc': 1.0.0-beta.10-commit.87188ed
     optional: true
 
-  rolldown@1.0.0-beta.38:
+  rolldown@1.0.0-beta.40:
     dependencies:
-      '@oxc-project/types': 0.89.0
-      '@rolldown/pluginutils': 1.0.0-beta.38
+      '@oxc-project/types': 0.92.0
+      '@rolldown/pluginutils': 1.0.0-beta.40
       ansis: 4.1.0
     optionalDependencies:
-      '@rolldown/binding-android-arm64': 1.0.0-beta.38
-      '@rolldown/binding-darwin-arm64': 1.0.0-beta.38
-      '@rolldown/binding-darwin-x64': 1.0.0-beta.38
-      '@rolldown/binding-freebsd-x64': 1.0.0-beta.38
-      '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-beta.38
-      '@rolldown/binding-linux-arm64-gnu': 1.0.0-beta.38
-      '@rolldown/binding-linux-arm64-musl': 1.0.0-beta.38
-      '@rolldown/binding-linux-x64-gnu': 1.0.0-beta.38
-      '@rolldown/binding-linux-x64-musl': 1.0.0-beta.38
-      '@rolldown/binding-openharmony-arm64': 1.0.0-beta.38
-      '@rolldown/binding-wasm32-wasi': 1.0.0-beta.38
-      '@rolldown/binding-win32-arm64-msvc': 1.0.0-beta.38
-      '@rolldown/binding-win32-ia32-msvc': 1.0.0-beta.38
-      '@rolldown/binding-win32-x64-msvc': 1.0.0-beta.38
-
-  rollup-plugin-visualizer@6.0.3(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.0):
+      '@rolldown/binding-android-arm64': 1.0.0-beta.40
+      '@rolldown/binding-darwin-arm64': 1.0.0-beta.40
+      '@rolldown/binding-darwin-x64': 1.0.0-beta.40
+      '@rolldown/binding-freebsd-x64': 1.0.0-beta.40
+      '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-beta.40
+      '@rolldown/binding-linux-arm64-gnu': 1.0.0-beta.40
+      '@rolldown/binding-linux-arm64-musl': 1.0.0-beta.40
+      '@rolldown/binding-linux-x64-gnu': 1.0.0-beta.40
+      '@rolldown/binding-linux-x64-musl': 1.0.0-beta.40
+      '@rolldown/binding-openharmony-arm64': 1.0.0-beta.40
+      '@rolldown/binding-wasm32-wasi': 1.0.0-beta.40
+      '@rolldown/binding-win32-arm64-msvc': 1.0.0-beta.40
+      '@rolldown/binding-win32-ia32-msvc': 1.0.0-beta.40
+      '@rolldown/binding-win32-x64-msvc': 1.0.0-beta.40
+
+  rollup-plugin-visualizer@6.0.3(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.52.2):
     dependencies:
       open: 8.4.2
       picomatch: 4.0.3
@@ -13260,34 +13347,34 @@ snapshots:
       yargs: 17.7.2
     optionalDependencies:
       rolldown: 1.0.0-beta.10-commit.87188ed
-      rollup: 4.52.0
+      rollup: 4.52.2
 
-  rollup@4.52.0:
+  rollup@4.52.2:
     dependencies:
       '@types/estree': 1.0.8
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.52.0
-      '@rollup/rollup-android-arm64': 4.52.0
-      '@rollup/rollup-darwin-arm64': 4.52.0
-      '@rollup/rollup-darwin-x64': 4.52.0
-      '@rollup/rollup-freebsd-arm64': 4.52.0
-      '@rollup/rollup-freebsd-x64': 4.52.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.52.0
-      '@rollup/rollup-linux-arm-musleabihf': 4.52.0
-      '@rollup/rollup-linux-arm64-gnu': 4.52.0
-      '@rollup/rollup-linux-arm64-musl': 4.52.0
-      '@rollup/rollup-linux-loong64-gnu': 4.52.0
-      '@rollup/rollup-linux-ppc64-gnu': 4.52.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.52.0
-      '@rollup/rollup-linux-riscv64-musl': 4.52.0
-      '@rollup/rollup-linux-s390x-gnu': 4.52.0
-      '@rollup/rollup-linux-x64-gnu': 4.52.0
-      '@rollup/rollup-linux-x64-musl': 4.52.0
-      '@rollup/rollup-openharmony-arm64': 4.52.0
-      '@rollup/rollup-win32-arm64-msvc': 4.52.0
-      '@rollup/rollup-win32-ia32-msvc': 4.52.0
-      '@rollup/rollup-win32-x64-gnu': 4.52.0
-      '@rollup/rollup-win32-x64-msvc': 4.52.0
+      '@rollup/rollup-android-arm-eabi': 4.52.2
+      '@rollup/rollup-android-arm64': 4.52.2
+      '@rollup/rollup-darwin-arm64': 4.52.2
+      '@rollup/rollup-darwin-x64': 4.52.2
+      '@rollup/rollup-freebsd-arm64': 4.52.2
+      '@rollup/rollup-freebsd-x64': 4.52.2
+      '@rollup/rollup-linux-arm-gnueabihf': 4.52.2
+      '@rollup/rollup-linux-arm-musleabihf': 4.52.2
+      '@rollup/rollup-linux-arm64-gnu': 4.52.2
+      '@rollup/rollup-linux-arm64-musl': 4.52.2
+      '@rollup/rollup-linux-loong64-gnu': 4.52.2
+      '@rollup/rollup-linux-ppc64-gnu': 4.52.2
+      '@rollup/rollup-linux-riscv64-gnu': 4.52.2
+      '@rollup/rollup-linux-riscv64-musl': 4.52.2
+      '@rollup/rollup-linux-s390x-gnu': 4.52.2
+      '@rollup/rollup-linux-x64-gnu': 4.52.2
+      '@rollup/rollup-linux-x64-musl': 4.52.2
+      '@rollup/rollup-openharmony-arm64': 4.52.2
+      '@rollup/rollup-win32-arm64-msvc': 4.52.2
+      '@rollup/rollup-win32-ia32-msvc': 4.52.2
+      '@rollup/rollup-win32-x64-gnu': 4.52.2
+      '@rollup/rollup-win32-x64-msvc': 4.52.2
       fsevents: 2.3.3
 
   run-applescript@7.0.0: {}
@@ -13346,7 +13433,7 @@ snapshots:
 
   send@1.2.0:
     dependencies:
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.3
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -13492,11 +13579,6 @@ snapshots:
 
   slash@5.1.0: {}
 
-  slice-ansi@5.0.0:
-    dependencies:
-      ansi-styles: 6.2.1
-      is-fullwidth-code-point: 4.0.0
-
   slice-ansi@7.1.0:
     dependencies:
       ansi-styles: 6.2.1
@@ -13576,6 +13658,11 @@ snapshots:
       get-east-asian-width: 1.3.0
       strip-ansi: 7.1.0
 
+  string-width@8.1.0:
+    dependencies:
+      get-east-asian-width: 1.3.0
+      strip-ansi: 7.1.0
+
   string_decoder@1.1.1:
     dependencies:
       safe-buffer: 5.1.2
@@ -13615,7 +13702,7 @@ snapshots:
 
   stylehacks@7.0.5(postcss@8.5.6):
     dependencies:
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       postcss: 8.5.6
       postcss-selector-parser: 7.1.0
 
@@ -13678,11 +13765,11 @@ snapshots:
 
   terser-webpack-plugin@5.3.14(webpack@5.101.3):
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.29
+      '@jridgewell/trace-mapping': 0.3.30
       jest-worker: 27.5.1
       schema-utils: 4.3.2
       serialize-javascript: 6.0.2
-      terser: 5.40.0
+      terser: 5.43.1
       webpack: 5.101.3
 
   terser@5.40.0:
@@ -13692,6 +13779,13 @@ snapshots:
       commander: 2.20.3
       source-map-support: 0.5.21
 
+  terser@5.43.1:
+    dependencies:
+      '@jridgewell/source-map': 0.3.11
+      acorn: 8.15.0
+      commander: 2.20.3
+      source-map-support: 0.5.21
+
   test-exclude@7.0.1:
     dependencies:
       '@istanbuljs/schema': 0.1.3
@@ -13714,7 +13808,7 @@ snapshots:
 
   tinyglobby@0.2.14:
     dependencies:
-      fdir: 6.5.0(picomatch@4.0.3)
+      fdir: 6.4.6(picomatch@4.0.3)
       picomatch: 4.0.3
 
   tinyglobby@0.2.15:
@@ -13773,8 +13867,8 @@ snapshots:
       diff: 8.0.2
       empathic: 2.0.0
       hookable: 5.5.3
-      rolldown: 1.0.0-beta.38
-      rolldown-plugin-dts: 0.16.7(rolldown@1.0.0-beta.38)(typescript@5.9.2)(vue-tsc@3.0.7(typescript@5.9.2))
+      rolldown: 1.0.0-beta.40
+      rolldown-plugin-dts: 0.16.8(rolldown@1.0.0-beta.40)(typescript@5.9.2)(vue-tsc@3.0.7(typescript@5.9.2))
       semver: 7.7.2
       tinyexec: 1.0.1
       tinyglobby: 0.2.15
@@ -13848,6 +13942,9 @@ snapshots:
 
   undici-types@6.21.0: {}
 
+  undici-types@7.10.0:
+    optional: true
+
   unenv@2.0.0-rc.18:
     dependencies:
       defu: 6.1.4
@@ -13901,7 +13998,7 @@ snapshots:
       mlly: 1.8.0
       pathe: 2.0.3
       picomatch: 4.0.3
-      pkg-types: 2.3.0
+      pkg-types: 2.2.0
       scule: 1.3.0
       strip-literal: 3.0.0
       tinyglobby: 0.2.15
@@ -13964,7 +14061,7 @@ snapshots:
       pathe: 2.0.3
       picomatch: 4.0.3
 
-  unplugin-vue-markdown@29.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)):
+  unplugin-vue-markdown@29.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
       '@mdit-vue/plugin-component': 2.1.4
       '@mdit-vue/plugin-frontmatter': 2.1.4
@@ -13974,7 +14071,7 @@ snapshots:
       markdown-it-async: 2.2.0
       unplugin: 2.3.10
       unplugin-utils: 0.2.5
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
   unplugin-vue-router@0.14.0(@vue/compiler-sfc@3.5.21)(vue-router@4.5.1(vue@3.5.18(typescript@5.9.2)))(vue@3.5.18(typescript@5.9.2)):
     dependencies:
@@ -14054,9 +14151,9 @@ snapshots:
       pkg-types: 1.3.1
       unplugin: 1.16.1
 
-  update-browserslist-db@1.1.3(browserslist@4.25.0):
+  update-browserslist-db@1.1.3(browserslist@4.25.2):
     dependencies:
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       escalade: 3.2.0
       picocolors: 1.1.1
 
@@ -14089,33 +14186,33 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.2
 
-  vite-dev-rpc@1.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)):
+  vite-dev-rpc@1.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
       birpc: 2.5.0
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
-      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
+      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
 
-  vite-dev-rpc@1.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)):
+  vite-dev-rpc@1.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
       birpc: 2.5.0
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
-      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
 
-  vite-hot-client@2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)):
+  vite-hot-client@2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
-  vite-hot-client@2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)):
+  vite-hot-client@2.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
-  vite-node@3.2.4(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1):
+  vite-node@3.2.4(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
     dependencies:
       cac: 6.7.14
       debug: 4.4.1(supports-color@5.5.0)
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -14130,13 +14227,13 @@ snapshots:
       - tsx
       - yaml
 
-  vite-node@3.2.4(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1):
+  vite-node@3.2.4(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
     dependencies:
       cac: 6.7.14
       debug: 4.4.1(supports-color@5.5.0)
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -14151,7 +14248,7 @@ snapshots:
       - tsx
       - yaml
 
-  vite-plugin-checker@0.9.3(meow@13.2.0)(typescript@5.9.2)(vite@6.3.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue-tsc@2.2.10(typescript@5.9.2)):
+  vite-plugin-checker@0.9.3(meow@13.2.0)(typescript@5.9.2)(vite@6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue-tsc@2.2.10(typescript@5.9.2)):
     dependencies:
       '@babel/code-frame': 7.27.1
       chokidar: 4.0.3
@@ -14161,14 +14258,14 @@ snapshots:
       strip-ansi: 7.1.0
       tiny-invariant: 1.3.3
       tinyglobby: 0.2.15
-      vite: 6.3.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       vscode-uri: 3.1.0
     optionalDependencies:
       meow: 13.2.0
       typescript: 5.9.2
       vue-tsc: 2.2.10(typescript@5.9.2)
 
-  vite-plugin-inspect@11.3.0(@nuxt/kit@3.17.6(magicast@0.3.5))(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)):
+  vite-plugin-inspect@11.3.0(@nuxt/kit@3.17.6(magicast@0.3.5))(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
       ansis: 4.1.0
       debug: 4.4.1(supports-color@5.5.0)
@@ -14178,14 +14275,14 @@ snapshots:
       perfect-debounce: 1.0.0
       sirv: 3.0.1
       unplugin-utils: 0.2.5
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
-      vite-dev-rpc: 1.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-dev-rpc: 1.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
     optionalDependencies:
       '@nuxt/kit': 3.17.6(magicast@0.3.5)
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-inspect@11.3.3(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)):
+  vite-plugin-inspect@11.3.3(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
       ansis: 4.1.0
       debug: 4.4.1(supports-color@5.5.0)
@@ -14195,27 +14292,27 @@ snapshots:
       perfect-debounce: 2.0.0
       sirv: 3.0.2
       unplugin-utils: 0.3.0
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
-      vite-dev-rpc: 1.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
+      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-dev-rpc: 1.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-devtools@8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2)):
+  vite-plugin-vue-devtools@8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
-      '@vue/devtools-core': 8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+      '@vue/devtools-core': 8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
       '@vue/devtools-kit': 8.0.2
       '@vue/devtools-shared': 8.0.2
       execa: 9.6.0
       sirv: 3.0.2
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
-      vite-plugin-inspect: 11.3.3(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
-      vite-plugin-vue-inspector: 5.3.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
+      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-plugin-inspect: 11.3.3(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
+      vite-plugin-vue-inspector: 5.3.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
     transitivePeerDependencies:
       - '@nuxt/kit'
       - supports-color
       - vue
 
-  vite-plugin-vue-inspector@5.3.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)):
+  vite-plugin-vue-inspector@5.3.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
       '@babel/core': 7.27.4
       '@babel/plugin-proposal-decorators': 7.25.9(@babel/core@7.27.4)
@@ -14223,80 +14320,96 @@ snapshots:
       '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.27.4)
       '@babel/plugin-transform-typescript': 7.27.1(@babel/core@7.27.4)
       '@vue/babel-plugin-jsx': 1.4.0(@babel/core@7.27.4)
-      '@vue/compiler-dom': 3.5.21
+      '@vue/compiler-dom': 3.5.18
       kolorist: 1.8.0
       magic-string: 0.30.19
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-tracer@1.0.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2)):
+  vite-plugin-vue-tracer@1.0.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2)):
     dependencies:
       estree-walker: 3.0.3
       exsolve: 1.0.7
       magic-string: 0.30.19
       pathe: 2.0.3
       source-map-js: 1.2.1
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       vue: 3.5.18(typescript@5.9.2)
 
-  vite@5.4.20(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.40.0):
+  vite@5.4.19(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.43.1):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.5.6
-      rollup: 4.52.0
+      rollup: 4.52.2
     optionalDependencies:
       '@types/node': 22.18.6
       fsevents: 2.3.3
       lightningcss: 1.29.3
-      terser: 5.40.0
+      terser: 5.43.1
 
-  vite@6.3.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1):
+  vite@6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.9
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
-      rollup: 4.52.0
+      rollup: 4.52.2
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 22.18.6
+      '@types/node': 24.3.0
       fsevents: 2.3.3
       jiti: 2.4.2
       lightningcss: 1.29.3
-      terser: 5.40.0
+      terser: 5.43.1
       yaml: 2.8.1
 
-  vite@7.1.6(@types/node@22.18.6)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1):
+  vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.9
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
-      rollup: 4.52.0
+      rollup: 4.52.2
       tinyglobby: 0.2.15
     optionalDependencies:
       '@types/node': 22.18.6
       fsevents: 2.3.3
+      jiti: 2.5.1
+      lightningcss: 1.29.3
+      terser: 5.43.1
+      yaml: 2.8.1
+
+  vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
+    dependencies:
+      esbuild: 0.25.9
+      fdir: 6.5.0(picomatch@4.0.3)
+      picomatch: 4.0.3
+      postcss: 8.5.6
+      rollup: 4.52.2
+      tinyglobby: 0.2.15
+    optionalDependencies:
+      '@types/node': 24.3.0
+      fsevents: 2.3.3
       jiti: 2.4.2
       lightningcss: 1.29.3
-      terser: 5.40.0
+      terser: 5.43.1
       yaml: 2.8.1
 
-  vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1):
+  vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.9
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
-      rollup: 4.52.0
+      rollup: 4.52.2
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 22.18.6
+      '@types/node': 24.3.0
       fsevents: 2.3.3
       jiti: 2.5.1
       lightningcss: 1.29.3
-      terser: 5.40.0
+      terser: 5.43.1
       yaml: 2.8.1
 
   vitepress-plugin-llms@1.7.5:
@@ -14317,7 +14430,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vitepress@1.6.4(@algolia/client-search@5.20.0)(@types/node@22.18.6)(change-case@5.4.4)(fuse.js@7.1.0)(jwt-decode@4.0.0)(lightningcss@1.29.3)(postcss@8.5.6)(search-insights@2.17.2)(terser@5.40.0)(typescript@5.9.2):
+  vitepress@1.6.4(@algolia/client-search@5.20.0)(@types/node@22.18.6)(change-case@5.4.4)(fuse.js@7.1.0)(jwt-decode@4.0.0)(lightningcss@1.29.3)(postcss@8.5.6)(search-insights@2.17.2)(terser@5.43.1)(typescript@5.9.2):
     dependencies:
       '@docsearch/css': 3.8.2
       '@docsearch/js': 3.8.2(@algolia/client-search@5.20.0)(search-insights@2.17.2)
@@ -14326,7 +14439,7 @@ snapshots:
       '@shikijs/transformers': 2.1.0
       '@shikijs/types': 2.3.2
       '@types/markdown-it': 14.1.2
-      '@vitejs/plugin-vue': 5.2.4(vite@5.4.20(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.40.0))(vue@3.5.21(typescript@5.9.2))
+      '@vitejs/plugin-vue': 5.2.4(vite@5.4.19(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.43.1))(vue@3.5.21(typescript@5.9.2))
       '@vue/devtools-api': 7.7.6
       '@vue/shared': 3.5.18
       '@vueuse/core': 12.5.0(typescript@5.9.2)
@@ -14335,7 +14448,7 @@ snapshots:
       mark.js: 8.11.1
       minisearch: 7.1.1
       shiki: 2.3.2
-      vite: 5.4.20(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.40.0)
+      vite: 5.4.19(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.43.1)
       vue: 3.5.21(typescript@5.9.2)
     optionalDependencies:
       postcss: 8.5.6
@@ -14366,11 +14479,11 @@ snapshots:
       - typescript
       - universal-cookie
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1):
+  vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1))
+      '@vitest/mocker': 3.2.4(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -14388,8 +14501,8 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
-      vite-node: 3.2.4(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.40.0)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-node: 3.2.4(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
@@ -14504,9 +14617,9 @@ snapshots:
       '@webassemblyjs/wasm-parser': 1.14.1
       acorn: 8.15.0
       acorn-import-phases: 1.0.4(acorn@8.15.0)
-      browserslist: 4.25.0
+      browserslist: 4.25.2
       chrome-trace-event: 1.0.4
-      enhanced-resolve: 5.18.1
+      enhanced-resolve: 5.18.3
       es-module-lexer: 1.7.0
       eslint-scope: 5.1.1
       events: 3.3.0
diff --git a/src/options.ts b/src/options.ts
index 7fe1f7e0f..2e1cf9f3b 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -225,9 +225,27 @@ export interface Options {
      * page component.
      */
     autoExportsDataLoaders?: string | string[]
+
+    /**
+     * Enable experimental support for the new custom resolvers.
+     */
+    paramMatchers?: boolean | ParamMatcherOptions
   }
 }
 
+export interface ParamMatcherOptions {
+  /**
+   * Folder(s) to scan for param matchers.
+   *
+   * @default `['src/params']`
+   */
+  dir?: string | string[]
+}
+
+export const DEFAULT_PARAM_MATCHER_OPTIONS = {
+  dir: ['src/params'],
+} satisfies Required<ParamMatcherOptions>
+
 export const DEFAULT_OPTIONS = {
   extensions: ['.vue'],
   exclude: [],
@@ -304,6 +322,14 @@ export function resolveOptions(options: Options) {
   }))
 
   const experimental = { ...options.experimental }
+  experimental.paramMatchers =
+    experimental.paramMatchers &&
+    (experimental.paramMatchers === true
+      ? DEFAULT_PARAM_MATCHER_OPTIONS
+      : {
+          ...DEFAULT_PARAM_MATCHER_OPTIONS,
+          ...experimental.paramMatchers,
+        })
 
   if (experimental.autoExportsDataLoaders) {
     experimental.autoExportsDataLoaders = (
@@ -351,6 +377,9 @@ export function resolveOptions(options: Options) {
   }
 }
 
+/**
+ * @internal
+ */
 export type ResolvedOptions = ReturnType<typeof resolveOptions>
 
 /**

From fe9da993c0b6a7a11da22379eedc2deaa512acc3 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 7 Aug 2025 17:46:23 +0200
Subject: [PATCH 02/81] feat: support static paths for resolver

---
 src/codegen/generateRouteRecords.ts       |   2 +-
 src/codegen/generateRouteResolver.spec.ts | 142 ++++++++++++++++++++++
 src/codegen/generateRouteResolver.ts      | 137 +++++++++++++++++++++
 src/core/tree.ts                          |   6 +
 4 files changed, 286 insertions(+), 1 deletion(-)
 create mode 100644 src/codegen/generateRouteResolver.spec.ts
 create mode 100644 src/codegen/generateRouteResolver.ts

diff --git a/src/codegen/generateRouteRecords.ts b/src/codegen/generateRouteRecords.ts
index 3dca451b4..3ac7738c9 100644
--- a/src/codegen/generateRouteRecords.ts
+++ b/src/codegen/generateRouteRecords.ts
@@ -145,7 +145,7 @@ ${indentStr}},`
  * @param importsMap - the import list to fill
  * @returns
  */
-function generatePageImport(
+export function generatePageImport(
   filepath: string,
   importMode: ResolvedOptions['importMode'],
   importsMap: ImportsMap
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
new file mode 100644
index 000000000..52dd9d4ba
--- /dev/null
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -0,0 +1,142 @@
+import { beforeEach, describe, expect, it } from 'vitest'
+import { PrefixTree } from '../core/tree'
+import { resolveOptions } from '../options'
+import {
+  generateRouteResolver,
+  generateRouteRecord,
+} from './generateRouteResolver'
+import { ImportsMap } from '../core/utils'
+
+const DEFAULT_OPTIONS = resolveOptions({})
+let DEFAULT_STATE: Parameters<typeof generateRouteRecord>[0]['state'] = {
+  id: 0,
+  recordVarNames: [],
+}
+
+beforeEach(() => {
+  DEFAULT_STATE = {
+    id: 0,
+    recordVarNames: [],
+  }
+})
+
+describe('generateRouteRecord', () => {
+  it('serializes a simple static path', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    const importsMap = new ImportsMap()
+    expect(
+      generateRouteRecord({
+        node: tree.insert('a', 'a.vue'),
+        parentVar: null,
+        state: DEFAULT_STATE,
+        options: DEFAULT_OPTIONS,
+        importsMap,
+      })
+    ).toMatchInlineSnapshot(`
+      "const r_0 = normalizeRouteRecord({
+        name: '/a',
+        path: new MatcherPatternPathStatic('/a'),
+        components: {
+          'default': () => import('a.vue')
+        },
+      })"
+    `)
+    expect(
+      generateRouteRecord({
+        node: tree.insert('a/b/c', 'a/b/c.vue'),
+        parentVar: null,
+        state: DEFAULT_STATE,
+        options: DEFAULT_OPTIONS,
+        importsMap,
+      })
+    ).toMatchInlineSnapshot(`
+      "const r_1 = normalizeRouteRecord({
+        name: '/a/b/c',
+        path: new MatcherPatternPathStatic('/a/b/c'),
+        components: {
+          'default': () => import('a/b/c.vue')
+        },
+      })"
+    `)
+  })
+})
+
+describe('generateRouteResolver', () => {
+  it('generates a resolver for a simple tree', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    const importsMap = new ImportsMap()
+    tree.insert('a', 'a.vue')
+    tree.insert('b/c', 'b/c.vue')
+    tree.insert('b/c/d', 'b/c/d.vue')
+    tree.insert('b/e/f', 'b/c/f.vue')
+    console.log(tree.getChildrenSorted())
+    const resolver = generateRouteResolver(tree, DEFAULT_OPTIONS, importsMap)
+
+    expect(resolver).toMatchInlineSnapshot(`
+      "
+      import {
+        createStaticResolver,
+        MatcherPatternPathStatic,
+        MatcherPatternPathCustomParams,
+        MatcherPatternPathStar,
+        normalizeRouteRecord,
+        // param matchers
+        PARAM_NUMBER,
+      } from 'vue-router/experimental'
+      import type {
+        EXPERIMENTAL_RouteRecordNormalized_Matchable,
+        MatcherPatternHash,
+        MatcherPatternQuery,
+        EmptyParams,
+      } from 'vue-router/experimental'
+
+      const r_0 = normalizeRouteRecord({
+        name: '/a',
+        path: new MatcherPatternPathStatic('/a'),
+        components: {
+          'default': () => import('a.vue')
+        },
+      })
+
+      const r_1 = normalizeRouteRecord({
+        /* internal name: '/b' */
+      })
+      const r_2 = normalizeRouteRecord({
+        name: '/b/c',
+        path: new MatcherPatternPathStatic('/b/c'),
+        components: {
+          'default': () => import('b/c.vue')
+        },
+        parent: r_1,
+      })
+      const r_3 = normalizeRouteRecord({
+        name: '/b/c/d',
+        path: new MatcherPatternPathStatic('/b/c/d'),
+        components: {
+          'default': () => import('b/c/d.vue')
+        },
+        parent: r_2,
+      })
+      const r_4 = normalizeRouteRecord({
+        /* internal name: '/b/e' */
+        parent: r_1,
+      })
+      const r_5 = normalizeRouteRecord({
+        name: '/b/e/f',
+        path: new MatcherPatternPathStatic('/b/e/f'),
+        components: {
+          'default': () => import('b/c/f.vue')
+        },
+        parent: r_4,
+      })
+
+      export const resolver = createStaticResolver([
+        r_0,
+        r_2,
+        r_3,
+        r_5,
+      ])
+      "
+    `)
+  })
+})
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
new file mode 100644
index 000000000..6b8d67b25
--- /dev/null
+++ b/src/codegen/generateRouteResolver.ts
@@ -0,0 +1,137 @@
+import { PrefixTree, type TreeNode } from '../core/tree'
+import { ImportsMap } from '../core/utils'
+import { type ResolvedOptions } from '../options'
+import { ts } from '../utils'
+import { generatePageImport } from './generateRouteRecords'
+
+export function generateRouteResolver(
+  tree: PrefixTree,
+  options: ResolvedOptions,
+  importsMap: ImportsMap
+): string {
+  const state = { id: 0, recordVarNames: [] }
+  const records = tree
+    .getChildrenSorted()
+    .map((node) =>
+      generateRouteRecord({ node, parentVar: null, state, options, importsMap })
+    )
+
+  return ts`
+import {
+  createStaticResolver,
+  MatcherPatternPathStatic,
+  MatcherPatternPathCustomParams,
+  MatcherPatternPathStar,
+  normalizeRouteRecord,
+  // param matchers
+  PARAM_NUMBER,
+} from 'vue-router/experimental'
+import type {
+  EXPERIMENTAL_RouteRecordNormalized_Matchable,
+  MatcherPatternHash,
+  MatcherPatternQuery,
+  EmptyParams,
+} from 'vue-router/experimental'
+
+${records.join('\n\n')}
+
+export const resolver = createStaticResolver([
+${state.recordVarNames.map((varName) => `  ${varName},`).join('\n')}
+])
+`
+}
+
+export function generateRouteRecord({
+  node,
+  parentVar,
+  state,
+  options,
+  importsMap,
+}: {
+  node: TreeNode
+  parentVar: string | null | undefined
+  state: {
+    id: number
+    recordVarNames: string[]
+  }
+  options: ResolvedOptions
+  importsMap: ImportsMap
+}): string {
+  const varName = `r_${state.id++}`
+
+  let recordName: string
+  let recordComponents: string
+
+  if (node.isMatchable()) {
+    state.recordVarNames.push(varName)
+    recordName = `name: '${node.name}',`
+    recordComponents = generateRouteRecordComponent(
+      node,
+      '  ',
+      options.importMode,
+      importsMap
+    )
+  } else {
+    recordName = node.name ? `/* internal name: '${node.name}' */` : ``
+    recordComponents = ''
+  }
+
+  const recordDeclaration = `
+const ${varName} = normalizeRouteRecord({
+  ${recordName}
+  ${generateRouteRecordPathMatcher({ node })}
+  ${recordComponents}
+  ${parentVar ? `parent: ${parentVar},` : ''}
+})
+`
+    .trim()
+    .split('\n')
+    // remove empty lines
+    .filter((l) => l.trimStart().length > 0)
+    .join('\n')
+
+  const children = node.getChildrenSorted().map((child) =>
+    generateRouteRecord({
+      node: child,
+      parentVar: varName,
+      state,
+      options,
+      importsMap,
+    })
+  )
+
+  return recordDeclaration + (children.length ? '\n' + children.join('\n') : '')
+}
+
+function generateRouteRecordComponent(
+  node: TreeNode,
+  indentStr: string,
+  importMode: ResolvedOptions['importMode'],
+  importsMap: ImportsMap
+): string {
+  const files = Array.from(node.value.components)
+  return `components: {
+${files
+  .map(
+    ([key, path]) =>
+      `${indentStr + '  '}'${key}': ${generatePageImport(
+        path,
+        importMode,
+        importsMap
+      )}`
+  )
+  .join(',\n')}
+${indentStr}},`
+}
+
+export function generateRouteRecordPathMatcher({ node }: { node: TreeNode }) {
+  if (!node.isMatchable()) {
+    return ''
+  } else if (node.value.isStatic()) {
+    return `path: new MatcherPatternPathStatic('${node.fullPath}'),`
+  } else if (node.value.isParam()) {
+    return `path: new MatcherPatternPathCustomParams('${node.fullPath}'),`
+  }
+
+  return `/* UNSUPPORTED path matcher for: "${node.fullPath}" */`
+}
diff --git a/src/core/tree.ts b/src/core/tree.ts
index 25fff6644..abc9335ea 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -279,6 +279,12 @@ export class TreeNode {
     return params
   }
 
+  isMatchable(): this is TreeNode & { name: string } {
+    // a node is matchable if it has at least one component
+    // and the name is not false
+    return this.value.components.size > 0 && this.name !== false
+  }
+
   /**
    * Returns wether this tree node is the root node of the tree.
    *

From 8e0a7a2181a5d58559ebf1974c86604f019b4802 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 7 Aug 2025 17:46:39 +0200
Subject: [PATCH 03/81] refactor: missing import type

---
 src/data-loaders/meta-extensions.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/data-loaders/meta-extensions.ts b/src/data-loaders/meta-extensions.ts
index 5835aa53c..0949cd7c5 100644
--- a/src/data-loaders/meta-extensions.ts
+++ b/src/data-loaders/meta-extensions.ts
@@ -10,6 +10,7 @@ import type {
   IS_SSR_KEY,
 } from './symbols'
 import { type NavigationResult } from './navigation-guard'
+import { type RouteLocationNormalizedLoaded } from 'vue-router'
 
 /**
  * Map type for the entries used by data loaders.

From f4ad320687cc7bfc8c353a74ce10bdb2b2b634e4 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 7 Aug 2025 17:46:50 +0200
Subject: [PATCH 04/81] chore: remove baseUrl from tsconfig

---
 tsconfig.json | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index 83731b6cd..75cb476c5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,15 +14,13 @@
     "dist"
   ],
   "compilerOptions": {
-    "baseUrl": ".",
+    // this makes auto import canonical (e.g. 'src/utils' instead of '../utils')
+    // "baseUrl": ".",
     "rootDir": ".",
     "jsx": "preserve",
     "target": "ESNext",
     "module": "ESNext",
-    "lib": [
-      "ESNext",
-      "DOM"
-    ],
+    "lib": ["ESNext", "DOM"],
     "moduleResolution": "Bundler",
     "skipDefaultLibCheck": true,
     "skipLibCheck": true,
@@ -42,25 +40,16 @@
     "strictNullChecks": true,
     "resolveJsonModule": true,
     "paths": {
-      "unplugin-vue-router": [
-        "./src/index.ts"
-      ],
-      "unplugin-vue-router/types": [
-        "./src/types.ts"
-      ],
-      "unplugin-vue-router/runtime": [
-        "./src/runtime.ts"
-      ],
+      "unplugin-vue-router": ["./src/index.ts"],
+      "unplugin-vue-router/types": ["./src/types.ts"],
+      "unplugin-vue-router/runtime": ["./src/runtime.ts"],
       "unplugin-vue-router/data-loaders": [
         "./src/data-loaders/entries/index.ts"
       ]
     },
-    "types": [
-      "node",
-      "vite/client"
-    ]
+    "types": ["node", "vite/client"]
   },
   "vueCompilerOptions": {
     "plugins": []
-  },
+  }
 }

From 81e088e9845bbd403dd081c2aa8544796b71af64 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 8 Aug 2025 17:51:59 +0200
Subject: [PATCH 05/81] chore: add experimental playground

---
 client.d.ts                                   |   2 +-
 playground-experimental/.gitignore            |   1 +
 playground-experimental/auto-imports.d.ts     |  14 ++
 playground-experimental/db.json               |  24 +++
 playground-experimental/env.d.ts              |   2 +
 playground-experimental/index.html            |  17 ++
 playground-experimental/package.json          |  23 +++
 playground-experimental/src/App.vue           | 103 +++++++++++++
 playground-experimental/src/main.ts           |  29 ++++
 playground-experimental/src/pages/(home).vue  |   5 +
 playground-experimental/src/pages/[name].vue  |   6 +
 .../src/pages/a.[b].c.[d].vue                 |   5 +
 .../src/pages/users/[userId].vue              |   5 +
 .../src/pages/users/sub-[first]-[second].vue  |   5 +
 playground-experimental/src/router.ts         |  32 ++++
 playground-experimental/src/utils.ts          |  40 +++++
 playground-experimental/tsconfig.config.json  |   8 +
 playground-experimental/tsconfig.json         |  41 +++++
 playground-experimental/typed-router.d.ts     |  71 +++++++++
 playground-experimental/vite.config.ts        | 145 ++++++++++++++++++
 pnpm-lock.yaml                                |  61 ++++++++
 pnpm-workspace.yaml                           |   1 +
 src/codegen/generateRouteResolver.spec.ts     |   1 -
 src/codegen/generateRouteResolver.ts          |  23 +--
 src/core/context.ts                           |  22 ++-
 src/core/moduleConstants.ts                   |   7 +-
 src/core/tree.ts                              |  40 +++++
 src/core/treeNodeValue.ts                     |  16 ++
 src/index.ts                                  |  15 +-
 29 files changed, 748 insertions(+), 16 deletions(-)
 create mode 100644 playground-experimental/.gitignore
 create mode 100644 playground-experimental/auto-imports.d.ts
 create mode 100644 playground-experimental/db.json
 create mode 100644 playground-experimental/env.d.ts
 create mode 100644 playground-experimental/index.html
 create mode 100644 playground-experimental/package.json
 create mode 100644 playground-experimental/src/App.vue
 create mode 100644 playground-experimental/src/main.ts
 create mode 100644 playground-experimental/src/pages/(home).vue
 create mode 100644 playground-experimental/src/pages/[name].vue
 create mode 100644 playground-experimental/src/pages/a.[b].c.[d].vue
 create mode 100644 playground-experimental/src/pages/users/[userId].vue
 create mode 100644 playground-experimental/src/pages/users/sub-[first]-[second].vue
 create mode 100644 playground-experimental/src/router.ts
 create mode 100644 playground-experimental/src/utils.ts
 create mode 100644 playground-experimental/tsconfig.config.json
 create mode 100644 playground-experimental/tsconfig.json
 create mode 100644 playground-experimental/typed-router.d.ts
 create mode 100644 playground-experimental/vite.config.ts

diff --git a/client.d.ts b/client.d.ts
index e6afb9f3b..fed885230 100644
--- a/client.d.ts
+++ b/client.d.ts
@@ -4,7 +4,7 @@ declare module 'vue-router/auto-routes' {
   /**
    * Array of routes generated by unplugin-vue-router
    */
-  export const routes: RouteRecordRaw[]
+  export const routes: readonly RouteRecordRaw[]
 
   /**
    * Setups hot module replacement for routes.
diff --git a/playground-experimental/.gitignore b/playground-experimental/.gitignore
new file mode 100644
index 000000000..cc1b7f164
--- /dev/null
+++ b/playground-experimental/.gitignore
@@ -0,0 +1 @@
+tsconfig.tsbuildinfo
diff --git a/playground-experimental/auto-imports.d.ts b/playground-experimental/auto-imports.d.ts
new file mode 100644
index 000000000..f77a9b47b
--- /dev/null
+++ b/playground-experimental/auto-imports.d.ts
@@ -0,0 +1,14 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// noinspection JSUnusedGlobalSymbols
+// Generated by unplugin-auto-import
+// biome-ignore lint: disable
+export {}
+declare global {
+  const defineBasicLoader: typeof import('../src/data-loaders/entries/basic')['defineBasicLoader']
+  const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave']
+  const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate']
+  const useRoute: typeof import('vue-router')['useRoute']
+  const useRouter: typeof import('vue-router')['useRouter']
+}
diff --git a/playground-experimental/db.json b/playground-experimental/db.json
new file mode 100644
index 000000000..53e4f7413
--- /dev/null
+++ b/playground-experimental/db.json
@@ -0,0 +1,24 @@
+{
+  "todos": [
+    {
+      "id": 2,
+      "title": "Walking",
+      "completed": true
+    },
+    {
+      "id": 3,
+      "title": "Cleaning",
+      "completed": false
+    },
+    {
+      "id": 4,
+      "title": "Cooking",
+      "completed": true
+    },
+    {
+      "title": "hello",
+      "completed": false,
+      "id": 7
+    }
+  ]
+}
\ No newline at end of file
diff --git a/playground-experimental/env.d.ts b/playground-experimental/env.d.ts
new file mode 100644
index 000000000..dabd0deba
--- /dev/null
+++ b/playground-experimental/env.d.ts
@@ -0,0 +1,2 @@
+/// <reference types="vite/client" />
+/// <reference types="unplugin-vue-router/client" />
diff --git a/playground-experimental/index.html b/playground-experimental/index.html
new file mode 100644
index 000000000..7795da29a
--- /dev/null
+++ b/playground-experimental/index.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  </head>
+  <body>
+    <a
+      href="/__inspect/#/module?id=/__vue-router/auto-routes&index=0"
+      target="_blank"
+      style="margin-top: 10px; display: block"
+      >visit /__inspect/ to inspect the intermediate state</a
+    >
+    <div id="app"></div>
+    <script type="module" src="./src/main.ts"></script>
+  </body>
+</html>
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
new file mode 100644
index 000000000..72945de4e
--- /dev/null
+++ b/playground-experimental/package.json
@@ -0,0 +1,23 @@
+{
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "nodemon -w '../src/**/*.ts' -e .ts -x vite",
+    "json-server": "json-server --watch db.json --port 4000",
+    "playground:build": "vite build"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-vue": "^6.0.1",
+    "@vue/compiler-sfc": "^3.5.18",
+    "@vue/tsconfig": "^0.7.0",
+    "json-server": "^0.17.4",
+    "unplugin-vue-router": "workspace:*",
+    "vite": "^7.0.6"
+  },
+  "dependencies": {
+    "mande": "^2.0.9",
+    "pinia": "^3.0.3",
+    "vue": "^3.5.18",
+    "vue-router": "file:/Users/posva/oss/vuejs/router/packages/router/vue-router-4.5.1.tgz"
+  }
+}
diff --git a/playground-experimental/src/App.vue b/playground-experimental/src/App.vue
new file mode 100644
index 000000000..6ec2bac35
--- /dev/null
+++ b/playground-experimental/src/App.vue
@@ -0,0 +1,103 @@
+<script setup lang="ts">
+import { useLink, useRoute } from 'vue-router'
+import type {
+  RouteLocationNormalizedLoaded,
+  RouteLocationResolved,
+  RouteLocation,
+} from 'vue-router'
+import { ref } from 'vue'
+import { routes } from 'vue-router/auto-routes'
+
+console.log(`We have ${routes.length} routes.`)
+
+const router = useRouter()
+
+const targetRoute = ref('')
+
+function _test() {
+  const b = function test(
+    a: RouteLocationResolved<'/[name]'>,
+    b: RouteLocationNormalizedLoaded<'/[name]'>,
+    c: RouteLocation<'/[name]'>
+  ) {
+    return {
+      a,
+      b,
+      c,
+    }
+  }
+
+  router.resolve('/:name')
+  router.resolve({ name: '/[name]', params: { name: 'hello' } }).params.name
+
+  useLink({ to: '/articles/2' }).route.value.name
+  useLink({ to: { path: '/articles/:id' } })
+  useLink({ to: { name: '/[name]', params: { name: 2 } } }).route.value.params
+    .name
+  // useLink({ name: '/[name]', params: { name: 2 } }).route.value.params.name
+  useLink({ to: ref({ name: '/[name]', params: { name: 2 } }) }).route.value
+    .name
+
+  const customRoute = useRoute('/(home)')
+
+  return { b, customRoute }
+}
+
+// this is always false, it's just for types
+if (Math.random() > 2) {
+  _test()
+}
+</script>
+
+<template>
+  <header>
+    <div class="wrapper">
+      <nav>
+        <ul>
+          <li>
+            <RouterLink to="/">Home</RouterLink>
+          </li>
+        </ul>
+      </nav>
+    </div>
+
+    <div>
+      <p>Currently at "{{ $route.name }}" ({{ $route.fullPath }})</p>
+      <pre>{{ $route.params }}</pre>
+      <form @submit.prevent="router.push(targetRoute)">
+        <label>
+          Navigate to:
+          <input type="text" v-model="targetRoute" />
+        </label>
+        <button>Go</button>
+      </form>
+    </div>
+  </header>
+
+  <hr />
+
+  <RouterView />
+  <hr />
+  <RouterView name="named" />
+</template>
+
+<style scoped>
+ul {
+  padding-left: 0;
+}
+ul > li {
+  display: inline-block;
+}
+
+ul > li:not(:first-child) {
+  margin-left: 0.5rem;
+}
+
+li > a {
+  text-decoration: none;
+}
+.router-link-active {
+  text-decoration: underline;
+  font-weight: bold;
+}
+</style>
diff --git a/playground-experimental/src/main.ts b/playground-experimental/src/main.ts
new file mode 100644
index 000000000..13178acb5
--- /dev/null
+++ b/playground-experimental/src/main.ts
@@ -0,0 +1,29 @@
+import { createApp } from 'vue'
+import App from './App.vue'
+import { createPinia } from 'pinia'
+import { PiniaColada } from '@pinia/colada'
+import { router } from './router'
+import { DataLoaderPlugin } from 'unplugin-vue-router/data-loaders'
+import { RouterLink, RouterView } from 'vue-router'
+
+const app = createApp(App)
+
+app.use(createPinia())
+app.use(PiniaColada, {})
+// @ts-expect-error: FIXME: should be doable
+app.use(DataLoaderPlugin, { router })
+app.component('RouterLink', RouterLink)
+app.component('RouterView', RouterView)
+app.use(router)
+
+// @ts-expect-error: for debugging on browser
+window.$router = router
+
+app.mount('#app')
+
+// small logger for navigations, useful to check HMR
+router.isReady().then(() => {
+  router.beforeEach((to, from) => {
+    console.log('🧭', from.fullPath, '->', to.fullPath)
+  })
+})
diff --git a/playground-experimental/src/pages/(home).vue b/playground-experimental/src/pages/(home).vue
new file mode 100644
index 000000000..9522e259e
--- /dev/null
+++ b/playground-experimental/src/pages/(home).vue
@@ -0,0 +1,5 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>Home</h1>
+</template>
diff --git a/playground-experimental/src/pages/[name].vue b/playground-experimental/src/pages/[name].vue
new file mode 100644
index 000000000..bc207c40c
--- /dev/null
+++ b/playground-experimental/src/pages/[name].vue
@@ -0,0 +1,6 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>Named param</h1>
+  <pre>{{ $route.params }}</pre>
+</template>
diff --git a/playground-experimental/src/pages/a.[b].c.[d].vue b/playground-experimental/src/pages/a.[b].c.[d].vue
new file mode 100644
index 000000000..29b5f2e77
--- /dev/null
+++ b/playground-experimental/src/pages/a.[b].c.[d].vue
@@ -0,0 +1,5 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>{{ String($route.name) }} - {{ $route.path }}</h1>
+</template>
diff --git a/playground-experimental/src/pages/users/[userId].vue b/playground-experimental/src/pages/users/[userId].vue
new file mode 100644
index 000000000..29b5f2e77
--- /dev/null
+++ b/playground-experimental/src/pages/users/[userId].vue
@@ -0,0 +1,5 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>{{ String($route.name) }} - {{ $route.path }}</h1>
+</template>
diff --git a/playground-experimental/src/pages/users/sub-[first]-[second].vue b/playground-experimental/src/pages/users/sub-[first]-[second].vue
new file mode 100644
index 000000000..29b5f2e77
--- /dev/null
+++ b/playground-experimental/src/pages/users/sub-[first]-[second].vue
@@ -0,0 +1,5 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>{{ String($route.name) }} - {{ $route.path }}</h1>
+</template>
diff --git a/playground-experimental/src/router.ts b/playground-experimental/src/router.ts
new file mode 100644
index 000000000..cb785aca7
--- /dev/null
+++ b/playground-experimental/src/router.ts
@@ -0,0 +1,32 @@
+import { experimental_createRouter } from 'vue-router/experimental'
+import { resolver } from 'vue-router/auto-resolver'
+import {
+  type RouteRecordInfo,
+  type ParamValue,
+  createWebHistory,
+} from 'vue-router'
+
+export const router = experimental_createRouter({
+  history: createWebHistory(),
+  resolver,
+})
+
+// manual extension of route types
+declare module 'vue-router/auto-routes' {
+  export interface RouteNamedMap {
+    'custom-dynamic-name': RouteRecordInfo<
+      'custom-dynamic-name',
+      '/added-during-runtime/[...path]',
+      { path: ParamValue<true> },
+      { path: ParamValue<false> },
+      'custom-dynamic-child-name'
+    >
+    'custom-dynamic-child-name': RouteRecordInfo<
+      'custom-dynamic-child-name',
+      '/added-during-runtime/[...path]/child',
+      { path: ParamValue<true> },
+      { path: ParamValue<false> },
+      never
+    >
+  }
+}
diff --git a/playground-experimental/src/utils.ts b/playground-experimental/src/utils.ts
new file mode 100644
index 000000000..07a8d448d
--- /dev/null
+++ b/playground-experimental/src/utils.ts
@@ -0,0 +1,40 @@
+import { inject, toValue, onUnmounted } from 'vue'
+import type { RouteLocation, RouteLocationNormalizedLoaded } from 'vue-router'
+import { viewDepthKey, useRoute, useRouter } from 'vue-router'
+import type { RouteNamedMap } from 'vue-router/auto-routes'
+
+type NavigationReturn = RouteLocation | boolean | void
+
+export function useParamMatcher<Name extends keyof RouteNamedMap>(
+  _name: Name,
+  fn: (
+    to: RouteLocationNormalizedLoaded<Name>
+  ) => NavigationReturn | Promise<NavigationReturn>
+) {
+  const route = useRoute()
+  const router = useRouter()
+  const depth = inject(viewDepthKey, 0)
+  // we only need it the first time
+  const matchedRecord = route.matched[toValue(depth) - 1]?.name
+  console.log(matchedRecord)
+
+  if (!matchedRecord) return
+
+  console.log('add guard')
+
+  const removeGuard = router.beforeEach((to) => {
+    console.log('beforeEach', to)
+    if (to.matched.find((record) => record.name === matchedRecord)) {
+      return fn(to as RouteLocationNormalizedLoaded<Name>)
+    }
+  })
+
+  onUnmounted(removeGuard)
+}
+
+export function dummy(arg: unknown) {
+  return 'ok'
+}
+
+export const dummy_id = 'dummy_id'
+export const dummy_number = 42
diff --git a/playground-experimental/tsconfig.config.json b/playground-experimental/tsconfig.config.json
new file mode 100644
index 000000000..fdcee2d99
--- /dev/null
+++ b/playground-experimental/tsconfig.config.json
@@ -0,0 +1,8 @@
+{
+  "extends": "@vue/tsconfig/tsconfig.json",
+  "include": ["vite.config.*", "vitest.config.*", "cypress.config.*"],
+  "compilerOptions": {
+    "composite": true,
+    "types": ["node"]
+  }
+}
diff --git a/playground-experimental/tsconfig.json b/playground-experimental/tsconfig.json
new file mode 100644
index 000000000..5fe7d55ab
--- /dev/null
+++ b/playground-experimental/tsconfig.json
@@ -0,0 +1,41 @@
+{
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
+  "include": [
+    "./env.d.ts",
+    "./src/**/*.ts",
+    "./src/**/*.vue",
+    "./typed-router.d.ts",
+    "./auto-imports.d.ts",
+    "../src"
+  ],
+  "compilerOptions": {
+    // "baseUrl": ".",
+    "composite": true,
+    "moduleResolution": "Bundler",
+    "paths": {
+      "@/*": ["./src/*"],
+      "unplugin-vue-router/runtime": ["../src/runtime.ts"],
+      "unplugin-vue-router/types": ["../src/types.ts"],
+      "unplugin-vue-router/data-loaders": [
+        "../src/data-loaders/entries/index.ts"
+      ],
+      "unplugin-vue-router/data-loaders/basic": [
+        "../src/data-loaders/entries/basic.ts"
+      ],
+      "unplugin-vue-router/data-loaders/pinia-colada": [
+        "../src/data-loaders/entries/pinia-colada.ts"
+      ]
+    }
+  },
+  "vueCompilerOptions": {
+    "plugins": [
+      "unplugin-vue-router/volar/sfc-route-blocks",
+      "unplugin-vue-router/volar/sfc-typed-router"
+    ]
+  },
+  "references": [
+    {
+      "path": "./tsconfig.config.json"
+    }
+  ]
+}
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
new file mode 100644
index 000000000..7d3994fa7
--- /dev/null
+++ b/playground-experimental/typed-router.d.ts
@@ -0,0 +1,71 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-router. ‼️ DO NOT MODIFY THIS FILE ‼️
+// It's recommended to commit this file.
+// Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.
+
+declare module 'vue-router/auto-routes' {
+  import type {
+    RouteRecordInfo,
+    ParamValue,
+    ParamValueOneOrMore,
+    ParamValueZeroOrMore,
+    ParamValueZeroOrOne,
+  } from 'vue-router'
+
+  /**
+   * Route name map generated by unplugin-vue-router
+   */
+  export interface RouteNamedMap {
+    '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
+    '/[name]': RouteRecordInfo<'/[name]', '/:name', { name: ParamValue<true> }, { name: ParamValue<false> }>,
+    '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: ParamValue<true>, d: ParamValue<true> }, { b: ParamValue<false>, d: ParamValue<false> }>,
+    '/users/[userId]': RouteRecordInfo<'/users/[userId]', '/users/:userId', { userId: ParamValue<true> }, { userId: ParamValue<false> }>,
+    '/users/sub-[first]-[second]': RouteRecordInfo<'/users/sub-[first]-[second]', '/users/sub-:first-:second', { first: ParamValue<true>, second: ParamValue<true> }, { first: ParamValue<false>, second: ParamValue<false> }>,
+  }
+
+  /**
+   * Route file to route info map by unplugin-vue-router.
+   * Used by the volar plugin to automatically type useRoute()
+   *
+   * Each key is a file path relative to the project root with 2 properties:
+   * - routes: union of route names of the possible routes when in this page (passed to useRoute<...>())
+   * - views: names of nested views (can be passed to <RouterView name="...">)
+   *
+   * @internal
+   */
+  export interface _RouteFileInfoMap {
+    'src/pages/(home).vue': {
+      routes: '/(home)'
+      views: never
+    }
+    'src/pages/[name].vue': {
+      routes: '/[name]'
+      views: never
+    }
+    'src/pages/a.[b].c.[d].vue': {
+      routes: '/a.[b].c.[d]'
+      views: never
+    }
+    'src/pages/users/[userId].vue': {
+      routes: '/users/[userId]'
+      views: never
+    }
+    'src/pages/users/sub-[first]-[second].vue': {
+      routes: '/users/sub-[first]-[second]'
+      views: never
+    }
+  }
+
+  /**
+   * Get a union of possible route names in a certain route component file.
+   * Used by the volar plugin to automatically type useRoute()
+   *
+   * @internal
+   */
+  export type _RouteNamesForFilePath<FilePath extends string> =
+    _RouteFileInfoMap extends Record<FilePath, infer Info>
+      ? Info['routes']
+      : keyof RouteNamedMap
+}
diff --git a/playground-experimental/vite.config.ts b/playground-experimental/vite.config.ts
new file mode 100644
index 000000000..3c6cd7af5
--- /dev/null
+++ b/playground-experimental/vite.config.ts
@@ -0,0 +1,145 @@
+import { fileURLToPath, URL } from 'url'
+import { defineConfig } from 'vite'
+import { join } from 'node:path'
+import Markdown from 'unplugin-vue-markdown/vite'
+// @ts-ignore: the plugin should not be checked in the playground
+import VueRouter from '../src/vite'
+import { VueRouterAutoImports } from '../src'
+import Vue from '@vitejs/plugin-vue'
+import AutoImport from 'unplugin-auto-import/vite'
+import VueDevtools from 'vite-plugin-vue-devtools'
+
+export default defineConfig({
+  clearScreen: false,
+  resolve: {
+    alias: {
+      '@': fileURLToPath(new URL('./src', import.meta.url)),
+      '~': fileURLToPath(new URL('./src', import.meta.url)),
+      'unplugin-vue-router/runtime': fileURLToPath(
+        new URL('../src/runtime.ts', import.meta.url)
+      ),
+      'unplugin-vue-router/types': fileURLToPath(
+        new URL('../src/types.ts', import.meta.url)
+      ),
+      'unplugin-vue-router/data-loaders/basic': fileURLToPath(
+        new URL('../src/data-loaders/entries/basic.ts', import.meta.url)
+      ),
+      'unplugin-vue-router/data-loaders/pinia-colada': fileURLToPath(
+        new URL('../src/data-loaders/entries/pinia-colada.ts', import.meta.url)
+      ),
+      'unplugin-vue-router/data-loaders': fileURLToPath(
+        new URL('../src/data-loaders/entries/index.ts', import.meta.url)
+      ),
+    },
+  },
+  build: {
+    sourcemap: true,
+  },
+  optimizeDeps: {
+    exclude: [
+      // easier to test with yalc
+      '@pinia/colada',
+    ],
+  },
+
+  plugins: [
+    VueRouter({
+      extensions: ['.page.vue', '.vue'],
+      importMode: 'async',
+      logs: true,
+      // getRouteName: getPascalCaseRouteName,
+      experimental: {
+        autoExportsDataLoaders: ['src/loaders/**/*', '@/loaders/**/*'],
+        paramMatchers: true,
+      },
+      extendRoute(route) {
+        // example of deleting routes
+        // if (route.name.startsWith('/users')) {
+        //   route.delete()
+        // }
+
+        if (route.name === '/a.[b].c.[d]') {
+          console.log(route.node)
+        }
+
+        if (route.name === '/[name]') {
+          // TODO: implement aliases
+          // route.addAlias('/hello-vite-:name')
+        }
+
+        // TODO: implement insertions
+        // const newRoute = root.insert(
+        //   '/custom/page',
+        //   route.components.get('default')!
+        // )
+        // newRoute.components.set('default', route.components.get('default')!)
+        // newRoute.meta = {
+        //   'custom-meta': 'works',
+        // }
+        // }
+      },
+      beforeWriteFiles(root) {
+        // root.insert('/from-root', join(__dirname, './src/pages/index.vue'))
+      },
+      routesFolder: [
+        // can add multiple routes folders
+        {
+          src: 'src/pages',
+        },
+        {
+          src: 'src/docs',
+          path: 'docs/[lang]/',
+          // doesn't take into account files directly at src/docs, only subfolders
+          filePatterns: ['*/**'],
+          // ignores .vue files
+          extensions: ['.md'],
+        },
+        {
+          src: 'src/features',
+          filePatterns: '*/pages/**/*',
+          path: (file) => {
+            const prefix = 'src/features'
+            // +1 for the starting slash
+            file = file
+              .slice(file.lastIndexOf(prefix) + prefix.length + 1)
+              .replace('/pages', '')
+            // console.log('👉 FILE', file)
+            return file
+          },
+        },
+      ],
+      exclude: [
+        '**/ignored/**',
+        // '**/ignored/**/*',
+        '**/__*',
+        '**/__**/*',
+        '**/*.component.vue',
+        // resolve(__dirname, './src/pages/ignored'),
+        //
+        // './src/pages/**/*.spec.ts',
+      ],
+    }),
+    Vue({
+      include: [/\.vue$/, /\.md$/],
+    }),
+    Markdown({}),
+    AutoImport({
+      imports: [
+        VueRouterAutoImports,
+        {
+          // NOTE: we need to match the resolved paths to local files for development
+          // instead of just 'unplugin-vue-router/data-loaders/basic': ['defineBasicLoader'],
+          [fileURLToPath(
+            new URL('../src/data-loaders/entries/basic.ts', import.meta.url)
+          )]: ['defineBasicLoader'],
+          // [fileURLToPath(
+          //   new URL('../src/data-loaders/entries/pinia-colada.ts', import.meta.url)
+          // )]: ['defineColadaLoader'],
+        },
+      ],
+    }),
+    // currently the devtools use 0.8.8 but we care more about
+    // inspecting virtual files
+    VueDevtools(),
+  ],
+})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 79cf034ae..273bc208e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -249,6 +249,40 @@ importers:
         specifier: ^7.1.6
         version: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
+  playground-experimental:
+    dependencies:
+      mande:
+        specifier: ^2.0.9
+        version: 2.0.9
+      pinia:
+        specifier: ^3.0.3
+        version: 3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
+      vue:
+        specifier: ^3.5.18
+        version: 3.5.21(typescript@5.9.2)
+      vue-router:
+        specifier: file:/Users/posva/oss/vuejs/router/packages/router/vue-router-4.5.1.tgz
+        version: file:../vuejs/router/packages/router/vue-router-4.5.1.tgz(vue@3.5.21(typescript@5.9.2))
+    devDependencies:
+      '@vitejs/plugin-vue':
+        specifier: ^6.0.1
+        version: 6.0.1(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+      '@vue/compiler-sfc':
+        specifier: ^3.5.18
+        version: 3.5.21
+      '@vue/tsconfig':
+        specifier: ^0.7.0
+        version: 0.7.0(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
+      json-server:
+        specifier: ^0.17.4
+        version: 0.17.4
+      unplugin-vue-router:
+        specifier: workspace:*
+        version: link:..
+      vite:
+        specifier: ^7.0.6
+        version: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+
 packages:
 
   '@algolia/autocomplete-core@1.17.7':
@@ -2623,6 +2657,17 @@ packages:
   '@vue/test-utils@2.4.6':
     resolution: {integrity: sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==}
 
+  '@vue/tsconfig@0.7.0':
+    resolution: {integrity: sha512-ku2uNz5MaZ9IerPPUyOHzyjhXoX2kVJaVf7hL315DC17vS6IiZRmmCPfggNbU16QTvM80+uYYy3eYJB59WCtvg==}
+    peerDependencies:
+      typescript: 5.x
+      vue: ^3.4.0
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+      vue:
+        optional: true
+
   '@vue/tsconfig@0.8.1':
     resolution: {integrity: sha512-aK7feIWPXFSUhsCP9PFqPyFOcz4ENkb8hZ2pneL6m2UjCkccvaOhC/5KCKluuBufvp2KzkbdA2W2pk20vLzu3g==}
     peerDependencies:
@@ -6820,6 +6865,12 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
+  vue-router@file:../vuejs/router/packages/router/vue-router-4.5.1.tgz:
+    resolution: {integrity: sha512-aBPR/DiVyr5ns0dQiI6cAQl7JRgq7uVeM/OZGt+gy4xvc9HgZh/nPc3FaF1IzM6Efap6tQ9z1K6gvX1RT6JN+Q==, tarball: file:../vuejs/router/packages/router/vue-router-4.5.1.tgz}
+    version: 4.5.1
+    peerDependencies:
+      vue: ^3.2.0
+
   vue-tsc@2.2.10:
     resolution: {integrity: sha512-jWZ1xSaNbabEV3whpIDMbjVSVawjAyW+x1n3JeGQo7S0uv2n9F/JMgWW90tGWNFRKya4YwKMZgCtr0vRAM7DeQ==}
     hasBin: true
@@ -9646,6 +9697,11 @@ snapshots:
       js-beautify: 1.15.1
       vue-component-type-helpers: 2.0.22
 
+  '@vue/tsconfig@0.7.0(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))':
+    optionalDependencies:
+      typescript: 5.9.2
+      vue: 3.5.21(typescript@5.9.2)
+
   '@vue/tsconfig@0.8.1(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))':
     optionalDependencies:
       typescript: 5.9.2
@@ -14551,6 +14607,11 @@ snapshots:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
+  vue-router@file:../vuejs/router/packages/router/vue-router-4.5.1.tgz(vue@3.5.21(typescript@5.9.2)):
+    dependencies:
+      '@vue/devtools-api': 6.6.4
+      vue: 3.5.21(typescript@5.9.2)
+
   vue-tsc@2.2.10(typescript@5.9.2):
     dependencies:
       '@volar/typescript': 2.4.23
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 09b39bb23..016b9ff5e 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,5 +1,6 @@
 packages:
   - playground
+  - playground-experimental
   - examples/*
 ignoredBuiltDependencies:
   - '@firebase/util'
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 52dd9d4ba..19c96ddf3 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -69,7 +69,6 @@ describe('generateRouteResolver', () => {
     tree.insert('b/c', 'b/c.vue')
     tree.insert('b/c/d', 'b/c/d.vue')
     tree.insert('b/e/f', 'b/c/f.vue')
-    console.log(tree.getChildrenSorted())
     const resolver = generateRouteResolver(tree, DEFAULT_OPTIONS, importsMap)
 
     expect(resolver).toMatchInlineSnapshot(`
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index 6b8d67b25..d547ed9ff 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -9,13 +9,15 @@ export function generateRouteResolver(
   options: ResolvedOptions,
   importsMap: ImportsMap
 ): string {
-  const state = { id: 0, recordVarNames: [] }
+  const state = { id: 0, recordVarNames: [] as string[] }
   const records = tree
     .getChildrenSorted()
     .map((node) =>
       generateRouteRecord({ node, parentVar: null, state, options, importsMap })
     )
 
+  // TODO: add these imports to the import map instead
+
   return ts`
 import {
   createStaticResolver,
@@ -23,14 +25,6 @@ import {
   MatcherPatternPathCustomParams,
   MatcherPatternPathStar,
   normalizeRouteRecord,
-  // param matchers
-  PARAM_NUMBER,
-} from 'vue-router/experimental'
-import type {
-  EXPERIMENTAL_RouteRecordNormalized_Matchable,
-  MatcherPatternHash,
-  MatcherPatternQuery,
-  EmptyParams,
 } from 'vue-router/experimental'
 
 ${records.join('\n\n')}
@@ -57,11 +51,13 @@ export function generateRouteRecord({
   options: ResolvedOptions
   importsMap: ImportsMap
 }): string {
+  // TODO: skip nodes that add no value. Maybe it should be done at the level of the tree?
   const varName = `r_${state.id++}`
 
   let recordName: string
   let recordComponents: string
 
+  // TODO: what about groups?
   if (node.isMatchable()) {
     state.recordVarNames.push(varName)
     recordName = `name: '${node.name}',`
@@ -127,10 +123,15 @@ ${indentStr}},`
 export function generateRouteRecordPathMatcher({ node }: { node: TreeNode }) {
   if (!node.isMatchable()) {
     return ''
-  } else if (node.value.isStatic()) {
+    // TODO: do we really need isGroup?
+  } else if (node.value.isStatic() || node.value.isGroup()) {
     return `path: new MatcherPatternPathStatic('${node.fullPath}'),`
   } else if (node.value.isParam()) {
-    return `path: new MatcherPatternPathCustomParams('${node.fullPath}'),`
+    return `path: new MatcherPatternPathCustomParams(
+    ${node.regexp},
+    ${JSON.stringify(node.matcherParams)},
+    ${JSON.stringify(node.matcherParts)},
+  ),`
   }
 
   return `/* UNSUPPORTED path matcher for: "${node.fullPath}" */`
diff --git a/src/core/context.ts b/src/core/context.ts
index f07494aae..555c2fbec 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -21,6 +21,7 @@ import { definePageTransform, extractDefinePageNameAndPath } from './definePage'
 import { EditableTreeNode } from './extendRoutes'
 import { isPackageExists as isPackageInstalled } from 'local-pkg'
 import { ts } from '../utils'
+import { generateRouteResolver } from '../codegen/generateRouteResolver'
 
 export function createRoutesContext(options: ResolvedOptions) {
   const { dts: preferDTS, root, routesFolder } = options
@@ -181,6 +182,24 @@ export function createRoutesContext(options: ResolvedOptions) {
     // unlinkDir event
   }
 
+  function generateResolver() {
+    const importsMap = new ImportsMap()
+
+    const resolverCode = generateRouteResolver(routeTree, options, importsMap)
+
+    // generate the list of imports
+    let imports = importsMap.toString()
+    // add an empty line for readability
+    if (imports) {
+      imports += '\n'
+    }
+
+    const newAutoRoutes = `${imports}${resolverCode}\n`
+
+    // prepend it to the code
+    return newAutoRoutes
+  }
+
   function generateRoutes() {
     const importsMap = new ImportsMap()
 
@@ -190,7 +209,7 @@ export function createRoutesContext(options: ResolvedOptions) {
       importsMap
     )}\n`
 
-    let hmr = ts`
+    const hmr = ts`
 export function handleHotUpdate(_router, _hotUpdateCallback) {
   if (import.meta.hot) {
     import.meta.hot.data.router = _router
@@ -305,6 +324,7 @@ if (import.meta.hot) {
     stopWatcher,
 
     generateRoutes,
+    generateResolver,
     generateVueRouterProxy,
 
     definePageTransform(code: string, id: string) {
diff --git a/src/core/moduleConstants.ts b/src/core/moduleConstants.ts
index c7dfa03d0..a21969340 100644
--- a/src/core/moduleConstants.ts
+++ b/src/core/moduleConstants.ts
@@ -4,6 +4,7 @@
 export const MODULE_VUE_ROUTER_AUTO = 'vue-router/auto'
 // vue-router/auto/routes was more natural but didn't work well with TS
 export const MODULE_ROUTES_PATH = `${MODULE_VUE_ROUTER_AUTO}-routes`
+export const MODULE_RESOLVER_PATH = `vue-router/auto-resolver`
 
 // NOTE: not sure if needed. Used for HMR the virtual routes
 let time = Date.now()
@@ -27,7 +28,11 @@ export const VIRTUAL_PREFIX = '/__'
 // allows removing the route block from the code
 export const ROUTE_BLOCK_ID = `${VIRTUAL_PREFIX}/vue-router/auto/route-block`
 
-export const MODULES_ID_LIST = [MODULE_VUE_ROUTER_AUTO, MODULE_ROUTES_PATH]
+export const MODULES_ID_LIST = [
+  MODULE_VUE_ROUTER_AUTO,
+  MODULE_ROUTES_PATH,
+  MODULE_RESOLVER_PATH,
+]
 
 export function getVirtualId(id: string) {
   return id.startsWith(VIRTUAL_PREFIX) ? id.slice(VIRTUAL_PREFIX.length) : null
diff --git a/src/core/tree.ts b/src/core/tree.ts
index abc9335ea..2ea270d92 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -279,6 +279,46 @@ export class TreeNode {
     return params
   }
 
+  get regexp(): string {
+    let re = ''
+    let parent: TreeNode | undefined = this
+
+    while (parent) {
+      if (parent.value.isParam() && parent.value.re) {
+        re = parent.value.re + (re ? '\\/' : '') + re
+      } else {
+        re = parent.value.pathSegment + (re ? '\\/' : '') + re
+      }
+
+      parent = parent.parent
+    }
+
+    return '/^' + re + '$/i'
+  }
+
+  get matcherParams() {
+    const params: Record<string, { repeat?: boolean }> = {}
+    for (const param of this.params) {
+      params[param.paramName] = {
+        repeat: param.repeatable,
+        // TODO: parser
+      }
+    }
+    return params
+  }
+
+  get matcherParts(): Array<string | number> {
+    const parts: Array<string | number> = []
+    let node: TreeNode | undefined = this
+
+    while (node && !node.isRoot()) {
+      parts.unshift(node.value.isParam() ? 0 : node.value.pathSegment)
+      node = node.parent
+    }
+
+    return parts
+  }
+
   isMatchable(): this is TreeNode & { name: string } {
     // a node is matchable if it has at least one component
     // and the name is not false
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index e2aabecc2..8dd0fc07e 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -228,6 +228,22 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
     super(rawSegment, parent, pathSegment, subSegments)
     this.params = params
   }
+
+  get re(): string {
+    return this.subSegments
+      .filter(Boolean)
+      .map((segment) => {
+        if (typeof segment === 'string') {
+          // TODO: escape regexp from vue router source code
+          return segment.replaceAll('/', '\\/')
+        }
+        return (
+          (segment.repeatable ? '(.+)' : '([^/]+)') +
+          (segment.optional ? '?' : '')
+        )
+      })
+      .join('')
+  }
 }
 
 export type TreeNodeValue =
diff --git a/src/index.ts b/src/index.ts
index 623d5304b..a6015cf46 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -10,6 +10,7 @@ import {
   ROUTES_LAST_LOAD_TIME,
   VIRTUAL_PREFIX,
   DEFINE_PAGE_QUERY_RE,
+  MODULE_RESOLVER_PATH,
 } from './core/moduleConstants'
 import {
   Options,
@@ -66,6 +67,7 @@ export default createUnplugin<Options | undefined>((opt = {}, _meta) => {
             include: [
               new RegExp(`^${MODULE_VUE_ROUTER_AUTO}$`),
               new RegExp(`^${MODULE_ROUTES_PATH}$`),
+              new RegExp(`^${MODULE_RESOLVER_PATH}$`),
               routeBlockQueryRE,
             ],
           },
@@ -73,7 +75,11 @@ export default createUnplugin<Options | undefined>((opt = {}, _meta) => {
         handler(id) {
           // vue-router/auto
           // vue-router/auto-routes
-          if (id === MODULE_ROUTES_PATH || id === MODULE_VUE_ROUTER_AUTO) {
+          if (
+            id === MODULE_ROUTES_PATH ||
+            id === MODULE_VUE_ROUTER_AUTO ||
+            id === MODULE_RESOLVER_PATH
+          ) {
             // must be a virtual module
             return asVirtualId(id)
           }
@@ -113,6 +119,7 @@ export default createUnplugin<Options | undefined>((opt = {}, _meta) => {
               new RegExp(`^${ROUTE_BLOCK_ID}$`),
               new RegExp(`^${VIRTUAL_PREFIX}${MODULE_VUE_ROUTER_AUTO}$`),
               new RegExp(`^${VIRTUAL_PREFIX}${MODULE_ROUTES_PATH}$`),
+              new RegExp(`^${VIRTUAL_PREFIX}${MODULE_RESOLVER_PATH}$`),
             ],
           },
         },
@@ -136,6 +143,12 @@ export default createUnplugin<Options | undefined>((opt = {}, _meta) => {
             return ctx.generateRoutes()
           }
 
+          // vue-router/auto-resolver
+          if (resolvedId === MODULE_RESOLVER_PATH) {
+            ROUTES_LAST_LOAD_TIME.update()
+            return ctx.generateResolver()
+          }
+
           // vue-router/auto
           if (resolvedId === MODULE_VUE_ROUTER_AUTO) {
             return ctx.generateVueRouterProxy()

From 8a6cbb33f363ee8cc53be37a2b782fd1421a9f25 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 8 Aug 2025 17:52:08 +0200
Subject: [PATCH 06/81] chore: fix name in layout

---
 playground/src/pages/(some-layout).vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playground/src/pages/(some-layout).vue b/playground/src/pages/(some-layout).vue
index cf0fff14d..ba4dd01c9 100644
--- a/playground/src/pages/(some-layout).vue
+++ b/playground/src/pages/(some-layout).vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 definePage({
-  name: '',
+  name: false,
 })
 </script>
 

From 672b1602476e9ac22796e1d1b8dcfe86d9e5bf01 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 8 Aug 2025 23:33:06 +0200
Subject: [PATCH 07/81] feat: sorting of experimental resolver

---
 src/codegen/generateRouteResolver.spec.ts | 64 +++++++++++++++--------
 src/codegen/generateRouteResolver.ts      | 44 ++++++++++------
 src/core/tree.ts                          | 24 ++++++---
 src/core/treeNodeValue.ts                 | 37 +++++++++++++
 4 files changed, 125 insertions(+), 44 deletions(-)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 19c96ddf3..e4ec21aeb 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -10,13 +10,13 @@ import { ImportsMap } from '../core/utils'
 const DEFAULT_OPTIONS = resolveOptions({})
 let DEFAULT_STATE: Parameters<typeof generateRouteRecord>[0]['state'] = {
   id: 0,
-  recordVarNames: [],
+  matchableRecords: [],
 }
 
 beforeEach(() => {
   DEFAULT_STATE = {
     id: 0,
-    recordVarNames: [],
+    matchableRecords: [],
   }
 })
 
@@ -73,22 +73,6 @@ describe('generateRouteResolver', () => {
 
     expect(resolver).toMatchInlineSnapshot(`
       "
-      import {
-        createStaticResolver,
-        MatcherPatternPathStatic,
-        MatcherPatternPathCustomParams,
-        MatcherPatternPathStar,
-        normalizeRouteRecord,
-        // param matchers
-        PARAM_NUMBER,
-      } from 'vue-router/experimental'
-      import type {
-        EXPERIMENTAL_RouteRecordNormalized_Matchable,
-        MatcherPatternHash,
-        MatcherPatternQuery,
-        EmptyParams,
-      } from 'vue-router/experimental'
-
       const r_0 = normalizeRouteRecord({
         name: '/a',
         path: new MatcherPatternPathStatic('/a'),
@@ -130,10 +114,46 @@ describe('generateRouteResolver', () => {
       })
 
       export const resolver = createStaticResolver([
-        r_0,
-        r_2,
-        r_3,
-        r_5,
+        r_0, /* /a */
+        r_2, /* /b/c */
+        r_3, /* /b/c/d */
+        r_5, /* /b/e/f */
+      ])
+      "
+    `)
+  })
+
+  it('orders records based on specificity of paths', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    const importsMap = new ImportsMap()
+    tree.insert('a', 'a.vue')
+    tree.insert('b/a-b', 'b/c/d.vue')
+    tree.insert('b/a-[a]', 'b/c/d.vue')
+    tree.insert('b/a-[a]+', 'b/c/d.vue')
+    tree.insert('b/a-[[a]]', 'b/c/d.vue')
+    tree.insert('b/a-[[a]]+', 'b/c/d.vue')
+    tree.insert('b/[a]', 'b/c.vue')
+    tree.insert('b/[a]+', 'b/c/d.vue')
+    tree.insert('b/[[a]]', 'b/c/d.vue')
+    tree.insert('b/[[a]]+', 'b/c/d.vue')
+    tree.insert('[...all]', 'b/c/f.vue')
+    const resolver = generateRouteResolver(tree, DEFAULT_OPTIONS, importsMap)
+
+    expect(
+      resolver.replace(/^.*?createStaticResolver/s, '')
+    ).toMatchInlineSnapshot(`
+      "([
+        r_1,   // /a
+        r_11,  // /b/a-b
+        r_7,   // /b/a-:a
+        r_8,   // /b/a-:a?
+        r_10,  // /b/a-:a+
+        r_9,   // /b/a-:a*
+        r_3,   // /b/:a
+        r_4,   // /b/:a?
+        r_6,   // /b/:a+
+        r_5,   // /b/:a*
+        r_0,   // /:all(.*)
       ])
       "
     `)
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index d547ed9ff..e45694994 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -4,33 +4,44 @@ import { type ResolvedOptions } from '../options'
 import { ts } from '../utils'
 import { generatePageImport } from './generateRouteRecords'
 
+interface GenerateRouteResolverState {
+  id: number
+  matchableRecords: {
+    path: string
+    varName: string
+    score: number
+  }[]
+}
+
 export function generateRouteResolver(
   tree: PrefixTree,
   options: ResolvedOptions,
   importsMap: ImportsMap
 ): string {
-  const state = { id: 0, recordVarNames: [] as string[] }
+  const state: GenerateRouteResolverState = { id: 0, matchableRecords: [] }
   const records = tree
     .getChildrenSorted()
     .map((node) =>
       generateRouteRecord({ node, parentVar: null, state, options, importsMap })
     )
 
-  // TODO: add these imports to the import map instead
+  importsMap.add('vue-router/experimental', 'createStaticResolver')
+  importsMap.add('vue-router/experimental', 'MatcherPatternPathStatic')
+  importsMap.add('vue-router/experimental', 'MatcherPatternPathCustomParams')
+  importsMap.add('vue-router/experimental', 'MatcherPatternPathStar')
+  importsMap.add('vue-router/experimental', 'normalizeRouteRecord')
 
   return ts`
-import {
-  createStaticResolver,
-  MatcherPatternPathStatic,
-  MatcherPatternPathCustomParams,
-  MatcherPatternPathStar,
-  normalizeRouteRecord,
-} from 'vue-router/experimental'
-
 ${records.join('\n\n')}
 
 export const resolver = createStaticResolver([
-${state.recordVarNames.map((varName) => `  ${varName},`).join('\n')}
+${state.matchableRecords
+  .sort((a, b) => b.score - a.score)
+  .map(
+    ({ varName, path }) =>
+      `  ${varName},  ${' '.repeat(String(state.id).length - varName.length + 2)}// ${path}`
+  )
+  .join('\n')}
 ])
 `
 }
@@ -44,10 +55,7 @@ export function generateRouteRecord({
 }: {
   node: TreeNode
   parentVar: string | null | undefined
-  state: {
-    id: number
-    recordVarNames: string[]
-  }
+  state: GenerateRouteResolverState
   options: ResolvedOptions
   importsMap: ImportsMap
 }): string {
@@ -59,7 +67,11 @@ export function generateRouteRecord({
 
   // TODO: what about groups?
   if (node.isMatchable()) {
-    state.recordVarNames.push(varName)
+    state.matchableRecords.push({
+      path: node.fullPath,
+      varName,
+      score: node.score,
+    })
     recordName = `name: '${node.name}',`
     recordComponents = generateRouteRecordComponent(
       node,
diff --git a/src/core/tree.ts b/src/core/tree.ts
index 2ea270d92..3437a00ac 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -281,21 +281,33 @@ export class TreeNode {
 
   get regexp(): string {
     let re = ''
-    let parent: TreeNode | undefined = this
+    let node: TreeNode | undefined = this
 
-    while (parent) {
-      if (parent.value.isParam() && parent.value.re) {
-        re = parent.value.re + (re ? '\\/' : '') + re
+    while (node) {
+      if (node.value.isParam() && node.value.re) {
+        re = node.value.re + (re ? '\\/' : '') + re
       } else {
-        re = parent.value.pathSegment + (re ? '\\/' : '') + re
+        re = node.value.pathSegment + (re ? '\\/' : '') + re
       }
 
-      parent = parent.parent
+      node = node.parent
     }
 
     return '/^' + re + '$/i'
   }
 
+  get score(): number {
+    let score = 666
+    let node: TreeNode | undefined = this
+
+    while (node && !node.isRoot()) {
+      score = Math.min(score, node.value.score)
+      node = node.parent
+    }
+
+    return score
+  }
+
   get matcherParams() {
     const params: Record<string, { repeat?: boolean }> = {}
     for (const param of this.params) {
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index 8dd0fc07e..575f63069 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -179,9 +179,24 @@ class _TreeNodeValueBase {
   }
 }
 
+/**
+ * - Static
+ * - Static + Custom Param (subSegments)
+ * - Static + Param (subSegments)
+ * - Custom Param
+ * - Param
+ * - CatchAll
+ */
+
+/**
+ * Static path like `/users`, `/users/list`, etc
+ * @extends _TreeNodeValueBase
+ */
 export class TreeNodeValueStatic extends _TreeNodeValueBase {
   override _type: TreeNodeType.static = TreeNodeType.static
 
+  readonly score = 300
+
   constructor(
     rawSegment: string,
     parent: TreeNodeValue | undefined,
@@ -195,6 +210,8 @@ export class TreeNodeValueGroup extends _TreeNodeValueBase {
   override _type: TreeNodeType.group = TreeNodeType.group
   groupName: string
 
+  readonly score = 300
+
   constructor(
     rawSegment: string,
     parent: TreeNodeValue | undefined,
@@ -229,6 +246,26 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
     this.params = params
   }
 
+  get score(): number {
+    const malus = Math.max(
+      ...this.params.map((p) =>
+        p.isSplat ? 500 : (p.optional ? 10 : 0) + (p.repeatable ? 20 : 0)
+      )
+    )
+
+    console.log(this.subSegments)
+
+    return (
+      80 -
+      malus +
+      (this.params.length > 0 &&
+      this.subSegments.length > 1 &&
+      this.subSegments.some((s) => typeof s === 'string' && s.length > 0)
+        ? 35
+        : 0)
+    )
+  }
+
   get re(): string {
     return this.subSegments
       .filter(Boolean)

From 613fa6213b7266d9315bea9460e7a74e19f06994 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sun, 10 Aug 2025 17:20:00 +0200
Subject: [PATCH 08/81] feat: parse custom param

---
 src/codegen/generateRouteResolver.spec.ts |   8 +-
 src/core/extendRoutes.spec.ts             |  20 +++--
 src/core/tree.spec.ts                     | 101 +++++++++++++++++++++-
 src/core/treeNodeValue.ts                 |  27 +++++-
 4 files changed, 138 insertions(+), 18 deletions(-)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index e4ec21aeb..421003206 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -114,10 +114,10 @@ describe('generateRouteResolver', () => {
       })
 
       export const resolver = createStaticResolver([
-        r_0, /* /a */
-        r_2, /* /b/c */
-        r_3, /* /b/c/d */
-        r_5, /* /b/e/f */
+        r_0,  // /a
+        r_2,  // /b/c
+        r_3,  // /b/c/d
+        r_5,  // /b/e/f
       ])
       "
     `)
diff --git a/src/core/extendRoutes.spec.ts b/src/core/extendRoutes.spec.ts
index 608bcb8c4..3417efd1f 100644
--- a/src/core/extendRoutes.spec.ts
+++ b/src/core/extendRoutes.spec.ts
@@ -69,12 +69,13 @@ describe('EditableTreeNode', () => {
     const child = tree.children.get(':id')!
     expect(child.fullPath).toBe('/:id')
     expect(child.path).toBe('/:id')
-    expect(child.params).toEqual([
+    expect(child.params).toMatchObject([
       {
         paramName: 'id',
         modifier: '',
         optional: false,
         repeatable: false,
+        parser: null,
         isSplat: false,
       },
     ])
@@ -89,9 +90,10 @@ describe('EditableTreeNode', () => {
     const child = tree.children.get(':id+')!
     expect(child.fullPath).toBe('/:id+')
     expect(child.path).toBe('/:id+')
-    expect(child.params).toEqual([
+    expect(child.params).toMatchObject([
       {
         paramName: 'id',
+        parser: null,
         modifier: '+',
         optional: false,
         repeatable: true,
@@ -109,7 +111,7 @@ describe('EditableTreeNode', () => {
     const node = tree.children.get(':foo/:bar')!
     expect(node.fullPath).toBe('/:foo/:bar')
     expect(node.path).toBe('/:foo/:bar')
-    expect(node.params).toEqual([
+    expect(node.params).toMatchObject([
       {
         paramName: 'foo',
         modifier: '',
@@ -136,7 +138,7 @@ describe('EditableTreeNode', () => {
     const node = tree.children.get(':foo/:bar+_:o(\\d+)')!
     expect(node.fullPath).toBe('/:foo/:bar+_:o(\\d+)')
     expect(node.path).toBe('/:foo/:bar+_:o(\\d+)')
-    expect(node.params).toEqual([
+    expect(node.params).toMatchObject([
       {
         paramName: 'foo',
         modifier: '',
@@ -169,7 +171,7 @@ describe('EditableTreeNode', () => {
     const node = tree.children.get(':id(\\d+)')!
     expect(node.fullPath).toBe('/:id(\\d+)')
     expect(node.path).toBe('/:id(\\d+)')
-    expect(node.params).toEqual([
+    expect(node.params).toMatchObject([
       {
         paramName: 'id',
         modifier: '',
@@ -188,7 +190,7 @@ describe('EditableTreeNode', () => {
     const node = tree.children.get(':id()')!
     expect(node.fullPath).toBe('/:id()')
     expect(node.path).toBe('/:id()')
-    expect(node.params).toEqual([
+    expect(node.params).toMatchObject([
       {
         paramName: 'id',
         modifier: '',
@@ -207,7 +209,7 @@ describe('EditableTreeNode', () => {
     const node = tree.children.get(':id(\\d+)+')!
     expect(node.fullPath).toBe('/:id(\\d+)+')
     expect(node.path).toBe('/:id(\\d+)+')
-    expect(node.params).toEqual([
+    expect(node.params).toMatchObject([
       {
         paramName: 'id',
         modifier: '+',
@@ -226,7 +228,7 @@ describe('EditableTreeNode', () => {
     const node = tree.children.get(':id()+')!
     expect(node.fullPath).toBe('/:id()+')
     expect(node.path).toBe('/:id()+')
-    expect(node.params).toEqual([
+    expect(node.params).toMatchObject([
       {
         paramName: 'id',
         modifier: '+',
@@ -246,7 +248,7 @@ describe('EditableTreeNode', () => {
     const child = tree.children.get(':path(.*)')!
     expect(child.fullPath).toBe('/:path(.*)')
     expect(child.path).toBe('/:path(.*)')
-    expect(child.params).toEqual([
+    expect(child.params).toMatchObject([
       {
         paramName: 'path',
         modifier: '',
diff --git a/src/core/tree.spec.ts b/src/core/tree.spec.ts
index f3f696090..97c51e007 100644
--- a/src/core/tree.spec.ts
+++ b/src/core/tree.spec.ts
@@ -43,6 +43,103 @@ describe('Tree', () => {
     expect(child.children.size).toBe(0)
   })
 
+  it('parses a custom param type', () => {
+    const tree = new PrefixTree(RESOLVED_OPTIONS)
+    tree.insert('[id=int]', '[id=int].vue')
+    const child = tree.children.get('[id=int]')!
+    expect(child).toBeDefined()
+    expect(child.value).toMatchObject({
+      rawSegment: '[id=int]',
+      params: [
+        {
+          paramName: 'id',
+          parser: 'int',
+        },
+      ],
+      fullPath: '/:id',
+      _type: TreeNodeType.param,
+    })
+  })
+
+  it('parses a repeatable custom param type', () => {
+    const tree = new PrefixTree(RESOLVED_OPTIONS)
+    tree.insert('[id=int]+', '[id=int]+.vue')
+    const child = tree.children.get('[id=int]+')!
+    expect(child).toBeDefined()
+    expect(child.value).toMatchObject({
+      rawSegment: '[id=int]+',
+      params: [
+        {
+          paramName: 'id',
+          parser: 'int',
+          repeatable: true,
+          modifier: '+',
+        },
+      ],
+      fullPath: '/:id+',
+      _type: TreeNodeType.param,
+    })
+  })
+
+  it('parses an optional custom param type', () => {
+    const tree = new PrefixTree(RESOLVED_OPTIONS)
+    tree.insert('[[id=int]]', '[[id=int]].vue')
+    const child = tree.children.get('[[id=int]]')!
+    expect(child).toBeDefined()
+    expect(child.value).toMatchObject({
+      rawSegment: '[[id=int]]',
+      params: [
+        {
+          paramName: 'id',
+          parser: 'int',
+          optional: true,
+          modifier: '?',
+        },
+      ],
+      fullPath: '/:id?',
+      _type: TreeNodeType.param,
+    })
+  })
+
+  it('parses a repeatable optional custom param type', () => {
+    const tree = new PrefixTree(RESOLVED_OPTIONS)
+    tree.insert('[[id=int]]+', '[[id=int]]+.vue')
+    const child = tree.children.get('[[id=int]]+')!
+    expect(child).toBeDefined()
+    expect(child.value).toMatchObject({
+      rawSegment: '[[id=int]]+',
+      params: [
+        {
+          paramName: 'id',
+          parser: 'int',
+          repeatable: true,
+          optional: true,
+          modifier: '*',
+        },
+      ],
+      fullPath: '/:id*',
+      _type: TreeNodeType.param,
+    })
+  })
+
+  it('parses a custom param type with sub segments', () => {
+    const tree = new PrefixTree(RESOLVED_OPTIONS)
+    tree.insert('a-[id=int]-b', 'file.vue')
+    const child = tree.children.get('a-[id=int]-b')!
+    expect(child).toBeDefined()
+    expect(child.value).toMatchObject({
+      rawSegment: 'a-[id=int]-b',
+      params: [
+        {
+          paramName: 'id',
+          parser: 'int',
+        },
+      ],
+      fullPath: '/a-:id-b',
+      _type: TreeNodeType.param,
+    })
+  })
+
   it('separate param names from static segments', () => {
     const tree = new PrefixTree(RESOLVED_OPTIONS)
     tree.insert('[id]_a', '[id]_a.vue')
@@ -452,13 +549,13 @@ describe('Tree', () => {
       path: '/:a()/new-b',
     })
     expect(node.params).toHaveLength(1)
-    expect(node.params[0]).toEqual({
+    expect(node.params[0]).toMatchObject({
       paramName: 'a',
       isSplat: false,
       modifier: '',
       optional: false,
       repeatable: false,
-    } satisfies TreeRouteParam)
+    } satisfies Partial<TreeRouteParam>)
   })
 
   it('removes trailing slash from path but not from name', () => {
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index 575f63069..e2105e220 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -229,6 +229,7 @@ export interface TreeRouteParam {
   optional: boolean
   repeatable: boolean
   isSplat: boolean
+  parser: string | null
 }
 
 export class TreeNodeValueParam extends _TreeNodeValueBase {
@@ -253,8 +254,6 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
       )
     )
 
-    console.log(this.subSegments)
-
     return (
       80 -
       malus +
@@ -384,6 +383,7 @@ const enum ParseFileSegmentState {
   static,
   paramOptional, // within [[]] or []
   param, // within []
+  paramParser, // [param=type]
   modifier, // after the ]
 }
 
@@ -414,6 +414,7 @@ function parseFileSegment(
   { dotNesting = true }: ParseSegmentOptions = {}
 ): [string, TreeRouteParam[], SubSegment[]] {
   let buffer = ''
+  let paramParserBuffer = ''
   let state: ParseFileSegmentState = ParseFileSegmentState.static
   const params: TreeRouteParam[] = []
   let pathSegment = ''
@@ -432,6 +433,7 @@ function parseFileSegment(
       subSegments.push(buffer)
     } else if (state === ParseFileSegmentState.modifier) {
       currentTreeRouteParam.paramName = buffer
+      currentTreeRouteParam.parser = paramParserBuffer || null
       currentTreeRouteParam.modifier = currentTreeRouteParam.optional
         ? currentTreeRouteParam.repeatable
           ? '*'
@@ -439,7 +441,11 @@ function parseFileSegment(
         : currentTreeRouteParam.repeatable
           ? '+'
           : ''
+
+      // reset the buffers
       buffer = ''
+      paramParserBuffer = ''
+
       pathSegment += `:${currentTreeRouteParam.paramName}${
         currentTreeRouteParam.isSplat
           ? '(.*)'
@@ -491,6 +497,9 @@ function parseFileSegment(
       } else if (c === '.') {
         currentTreeRouteParam.isSplat = true
         pos += 2 // skip the other 2 dots
+      } else if (c === '=') {
+        state = ParseFileSegmentState.paramParser
+        paramParserBuffer = ''
       } else {
         buffer += c
       }
@@ -504,12 +513,23 @@ function parseFileSegment(
       consumeBuffer()
       // start again
       state = ParseFileSegmentState.static
+    } else if (state === ParseFileSegmentState.paramParser) {
+      if (c === ']') {
+        if (currentTreeRouteParam.optional) {
+          // skip the next ]
+          pos++
+        }
+        state = ParseFileSegmentState.modifier
+      } else {
+        paramParserBuffer += c
+      }
     }
   }
 
   if (
     state === ParseFileSegmentState.param ||
-    state === ParseFileSegmentState.paramOptional
+    state === ParseFileSegmentState.paramOptional ||
+    state === ParseFileSegmentState.paramParser
   ) {
     throw new Error(`Invalid segment: "${segment}"`)
   }
@@ -674,6 +694,7 @@ function parseRawPathSegment(
 function createEmptyRouteParam(): TreeRouteParam {
   return {
     paramName: '',
+    parser: null,
     modifier: '',
     optional: false,
     repeatable: false,

From 3cbe471d19cb57b357bc7a3fd4dcf828fe029a06 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sun, 10 Aug 2025 17:20:13 +0200
Subject: [PATCH 09/81] chore: custom param in playground

---
 .../src/pages/users/{[userId].vue => [userId=int].vue}      | 0
 playground-experimental/typed-router.d.ts                   | 6 +++---
 playground-experimental/vite.config.ts                      | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename playground-experimental/src/pages/users/{[userId].vue => [userId=int].vue} (100%)

diff --git a/playground-experimental/src/pages/users/[userId].vue b/playground-experimental/src/pages/users/[userId=int].vue
similarity index 100%
rename from playground-experimental/src/pages/users/[userId].vue
rename to playground-experimental/src/pages/users/[userId=int].vue
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
index 7d3994fa7..09d3ac953 100644
--- a/playground-experimental/typed-router.d.ts
+++ b/playground-experimental/typed-router.d.ts
@@ -21,7 +21,7 @@ declare module 'vue-router/auto-routes' {
     '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
     '/[name]': RouteRecordInfo<'/[name]', '/:name', { name: ParamValue<true> }, { name: ParamValue<false> }>,
     '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: ParamValue<true>, d: ParamValue<true> }, { b: ParamValue<false>, d: ParamValue<false> }>,
-    '/users/[userId]': RouteRecordInfo<'/users/[userId]', '/users/:userId', { userId: ParamValue<true> }, { userId: ParamValue<false> }>,
+    '/users/[userId=int]': RouteRecordInfo<'/users/[userId=int]', '/users/:userId', { userId: ParamValue<true> }, { userId: ParamValue<false> }>,
     '/users/sub-[first]-[second]': RouteRecordInfo<'/users/sub-[first]-[second]', '/users/sub-:first-:second', { first: ParamValue<true>, second: ParamValue<true> }, { first: ParamValue<false>, second: ParamValue<false> }>,
   }
 
@@ -48,8 +48,8 @@ declare module 'vue-router/auto-routes' {
       routes: '/a.[b].c.[d]'
       views: never
     }
-    'src/pages/users/[userId].vue': {
-      routes: '/users/[userId]'
+    'src/pages/users/[userId=int].vue': {
+      routes: '/users/[userId=int]'
       views: never
     }
     'src/pages/users/sub-[first]-[second].vue': {
diff --git a/playground-experimental/vite.config.ts b/playground-experimental/vite.config.ts
index 3c6cd7af5..ffbb999f9 100644
--- a/playground-experimental/vite.config.ts
+++ b/playground-experimental/vite.config.ts
@@ -58,10 +58,6 @@ export default defineConfig({
         //   route.delete()
         // }
 
-        if (route.name === '/a.[b].c.[d]') {
-          console.log(route.node)
-        }
-
         if (route.name === '/[name]') {
           // TODO: implement aliases
           // route.addAlias('/hello-vite-:name')

From 2ab8dad1d14f7bc4109ef6a94ba6a755d9b0bb46 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 11 Aug 2025 11:15:21 +0200
Subject: [PATCH 10/81] feat: types + runtime of param parsers on path

---
 playground-experimental/tsconfig.json     | 14 +++--
 playground-experimental/typed-router.d.ts |  8 +--
 src/codegen/generateParamParsers.ts       | 74 +++++++++++++++++++++++
 src/codegen/generateRouteMap.ts           | 44 +++++++++++---
 src/codegen/generateRouteParams.ts        | 29 +++++++++
 src/codegen/generateRouteResolver.ts      | 13 +++-
 src/core/context.ts                       |  2 +-
 7 files changed, 164 insertions(+), 20 deletions(-)
 create mode 100644 src/codegen/generateParamParsers.ts

diff --git a/playground-experimental/tsconfig.json b/playground-experimental/tsconfig.json
index 5fe7d55ab..7106ea827 100644
--- a/playground-experimental/tsconfig.json
+++ b/playground-experimental/tsconfig.json
@@ -9,13 +9,19 @@
     "../src"
   ],
   "compilerOptions": {
-    // "baseUrl": ".",
+    "baseUrl": ".",
     "composite": true,
     "moduleResolution": "Bundler",
     "paths": {
-      "@/*": ["./src/*"],
-      "unplugin-vue-router/runtime": ["../src/runtime.ts"],
-      "unplugin-vue-router/types": ["../src/types.ts"],
+      "@/*": [
+        "./src/*"
+      ],
+      "unplugin-vue-router/runtime": [
+        "../src/runtime.ts"
+      ],
+      "unplugin-vue-router/types": [
+        "../src/types.ts"
+      ],
       "unplugin-vue-router/data-loaders": [
         "../src/data-loaders/entries/index.ts"
       ],
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
index 09d3ac953..521ad4c9d 100644
--- a/playground-experimental/typed-router.d.ts
+++ b/playground-experimental/typed-router.d.ts
@@ -19,10 +19,10 @@ declare module 'vue-router/auto-routes' {
    */
   export interface RouteNamedMap {
     '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
-    '/[name]': RouteRecordInfo<'/[name]', '/:name', { name: ParamValue<true> }, { name: ParamValue<false> }>,
-    '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: ParamValue<true>, d: ParamValue<true> }, { b: ParamValue<false>, d: ParamValue<false> }>,
-    '/users/[userId=int]': RouteRecordInfo<'/users/[userId=int]', '/users/:userId', { userId: ParamValue<true> }, { userId: ParamValue<false> }>,
-    '/users/sub-[first]-[second]': RouteRecordInfo<'/users/sub-[first]-[second]', '/users/sub-:first-:second', { first: ParamValue<true>, second: ParamValue<true> }, { first: ParamValue<false>, second: ParamValue<false> }>,
+    '/[name]': RouteRecordInfo<'/[name]', '/:name', { name: ParamValue<false> }, { name: ParamValue<false> }>,
+    '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: ParamValue<false>, d: ParamValue<false> }, { b: ParamValue<false>, d: ParamValue<false> }>,
+    '/users/[userId=int]': RouteRecordInfo<'/users/[userId=int]', '/users/:userId', { userId: number }, { userId: number }>,
+    '/users/sub-[first]-[second]': RouteRecordInfo<'/users/sub-[first]-[second]', '/users/sub-:first-:second', { first: ParamValue<false>, second: ParamValue<false> }, { first: ParamValue<false>, second: ParamValue<false> }>,
   }
 
   /**
diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
new file mode 100644
index 000000000..a5d1b0499
--- /dev/null
+++ b/src/codegen/generateParamParsers.ts
@@ -0,0 +1,74 @@
+import { camelCase } from 'scule'
+import { TreeRouteParam } from '../core/treeNodeValue'
+import { ImportsMap } from '../core/utils'
+
+/**
+ * Represents the type information for a parameter parser.
+ * It includes the type declaration string and the type name.
+ */
+export type ParamParserTypeInfo = [typeDeclaration: string, type: string]
+
+/**
+ * Generates the import statement for a parameter parser type.
+ *
+ * @param paramParserPath - The path to the parameter parser file.
+ */
+export function generateParamParserTypeImport(
+  param: TreeRouteParam
+): ParamParserTypeInfo | null {
+  if (!param.parser) {
+    return null
+  }
+  // TODO: actualpath
+  // const nameWithExtension = basename(param.paramName)
+  const name = camelCase(param.parser)
+
+  // TODO: treat custom parsers first
+
+  // native parsers
+  if (name === 'int') {
+    return [``, 'number']
+  }
+
+  return [
+    `type Param_${name} ReturnType<typeof import('./src/params/${param.paramName}').get>`,
+    `Param_${name}`,
+  ]
+}
+
+export function generateParamsTypeDeclarations(
+  params: TreeRouteParam[]
+): Array<ParamParserTypeInfo | null> {
+  return params.map((param) => generateParamParserTypeImport(param))
+}
+
+// TODO: generate the whole list of type declarations
+
+function generateParamParser(
+  param: TreeRouteParam,
+  importsMap: ImportsMap
+): string {
+  // TODO: lookup into src/params based on options
+  // otherwise try native parsers
+  if (param.parser === 'int') {
+    importsMap.add('vue-router/experimental', `PARAM_PARSER_INT`)
+    return ` ...PARAM_PARSER_INT, `
+  }
+  return ''
+}
+
+export function generateParamOptions(
+  params: TreeRouteParam[],
+  importsMap: ImportsMap
+) {
+  const paramOptions = params.map((param) => {
+    const repeatable = param.repeatable ? `repeat: true, ` : ''
+    return `
+      ${param.paramName}: {${generateParamParser(param, importsMap)}${repeatable}},
+`
+  })
+
+  return `{
+${paramOptions.join('\n')}
+    }`
+}
diff --git a/src/codegen/generateRouteMap.ts b/src/codegen/generateRouteMap.ts
index 0454f9908..360bfb346 100644
--- a/src/codegen/generateRouteMap.ts
+++ b/src/codegen/generateRouteMap.ts
@@ -1,30 +1,58 @@
 import type { TreeNode } from '../core/tree'
-import { generateRouteParams } from './generateRouteParams'
+import { ResolvedOptions } from '../options'
+import {
+  generateParamsTypeDeclarations,
+  ParamParserTypeInfo,
+} from './generateParamParsers'
+import {
+  EXPERIMENTAL_generateRouteParams,
+  generateRouteParams,
+} from './generateRouteParams'
 
-export function generateRouteNamedMap(node: TreeNode): string {
+export function generateRouteNamedMap(
+  node: TreeNode,
+  options: ResolvedOptions
+): string {
   if (node.isRoot()) {
     return `export interface RouteNamedMap {
-${node.getChildrenSorted().map(generateRouteNamedMap).join('')}}`
+${node
+  .getChildrenSorted()
+  .map((n) => generateRouteNamedMap(n, options))
+  .join('')}}`
   }
 
   return (
     // if the node has a filePath, it's a component, it has a routeName and it should be referenced in the RouteNamedMap
     // otherwise it should be skipped to avoid navigating to a route that doesn't render anything
     (node.value.components.size > 0 && node.name
-      ? `  '${node.name}': ${generateRouteRecordInfo(node)},\n`
+      ? `  '${node.name}': ${generateRouteRecordInfo(node, options)},\n`
       : '') +
     (node.children.size > 0
-      ? node.getChildrenSorted().map(generateRouteNamedMap).join('\n')
+      ? node
+          .getChildrenSorted()
+          .map((n) => generateRouteNamedMap(n, options))
+          .join('\n')
       : '')
   )
 }
 
-export function generateRouteRecordInfo(node: TreeNode) {
+export function generateRouteRecordInfo(
+  node: TreeNode,
+  options: ResolvedOptions
+): string {
+  const params = node.params
+  let paramParsers: Array<ParamParserTypeInfo | null> = []
+  let paramType: string = ''
+  if (options.experimental.paramMatchers) {
+    paramParsers = generateParamsTypeDeclarations(params)
+    console.log(paramParsers)
+    paramType = EXPERIMENTAL_generateRouteParams(node, paramParsers)
+  }
   const typeParams = [
     `'${node.name}'`,
     `'${node.fullPath}'`,
-    generateRouteParams(node, true),
-    generateRouteParams(node, false),
+    paramType || generateRouteParams(node, true),
+    paramType || generateRouteParams(node, false),
   ]
 
   if (node.children.size > 0) {
diff --git a/src/codegen/generateRouteParams.ts b/src/codegen/generateRouteParams.ts
index 28e94e64d..b11084816 100644
--- a/src/codegen/generateRouteParams.ts
+++ b/src/codegen/generateRouteParams.ts
@@ -1,4 +1,5 @@
 import { TreeNode } from '../core/tree'
+import { ParamParserTypeInfo } from './generateParamParsers'
 
 export function generateRouteParams(node: TreeNode, isRaw: boolean): string {
   // node.params is a getter so we compute it once
@@ -21,6 +22,34 @@ export function generateRouteParams(node: TreeNode, isRaw: boolean): string {
       'Record<never, never>'
 }
 
+export function EXPERIMENTAL_generateRouteParams(
+  node: TreeNode,
+  types: Array<ParamParserTypeInfo | null>
+) {
+  // node.params is a getter so we compute it once
+  const nodeParams = node.params
+  return nodeParams.length > 0
+    ? `{ ${nodeParams
+        .map((param, i) => {
+          const type = types[i]
+          const isRaw = false
+          return `${param.paramName}${param.optional ? '?' : ''}: ${
+            type
+              ? type[1] || '/* INVALID */ unknown'
+              : param.modifier === '+'
+                ? `ParamValueOneOrMore<${isRaw}>`
+                : param.modifier === '*'
+                  ? `ParamValueZeroOrMore<${isRaw}>`
+                  : param.modifier === '?'
+                    ? `ParamValueZeroOrOne<${isRaw}>`
+                    : `ParamValue<${isRaw}>`
+          }`
+        })
+        .join(', ')} }`
+    : // no params allowed
+      'Record<never, never>'
+}
+
 // TODO: refactor to ParamValueRaw and ParamValue ?
 
 /**
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index e45694994..99671dfe6 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -2,6 +2,7 @@ import { PrefixTree, type TreeNode } from '../core/tree'
 import { ImportsMap } from '../core/utils'
 import { type ResolvedOptions } from '../options'
 import { ts } from '../utils'
+import { generateParamOptions } from './generateParamParsers'
 import { generatePageImport } from './generateRouteRecords'
 
 interface GenerateRouteResolverState {
@@ -87,7 +88,7 @@ export function generateRouteRecord({
   const recordDeclaration = `
 const ${varName} = normalizeRouteRecord({
   ${recordName}
-  ${generateRouteRecordPathMatcher({ node })}
+  ${generateRouteRecordPathMatcher({ node, importsMap })}
   ${recordComponents}
   ${parentVar ? `parent: ${parentVar},` : ''}
 })
@@ -132,7 +133,13 @@ ${files
 ${indentStr}},`
 }
 
-export function generateRouteRecordPathMatcher({ node }: { node: TreeNode }) {
+export function generateRouteRecordPathMatcher({
+  node,
+  importsMap,
+}: {
+  node: TreeNode
+  importsMap: ImportsMap
+}) {
   if (!node.isMatchable()) {
     return ''
     // TODO: do we really need isGroup?
@@ -141,7 +148,7 @@ export function generateRouteRecordPathMatcher({ node }: { node: TreeNode }) {
   } else if (node.value.isParam()) {
     return `path: new MatcherPatternPathCustomParams(
     ${node.regexp},
-    ${JSON.stringify(node.matcherParams)},
+    ${generateParamOptions(node.params, importsMap)},
     ${JSON.stringify(node.matcherParts)},
   ),`
   }
diff --git a/src/core/context.ts b/src/core/context.ts
index 555c2fbec..b175e343f 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -261,7 +261,7 @@ if (import.meta.hot) {
     return _generateDTS({
       vueRouterModule: MODULE_VUE_ROUTER_AUTO,
       routesModule: MODULE_ROUTES_PATH,
-      routeNamedMap: generateRouteNamedMap(routeTree),
+      routeNamedMap: generateRouteNamedMap(routeTree, options),
       routeFileInfoMap: generateRouteFileInfoMap(routeTree, {
         root,
       }),

From 6c65c9e7e18ed7006ab47f7f54c4291b568b6b96 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 11 Aug 2025 11:40:09 +0200
Subject: [PATCH 11/81] refactor: simplify options by placing them in tree

---
 .../src/pages/users/[userId=int].vue          | 11 +++++++++-
 src/codegen/generateRouteMap.ts               | 21 +++++++------------
 src/core/context.ts                           |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/playground-experimental/src/pages/users/[userId=int].vue b/playground-experimental/src/pages/users/[userId=int].vue
index 29b5f2e77..37940c487 100644
--- a/playground-experimental/src/pages/users/[userId=int].vue
+++ b/playground-experimental/src/pages/users/[userId=int].vue
@@ -1,4 +1,13 @@
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+const route = useRoute()
+route.params.userId
+
+definePage({
+  meta: {
+    // te: 3, 2
+  },
+})
+</script>
 
 <template>
   <h1>{{ String($route.name) }} - {{ $route.path }}</h1>
diff --git a/src/codegen/generateRouteMap.ts b/src/codegen/generateRouteMap.ts
index 360bfb346..df5f01cf4 100644
--- a/src/codegen/generateRouteMap.ts
+++ b/src/codegen/generateRouteMap.ts
@@ -1,5 +1,4 @@
 import type { TreeNode } from '../core/tree'
-import { ResolvedOptions } from '../options'
 import {
   generateParamsTypeDeclarations,
   ParamParserTypeInfo,
@@ -9,15 +8,12 @@ import {
   generateRouteParams,
 } from './generateRouteParams'
 
-export function generateRouteNamedMap(
-  node: TreeNode,
-  options: ResolvedOptions
-): string {
+export function generateRouteNamedMap(node: TreeNode): string {
   if (node.isRoot()) {
     return `export interface RouteNamedMap {
 ${node
   .getChildrenSorted()
-  .map((n) => generateRouteNamedMap(n, options))
+  .map((n) => generateRouteNamedMap(n))
   .join('')}}`
   }
 
@@ -25,27 +21,24 @@ ${node
     // if the node has a filePath, it's a component, it has a routeName and it should be referenced in the RouteNamedMap
     // otherwise it should be skipped to avoid navigating to a route that doesn't render anything
     (node.value.components.size > 0 && node.name
-      ? `  '${node.name}': ${generateRouteRecordInfo(node, options)},\n`
+      ? `  '${node.name}': ${generateRouteRecordInfo(node)},\n`
       : '') +
     (node.children.size > 0
       ? node
           .getChildrenSorted()
-          .map((n) => generateRouteNamedMap(n, options))
+          .map((n) => generateRouteNamedMap(n))
           .join('\n')
       : '')
   )
 }
 
-export function generateRouteRecordInfo(
-  node: TreeNode,
-  options: ResolvedOptions
-): string {
+export function generateRouteRecordInfo(node: TreeNode): string {
   const params = node.params
   let paramParsers: Array<ParamParserTypeInfo | null> = []
   let paramType: string = ''
-  if (options.experimental.paramMatchers) {
+
+  if (node.options.experimental.paramMatchers) {
     paramParsers = generateParamsTypeDeclarations(params)
-    console.log(paramParsers)
     paramType = EXPERIMENTAL_generateRouteParams(node, paramParsers)
   }
   const typeParams = [
diff --git a/src/core/context.ts b/src/core/context.ts
index b175e343f..555c2fbec 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -261,7 +261,7 @@ if (import.meta.hot) {
     return _generateDTS({
       vueRouterModule: MODULE_VUE_ROUTER_AUTO,
       routesModule: MODULE_ROUTES_PATH,
-      routeNamedMap: generateRouteNamedMap(routeTree, options),
+      routeNamedMap: generateRouteNamedMap(routeTree),
       routeFileInfoMap: generateRouteFileInfoMap(routeTree, {
         root,
       }),

From 914908b20f16aaae165748f37effdcf3f02c4623 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 13 Aug 2025 17:23:40 +0200
Subject: [PATCH 12/81] feat: support custom params folder

---
 playground-experimental/src/App.vue           |  10 ++
 .../src/pages/events/[when=date].vue          |   8 ++
 .../src/pages/users/[userId=int].vue          |   6 +
 playground-experimental/src/params/date.ts    |  21 ++++
 playground-experimental/typed-router.d.ts     |   7 ++
 src/codegen/generateDTS.ts                    |   4 +-
 src/codegen/generateParamParsers.ts           | 112 ++++++++++++++----
 src/codegen/generateRouteMap.ts               |  30 +++--
 src/codegen/generateRouteParams.ts            |   5 +-
 src/codegen/generateRouteResolver.spec.ts     |  23 +++-
 src/codegen/generateRouteResolver.ts          |  23 +++-
 src/core/context.ts                           | 105 ++++++++++++++--
 src/index.ts                                  |   4 +-
 src/options.ts                                |  44 ++++---
 src/runtime.ts                                |  40 +++++++
 src/utils/index.ts                            |  11 ++
 16 files changed, 373 insertions(+), 80 deletions(-)
 create mode 100644 playground-experimental/src/pages/events/[when=date].vue
 create mode 100644 playground-experimental/src/params/date.ts

diff --git a/playground-experimental/src/App.vue b/playground-experimental/src/App.vue
index 6ec2bac35..67048a788 100644
--- a/playground-experimental/src/App.vue
+++ b/playground-experimental/src/App.vue
@@ -57,6 +57,16 @@ if (Math.random() > 2) {
           <li>
             <RouterLink to="/">Home</RouterLink>
           </li>
+          <li>
+            <RouterLink to="/users/24" #default="{ href }">{{
+              href
+            }}</RouterLink>
+          </li>
+          <li>
+            <RouterLink to="/events/1992-03-24" #default="{ href }">{{
+              href
+            }}</RouterLink>
+          </li>
         </ul>
       </nav>
     </div>
diff --git a/playground-experimental/src/pages/events/[when=date].vue b/playground-experimental/src/pages/events/[when=date].vue
new file mode 100644
index 000000000..b3f7a9a8a
--- /dev/null
+++ b/playground-experimental/src/pages/events/[when=date].vue
@@ -0,0 +1,8 @@
+<script lang="ts" setup>
+const route = useRoute()
+</script>
+
+<template>
+  <h1>Date</h1>
+  <pre>{{ typeof route.params.when }} - {{ route.params.when }}</pre>
+</template>
diff --git a/playground-experimental/src/pages/users/[userId=int].vue b/playground-experimental/src/pages/users/[userId=int].vue
index 37940c487..7f3172413 100644
--- a/playground-experimental/src/pages/users/[userId=int].vue
+++ b/playground-experimental/src/pages/users/[userId=int].vue
@@ -3,6 +3,12 @@ const route = useRoute()
 route.params.userId
 
 definePage({
+  query: {
+    page: {
+      type: 'int',
+      optional: true,
+    },
+  },
   meta: {
     // te: 3, 2
   },
diff --git a/playground-experimental/src/params/date.ts b/playground-experimental/src/params/date.ts
new file mode 100644
index 000000000..5be1cec51
--- /dev/null
+++ b/playground-experimental/src/params/date.ts
@@ -0,0 +1,21 @@
+import { type ParamParser } from 'vue-router/experimental'
+
+// NOTE: should be imported from vue-router
+const invalid = (...args: ConstructorParameters<typeof Error>) =>
+  new Error(...args)
+
+export const parser: ParamParser<Date, string> = {
+  get: (value: string): Date => {
+    const asDate = new Date(value)
+    if (Number.isNaN(asDate.getTime())) {
+      throw invalid(`Invalid date: "${value}"`)
+    }
+
+    return asDate
+  },
+  set: (value: Date): string =>
+    value
+      .toISOString()
+      // allows keeping simple dates like 2023-10-01 without time
+      .replace('T00:00:00.000Z', ''),
+}
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
index 521ad4c9d..127b745ee 100644
--- a/playground-experimental/typed-router.d.ts
+++ b/playground-experimental/typed-router.d.ts
@@ -5,6 +5,8 @@
 // It's recommended to commit this file.
 // Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.
 
+type Param_date = ReturnType<NonNullable<typeof import('./src/params/date.ts').parser['get']>>
+
 declare module 'vue-router/auto-routes' {
   import type {
     RouteRecordInfo,
@@ -21,6 +23,7 @@ declare module 'vue-router/auto-routes' {
     '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
     '/[name]': RouteRecordInfo<'/[name]', '/:name', { name: ParamValue<false> }, { name: ParamValue<false> }>,
     '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: ParamValue<false>, d: ParamValue<false> }, { b: ParamValue<false>, d: ParamValue<false> }>,
+    '/events/[when=date]': RouteRecordInfo<'/events/[when=date]', '/events/:when', { when: Param_date }, { when: Param_date }>,
     '/users/[userId=int]': RouteRecordInfo<'/users/[userId=int]', '/users/:userId', { userId: number }, { userId: number }>,
     '/users/sub-[first]-[second]': RouteRecordInfo<'/users/sub-[first]-[second]', '/users/sub-:first-:second', { first: ParamValue<false>, second: ParamValue<false> }, { first: ParamValue<false>, second: ParamValue<false> }>,
   }
@@ -48,6 +51,10 @@ declare module 'vue-router/auto-routes' {
       routes: '/a.[b].c.[d]'
       views: never
     }
+    'src/pages/events/[when=date].vue': {
+      routes: '/events/[when=date]'
+      views: never
+    }
     'src/pages/users/[userId=int].vue': {
       routes: '/users/[userId=int]'
       views: never
diff --git a/src/codegen/generateDTS.ts b/src/codegen/generateDTS.ts
index 09a6e2b8c..95ad5bd02 100644
--- a/src/codegen/generateDTS.ts
+++ b/src/codegen/generateDTS.ts
@@ -19,11 +19,12 @@ export function generateDTS({
   routesModule,
   routeNamedMap,
   routeFileInfoMap,
+  paramsTypesDeclaration,
 }: {
-  vueRouterModule: string
   routesModule: string
   routeNamedMap: string
   routeFileInfoMap: string
+  paramsTypesDeclaration: string
 }) {
   return ts`
 /* eslint-disable */
@@ -33,6 +34,7 @@ export function generateDTS({
 // It's recommended to commit this file.
 // Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.
 
+${paramsTypesDeclaration ? paramsTypesDeclaration + '\n' : ''}
 declare module '${routesModule}' {
   import type {
     RouteRecordInfo,
diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
index a5d1b0499..07c98d158 100644
--- a/src/codegen/generateParamParsers.ts
+++ b/src/codegen/generateParamParsers.ts
@@ -1,21 +1,44 @@
 import { camelCase } from 'scule'
 import { TreeRouteParam } from '../core/treeNodeValue'
 import { ImportsMap } from '../core/utils'
+import { ts } from '../utils'
+import { PrefixTree } from '../core/tree'
+import { ResolvedOptions } from '../options'
 
-/**
- * Represents the type information for a parameter parser.
- * It includes the type declaration string and the type name.
- */
-export type ParamParserTypeInfo = [typeDeclaration: string, type: string]
+export type ParamParsersMap = Map<
+  string,
+  {
+    name: string
+    typeName: `Param_${string}`
+    relativePath: string
+    absolutePath: string
+  }
+>
+
+export async function warnMissingParamParsers(
+  tree: PrefixTree,
+  options: ResolvedOptions,
+  paramParsers: ParamParsersMap
+) {
+  for (const node of tree.getChildrenDeepSorted()) {
+    for (const param of node.params) {
+      if (param.parser && !paramParsers.has(param.parser)) {
+        if (param.parser !== 'int') {
+          console.warn(
+            `Parameter parser "${param.parser}" not found for route "${node.fullPath}".`
+          )
+        }
+      }
+    }
+  }
+}
 
 /**
  * Generates the import statement for a parameter parser type.
  *
  * @param paramParserPath - The path to the parameter parser file.
  */
-export function generateParamParserTypeImport(
-  param: TreeRouteParam
-): ParamParserTypeInfo | null {
+export function generateParamParserType(param: TreeRouteParam): string | null {
   if (!param.parser) {
     return null
   }
@@ -27,44 +50,68 @@ export function generateParamParserTypeImport(
 
   // native parsers
   if (name === 'int') {
-    return [``, 'number']
+    return 'number'
   }
 
-  return [
-    `type Param_${name} ReturnType<typeof import('./src/params/${param.paramName}').get>`,
-    `Param_${name}`,
-  ]
+  return `Param_${name}`
 }
 
-export function generateParamsTypeDeclarations(
-  params: TreeRouteParam[]
-): Array<ParamParserTypeInfo | null> {
-  return params.map((param) => generateParamParserTypeImport(param))
+export function generateParamParsersTypesDeclarations(
+  paramParsers: ParamParsersMap
+) {
+  return Array.from(paramParsers.values())
+    .map(
+      ({ typeName, relativePath }) =>
+        `type ${typeName} = ReturnType<NonNullable<typeof import('./${relativePath}').parser['get']>>`
+    )
+    .join('\n')
 }
 
-// TODO: generate the whole list of type declarations
+export function generateParamsTypes(
+  params: TreeRouteParam[],
+  parparsersMap: ParamParsersMap
+): Array<string | null> {
+  return params.map((param) => {
+    if (param.parser) {
+      if (parparsersMap.has(param.parser)) {
+        return parparsersMap.get(param.parser)!.typeName
+      } else if (param.parser === 'int') {
+        return 'number'
+      }
+    }
+    return null
+  })
+}
 
-function generateParamParser(
+function generateParamParserOptions(
   param: TreeRouteParam,
-  importsMap: ImportsMap
+  importsMap: ImportsMap,
+  paramParsers: ParamParsersMap
 ): string {
-  // TODO: lookup into src/params based on options
-  // otherwise try native parsers
-  if (param.parser === 'int') {
+  // we prioritize custom parsers to let users override them
+  if (param.parser && paramParsers.has(param.parser)) {
+    const { name, absolutePath } = paramParsers.get(param.parser)!
+    importsMap.add(absolutePath, { name: 'parser', as: name })
+    return ` ...${name}, `
+  } else if (param.parser === 'int') {
     importsMap.add('vue-router/experimental', `PARAM_PARSER_INT`)
     return ` ...PARAM_PARSER_INT, `
   }
   return ''
 }
 
-export function generateParamOptions(
+export function generateParamsOptions(
   params: TreeRouteParam[],
-  importsMap: ImportsMap
+  importsMap: ImportsMap,
+  paramParsers: ParamParsersMap
 ) {
+  if (!paramParsers) {
+    throw new Error('what')
+  }
   const paramOptions = params.map((param) => {
     const repeatable = param.repeatable ? `repeat: true, ` : ''
     return `
-      ${param.paramName}: {${generateParamParser(param, importsMap)}${repeatable}},
+      ${param.paramName}: {${generateParamParserOptions(param, importsMap, paramParsers)}${repeatable}},
 `
   })
 
@@ -72,3 +119,16 @@ export function generateParamOptions(
 ${paramOptions.join('\n')}
     }`
 }
+
+export function generateParamParserListTypes(parserNames: string[]) {
+  return parserNames.length
+    ? ts`
+declare module 'vue-router' {
+  export interface TypesConfig {
+    ParamParsers:
+${parserNames.map((name) => `      | '${name}'`).join('\n')}
+  }
+}
+`.trimStart()
+    : ''
+}
diff --git a/src/codegen/generateRouteMap.ts b/src/codegen/generateRouteMap.ts
index df5f01cf4..ce732f0ab 100644
--- a/src/codegen/generateRouteMap.ts
+++ b/src/codegen/generateRouteMap.ts
@@ -1,19 +1,21 @@
 import type { TreeNode } from '../core/tree'
-import {
-  generateParamsTypeDeclarations,
-  ParamParserTypeInfo,
-} from './generateParamParsers'
+import type { ResolvedOptions } from '../options'
+import { generateParamsTypes, ParamParsersMap } from './generateParamParsers'
 import {
   EXPERIMENTAL_generateRouteParams,
   generateRouteParams,
 } from './generateRouteParams'
 
-export function generateRouteNamedMap(node: TreeNode): string {
+export function generateRouteNamedMap(
+  node: TreeNode,
+  options: ResolvedOptions,
+  paramParsersMap: ParamParsersMap
+): string {
   if (node.isRoot()) {
     return `export interface RouteNamedMap {
 ${node
   .getChildrenSorted()
-  .map((n) => generateRouteNamedMap(n))
+  .map((n) => generateRouteNamedMap(n, options, paramParsersMap))
   .join('')}}`
   }
 
@@ -21,24 +23,28 @@ ${node
     // if the node has a filePath, it's a component, it has a routeName and it should be referenced in the RouteNamedMap
     // otherwise it should be skipped to avoid navigating to a route that doesn't render anything
     (node.value.components.size > 0 && node.name
-      ? `  '${node.name}': ${generateRouteRecordInfo(node)},\n`
+      ? `  '${node.name}': ${generateRouteRecordInfo(node, options, paramParsersMap)},\n`
       : '') +
     (node.children.size > 0
       ? node
           .getChildrenSorted()
-          .map((n) => generateRouteNamedMap(n))
+          .map((n) => generateRouteNamedMap(n, options, paramParsersMap))
           .join('\n')
       : '')
   )
 }
 
-export function generateRouteRecordInfo(node: TreeNode): string {
+export function generateRouteRecordInfo(
+  node: TreeNode,
+  options: ResolvedOptions,
+  paramParsersMap: ParamParsersMap
+): string {
   const params = node.params
-  let paramParsers: Array<ParamParserTypeInfo | null> = []
+  let paramParsers: Array<string | null> = []
   let paramType: string = ''
 
-  if (node.options.experimental.paramMatchers) {
-    paramParsers = generateParamsTypeDeclarations(params)
+  if (options.experimental.paramMatchers) {
+    paramParsers = generateParamsTypes(params, paramParsersMap)
     paramType = EXPERIMENTAL_generateRouteParams(node, paramParsers)
   }
   const typeParams = [
diff --git a/src/codegen/generateRouteParams.ts b/src/codegen/generateRouteParams.ts
index b11084816..a396b9a1b 100644
--- a/src/codegen/generateRouteParams.ts
+++ b/src/codegen/generateRouteParams.ts
@@ -1,5 +1,4 @@
 import { TreeNode } from '../core/tree'
-import { ParamParserTypeInfo } from './generateParamParsers'
 
 export function generateRouteParams(node: TreeNode, isRaw: boolean): string {
   // node.params is a getter so we compute it once
@@ -24,7 +23,7 @@ export function generateRouteParams(node: TreeNode, isRaw: boolean): string {
 
 export function EXPERIMENTAL_generateRouteParams(
   node: TreeNode,
-  types: Array<ParamParserTypeInfo | null>
+  types: Array<string | null>
 ) {
   // node.params is a getter so we compute it once
   const nodeParams = node.params
@@ -35,7 +34,7 @@ export function EXPERIMENTAL_generateRouteParams(
           const isRaw = false
           return `${param.paramName}${param.optional ? '?' : ''}: ${
             type
-              ? type[1] || '/* INVALID */ unknown'
+              ? type || '/* INVALID */ unknown'
               : param.modifier === '+'
                 ? `ParamValueOneOrMore<${isRaw}>`
                 : param.modifier === '*'
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 421003206..c82a58cff 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -6,6 +6,7 @@ import {
   generateRouteRecord,
 } from './generateRouteResolver'
 import { ImportsMap } from '../core/utils'
+import { ParamParsersMap } from './generateParamParsers'
 
 const DEFAULT_OPTIONS = resolveOptions({})
 let DEFAULT_STATE: Parameters<typeof generateRouteRecord>[0]['state'] = {
@@ -24,6 +25,7 @@ describe('generateRouteRecord', () => {
   it('serializes a simple static path', () => {
     const tree = new PrefixTree(DEFAULT_OPTIONS)
     const importsMap = new ImportsMap()
+    const paramParsersMap: ParamParsersMap = new Map()
     expect(
       generateRouteRecord({
         node: tree.insert('a', 'a.vue'),
@@ -31,6 +33,7 @@ describe('generateRouteRecord', () => {
         state: DEFAULT_STATE,
         options: DEFAULT_OPTIONS,
         importsMap,
+        paramParsersMap,
       })
     ).toMatchInlineSnapshot(`
       "const r_0 = normalizeRouteRecord({
@@ -48,6 +51,7 @@ describe('generateRouteRecord', () => {
         state: DEFAULT_STATE,
         options: DEFAULT_OPTIONS,
         importsMap,
+        paramParsersMap,
       })
     ).toMatchInlineSnapshot(`
       "const r_1 = normalizeRouteRecord({
@@ -69,7 +73,12 @@ describe('generateRouteResolver', () => {
     tree.insert('b/c', 'b/c.vue')
     tree.insert('b/c/d', 'b/c/d.vue')
     tree.insert('b/e/f', 'b/c/f.vue')
-    const resolver = generateRouteResolver(tree, DEFAULT_OPTIONS, importsMap)
+    const resolver = generateRouteResolver(
+      tree,
+      DEFAULT_OPTIONS,
+      importsMap,
+      new Map()
+    )
 
     expect(resolver).toMatchInlineSnapshot(`
       "
@@ -137,11 +146,15 @@ describe('generateRouteResolver', () => {
     tree.insert('b/[[a]]', 'b/c/d.vue')
     tree.insert('b/[[a]]+', 'b/c/d.vue')
     tree.insert('[...all]', 'b/c/f.vue')
-    const resolver = generateRouteResolver(tree, DEFAULT_OPTIONS, importsMap)
+    const resolver = generateRouteResolver(
+      tree,
+      DEFAULT_OPTIONS,
+      importsMap,
+      new Map()
+    )
 
-    expect(
-      resolver.replace(/^.*?createStaticResolver/s, '')
-    ).toMatchInlineSnapshot(`
+    expect(resolver.replace(/^.*?createStaticResolver/s, ''))
+      .toMatchInlineSnapshot(`
       "([
         r_1,   // /a
         r_11,  // /b/a-b
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index 99671dfe6..a5543eaf7 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -2,7 +2,7 @@ import { PrefixTree, type TreeNode } from '../core/tree'
 import { ImportsMap } from '../core/utils'
 import { type ResolvedOptions } from '../options'
 import { ts } from '../utils'
-import { generateParamOptions } from './generateParamParsers'
+import { generateParamsOptions, ParamParsersMap } from './generateParamParsers'
 import { generatePageImport } from './generateRouteRecords'
 
 interface GenerateRouteResolverState {
@@ -17,13 +17,21 @@ interface GenerateRouteResolverState {
 export function generateRouteResolver(
   tree: PrefixTree,
   options: ResolvedOptions,
-  importsMap: ImportsMap
+  importsMap: ImportsMap,
+  paramParsersMap: ParamParsersMap
 ): string {
   const state: GenerateRouteResolverState = { id: 0, matchableRecords: [] }
   const records = tree
     .getChildrenSorted()
     .map((node) =>
-      generateRouteRecord({ node, parentVar: null, state, options, importsMap })
+      generateRouteRecord({
+        node,
+        parentVar: null,
+        state,
+        options,
+        importsMap,
+        paramParsersMap,
+      })
     )
 
   importsMap.add('vue-router/experimental', 'createStaticResolver')
@@ -53,12 +61,14 @@ export function generateRouteRecord({
   state,
   options,
   importsMap,
+  paramParsersMap,
 }: {
   node: TreeNode
   parentVar: string | null | undefined
   state: GenerateRouteResolverState
   options: ResolvedOptions
   importsMap: ImportsMap
+  paramParsersMap: ParamParsersMap
 }): string {
   // TODO: skip nodes that add no value. Maybe it should be done at the level of the tree?
   const varName = `r_${state.id++}`
@@ -88,7 +98,7 @@ export function generateRouteRecord({
   const recordDeclaration = `
 const ${varName} = normalizeRouteRecord({
   ${recordName}
-  ${generateRouteRecordPathMatcher({ node, importsMap })}
+  ${generateRouteRecordPathMatcher({ node, importsMap, paramParsersMap })}
   ${recordComponents}
   ${parentVar ? `parent: ${parentVar},` : ''}
 })
@@ -106,6 +116,7 @@ const ${varName} = normalizeRouteRecord({
       state,
       options,
       importsMap,
+      paramParsersMap,
     })
   )
 
@@ -136,9 +147,11 @@ ${indentStr}},`
 export function generateRouteRecordPathMatcher({
   node,
   importsMap,
+  paramParsersMap,
 }: {
   node: TreeNode
   importsMap: ImportsMap
+  paramParsersMap: ParamParsersMap
 }) {
   if (!node.isMatchable()) {
     return ''
@@ -148,7 +161,7 @@ export function generateRouteRecordPathMatcher({
   } else if (node.value.isParam()) {
     return `path: new MatcherPatternPathCustomParams(
     ${node.regexp},
-    ${generateParamOptions(node.params, importsMap)},
+    ${generateParamsOptions(node.params, importsMap, paramParsersMap)},
     ${JSON.stringify(node.matcherParts)},
   ),`
   }
diff --git a/src/core/context.ts b/src/core/context.ts
index 555c2fbec..6532c8734 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -1,13 +1,13 @@
 import { ResolvedOptions } from '../options'
 import { TreeNode, PrefixTree } from './tree'
-import { promises as fs } from 'fs'
+import { promises as fs } from 'node:fs'
 import { asRoutePath, ImportsMap, logTree, throttle } from './utils'
 import { generateRouteNamedMap } from '../codegen/generateRouteMap'
 import { generateRouteFileInfoMap } from '../codegen/generateRouteFileInfoMap'
-import { MODULE_ROUTES_PATH, MODULE_VUE_ROUTER_AUTO } from './moduleConstants'
+import { MODULE_ROUTES_PATH } from './moduleConstants'
 import { generateRouteRecord } from '../codegen/generateRouteRecords'
 import { glob } from 'tinyglobby'
-import { dirname, relative, resolve } from 'pathe'
+import { dirname, parse as parsePathe, relative, resolve } from 'pathe'
 import { ServerContext } from '../options'
 import { getRouteBlock } from './customBlock'
 import {
@@ -22,6 +22,12 @@ import { EditableTreeNode } from './extendRoutes'
 import { isPackageExists as isPackageInstalled } from 'local-pkg'
 import { ts } from '../utils'
 import { generateRouteResolver } from '../codegen/generateRouteResolver'
+import { type FSWatcher, watch as fsWatch } from 'chokidar'
+import {
+  generateParamParsersTypesDeclarations,
+  ParamParsersMap,
+  warnMissingParamParsers,
+} from '../codegen/generateParamParsers'
 
 export function createRoutesContext(options: ResolvedOptions) {
   const { dts: preferDTS, root, routesFolder } = options
@@ -46,7 +52,8 @@ export function createRoutesContext(options: ResolvedOptions) {
   })
 
   // populated by the initial scan pages
-  const watchers: RoutesFolderWatcher[] = []
+  const watchers: Array<FSWatcher | RoutesFolderWatcher> = []
+  const paramParsers: ParamParsersMap = new Map()
 
   async function scanPages(startWatchers = true) {
     if (options.extensions.length < 1) {
@@ -61,8 +68,8 @@ export function createRoutesContext(options: ResolvedOptions) {
     }
 
     // get the initial list of pages
-    await Promise.all(
-      routesFolder
+    await Promise.all([
+      ...routesFolder
         .map((folder) => resolveFolderOptions(options, folder))
         .map((folder) => {
           if (startWatchers) {
@@ -94,8 +101,47 @@ export function createRoutesContext(options: ResolvedOptions) {
                 )
             )
           )
+        }),
+      ...options.experimental.paramMatchers?.dir.map((folder) => {
+        watchers.push(
+          setupParamParserWatcher(
+            fsWatch('.', {
+              cwd: folder,
+              ignoreInitial: true,
+              ignorePermissionErrors: true,
+              ignored: (filePath, stats) => {
+                console.log('ignore?', filePath)
+                // let folders pass, they are ignored by the glob pattern
+                if (!stats || stats.isDirectory()) {
+                  return false
+                }
+
+                return false
+                // return !isMatch(path.relative(this.src, filePath))
+              },
+            })
+          )
+        )
+        return glob('*', {
+          cwd: folder,
+          onlyFiles: true,
+          expandDirectories: false,
+        }).then((paramParserFiles) => {
+          for (const file of paramParserFiles) {
+            const name = parsePathe(file).name
+            // TODO: could be simplified to only one import that starts with / for vite
+            const absolutePath = resolve(folder, file)
+            paramParsers.set(name, {
+              name,
+              typeName: `Param_${name}`,
+              absolutePath,
+              relativePath: relative(options.root, absolutePath),
+            })
+          }
+          console.log('PARAM PARSERS', [...paramParsers])
         })
-    )
+      }),
+    ])
 
     for (const route of editableRoutes) {
       await options.extendRoute?.(route)
@@ -161,6 +207,26 @@ export function createRoutesContext(options: ResolvedOptions) {
     server?.updateRoutes()
   }
 
+  function setupParamParserWatcher(watcher: FSWatcher) {
+    logger.log(`🤖 Scanning param parsers in ${watcher.options.cwd}`)
+    return watcher
+      .on('add', (file) => {
+        const name = parsePathe(file).name
+        const absolutePath = resolve(watcher.options.cwd!, file)
+        paramParsers.set(name, {
+          name,
+          typeName: `Param_${name}`,
+          absolutePath,
+          relativePath: './' + relative(options.root, absolutePath),
+        })
+        writeConfigFiles()
+      })
+      .on('unlink', (file) => {
+        paramParsers.delete(parsePathe(file).name)
+        writeConfigFiles()
+      })
+  }
+
   function setupWatcher(watcher: RoutesFolderWatcher) {
     logger.log(`🤖 Scanning files in ${watcher.src}`)
 
@@ -185,7 +251,12 @@ export function createRoutesContext(options: ResolvedOptions) {
   function generateResolver() {
     const importsMap = new ImportsMap()
 
-    const resolverCode = generateRouteResolver(routeTree, options, importsMap)
+    const resolverCode = generateRouteResolver(
+      routeTree,
+      options,
+      importsMap,
+      paramParsers
+    )
 
     // generate the list of imports
     let imports = importsMap.toString()
@@ -257,15 +328,25 @@ if (import.meta.hot) {
     return newAutoRoutes
   }
 
-  function generateDTS(): string {
-    return _generateDTS({
-      vueRouterModule: MODULE_VUE_ROUTER_AUTO,
+  function generateDTS() {
+    if (options.experimental.paramMatchers.dir.length > 0) {
+      warnMissingParamParsers(routeTree, options, paramParsers)
+    }
+
+    const autoRoutes = _generateDTS({
       routesModule: MODULE_ROUTES_PATH,
-      routeNamedMap: generateRouteNamedMap(routeTree),
+      routeNamedMap: generateRouteNamedMap(routeTree, options, paramParsers),
       routeFileInfoMap: generateRouteFileInfoMap(routeTree, {
         root,
       }),
+      paramsTypesDeclaration:
+        generateParamParsersTypesDeclarations(paramParsers),
     })
+
+    // TODO: parser auto copmlete for definePage
+    // const paramParserListType = generateParamParserListTypes([...paramParsers])
+
+    return autoRoutes
   }
 
   // NOTE: this code needs to be generated because otherwise it doesn't go through transforms and `vue-router/auto-routes`
diff --git a/src/index.ts b/src/index.ts
index a6015cf46..799e7e1c0 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -90,8 +90,8 @@ export default createUnplugin<Options | undefined>((opt = {}, _meta) => {
         },
       },
 
-      buildStart() {
-        return ctx.scanPages(options.watch)
+      async buildStart() {
+        await ctx.scanPages(options.watch)
       },
 
       buildEnd() {
diff --git a/src/options.ts b/src/options.ts
index 2e1cf9f3b..5bf7eaa07 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -235,7 +235,7 @@ export interface Options {
 
 export interface ParamMatcherOptions {
   /**
-   * Folder(s) to scan for param matchers.
+   * Folder(s) to scan for param matchers. Set to an empty array to disable the feature.
    *
    * @default `['src/params']`
    */
@@ -321,22 +321,38 @@ export function resolveOptions(options: Options) {
     src: resolve(root, routeOption.src),
   }))
 
-  const experimental = { ...options.experimental }
-  experimental.paramMatchers =
-    experimental.paramMatchers &&
-    (experimental.paramMatchers === true
+  const paramMatchers = options.experimental?.paramMatchers
+    ? options.experimental.paramMatchers === true
       ? DEFAULT_PARAM_MATCHER_OPTIONS
       : {
           ...DEFAULT_PARAM_MATCHER_OPTIONS,
-          ...experimental.paramMatchers,
-        })
-
-  if (experimental.autoExportsDataLoaders) {
-    experimental.autoExportsDataLoaders = (
-      Array.isArray(experimental.autoExportsDataLoaders)
-        ? experimental.autoExportsDataLoaders
-        : [experimental.autoExportsDataLoaders]
-    ).map((path) => resolve(root, path))
+          ...options.experimental.paramMatchers,
+        }
+    : // this way we can do paramMatchers?.dir
+      null
+
+  const paramMatchersDir = (
+    paramMatchers?.dir
+      ? isArray(paramMatchers.dir)
+        ? paramMatchers.dir
+        : [paramMatchers.dir]
+      : []
+  ).map((dir) => resolve(root, dir))
+
+  const autoExportsDataLoaders = options.experimental?.autoExportsDataLoaders
+    ? (isArray(options.experimental.autoExportsDataLoaders)
+        ? options.experimental.autoExportsDataLoaders
+        : [options.experimental.autoExportsDataLoaders]
+      ).map((path) => resolve(root, path))
+    : undefined
+
+  const experimental = {
+    ...options.experimental,
+    autoExportsDataLoaders,
+    paramMatchers: {
+      ...paramMatchers,
+      dir: paramMatchersDir,
+    },
   }
 
   if (options.extensions) {
diff --git a/src/runtime.ts b/src/runtime.ts
index 03e97b865..9e74b741f 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -58,4 +58,44 @@ export interface DefinePage
    * Can be set to `false` to remove the name from types.
    */
   name?: string | false
+
+  // TODO: add a custom serialization based on the query object completely that
+  // allows and extracts a function
+  query: Record<string, QueryParamType | DefinePageQueryParamOptions>
+}
+
+/**
+ * TODO:
+ * - User should be able to define a lax object matcher with a validation library
+ *   - should be easy to use if they throw inside the param
+ */
+
+export type QueryParamType = 'int' | 'bool'
+
+/**
+ * Configures how to extract a route param from a specific query parameter.
+ */
+export interface DefinePageQueryParamOptions {
+  /**
+   * The type of the query parameter. Allowed values are native param parsers
+   * and any parser in the {@link https://uvr.esm.is/TODO | params folder }.
+   */
+  type: QueryParamType
+
+  /**
+   * Defines whether the query parameter can be omitted or not. If false, the
+   * route won't match if the query parameter is not present.
+   *
+   * @default false
+   */
+  optional?: boolean
+
+  /**
+   * Can the query parameter be repeated? If true, it will always return an
+   * array of values. If false, it will return the first value and ignore the
+   * rest.
+   *
+   * @default false
+   */
+  repeatable?: boolean
 }
diff --git a/src/utils/index.ts b/src/utils/index.ts
index c74ccc691..9ebdc98a1 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,3 +1,5 @@
+import { access, constants } from 'fs/promises'
+
 /**
  * Maybe a promise maybe not
  * @internal
@@ -14,3 +16,12 @@ export type LiteralStringUnion<LiteralType, BaseType extends string = string> =
 
 // for highlighting
 export const ts = String.raw
+
+export async function fileExists(filePath: string) {
+  try {
+    await access(filePath, constants.F_OK)
+    return true
+  } catch {
+    return false
+  }
+}

From 53209aa48ab15910d90b2620728a04ef050e5fdf Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 13 Aug 2025 17:26:03 +0200
Subject: [PATCH 13/81] refactor: rename import as

---
 src/codegen/generateParamParsers.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
index 07c98d158..fa5d9c65e 100644
--- a/src/codegen/generateParamParsers.ts
+++ b/src/codegen/generateParamParsers.ts
@@ -91,8 +91,9 @@ function generateParamParserOptions(
   // we prioritize custom parsers to let users override them
   if (param.parser && paramParsers.has(param.parser)) {
     const { name, absolutePath } = paramParsers.get(param.parser)!
-    importsMap.add(absolutePath, { name: 'parser', as: name })
-    return ` ...${name}, `
+    const varName = `PARAM_PARSER__${name}`
+    importsMap.add(absolutePath, { name: 'parser', as: varName })
+    return ` ...${varName}, `
   } else if (param.parser === 'int') {
     importsMap.add('vue-router/experimental', `PARAM_PARSER_INT`)
     return ` ...PARAM_PARSER_INT, `

From 928e6f30078d0ea8ccd0a1efbd04e5751387dcc9 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 09:54:47 +0200
Subject: [PATCH 14/81] refactor: fixes

---
 playground-experimental/package.json          |  2 +-
 playground-experimental/src/pages/[name].vue  |  2 +
 .../src/pages/[name]/24.vue                   |  6 ++
 .../src/pages/[name]/[userId=int].vue         |  7 ++
 playground-experimental/src/pages/b.vue       |  5 ++
 playground-experimental/typed-router.d.ts     | 20 ++++-
 playground/src/params/date.ts                 | 18 +++++
 playground/src/params/number.ts               | 14 ++++
 playground/vite.config.ts                     |  2 +-
 pnpm-lock.yaml                                | 10 +--
 src/codegen/generateDTS.ts                    | 11 ++-
 src/codegen/generateParamParsers.ts           |  2 -
 src/codegen/generateRouteMap.spec.ts          | 80 ++++++++++++++-----
 src/codegen/generateRouteResolver.ts          | 22 +++--
 src/core/context.ts                           | 20 +++--
 src/core/treeNodeValue.ts                     | 16 ++++
 src/options.ts                                |  5 +-
 src/runtime.ts                                |  2 +-
 18 files changed, 188 insertions(+), 56 deletions(-)
 create mode 100644 playground-experimental/src/pages/[name]/24.vue
 create mode 100644 playground-experimental/src/pages/[name]/[userId=int].vue
 create mode 100644 playground-experimental/src/pages/b.vue
 create mode 100644 playground/src/params/date.ts
 create mode 100644 playground/src/params/number.ts

diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index 72945de4e..036011c51 100644
--- a/playground-experimental/package.json
+++ b/playground-experimental/package.json
@@ -18,6 +18,6 @@
     "mande": "^2.0.9",
     "pinia": "^3.0.3",
     "vue": "^3.5.18",
-    "vue-router": "file:/Users/posva/oss/vuejs/router/packages/router/vue-router-4.5.1.tgz"
+    "vue-router": "https://pkg.pr.new/vue-router@2d79fe7"
   }
 }
diff --git a/playground-experimental/src/pages/[name].vue b/playground-experimental/src/pages/[name].vue
index bc207c40c..2d5ad6847 100644
--- a/playground-experimental/src/pages/[name].vue
+++ b/playground-experimental/src/pages/[name].vue
@@ -3,4 +3,6 @@
 <template>
   <h1>Named param</h1>
   <pre>{{ $route.params }}</pre>
+
+  <RouterView />
 </template>
diff --git a/playground-experimental/src/pages/[name]/24.vue b/playground-experimental/src/pages/[name]/24.vue
new file mode 100644
index 000000000..b5778f70e
--- /dev/null
+++ b/playground-experimental/src/pages/[name]/24.vue
@@ -0,0 +1,6 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h2>Nested [name] page</h2>
+  <p>Too test specificity in routes</p>
+</template>
diff --git a/playground-experimental/src/pages/[name]/[userId=int].vue b/playground-experimental/src/pages/[name]/[userId=int].vue
new file mode 100644
index 000000000..b8e8f105c
--- /dev/null
+++ b/playground-experimental/src/pages/[name]/[userId=int].vue
@@ -0,0 +1,7 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h2>This page should never be visible</h2>
+
+  <RouterView />
+</template>
diff --git a/playground-experimental/src/pages/b.vue b/playground-experimental/src/pages/b.vue
new file mode 100644
index 000000000..9522e259e
--- /dev/null
+++ b/playground-experimental/src/pages/b.vue
@@ -0,0 +1,5 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>Home</h1>
+</template>
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
index 127b745ee..09355a30d 100644
--- a/playground-experimental/typed-router.d.ts
+++ b/playground-experimental/typed-router.d.ts
@@ -5,6 +5,7 @@
 // It's recommended to commit this file.
 // Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.
 
+// Custom route params parsers
 type Param_date = ReturnType<NonNullable<typeof import('./src/params/date.ts').parser['get']>>
 
 declare module 'vue-router/auto-routes' {
@@ -21,8 +22,11 @@ declare module 'vue-router/auto-routes' {
    */
   export interface RouteNamedMap {
     '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
-    '/[name]': RouteRecordInfo<'/[name]', '/:name', { name: ParamValue<false> }, { name: ParamValue<false> }>,
+    '/[name]': RouteRecordInfo<'/[name]', '/:name', { name: ParamValue<false> }, { name: ParamValue<false> }, '/[name]/24' | '/[name]/[userId=int]'>,
+    '/[name]/[userId=int]': RouteRecordInfo<'/[name]/[userId=int]', '/:name/:userId', { name: ParamValue<false>, userId: number }, { name: ParamValue<false>, userId: number }>,
+    '/[name]/24': RouteRecordInfo<'/[name]/24', '/:name/24', { name: ParamValue<false> }, { name: ParamValue<false> }>,
     '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: ParamValue<false>, d: ParamValue<false> }, { b: ParamValue<false>, d: ParamValue<false> }>,
+    '/b': RouteRecordInfo<'/b', '/b', Record<never, never>, Record<never, never>>,
     '/events/[when=date]': RouteRecordInfo<'/events/[when=date]', '/events/:when', { when: Param_date }, { when: Param_date }>,
     '/users/[userId=int]': RouteRecordInfo<'/users/[userId=int]', '/users/:userId', { userId: number }, { userId: number }>,
     '/users/sub-[first]-[second]': RouteRecordInfo<'/users/sub-[first]-[second]', '/users/sub-:first-:second', { first: ParamValue<false>, second: ParamValue<false> }, { first: ParamValue<false>, second: ParamValue<false> }>,
@@ -44,13 +48,25 @@ declare module 'vue-router/auto-routes' {
       views: never
     }
     'src/pages/[name].vue': {
-      routes: '/[name]'
+      routes: '/[name]' | '/[name]/[userId=int]' | '/[name]/24'
+      views: 'default'
+    }
+    'src/pages/[name]/[userId=int].vue': {
+      routes: '/[name]/[userId=int]'
+      views: never
+    }
+    'src/pages/[name]/24.vue': {
+      routes: '/[name]/24'
       views: never
     }
     'src/pages/a.[b].c.[d].vue': {
       routes: '/a.[b].c.[d]'
       views: never
     }
+    'src/pages/b.vue': {
+      routes: '/b'
+      views: never
+    }
     'src/pages/events/[when=date].vue': {
       routes: '/events/[when=date]'
       views: never
diff --git a/playground/src/params/date.ts b/playground/src/params/date.ts
new file mode 100644
index 000000000..490dbb617
--- /dev/null
+++ b/playground/src/params/date.ts
@@ -0,0 +1,18 @@
+// NOTE: should be imported from vue-router
+const invalid = (...args: ConstructorParameters<typeof Error>) =>
+  new Error(...args)
+
+export const parse = (value: string): Date => {
+  const asDate = new Date(value)
+  if (Number.isNaN(asDate.getTime())) {
+    throw invalid(`Invalid date: "${value}"`)
+  }
+
+  return asDate
+}
+
+export const toString = (value: Date): string =>
+  value
+    .toISOString()
+    // allows keeping simple dates like 2023-10-01 without time
+    .replace('T00:00:00.000Z', '')
diff --git a/playground/src/params/number.ts b/playground/src/params/number.ts
new file mode 100644
index 000000000..3d70f3913
--- /dev/null
+++ b/playground/src/params/number.ts
@@ -0,0 +1,14 @@
+// NOTE: should be imported from vue-router
+const invalid = (...args: ConstructorParameters<typeof Error>) =>
+  new Error(...args)
+
+export const parse = (value: string): number => {
+  const asNumber = Number(value)
+  if (Number.isFinite(asNumber)) {
+    return asNumber
+  }
+  throw invalid(`Expected a number, but received: ${value}`)
+}
+
+// Same as default serializer
+export const toString = (value: number): string => String(value)
diff --git a/playground/vite.config.ts b/playground/vite.config.ts
index 5d44cb03a..4dbd5a986 100644
--- a/playground/vite.config.ts
+++ b/playground/vite.config.ts
@@ -50,7 +50,7 @@ export default defineConfig({
       // getRouteName: getPascalCaseRouteName,
       experimental: {
         autoExportsDataLoaders: ['src/loaders/**/*', '@/loaders/**/*'],
-        paramMatchers: true,
+        paramMatchers: false,
       },
       extendRoute(route) {
         route.params.forEach((param) => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 273bc208e..b9d0bdb90 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -261,8 +261,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: file:/Users/posva/oss/vuejs/router/packages/router/vue-router-4.5.1.tgz
-        version: file:../vuejs/router/packages/router/vue-router-4.5.1.tgz(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@2d79fe7
+        version: https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -6865,8 +6865,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@file:../vuejs/router/packages/router/vue-router-4.5.1.tgz:
-    resolution: {integrity: sha512-aBPR/DiVyr5ns0dQiI6cAQl7JRgq7uVeM/OZGt+gy4xvc9HgZh/nPc3FaF1IzM6Efap6tQ9z1K6gvX1RT6JN+Q==, tarball: file:../vuejs/router/packages/router/vue-router-4.5.1.tgz}
+  vue-router@https://pkg.pr.new/vue-router@2d79fe7:
+    resolution: {tarball: https://pkg.pr.new/vue-router@2d79fe7}
     version: 4.5.1
     peerDependencies:
       vue: ^3.2.0
@@ -14607,7 +14607,7 @@ snapshots:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@file:../vuejs/router/packages/router/vue-router-4.5.1.tgz(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
diff --git a/src/codegen/generateDTS.ts b/src/codegen/generateDTS.ts
index 95ad5bd02..ce3a1818e 100644
--- a/src/codegen/generateDTS.ts
+++ b/src/codegen/generateDTS.ts
@@ -34,8 +34,15 @@ export function generateDTS({
 // It's recommended to commit this file.
 // Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.
 
-${paramsTypesDeclaration ? paramsTypesDeclaration + '\n' : ''}
-declare module '${routesModule}' {
+${
+  paramsTypesDeclaration
+    ? `
+// Custom route params parsers
+${paramsTypesDeclaration}
+
+`.trimStart()
+    : ''
+}declare module '${routesModule}' {
   import type {
     RouteRecordInfo,
     ParamValue,
diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
index fa5d9c65e..95c5d9347 100644
--- a/src/codegen/generateParamParsers.ts
+++ b/src/codegen/generateParamParsers.ts
@@ -3,7 +3,6 @@ import { TreeRouteParam } from '../core/treeNodeValue'
 import { ImportsMap } from '../core/utils'
 import { ts } from '../utils'
 import { PrefixTree } from '../core/tree'
-import { ResolvedOptions } from '../options'
 
 export type ParamParsersMap = Map<
   string,
@@ -17,7 +16,6 @@ export type ParamParsersMap = Map<
 
 export async function warnMissingParamParsers(
   tree: PrefixTree,
-  options: ResolvedOptions,
   paramParsers: ParamParsersMap
 ) {
   for (const node of tree.getChildrenDeepSorted()) {
diff --git a/src/codegen/generateRouteMap.spec.ts b/src/codegen/generateRouteMap.spec.ts
index 99f517615..43ecaeba2 100644
--- a/src/codegen/generateRouteMap.spec.ts
+++ b/src/codegen/generateRouteMap.spec.ts
@@ -19,7 +19,9 @@ describe('generateRouteNamedMap', () => {
     tree.insert('a', 'a.vue')
     tree.insert('b', 'b.vue')
     tree.insert('c', 'c.vue')
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/': RouteRecordInfo<'/', '/', Record<never, never>, Record<never, never>>,
         '/a': RouteRecordInfo<'/a', '/a', Record<never, never>, Record<never, never>>,
@@ -40,7 +42,9 @@ describe('generateRouteNamedMap', () => {
     tree.insert('[...a]', '[...a].vue') // splat
     tree.insert('[[...a]]', '[[...a]].vue') // splat
     tree.insert('[[...a]]+', '[[...a]]+.vue') // splat
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/[a]': RouteRecordInfo<'/[a]', '/:a', { a: ParamValue<true> }, { a: ParamValue<false> }>,
         '/[[a]]': RouteRecordInfo<'/[[a]]', '/:a?', { a?: ParamValueZeroOrOne<true> }, { a?: ParamValueZeroOrOne<false> }>,
@@ -61,7 +65,9 @@ describe('generateRouteNamedMap', () => {
     const b = tree.insertParsedPath(':b()', 'a.vue')
     expect(a.name).toBe('/:a')
     expect(b.name).toBe('/:b()')
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/:a': RouteRecordInfo<'/:a', '/:a', { a: ParamValue<true> }, { a: ParamValue<false> }>,
         '/:b()': RouteRecordInfo<'/:b()', '/:b()', { b: ParamValue<true> }, { b: ParamValue<false> }>,
@@ -75,7 +81,9 @@ describe('generateRouteNamedMap', () => {
     tree.insert('n/[a]/other', 'n/[a]/other.vue')
     tree.insert('n/[a]/[b]', 'n/[a]/[b].vue')
     tree.insert('n/[a]/[c]/other-[d]', 'n/[a]/[c]/other-[d].vue')
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/n/[a]/': RouteRecordInfo<'/n/[a]/', '/n/:a', { a: ParamValue<true> }, { a: ParamValue<false> }>,
         '/n/[a]/[b]': RouteRecordInfo<'/n/[a]/[b]', '/n/:a/:b', { a: ParamValue<true>, b: ParamValue<true> }, { a: ParamValue<false>, b: ParamValue<false> }>,
@@ -93,7 +101,9 @@ describe('generateRouteNamedMap', () => {
     tree.insert('n/[a]+', 'n/[a]+.vue') // repeated
     tree.insert('n/[[a]]+', 'n/[[a]]+.vue') // optional repeated
     tree.insert('n/[...a]', 'n/[...a].vue') // splat
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/n/[a]': RouteRecordInfo<'/n/[a]', '/n/:a', { a: ParamValue<true> }, { a: ParamValue<false> }>,
         '/n/[[a]]': RouteRecordInfo<'/n/[[a]]', '/n/:a?', { a?: ParamValueZeroOrOne<true> }, { a?: ParamValueZeroOrOne<false> }>,
@@ -115,7 +125,9 @@ describe('generateRouteNamedMap', () => {
     tree.insert('[lang]/a', 'src/pages/a.vue')
     tree.insert('[lang]/[id]', 'src/pages/[id].vue')
 
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/[lang]/': RouteRecordInfo<'/[lang]/', '/:lang', { lang: ParamValue<true> }, { lang: ParamValue<false> }>,
         '/[lang]/[id]': RouteRecordInfo<'/[lang]/[id]', '/:lang/:id', { lang: ParamValue<true>, id: ParamValue<true> }, { lang: ParamValue<false>, id: ParamValue<false> }>,
@@ -134,7 +146,9 @@ describe('generateRouteNamedMap', () => {
     tree.insert('b/d', 'b/d.vue')
     tree.insert('c', 'c.vue')
     tree.insert('d', 'd.vue')
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/a/a': RouteRecordInfo<'/a/a', '/a/a', Record<never, never>, Record<never, never>>,
         '/a/b': RouteRecordInfo<'/a/b', '/a/b', Record<never, never>, Record<never, never>>,
@@ -154,7 +168,9 @@ describe('generateRouteNamedMap', () => {
     tree.insert('a/index', 'a/index.vue')
     tree.insert('a/[id]', 'a/[id].vue')
     tree.insert('a/[id]/index', 'a/[id]/index.vue')
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/a': RouteRecordInfo<'/a', '/a', Record<never, never>, Record<never, never>, '/a/' | '/a/[id]' | '/a/[id]/'>,
         '/a/': RouteRecordInfo<'/a/', '/a', Record<never, never>, Record<never, never>>,
@@ -170,7 +186,9 @@ describe('generateRouteNamedMap', () => {
     const child = tree.insert('parent/child', 'parent/child.vue')
     parent.value.setOverride('parent', { path: '/' })
     expect(child.fullPath).toBe('/child')
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/parent': RouteRecordInfo<'/parent', '/', Record<never, never>, Record<never, never>, '/parent/child'>,
         '/parent/child': RouteRecordInfo<'/parent/child', '/child', Record<never, never>, Record<never, never>>,
@@ -188,7 +206,9 @@ describe('generateRouteNamedMap', () => {
       'parent/child/subchild/grandchild.vue'
     )
     tree.insert('parent/other-child', 'parent/other-child.vue')
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/parent': RouteRecordInfo<'/parent', '/parent', Record<never, never>, Record<never, never>, '/parent/child' | '/parent/child/subchild' | '/parent/child/subchild/grandchild' | '/parent/other-child'>,
         '/parent/child': RouteRecordInfo<'/parent/child', '/parent/child', Record<never, never>, Record<never, never>, '/parent/child/subchild' | '/parent/child/subchild/grandchild'>,
@@ -203,7 +223,9 @@ describe('generateRouteNamedMap', () => {
     const tree = new PrefixTree(DEFAULT_OPTIONS)
     tree.insert('parent', 'parent.vue')
     tree.insert('parent/child/a/b/c', 'parent/child/a/b/c.vue')
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/parent': RouteRecordInfo<'/parent', '/parent', Record<never, never>, Record<never, never>, '/parent/child/a/b/c'>,
         '/parent/child/a/b/c': RouteRecordInfo<'/parent/child/a/b/c', '/parent/child/a/b/c', Record<never, never>, Record<never, never>>,
@@ -215,7 +237,9 @@ describe('generateRouteNamedMap', () => {
     const tree = new PrefixTree(DEFAULT_OPTIONS)
     tree.insert('parent/index', 'parent/index.vue')
     tree.insert('parent/child', 'parent/child.vue')
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/parent/': RouteRecordInfo<'/parent/', '/parent', Record<never, never>, Record<never, never>>,
         '/parent/child': RouteRecordInfo<'/parent/child', '/parent/child', Record<never, never>, Record<never, never>>,
@@ -230,7 +254,9 @@ describe('generateRouteNamedMap', () => {
     tree.insert('parent/a/b', 'parent/a/b.vue')
     tree.insert('parent/a/b/index', 'parent/a/b/index.vue')
     tree.insert('parent/a/b/c', 'parent/a/b/c.vue')
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/parent/': RouteRecordInfo<'/parent/', '/parent', Record<never, never>, Record<never, never>>,
         '/parent/a/': RouteRecordInfo<'/parent/a/', '/parent/a', Record<never, never>, Record<never, never>>,
@@ -252,7 +278,9 @@ describe('generateRouteNamedMap', () => {
     tree.insert('[lang]/a', 'src/pages/a.vue')
     tree.insert('[lang]/[id]', 'src/pages/[id].vue')
 
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/[lang]/': RouteRecordInfo<'/[lang]/', '/:lang', { lang: ParamValue<true> }, { lang: ParamValue<false> }>,
         '/[lang]/[id]': RouteRecordInfo<'/[lang]/[id]', '/:lang/:id', { lang: ParamValue<true>, id: ParamValue<true> }, { lang: ParamValue<false>, id: ParamValue<false> }>,
@@ -266,7 +294,9 @@ describe('generateRouteNamedMap', () => {
 
     tree.insert('(group)/a', 'a.vue')
 
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/(group)/a': RouteRecordInfo<'/(group)/a', '/a', Record<never, never>, Record<never, never>>,
       }"
@@ -278,7 +308,9 @@ describe('generateRouteNamedMap', () => {
 
     tree.insert('(group)/(subgroup)/c', 'c.vue')
 
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/(group)/(subgroup)/c': RouteRecordInfo<'/(group)/(subgroup)/c', '/c', Record<never, never>, Record<never, never>>,
       }"
@@ -290,7 +322,9 @@ describe('generateRouteNamedMap', () => {
 
     tree.insert('folder/(group)', 'folder/(group).vue')
 
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/folder/(group)': RouteRecordInfo<'/folder/(group)', '/folder', Record<never, never>, Record<never, never>>,
       }"
@@ -308,7 +342,9 @@ describe('generateRouteNamedMap', () => {
         tree.insert(route, `${route}.vue`)
       })
 
-      return formatExports(generateRouteNamedMap(tree))
+      return formatExports(
+        generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map())
+      )
     }
 
     // Same routes, different insertion orders
@@ -340,7 +376,9 @@ describe('generateRouteNamedMap', () => {
     const parentNode = tree.children.get('parent')!
     parentNode.value.setOverride('parent', { name: '' })
 
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/child': RouteRecordInfo<'/child', '/child', Record<never, never>, Record<never, never>>,
         '/parent/child': RouteRecordInfo<'/parent/child', '/parent/child', Record<never, never>, Record<never, never>>,
@@ -359,7 +397,9 @@ describe('generateRouteNamedMap', () => {
     const child2Node = tree.children.get('parent')!.children.get('child2')!
     child2Node.value.setOverride('parent/child2', { name: '' })
 
-    expect(formatExports(generateRouteNamedMap(tree))).toMatchInlineSnapshot(`
+    expect(
+      formatExports(generateRouteNamedMap(tree, DEFAULT_OPTIONS, new Map()))
+    ).toMatchInlineSnapshot(`
       "export interface RouteNamedMap {
         '/parent': RouteRecordInfo<'/parent', '/parent', Record<never, never>, Record<never, never>, '/parent/child1' | '/parent/child3'>,
         '/parent/child1': RouteRecordInfo<'/parent/child1', '/parent/child1', Record<never, never>, Record<never, never>>,
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index a5543eaf7..231091814 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -21,18 +21,16 @@ export function generateRouteResolver(
   paramParsersMap: ParamParsersMap
 ): string {
   const state: GenerateRouteResolverState = { id: 0, matchableRecords: [] }
-  const records = tree
-    .getChildrenSorted()
-    .map((node) =>
-      generateRouteRecord({
-        node,
-        parentVar: null,
-        state,
-        options,
-        importsMap,
-        paramParsersMap,
-      })
-    )
+  const records = tree.getChildrenSorted().map((node) =>
+    generateRouteRecord({
+      node,
+      parentVar: null,
+      state,
+      options,
+      importsMap,
+      paramParsersMap,
+    })
+  )
 
   importsMap.add('vue-router/experimental', 'createStaticResolver')
   importsMap.add('vue-router/experimental', 'MatcherPatternPathStatic')
diff --git a/src/core/context.ts b/src/core/context.ts
index 6532c8734..76ca61159 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -28,6 +28,7 @@ import {
   ParamParsersMap,
   warnMissingParamParsers,
 } from '../codegen/generateParamParsers'
+import picomatch from 'picomatch'
 
 export function createRoutesContext(options: ResolvedOptions) {
   const { dts: preferDTS, root, routesFolder } = options
@@ -67,6 +68,8 @@ export function createRoutesContext(options: ResolvedOptions) {
       return
     }
 
+    const isParamParserMatch = picomatch('*.{ts,js}')
+
     // get the initial list of pages
     await Promise.all([
       ...routesFolder
@@ -102,7 +105,7 @@ export function createRoutesContext(options: ResolvedOptions) {
             )
           )
         }),
-      ...options.experimental.paramMatchers?.dir.map((folder) => {
+      ...(options.experimental.paramMatchers?.dir.map((folder) => {
         watchers.push(
           setupParamParserWatcher(
             fsWatch('.', {
@@ -110,14 +113,12 @@ export function createRoutesContext(options: ResolvedOptions) {
               ignoreInitial: true,
               ignorePermissionErrors: true,
               ignored: (filePath, stats) => {
-                console.log('ignore?', filePath)
                 // let folders pass, they are ignored by the glob pattern
                 if (!stats || stats.isDirectory()) {
                   return false
                 }
 
-                return false
-                // return !isMatch(path.relative(this.src, filePath))
+                return !isParamParserMatch(relative(folder, filePath))
               },
             })
           )
@@ -138,9 +139,9 @@ export function createRoutesContext(options: ResolvedOptions) {
               relativePath: relative(options.root, absolutePath),
             })
           }
-          console.log('PARAM PARSERS', [...paramParsers])
+          logger.log('Parsed param parsers', [...paramParsers])
         })
-      }),
+      }) || []),
     ])
 
     for (const route of editableRoutes) {
@@ -329,8 +330,11 @@ if (import.meta.hot) {
   }
 
   function generateDTS() {
-    if (options.experimental.paramMatchers.dir.length > 0) {
-      warnMissingParamParsers(routeTree, options, paramParsers)
+    if (
+      options.experimental.paramMatchers &&
+      options.experimental.paramMatchers.dir.length > 0
+    ) {
+      warnMissingParamParsers(routeTree, paramParsers)
     }
 
     const autoRoutes = _generateDTS({
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index e2105e220..4f7ff059a 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -247,6 +247,7 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
     this.params = params
   }
 
+  // FIXME: implement scoring from vue-router
   get score(): number {
     const malus = Math.max(
       ...this.params.map((p) =>
@@ -280,6 +281,21 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
       })
       .join('')
   }
+
+  override toString(): string {
+    const params =
+      this.params.length > 0
+        ? ` 𝑥(` +
+          this.params
+            .map(
+              (p) =>
+                `${p.paramName}${p.modifier}` + (p.parser ? '=' + p.parser : '')
+            )
+            .join(', ') +
+          ')'
+        : ''
+    return `${this.pathSegment}` + params
+  }
 }
 
 export type TreeNodeValue =
diff --git a/src/options.ts b/src/options.ts
index 5bf7eaa07..d6f89797a 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -329,7 +329,7 @@ export function resolveOptions(options: Options) {
           ...options.experimental.paramMatchers,
         }
     : // this way we can do paramMatchers?.dir
-      null
+      undefined
 
   const paramMatchersDir = (
     paramMatchers?.dir
@@ -349,7 +349,8 @@ export function resolveOptions(options: Options) {
   const experimental = {
     ...options.experimental,
     autoExportsDataLoaders,
-    paramMatchers: {
+    // keep undefined if paramMatchers is not set
+    paramMatchers: paramMatchers && {
       ...paramMatchers,
       dir: paramMatchersDir,
     },
diff --git a/src/runtime.ts b/src/runtime.ts
index 9e74b741f..a0c8d2e24 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -61,7 +61,7 @@ export interface DefinePage
 
   // TODO: add a custom serialization based on the query object completely that
   // allows and extracts a function
-  query: Record<string, QueryParamType | DefinePageQueryParamOptions>
+  query?: Record<string, QueryParamType | DefinePageQueryParamOptions>
 }
 
 /**

From 3cc9afa88fc3332f1d5c6de8108cfdbd4d3d42e4 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 09:57:27 +0200
Subject: [PATCH 15/81] chore: fix package install

---
 package.json   |  2 +-
 pnpm-lock.yaml | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 1e77f56c2..776323021 100644
--- a/package.json
+++ b/package.json
@@ -203,7 +203,7 @@
     "vitepress-plugin-llms": "^1.7.5",
     "vitest": "^3.2.4",
     "vue": "^3.5.21",
-    "vue-router": "^4.5.1",
+    "vue-router": "https://pkg.pr.new/vue-router@2d79fe7",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b9d0bdb90..69718a1f1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -169,11 +169,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: ^4.5.1
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@2d79fe7
+        version: https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -6856,6 +6856,7 @@ packages:
 
   vue-router-mock@2.0.0:
     resolution: {integrity: sha512-UmfJ9C4odcC8P2d8+yZWGPnjK7MMc1Uk3bmchpq+8lcGEdpwrO18RPQOMUEiwAjqjTVN5Z955Weaz2Ev9UrXMw==}
+    version: 2.0.0
     peerDependencies:
       vue: ^3.2.23
       vue-router: ^4.0.12
@@ -14597,10 +14598,10 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: 4.5.1(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:

From 0638535325ebcbba88b135cf3c4b7d81a5aff0c6 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 11:13:20 +0200
Subject: [PATCH 16/81] ci: update packages

---
 examples/nuxt/package.json           |   2 +-
 package.json                         |   1 +
 playground-experimental/package.json |   2 +-
 pnpm-lock.yaml                       | 137 +++++++++++----------------
 4 files changed, 59 insertions(+), 83 deletions(-)

diff --git a/examples/nuxt/package.json b/examples/nuxt/package.json
index bcb1cb9e0..4079ab5c1 100644
--- a/examples/nuxt/package.json
+++ b/examples/nuxt/package.json
@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "@pinia/colada-nuxt": "^0.2.1",
-    "@pinia/nuxt": "^0.11.1",
+    "@pinia/nuxt": "^0.11.2",
     "nuxt": "^3.17.5",
     "unplugin-vue-router": "workspace:*"
   },
diff --git a/package.json b/package.json
index 776323021..de45953fa 100644
--- a/package.json
+++ b/package.json
@@ -172,6 +172,7 @@
     "@shikijs/vitepress-twoslash": "3.13.0",
     "@tanstack/vue-query": "^5.89.0",
     "@types/node": "^22.18.6",
+    "@types/node": "^24.3.0",
     "@types/picomatch": "^4.0.2",
     "@vitest/coverage-v8": "^3.2.4",
     "@vitest/ui": "^3.2.4",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index 036011c51..a6774fa05 100644
--- a/playground-experimental/package.json
+++ b/playground-experimental/package.json
@@ -12,7 +12,7 @@
     "@vue/tsconfig": "^0.7.0",
     "json-server": "^0.17.4",
     "unplugin-vue-router": "workspace:*",
-    "vite": "^7.0.6"
+    "vite": "^7.1.2"
   },
   "dependencies": {
     "mande": "^2.0.9",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 69718a1f1..02eccd9d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -76,8 +76,8 @@ importers:
         specifier: ^5.89.0
         version: 5.89.0(vue@3.5.21(typescript@5.9.2))
       '@types/node':
-        specifier: ^22.18.6
-        version: 22.18.6
+        specifier: ^24.3.0
+        version: 24.3.0
       '@types/picomatch':
         specifier: ^4.0.2
         version: 4.0.2
@@ -146,25 +146,25 @@ importers:
         version: 20.1.0(@vueuse/core@12.5.0(typescript@5.9.2))
       unplugin-vue-markdown:
         specifier: ^29.1.0
-        version: 29.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
+        version: 29.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
       unplugin-vue-router:
         specifier: workspace:*
         version: 'link:'
       vite:
         specifier: ^7.1.6
-        version: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+        version: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       vite-plugin-vue-devtools:
         specifier: ^8.0.2
-        version: 8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+        version: 8.0.2(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
       vitepress:
         specifier: ^1.6.4
-        version: 1.6.4(@algolia/client-search@5.20.0)(@types/node@22.18.6)(change-case@5.4.4)(fuse.js@7.1.0)(jwt-decode@4.0.0)(lightningcss@1.29.3)(postcss@8.5.6)(search-insights@2.17.2)(terser@5.43.1)(typescript@5.9.2)
+        version: 1.6.4(@algolia/client-search@5.20.0)(@types/node@24.3.0)(change-case@5.4.4)(fuse.js@7.1.0)(jwt-decode@4.0.0)(lightningcss@1.29.3)(postcss@8.5.6)(search-insights@2.17.2)(terser@5.43.1)(typescript@5.9.2)
       vitepress-plugin-llms:
         specifier: ^1.7.5
         version: 1.7.5
       vitest:
         specifier: ^3.2.4
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@24.3.0)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       vue:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
@@ -200,7 +200,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1(@pinia/colada@0.17.1(pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))))(magicast@0.3.5)
       '@pinia/nuxt':
-        specifier: ^0.11.1
+        specifier: ^0.11.2
         version: 0.11.2(magicast@0.3.5)(pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2)))
       nuxt:
         specifier: ^3.17.5
@@ -280,7 +280,7 @@ importers:
         specifier: workspace:*
         version: link:..
       vite:
-        specifier: ^7.0.6
+        specifier: ^7.1.2
         version: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
 packages:
@@ -2355,9 +2355,6 @@ packages:
   '@types/node@20.19.11':
     resolution: {integrity: sha512-uug3FEEGv0r+jrecvUUpbY8lLisvIjg6AAic6a2bSP5OEOLeJsDSnvhCDov7ipFFMXS3orMpzlmi0ZcuGkBbow==}
 
-  '@types/node@22.18.6':
-    resolution: {integrity: sha512-r8uszLPpeIWbNKtvWRt/DbVi5zbqZyj1PTmhRMqBMvDnaz1QpmSKujUtJLrqGZeoM8v72MfYggDceY4K1itzWQ==}
-
   '@types/node@24.3.0':
     resolution: {integrity: sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==}
 
@@ -8114,7 +8111,7 @@ snapshots:
   '@grpc/grpc-js@1.9.15':
     dependencies:
       '@grpc/proto-loader': 0.7.15
-      '@types/node': 22.18.6
+      '@types/node': 24.3.0
 
   '@grpc/proto-loader@0.7.15':
     dependencies:
@@ -9208,14 +9205,9 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
-  '@types/node@22.18.6':
-    dependencies:
-      undici-types: 6.21.0
-
   '@types/node@24.3.0':
     dependencies:
       undici-types: 7.10.0
-    optional: true
 
   '@types/normalize-package-data@2.4.4': {}
 
@@ -9239,7 +9231,7 @@ snapshots:
 
   '@types/yauzl@2.10.3':
     dependencies:
-      '@types/node': 22.18.6
+      '@types/node': 24.3.0
     optional: true
 
   '@typescript-eslint/project-service@8.33.0(typescript@5.9.2)':
@@ -9342,9 +9334,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.2.4(vite@5.4.19(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.43.1))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue@5.2.4(vite@5.4.19(@types/node@24.3.0)(lightningcss@1.29.3)(terser@5.43.1))(vue@3.5.21(typescript@5.9.2))':
     dependencies:
-      vite: 5.4.19(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.43.1)
+      vite: 5.4.19(@types/node@24.3.0)(lightningcss@1.29.3)(terser@5.43.1)
       vue: 3.5.21(typescript@5.9.2)
 
   '@vitejs/plugin-vue@5.2.4(vite@6.3.5(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18(typescript@5.9.2))':
@@ -9373,7 +9365,7 @@ snapshots:
       std-env: 3.9.0
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@24.3.0)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -9385,13 +9377,13 @@ snapshots:
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))':
+  '@vitest/mocker@3.2.4(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.19
     optionalDependencies:
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -9422,7 +9414,7 @@ snapshots:
       sirv: 3.0.1
       tinyglobby: 0.2.15
       tinyrainbow: 2.0.0
-      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@24.3.0)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
   '@vitest/utils@3.2.4':
     dependencies:
@@ -9578,14 +9570,14 @@ snapshots:
     transitivePeerDependencies:
       - vite
 
-  '@vue/devtools-core@8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
+  '@vue/devtools-core@8.0.2(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
     dependencies:
       '@vue/devtools-kit': 8.0.2
       '@vue/devtools-shared': 8.0.2
       mitt: 3.0.1
       nanoid: 5.1.5
       pathe: 2.0.3
-      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
+      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
       vue: 3.5.21(typescript@5.9.2)
     transitivePeerDependencies:
       - vite
@@ -11620,7 +11612,7 @@ snapshots:
 
   jest-worker@27.5.1:
     dependencies:
-      '@types/node': 22.18.6
+      '@types/node': 24.3.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
@@ -13134,7 +13126,7 @@ snapshots:
       '@protobufjs/path': 1.1.2
       '@protobufjs/pool': 1.1.0
       '@protobufjs/utf8': 1.1.0
-      '@types/node': 22.18.6
+      '@types/node': 24.3.0
       long: 5.3.2
 
   protocols@2.0.2: {}
@@ -13999,8 +13991,7 @@ snapshots:
 
   undici-types@6.21.0: {}
 
-  undici-types@7.10.0:
-    optional: true
+  undici-types@7.10.0: {}
 
   unenv@2.0.0-rc.18:
     dependencies:
@@ -14118,7 +14109,7 @@ snapshots:
       pathe: 2.0.3
       picomatch: 4.0.3
 
-  unplugin-vue-markdown@29.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
+  unplugin-vue-markdown@29.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
       '@mdit-vue/plugin-component': 2.1.4
       '@mdit-vue/plugin-frontmatter': 2.1.4
@@ -14128,7 +14119,7 @@ snapshots:
       markdown-it-async: 2.2.0
       unplugin: 2.3.10
       unplugin-utils: 0.2.5
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
   unplugin-vue-router@0.14.0(@vue/compiler-sfc@3.5.21)(vue-router@4.5.1(vue@3.5.18(typescript@5.9.2)))(vue@3.5.18(typescript@5.9.2)):
     dependencies:
@@ -14243,33 +14234,33 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.2
 
-  vite-dev-rpc@1.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
-    dependencies:
-      birpc: 2.5.0
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
-      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
-
   vite-dev-rpc@1.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
       birpc: 2.5.0
       vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       vite-hot-client: 2.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
 
-  vite-hot-client@2.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
+  vite-dev-rpc@1.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      birpc: 2.5.0
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-hot-client: 2.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
 
   vite-hot-client@2.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
       vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
 
-  vite-node@3.2.4(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
+  vite-hot-client@2.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
+    dependencies:
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+
+  vite-node@3.2.4(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
     dependencies:
       cac: 6.7.14
       debug: 4.4.1(supports-color@5.5.0)
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -14284,13 +14275,13 @@ snapshots:
       - tsx
       - yaml
 
-  vite-node@3.2.4(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
+  vite-node@3.2.4(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
     dependencies:
       cac: 6.7.14
       debug: 4.4.1(supports-color@5.5.0)
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -14339,7 +14330,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-inspect@11.3.3(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
+  vite-plugin-inspect@11.3.3(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
       ansis: 4.1.0
       debug: 4.4.1(supports-color@5.5.0)
@@ -14349,27 +14340,27 @@ snapshots:
       perfect-debounce: 2.0.0
       sirv: 3.0.2
       unplugin-utils: 0.3.0
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
-      vite-dev-rpc: 1.1.0(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-dev-rpc: 1.1.0(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-devtools@8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2)):
+  vite-plugin-vue-devtools@8.0.2(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
-      '@vue/devtools-core': 8.0.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+      '@vue/devtools-core': 8.0.2(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
       '@vue/devtools-kit': 8.0.2
       '@vue/devtools-shared': 8.0.2
       execa: 9.6.0
       sirv: 3.0.2
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
-      vite-plugin-inspect: 11.3.3(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
-      vite-plugin-vue-inspector: 5.3.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-plugin-inspect: 11.3.3(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
+      vite-plugin-vue-inspector: 5.3.2(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
     transitivePeerDependencies:
       - '@nuxt/kit'
       - supports-color
       - vue
 
-  vite-plugin-vue-inspector@5.3.2(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
+  vite-plugin-vue-inspector@5.3.2(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)):
     dependencies:
       '@babel/core': 7.27.4
       '@babel/plugin-proposal-decorators': 7.25.9(@babel/core@7.27.4)
@@ -14380,7 +14371,7 @@ snapshots:
       '@vue/compiler-dom': 3.5.18
       kolorist: 1.8.0
       magic-string: 0.30.19
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -14394,13 +14385,13 @@ snapshots:
       vite: 7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       vue: 3.5.18(typescript@5.9.2)
 
-  vite@5.4.19(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.43.1):
+  vite@5.4.19(@types/node@24.3.0)(lightningcss@1.29.3)(terser@5.43.1):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.5.6
       rollup: 4.52.2
     optionalDependencies:
-      '@types/node': 22.18.6
+      '@types/node': 24.3.0
       fsevents: 2.3.3
       lightningcss: 1.29.3
       terser: 5.43.1
@@ -14421,22 +14412,6 @@ snapshots:
       terser: 5.43.1
       yaml: 2.8.1
 
-  vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
-    dependencies:
-      esbuild: 0.25.9
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
-      postcss: 8.5.6
-      rollup: 4.52.2
-      tinyglobby: 0.2.15
-    optionalDependencies:
-      '@types/node': 22.18.6
-      fsevents: 2.3.3
-      jiti: 2.5.1
-      lightningcss: 1.29.3
-      terser: 5.43.1
-      yaml: 2.8.1
-
   vite@7.1.6(@types/node@24.3.0)(jiti@2.4.2)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.9
@@ -14487,7 +14462,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vitepress@1.6.4(@algolia/client-search@5.20.0)(@types/node@22.18.6)(change-case@5.4.4)(fuse.js@7.1.0)(jwt-decode@4.0.0)(lightningcss@1.29.3)(postcss@8.5.6)(search-insights@2.17.2)(terser@5.43.1)(typescript@5.9.2):
+  vitepress@1.6.4(@algolia/client-search@5.20.0)(@types/node@24.3.0)(change-case@5.4.4)(fuse.js@7.1.0)(jwt-decode@4.0.0)(lightningcss@1.29.3)(postcss@8.5.6)(search-insights@2.17.2)(terser@5.43.1)(typescript@5.9.2):
     dependencies:
       '@docsearch/css': 3.8.2
       '@docsearch/js': 3.8.2(@algolia/client-search@5.20.0)(search-insights@2.17.2)
@@ -14496,7 +14471,7 @@ snapshots:
       '@shikijs/transformers': 2.1.0
       '@shikijs/types': 2.3.2
       '@types/markdown-it': 14.1.2
-      '@vitejs/plugin-vue': 5.2.4(vite@5.4.19(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.43.1))(vue@3.5.21(typescript@5.9.2))
+      '@vitejs/plugin-vue': 5.2.4(vite@5.4.19(@types/node@24.3.0)(lightningcss@1.29.3)(terser@5.43.1))(vue@3.5.21(typescript@5.9.2))
       '@vue/devtools-api': 7.7.6
       '@vue/shared': 3.5.18
       '@vueuse/core': 12.5.0(typescript@5.9.2)
@@ -14505,7 +14480,7 @@ snapshots:
       mark.js: 8.11.1
       minisearch: 7.1.1
       shiki: 2.3.2
-      vite: 5.4.19(@types/node@22.18.6)(lightningcss@1.29.3)(terser@5.43.1)
+      vite: 5.4.19(@types/node@24.3.0)(lightningcss@1.29.3)(terser@5.43.1)
       vue: 3.5.21(typescript@5.9.2)
     optionalDependencies:
       postcss: 8.5.6
@@ -14536,11 +14511,11 @@ snapshots:
       - typescript
       - universal-cookie
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.6)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
+  vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.3.0)(@vitest/ui@3.2.4)(happy-dom@18.0.1)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
+      '@vitest/mocker': 3.2.4(vite@7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -14558,12 +14533,12 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
-      vite-node: 3.2.4(@types/node@22.18.6)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite: 7.1.6(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
+      vite-node: 3.2.4(@types/node@24.3.0)(jiti@2.5.1)(lightningcss@1.29.3)(terser@5.43.1)(yaml@2.8.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
-      '@types/node': 22.18.6
+      '@types/node': 24.3.0
       '@vitest/ui': 3.2.4(vitest@3.2.4)
       happy-dom: 18.0.1
     transitivePeerDependencies:

From 4adf69a558d3aeff1033b124ec9ee103f7af8706 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 11:59:24 +0200
Subject: [PATCH 17/81] refactor: place sub segments

---
 src/codegen/generateRouteResolver.spec.ts |  2 ++
 src/codegen/generateRouteResolver.ts      | 21 +++++++++++++--------
 src/core/tree.ts                          | 12 +++++++++++-
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index c82a58cff..d14858781 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -171,4 +171,6 @@ describe('generateRouteResolver', () => {
       "
     `)
   })
+
+  it.todo('strips off empty parent records')
 })
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index 231091814..1ebdea51a 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -53,6 +53,9 @@ ${state.matchableRecords
 `
 }
 
+/**
+ * Generates the route record in the format expected by the static resolver.
+ */
 export function generateRouteRecord({
   node,
   parentVar,
@@ -96,7 +99,7 @@ export function generateRouteRecord({
   const recordDeclaration = `
 const ${varName} = normalizeRouteRecord({
   ${recordName}
-  ${generateRouteRecordPathMatcher({ node, importsMap, paramParsersMap })}
+  ${generateRouteRecordPath({ node, importsMap, paramParsersMap })}
   ${recordComponents}
   ${parentVar ? `parent: ${parentVar},` : ''}
 })
@@ -142,7 +145,10 @@ ${files
 ${indentStr}},`
 }
 
-export function generateRouteRecordPathMatcher({
+/**
+ * Generates the `path` property of a route record for the static resolver.
+ */
+export function generateRouteRecordPath({
   node,
   importsMap,
   paramParsersMap,
@@ -153,16 +159,15 @@ export function generateRouteRecordPathMatcher({
 }) {
   if (!node.isMatchable()) {
     return ''
-    // TODO: do we really need isGroup?
-  } else if (node.value.isStatic() || node.value.isGroup()) {
-    return `path: new MatcherPatternPathStatic('${node.fullPath}'),`
-  } else if (node.value.isParam()) {
+  }
+  const params = node.params
+  if (params.length > 0) {
     return `path: new MatcherPatternPathCustomParams(
     ${node.regexp},
     ${generateParamsOptions(node.params, importsMap, paramParsersMap)},
     ${JSON.stringify(node.matcherParts)},
   ),`
+  } else {
+    return `path: new MatcherPatternPathStatic('${node.fullPath}'),`
   }
-
-  return `/* UNSUPPORTED path matcher for: "${node.fullPath}" */`
 }
diff --git a/src/core/tree.ts b/src/core/tree.ts
index 3437a00ac..5ce8743f6 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -324,7 +324,17 @@ export class TreeNode {
     let node: TreeNode | undefined = this
 
     while (node && !node.isRoot()) {
-      parts.unshift(node.value.isParam() ? 0 : node.value.pathSegment)
+      var subSegments = node.value.subSegments
+        .map(
+          (segment) =>
+            typeof segment === 'string'
+              ? segment.replaceAll('/', '')
+              : 0 /* param */
+        )
+        // filter out empty segments
+        .filter((v) => v !== '')
+      console.log('✨', subSegments)
+      parts.unshift(...subSegments)
       node = node.parent
     }
 

From 8e255e43e45040ac56e808251c5354fc45258ae0 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 14:30:14 +0200
Subject: [PATCH 18/81] fix: handle subsegments

---
 src/codegen/generateParamParsers.ts       |   6 +-
 src/codegen/generateRouteResolver.spec.ts | 130 ++++++++++++++++++++++
 src/codegen/generateRouteResolver.ts      |   1 +
 src/core/tree.ts                          |  30 +++--
 src/core/treeNodeValue.ts                 |  16 ++-
 5 files changed, 164 insertions(+), 19 deletions(-)

diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
index 95c5d9347..844348006 100644
--- a/src/codegen/generateParamParsers.ts
+++ b/src/codegen/generateParamParsers.ts
@@ -110,12 +110,12 @@ export function generateParamsOptions(
   const paramOptions = params.map((param) => {
     const repeatable = param.repeatable ? `repeat: true, ` : ''
     return `
-      ${param.paramName}: {${generateParamParserOptions(param, importsMap, paramParsers)}${repeatable}},
-`
+${param.paramName}: {${generateParamParserOptions(param, importsMap, paramParsers)}${repeatable}},
+`.slice(1, -1)
   })
 
   return `{
-${paramOptions.join('\n')}
+      ${paramOptions.join('\n      ')}
     }`
 }
 
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index d14858781..98534f923 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -4,6 +4,7 @@ import { resolveOptions } from '../options'
 import {
   generateRouteResolver,
   generateRouteRecord,
+  generateRouteRecordPath,
 } from './generateRouteResolver'
 import { ImportsMap } from '../core/utils'
 import { ParamParsersMap } from './generateParamParsers'
@@ -21,6 +22,135 @@ beforeEach(() => {
   }
 })
 
+describe('generateRouteRecordPath', () => {
+  let importsMap!: ImportsMap
+  beforeEach(() => {
+    importsMap = new ImportsMap()
+  })
+
+  it('generates static paths', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
+    expect(
+      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
+    ).toBe(`path: new MatcherPatternPathStatic('/a'),`)
+  })
+
+  it('works with multiple segments', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/b/c', 'a/b/c.vue')
+    expect(
+      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
+    ).toBe(`path: new MatcherPatternPathStatic('/a/b/c'),`)
+  })
+
+  // TODO: we need to figure out an option for this
+  it.todo('keeps trailing slashes', () => {
+    // currently, the `a/` gets converted to `a` in the tree (which is expected)
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/', 'a.vue')
+    expect(
+      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
+    ).toBe(`path: new MatcherPatternPathStatic('/a/'),`)
+  })
+
+  it('generates paths with params', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[b]', 'a.vue')
+    expect(
+      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "path: new MatcherPatternPathCustomParams(
+          /^\\/a\\/([^/]+)$/i,
+          {
+            b: {},
+          },
+          ["a",0],
+        ),"
+    `)
+  })
+
+  it('works with multiple params', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[b]/[c]', 'a.vue')
+    expect(
+      generateRouteRecordPath({
+        importsMap,
+        node,
+        paramParsersMap: new Map(),
+      })
+    ).toMatchInlineSnapshot(`
+      "path: new MatcherPatternPathCustomParams(
+          /^\\/a\\/([^/]+)\\/([^/]+)$/i,
+          {
+            b: {},
+            c: {},
+          },
+          ["a",0,0],
+        ),"
+    `)
+  })
+
+  it('works with optional params', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[[b]]', 'a.vue')
+    expect(
+      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "path: new MatcherPatternPathCustomParams(
+          /^\\/a\\/([^/]+)?$/i,
+          {
+            b: {},
+          },
+          ["a",0],
+        ),"
+    `)
+  })
+
+  it('works with repeatable params', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[b]+', 'a.vue')
+    expect(
+      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "path: new MatcherPatternPathCustomParams(
+          /^\\/a\\/(.+?)$/i,
+          {
+            b: {repeat: true, },
+          },
+          ["a",0],
+        ),"
+    `)
+  })
+
+  it('works with repeatable optional params', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[[b]]+', 'a.vue')
+    expect(
+      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "path: new MatcherPatternPathCustomParams(
+          /^\\/a\\/(.+?)?$/i,
+          {
+            b: {repeat: true, },
+          },
+          ["a",0],
+        ),"
+    `)
+  })
+
+  it('works with segments', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+      'a/a-[b]-c-[d]',
+      'a.vue'
+    )
+    expect(
+      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "path: new MatcherPatternPathCustomParams(
+          /^\\/a\\/a-([^/]+)-c-([^/]+)$/i,
+          {
+            b: {},
+            d: {},
+          },
+          ["a",["a-",0,"-c-",0]],
+        ),"
+    `)
+  })
+})
+
 describe('generateRouteRecord', () => {
   it('serializes a simple static path', () => {
     const tree = new PrefixTree(DEFAULT_OPTIONS)
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index 1ebdea51a..ab442c961 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -72,6 +72,7 @@ export function generateRouteRecord({
   paramParsersMap: ParamParsersMap
 }): string {
   // TODO: skip nodes that add no value. Maybe it should be done at the level of the tree?
+  // by skipping the parent node that has no extra information
   const varName = `r_${state.id++}`
 
   let recordName: string
diff --git a/src/core/tree.ts b/src/core/tree.ts
index 5ce8743f6..2824cae48 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -12,6 +12,10 @@ export interface TreeNodeOptions extends ResolvedOptions {
   treeNodeOptions?: TreeNodeValueOptions
 }
 
+export type TreeNodeValueMatcherPart = Array<
+  string | number | Array<string | number>
+>
+
 export class TreeNode {
   /**
    * value of the node
@@ -319,22 +323,24 @@ export class TreeNode {
     return params
   }
 
-  get matcherParts(): Array<string | number> {
-    const parts: Array<string | number> = []
+  get matcherParts(): TreeNodeValueMatcherPart {
+    const parts: TreeNodeValueMatcherPart = []
     let node: TreeNode | undefined = this
 
     while (node && !node.isRoot()) {
-      var subSegments = node.value.subSegments
-        .map(
-          (segment) =>
-            typeof segment === 'string'
-              ? segment.replaceAll('/', '')
-              : 0 /* param */
+      const subSegments = node.value.subSegments.map(
+        (segment) => (typeof segment === 'string' ? segment : 0) /* param */
+      )
+
+      if (subSegments.length > 1) {
+        parts.unshift(
+          node.value.subSegments.map(
+            (segment) => (typeof segment === 'string' ? segment : 0) /* param */
+          )
         )
-        // filter out empty segments
-        .filter((v) => v !== '')
-      console.log('✨', subSegments)
-      parts.unshift(...subSegments)
+      } else if (subSegments.length === 1) {
+        parts.unshift(subSegments[0]!)
+      }
       node = node.parent
     }
 
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index 4f7ff059a..47a192032 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -232,6 +232,12 @@ export interface TreeRouteParam {
   parser: string | null
 }
 
+/**
+ * To escape regex characters in the path segment.
+ * @internal
+ */
+const REGEX_CHARS_RE = /[.+*?^${}()[\]/\\]/g
+
 export class TreeNodeValueParam extends _TreeNodeValueBase {
   params: TreeRouteParam[]
   override _type: TreeNodeType.param = TreeNodeType.param
@@ -271,11 +277,10 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
       .filter(Boolean)
       .map((segment) => {
         if (typeof segment === 'string') {
-          // TODO: escape regexp from vue router source code
-          return segment.replaceAll('/', '\\/')
+          return segment.replace(REGEX_CHARS_RE, '\\$&')
         }
         return (
-          (segment.repeatable ? '(.+)' : '([^/]+)') +
+          (segment.repeatable ? '(.+?)' : '([^/]+)') +
           (segment.optional ? '?' : '')
         )
       })
@@ -484,7 +489,10 @@ function parseFileSegment(
 
     if (state === ParseFileSegmentState.static) {
       if (c === '[') {
-        consumeBuffer()
+        // avoid adding the leading empty string for segments that start with a param
+        if (buffer) {
+          consumeBuffer()
+        }
         // check if it's an optional param or not
         state = ParseFileSegmentState.paramOptional
       } else {

From be601e2374d26e591e60f4b44453d601a6f65141 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 14:34:18 +0200
Subject: [PATCH 19/81] chore: up vue router

---
 package.json                         |  2 +-
 playground-experimental/package.json |  2 +-
 pnpm-lock.yaml                       | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index de45953fa..f5bb92cee 100644
--- a/package.json
+++ b/package.json
@@ -204,7 +204,7 @@
     "vitepress-plugin-llms": "^1.7.5",
     "vitest": "^3.2.4",
     "vue": "^3.5.21",
-    "vue-router": "https://pkg.pr.new/vue-router@2d79fe7",
+    "vue-router": "https://pkg.pr.new/vue-router@96d8a89",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index a6774fa05..1ddbabb5f 100644
--- a/playground-experimental/package.json
+++ b/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@2d79fe7"
+    "vue-router": "https://pkg.pr.new/vue-router@96d8a89"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 02eccd9d1..683a30a30 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -169,11 +169,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@2d79fe7
-        version: https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@96d8a89
+        version: https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -261,8 +261,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@2d79fe7
-        version: https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@96d8a89
+        version: https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -6863,8 +6863,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@https://pkg.pr.new/vue-router@2d79fe7:
-    resolution: {tarball: https://pkg.pr.new/vue-router@2d79fe7}
+  vue-router@https://pkg.pr.new/vue-router@96d8a89:
+    resolution: {tarball: https://pkg.pr.new/vue-router@96d8a89}
     version: 4.5.1
     peerDependencies:
       vue: ^3.2.0
@@ -14573,17 +14573,17 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@https://pkg.pr.new/vue-router@2d79fe7(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)

From 246106da7412a6d6ed64bcec7358c42049af2abb Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 14:34:27 +0200
Subject: [PATCH 20/81] fix: non greedy param

---
 src/core/treeNodeValue.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index 47a192032..6ccea542e 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -280,7 +280,7 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
           return segment.replace(REGEX_CHARS_RE, '\\$&')
         }
         return (
-          (segment.repeatable ? '(.+?)' : '([^/]+)') +
+          (segment.repeatable ? '(.+?)' : '([^/]+?)') +
           (segment.optional ? '?' : '')
         )
       })

From b4fe70359ecdfd5628a8aaa9bf64297a92c2f867 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 15:46:08 +0200
Subject: [PATCH 21/81] fix: proper scoring

---
 src/codegen/generateRouteResolver.spec.ts | 160 +++++++++++++++++++---
 src/codegen/generateRouteResolver.ts      |  48 ++++++-
 src/core/tree.ts                          |   8 +-
 src/core/treeNodeValue.ts                 |  34 +++--
 vitest.config.ts                          |   2 +-
 vitest.workspace.js                       |   3 -
 6 files changed, 206 insertions(+), 49 deletions(-)
 delete mode 100644 vitest.workspace.js

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 98534f923..3b92768e2 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -57,7 +57,7 @@ describe('generateRouteRecordPath', () => {
       generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
       "path: new MatcherPatternPathCustomParams(
-          /^\\/a\\/([^/]+)$/i,
+          /^\\/a\\/([^/]+?)$/i,
           {
             b: {},
           },
@@ -76,7 +76,7 @@ describe('generateRouteRecordPath', () => {
       })
     ).toMatchInlineSnapshot(`
       "path: new MatcherPatternPathCustomParams(
-          /^\\/a\\/([^/]+)\\/([^/]+)$/i,
+          /^\\/a\\/([^/]+?)\\/([^/]+?)$/i,
           {
             b: {},
             c: {},
@@ -92,7 +92,7 @@ describe('generateRouteRecordPath', () => {
       generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
       "path: new MatcherPatternPathCustomParams(
-          /^\\/a\\/([^/]+)?$/i,
+          /^\\/a\\/([^/]+?)?$/i,
           {
             b: {},
           },
@@ -140,7 +140,7 @@ describe('generateRouteRecordPath', () => {
       generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
       "path: new MatcherPatternPathCustomParams(
-          /^\\/a\\/a-([^/]+)-c-([^/]+)$/i,
+          /^\\/a\\/a-([^/]+?)-c-([^/]+?)$/i,
           {
             b: {},
             d: {},
@@ -253,10 +253,10 @@ describe('generateRouteResolver', () => {
       })
 
       export const resolver = createStaticResolver([
-        r_0,  // /a
-        r_2,  // /b/c
         r_3,  // /b/c/d
         r_5,  // /b/e/f
+        r_2,  // /b/c
+        r_0,  // /a
       ])
       "
     `)
@@ -285,22 +285,140 @@ describe('generateRouteResolver', () => {
 
     expect(resolver.replace(/^.*?createStaticResolver/s, ''))
       .toMatchInlineSnapshot(`
-      "([
-        r_1,   // /a
-        r_11,  // /b/a-b
-        r_7,   // /b/a-:a
-        r_8,   // /b/a-:a?
-        r_10,  // /b/a-:a+
-        r_9,   // /b/a-:a*
-        r_3,   // /b/:a
-        r_4,   // /b/:a?
-        r_6,   // /b/:a+
-        r_5,   // /b/:a*
-        r_0,   // /:all(.*)
-      ])
-      "
-    `)
+        "([
+          r_11,  // /b/a-b
+          r_7,   // /b/a-:a
+          r_3,   // /b/:a
+          r_8,   // /b/a-:a?
+          r_4,   // /b/:a?
+          r_10,  // /b/a-:a+
+          r_6,   // /b/:a+
+          r_9,   // /b/a-:a*
+          r_5,   // /b/:a*
+          r_1,   // /a
+          r_0,   // /:all(.*)
+        ])
+        "
+      `)
   })
 
   it.todo('strips off empty parent records')
 })
+
+describe('route prioritization in resolver', () => {
+  function getRouteOrderFromResolver(tree: PrefixTree): string[] {
+    const resolver = generateRouteResolver(
+      tree,
+      DEFAULT_OPTIONS,
+      new ImportsMap(),
+      new Map()
+    )
+
+    // Extract the order from the resolver output
+    const lines = resolver.split('\n').filter((line) => line.includes('// /'))
+    return lines.map((line) => line.split('// ')[1] || '')
+  }
+
+  it('prioritizes routes correctly in resolver output', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+
+    // Create routes with different specificity levels
+    tree.insert('static', 'static.vue')
+    tree.insert('[id]', '[id].vue')
+    tree.insert('[[optional]]', '[[optional]].vue')
+    tree.insert('prefix-[id]-suffix', 'prefix-[id]-suffix.vue')
+    tree.insert('[...all]', '[...all].vue')
+
+    // Routes should be ordered from most specific to least specific
+    expect(getRouteOrderFromResolver(tree)).toEqual([
+      '/static', // static routes first
+      '/prefix-:id-suffix', // mixed routes with static content
+      '/:id', // pure parameter routes
+      '/:optional?', // optional parameter routes
+      '/:all(.*)', // catch-all routes last
+    ])
+  })
+
+  it('handles nested route prioritization correctly', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+
+    // Create nested routes with different patterns
+    tree.insert('api/users', 'api/users.vue')
+    tree.insert('api/[resource]', 'api/[resource].vue')
+    tree.insert('prefix-[param]/static', 'prefix-[param]/static.vue')
+    tree.insert('[dynamic]/static', '[dynamic]/static.vue')
+    tree.insert('[x]/[y]', '[x]/[y].vue')
+
+    // Routes with more static content should come first
+    expect(getRouteOrderFromResolver(tree)).toEqual([
+      '/api/users', // all static segments
+      '/api/:resource', // static root, param child
+      '/prefix-:param/static', // mixed root, static child
+      '/:dynamic/static', // param root, static child
+      '/:x/:y', // all param segments
+    ])
+  })
+
+  it('orders complex mixed routes appropriately', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+
+    // Create routes with various subsegment complexity
+    tree.insert('users', 'users.vue') // pure static
+    tree.insert('prefix-[id]', 'prefix-[id].vue') // prefix + param
+    tree.insert('[id]-suffix', '[id]-suffix.vue') // param + suffix
+    tree.insert('pre-[a]-mid-[b]-end', 'complex.vue') // complex mixed
+    tree.insert('[a]-[b]', '[a]-[b].vue') // params with separator
+    tree.insert('[param]', '[param].vue') // pure param
+
+    expect(getRouteOrderFromResolver(tree)).toEqual([
+      '/users', // pure static wins
+      '/pre-:a-mid-:b-end', // most static content in mixed
+      '/:id-suffix', // static suffix
+      '/prefix-:id', // static prefix
+      '/:a-:b', // params with static separator
+      '/:param', // pure param last
+    ])
+  })
+
+  it('handles optional and repeatable params in nested contexts', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+
+    // Create nested routes with optional and repeatable params
+    tree.insert('api/static', 'api/static.vue')
+    tree.insert('api/[[optional]]', 'api/[[optional]].vue')
+    tree.insert('api/[required]', 'api/[required].vue')
+    tree.insert('api/[repeatable]+', 'api/[repeatable]+.vue')
+    tree.insert('api/[[optional]]+', 'api/[[optional]]+.vue')
+    tree.insert('api/[...catchall]', 'api/[...catchall].vue')
+
+    expect(getRouteOrderFromResolver(tree)).toEqual([
+      '/api/static', // static segment wins
+      '/api/:required', // required param
+      '/api/:optional?', // optional param
+      '/api/:repeatable+', // repeatable param
+      '/api/:optional*', // optional repeatable param
+      '/api/:catchall(.*)', // catch-all last
+    ])
+  })
+
+  it('handles complex subsegments in deeply nested routes', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+
+    // Create deeply nested routes with complex subsegment patterns
+    tree.insert('api/v1/users', 'api/v1/users.vue')
+    tree.insert('api/v1/user-[id]', 'api/v1/user-[id].vue')
+    tree.insert('api/v1/[type]/list', 'api/v1/[type]/list.vue')
+    tree.insert('api/v1/[type]/[id]', 'api/v1/[type]/[id].vue')
+    tree.insert('api/v1/prefix-[a]-mid-[b]', 'api/v1/prefix-[a]-mid-[b].vue')
+    tree.insert('api/v1/[x]-[y]-[z]', 'api/v1/[x]-[y]-[z].vue')
+
+    expect(getRouteOrderFromResolver(tree)).toEqual([
+      '/api/v1/users', // all static segments
+      '/api/v1/user-:id', // mixed with static prefix
+      '/api/v1/prefix-:a-mid-:b', // complex mixed pattern
+      '/api/v1/:x-:y-:z', // multiple params with separators (mixed subsegments rank higher)
+      '/api/v1/:type/list', // param + static child
+      '/api/v1/:type/:id', // all param segments
+    ])
+  })
+})
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index ab442c961..2edc0e098 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -5,12 +5,56 @@ import { ts } from '../utils'
 import { generateParamsOptions, ParamParsersMap } from './generateParamParsers'
 import { generatePageImport } from './generateRouteRecords'
 
+/**
+ * Compare two score arrays for sorting routes by priority.
+ * Higher scores should come first (more specific routes).
+ */
+function compareRouteScore(a: number[][], b: number[][]): number {
+  const maxLength = Math.max(a.length, b.length)
+
+  for (let i = 0; i < maxLength; i++) {
+    const aSegment = a[i] || []
+    const bSegment = b[i] || []
+
+    // Compare segment by segment, but consider the "minimum" score of each segment
+    // since mixed segments with params should rank lower than pure static
+    const aMinScore = aSegment.length > 0 ? Math.min(...aSegment) : 0
+    const bMinScore = bSegment.length > 0 ? Math.min(...bSegment) : 0
+
+    if (aMinScore !== bMinScore) {
+      return bMinScore - aMinScore // Higher minimum score wins
+    }
+
+    // If minimum scores are equal, compare average scores
+    const aAvgScore =
+      aSegment.length > 0
+        ? aSegment.reduce((sum, s) => sum + s, 0) / aSegment.length
+        : 0
+    const bAvgScore =
+      bSegment.length > 0
+        ? bSegment.reduce((sum, s) => sum + s, 0) / bSegment.length
+        : 0
+
+    if (aAvgScore !== bAvgScore) {
+      return bAvgScore - aAvgScore // Higher average score wins
+    }
+
+    // If averages are equal, prefer fewer subsegments (less complexity)
+    if (aSegment.length !== bSegment.length) {
+      return aSegment.length - bSegment.length
+    }
+  }
+
+  // If all segments are equal, prefer fewer segments (shorter paths)
+  return a.length - b.length
+}
+
 interface GenerateRouteResolverState {
   id: number
   matchableRecords: {
     path: string
     varName: string
-    score: number
+    score: number[][]
   }[]
 }
 
@@ -43,7 +87,7 @@ ${records.join('\n\n')}
 
 export const resolver = createStaticResolver([
 ${state.matchableRecords
-  .sort((a, b) => b.score - a.score)
+  .sort((a, b) => compareRouteScore(a.score, b.score))
   .map(
     ({ varName, path }) =>
       `  ${varName},  ${' '.repeat(String(state.id).length - varName.length + 2)}// ${path}`
diff --git a/src/core/tree.ts b/src/core/tree.ts
index 2824cae48..b0548b592 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -300,16 +300,16 @@ export class TreeNode {
     return '/^' + re + '$/i'
   }
 
-  get score(): number {
-    let score = 666
+  get score(): number[][] {
+    const scores: number[][] = []
     let node: TreeNode | undefined = this
 
     while (node && !node.isRoot()) {
-      score = Math.min(score, node.value.score)
+      scores.unshift(node.value.score)
       node = node.parent
     }
 
-    return score
+    return scores
   }
 
   get matcherParams() {
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index 6ccea542e..435f81c41 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -195,7 +195,7 @@ class _TreeNodeValueBase {
 export class TreeNodeValueStatic extends _TreeNodeValueBase {
   override _type: TreeNodeType.static = TreeNodeType.static
 
-  readonly score = 300
+  readonly score = [300]
 
   constructor(
     rawSegment: string,
@@ -210,7 +210,7 @@ export class TreeNodeValueGroup extends _TreeNodeValueBase {
   override _type: TreeNodeType.group = TreeNodeType.group
   groupName: string
 
-  readonly score = 300
+  readonly score = [300]
 
   constructor(
     rawSegment: string,
@@ -253,23 +253,21 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
     this.params = params
   }
 
-  // FIXME: implement scoring from vue-router
-  get score(): number {
-    const malus = Math.max(
-      ...this.params.map((p) =>
-        p.isSplat ? 500 : (p.optional ? 10 : 0) + (p.repeatable ? 20 : 0)
-      )
-    )
+  // Calculate score for each subsegment to handle mixed static/param parts
+  get score(): number[] {
+    return this.subSegments.map((segment) => {
+      if (typeof segment === 'string') {
+        // Static subsegment gets highest score
+        return 300
+      } else {
+        // Parameter subsegment - calculate malus based on param properties
+        const malus = segment.isSplat
+          ? 500
+          : (segment.optional ? 10 : 0) + (segment.repeatable ? 20 : 0)
 
-    return (
-      80 -
-      malus +
-      (this.params.length > 0 &&
-      this.subSegments.length > 1 &&
-      this.subSegments.some((s) => typeof s === 'string' && s.length > 0)
-        ? 35
-        : 0)
-    )
+        return 80 - malus
+      }
+    })
   }
 
   get re(): string {
diff --git a/vitest.config.ts b/vitest.config.ts
index acd118418..37ace1e22 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -2,7 +2,6 @@ import { defineConfig } from 'vitest/config'
 import Vue from '@vitejs/plugin-vue'
 import { fileURLToPath, URL } from 'url'
 
-const __dirname = new URL('.', import.meta.url).pathname
 export default defineConfig({
   resolve: {
     alias: [
@@ -20,6 +19,7 @@ export default defineConfig({
       },
     ],
   },
+
   plugins: [Vue()],
 
   test: {
diff --git a/vitest.workspace.js b/vitest.workspace.js
deleted file mode 100644
index 45759c07c..000000000
--- a/vitest.workspace.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { defineWorkspace } from 'vitest/config'
-
-export default defineWorkspace(['./vitest.config.ts'])

From 3171dfe203d2942cb1c06ef3077872ad08737326 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 17:32:29 +0200
Subject: [PATCH 22/81] feat: remove empty parents from routes

---
 src/codegen/generateRouteResolver.spec.ts | 170 +++++++++++++++++++---
 src/codegen/generateRouteResolver.ts      |  80 +++++-----
 src/core/treeNodeValue.ts                 |   8 +-
 3 files changed, 197 insertions(+), 61 deletions(-)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 3b92768e2..8eb81f5f9 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -221,41 +221,32 @@ describe('generateRouteResolver', () => {
       })
 
       const r_1 = normalizeRouteRecord({
-        /* internal name: '/b' */
-      })
-      const r_2 = normalizeRouteRecord({
         name: '/b/c',
         path: new MatcherPatternPathStatic('/b/c'),
         components: {
           'default': () => import('b/c.vue')
         },
-        parent: r_1,
       })
-      const r_3 = normalizeRouteRecord({
+      const r_2 = normalizeRouteRecord({
         name: '/b/c/d',
         path: new MatcherPatternPathStatic('/b/c/d'),
         components: {
           'default': () => import('b/c/d.vue')
         },
-        parent: r_2,
-      })
-      const r_4 = normalizeRouteRecord({
-        /* internal name: '/b/e' */
         parent: r_1,
       })
-      const r_5 = normalizeRouteRecord({
+      const r_3 = normalizeRouteRecord({
         name: '/b/e/f',
         path: new MatcherPatternPathStatic('/b/e/f'),
         components: {
           'default': () => import('b/c/f.vue')
         },
-        parent: r_4,
       })
 
       export const resolver = createStaticResolver([
-        r_3,  // /b/c/d
-        r_5,  // /b/e/f
-        r_2,  // /b/c
+        r_2,  // /b/c/d
+        r_3,  // /b/e/f
+        r_1,  // /b/c
         r_0,  // /a
       ])
       "
@@ -286,15 +277,15 @@ describe('generateRouteResolver', () => {
     expect(resolver.replace(/^.*?createStaticResolver/s, ''))
       .toMatchInlineSnapshot(`
         "([
-          r_11,  // /b/a-b
-          r_7,   // /b/a-:a
-          r_3,   // /b/:a
-          r_8,   // /b/a-:a?
-          r_4,   // /b/:a?
-          r_10,  // /b/a-:a+
-          r_6,   // /b/:a+
-          r_9,   // /b/a-:a*
-          r_5,   // /b/:a*
+          r_10,  // /b/a-b
+          r_6,   // /b/a-:a
+          r_2,   // /b/:a
+          r_7,   // /b/a-:a?
+          r_3,   // /b/:a?
+          r_9,   // /b/a-:a+
+          r_5,   // /b/:a+
+          r_8,   // /b/a-:a*
+          r_4,   // /b/:a*
           r_1,   // /a
           r_0,   // /:all(.*)
         ])
@@ -302,7 +293,138 @@ describe('generateRouteResolver', () => {
       `)
   })
 
-  it.todo('strips off empty parent records')
+  it('strips off empty parent records', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    const importsMap = new ImportsMap()
+    tree.insert('a', 'a.vue')
+    tree.insert('b/c', 'b/c.vue')
+    tree.insert('b/c/d', 'b/c/d.vue')
+    tree.insert('b/e/f', 'b/c/f.vue')
+    const resolver = generateRouteResolver(
+      tree,
+      DEFAULT_OPTIONS,
+      importsMap,
+      new Map()
+    )
+
+    expect(resolver).toMatchInlineSnapshot(`
+      "
+      const r_0 = normalizeRouteRecord({
+        name: '/a',
+        path: new MatcherPatternPathStatic('/a'),
+        components: {
+          'default': () => import('a.vue')
+        },
+      })
+
+      const r_1 = normalizeRouteRecord({
+        name: '/b/c',
+        path: new MatcherPatternPathStatic('/b/c'),
+        components: {
+          'default': () => import('b/c.vue')
+        },
+      })
+      const r_2 = normalizeRouteRecord({
+        name: '/b/c/d',
+        path: new MatcherPatternPathStatic('/b/c/d'),
+        components: {
+          'default': () => import('b/c/d.vue')
+        },
+        parent: r_1,
+      })
+      const r_3 = normalizeRouteRecord({
+        name: '/b/e/f',
+        path: new MatcherPatternPathStatic('/b/e/f'),
+        components: {
+          'default': () => import('b/c/f.vue')
+        },
+      })
+
+      export const resolver = createStaticResolver([
+        r_2,  // /b/c/d
+        r_3,  // /b/e/f
+        r_1,  // /b/c
+        r_0,  // /a
+      ])
+      "
+    `)
+  })
+
+  it('retains parent chain when skipping empty intermediate nodes', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    // Create a meaningful parent
+    tree.insert('a', 'a.vue')
+    // Create a deeply nested child with empty intermediate nodes b and c
+    tree.insert('a/b/c/e', 'a/b/c/e.vue')
+    const resolver = generateRouteResolver(
+      tree,
+      DEFAULT_OPTIONS,
+      new ImportsMap(),
+      new Map()
+    )
+
+    expect(resolver).toMatchInlineSnapshot(`
+      "
+      const r_0 = normalizeRouteRecord({
+        name: '/a',
+        path: new MatcherPatternPathStatic('/a'),
+        components: {
+          'default': () => import('a.vue')
+        },
+      })
+      const r_1 = normalizeRouteRecord({
+        name: '/a/b/c/e',
+        path: new MatcherPatternPathStatic('/a/b/c/e'),
+        components: {
+          'default': () => import('a/b/c/e.vue')
+        },
+        parent: r_0,
+      })
+
+      export const resolver = createStaticResolver([
+        r_1,  // /a/b/c/e
+        r_0,  // /a
+      ])
+      "
+    `)
+  })
+
+  it('preserves parent nodes with meta data', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    // Create a nested route
+    tree.insert('a/b/c', 'a/b/c.vue')
+    // Add meta to the intermediate b node (no components, but has meta)
+    const aNode = tree.children.get('a')!
+    const bNode = aNode.children.get('b')!
+    bNode.value.setEditOverride('meta', { requiresAuth: true })
+
+    const resolver = generateRouteResolver(
+      tree,
+      DEFAULT_OPTIONS,
+      new ImportsMap(),
+      new Map()
+    )
+
+    expect(resolver).toMatchInlineSnapshot(`
+      "
+      const r_0 = normalizeRouteRecord({
+        /* internal name: '/a/b' */
+      })
+      const r_1 = normalizeRouteRecord({
+        name: '/a/b/c',
+        path: new MatcherPatternPathStatic('/a/b/c'),
+        components: {
+          'default': () => import('a/b/c.vue')
+        },
+        parent: r_0,
+      })
+
+      export const resolver = createStaticResolver([
+        r_1,  // /a/b/c
+      ])
+      "
+    `)
+  })
 })
 
 describe('route prioritization in resolver', () => {
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index 2edc0e098..ed79805fc 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -115,33 +115,40 @@ export function generateRouteRecord({
   importsMap: ImportsMap
   paramParsersMap: ParamParsersMap
 }): string {
-  // TODO: skip nodes that add no value. Maybe it should be done at the level of the tree?
-  // by skipping the parent node that has no extra information
-  const varName = `r_${state.id++}`
-
-  let recordName: string
-  let recordComponents: string
-
-  // TODO: what about groups?
-  if (node.isMatchable()) {
-    state.matchableRecords.push({
-      path: node.fullPath,
-      varName,
-      score: node.score,
-    })
-    recordName = `name: '${node.name}',`
-    recordComponents = generateRouteRecordComponent(
-      node,
-      '  ',
-      options.importMode,
-      importsMap
-    )
-  } else {
-    recordName = node.name ? `/* internal name: '${node.name}' */` : ``
-    recordComponents = ''
-  }
+  const isMatchable = node.isMatchable()
+
+  // we want to skip adding routes that add no options (components, meta, props, etc)
+  // that simplifies the generated tree
+  const shouldSkipNode = !isMatchable && !node.meta
+
+  let varName: string | null = null
+  let recordDeclaration = ''
+
+  if (!shouldSkipNode) {
+    varName = `r_${state.id++}`
+
+    let recordName: string
+    let recordComponents: string
+
+    if (isMatchable) {
+      state.matchableRecords.push({
+        path: node.fullPath,
+        varName,
+        score: node.score,
+      })
+      recordName = `name: '${node.name}',`
+      recordComponents = generateRouteRecordComponent(
+        node,
+        '  ',
+        options.importMode,
+        importsMap
+      )
+    } else {
+      recordName = node.name ? `/* internal name: '${node.name}' */` : ``
+      recordComponents = ''
+    }
 
-  const recordDeclaration = `
+    recordDeclaration = `
 const ${varName} = normalizeRouteRecord({
   ${recordName}
   ${generateRouteRecordPath({ node, importsMap, paramParsersMap })}
@@ -149,16 +156,18 @@ const ${varName} = normalizeRouteRecord({
   ${parentVar ? `parent: ${parentVar},` : ''}
 })
 `
-    .trim()
-    .split('\n')
-    // remove empty lines
-    .filter((l) => l.trimStart().length > 0)
-    .join('\n')
+      .trim()
+      .split('\n')
+      // remove empty lines
+      .filter((l) => l.trimStart().length > 0)
+      .join('\n')
+  }
 
   const children = node.getChildrenSorted().map((child) =>
     generateRouteRecord({
       node: child,
-      parentVar: varName,
+      // If we skipped this node, pass the parent var from above, otherwise use our var
+      parentVar: shouldSkipNode ? parentVar : varName,
       state,
       options,
       importsMap,
@@ -166,7 +175,12 @@ const ${varName} = normalizeRouteRecord({
     })
   )
 
-  return recordDeclaration + (children.length ? '\n' + children.join('\n') : '')
+  return (
+    recordDeclaration +
+    (children.length
+      ? (recordDeclaration ? '\n' : '') + children.join('\n')
+      : '')
+  )
 }
 
 function generateRouteRecordComponent(
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index 435f81c41..a33275b7d 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -277,10 +277,10 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
         if (typeof segment === 'string') {
           return segment.replace(REGEX_CHARS_RE, '\\$&')
         }
-        return (
-          (segment.repeatable ? '(.+?)' : '([^/]+?)') +
-          (segment.optional ? '?' : '')
-        )
+        return segment.isSplat
+          ? '(.*)'
+          : (segment.repeatable ? '(.+?)' : '([^/]+?)') +
+              (segment.optional ? '?' : '')
       })
       .join('')
   }

From 77275d700971e11e485a697bbd71b03cae4fa856 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 17:32:49 +0200
Subject: [PATCH 23/81] chore: rename to test 404 page

---
 .../src/pages/[...404].vue                    |  7 +++++
 .../src/pages/{[name].vue => u[name].vue}     |  0
 .../src/pages/{[name] => u[name]}/24.vue      |  0
 .../{[name] => u[name]}/[userId=int].vue      |  0
 playground-experimental/typed-router.d.ts     | 31 +++++++++++--------
 5 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 playground-experimental/src/pages/[...404].vue
 rename playground-experimental/src/pages/{[name].vue => u[name].vue} (100%)
 rename playground-experimental/src/pages/{[name] => u[name]}/24.vue (100%)
 rename playground-experimental/src/pages/{[name] => u[name]}/[userId=int].vue (100%)

diff --git a/playground-experimental/src/pages/[...404].vue b/playground-experimental/src/pages/[...404].vue
new file mode 100644
index 000000000..3a8551cb2
--- /dev/null
+++ b/playground-experimental/src/pages/[...404].vue
@@ -0,0 +1,7 @@
+<template>
+  <main>
+    <h1>Not Found</h1>
+
+    <p>{{ $route.params }}</p>
+  </main>
+</template>
diff --git a/playground-experimental/src/pages/[name].vue b/playground-experimental/src/pages/u[name].vue
similarity index 100%
rename from playground-experimental/src/pages/[name].vue
rename to playground-experimental/src/pages/u[name].vue
diff --git a/playground-experimental/src/pages/[name]/24.vue b/playground-experimental/src/pages/u[name]/24.vue
similarity index 100%
rename from playground-experimental/src/pages/[name]/24.vue
rename to playground-experimental/src/pages/u[name]/24.vue
diff --git a/playground-experimental/src/pages/[name]/[userId=int].vue b/playground-experimental/src/pages/u[name]/[userId=int].vue
similarity index 100%
rename from playground-experimental/src/pages/[name]/[userId=int].vue
rename to playground-experimental/src/pages/u[name]/[userId=int].vue
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
index 09355a30d..851ee10ad 100644
--- a/playground-experimental/typed-router.d.ts
+++ b/playground-experimental/typed-router.d.ts
@@ -22,12 +22,13 @@ declare module 'vue-router/auto-routes' {
    */
   export interface RouteNamedMap {
     '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
-    '/[name]': RouteRecordInfo<'/[name]', '/:name', { name: ParamValue<false> }, { name: ParamValue<false> }, '/[name]/24' | '/[name]/[userId=int]'>,
-    '/[name]/[userId=int]': RouteRecordInfo<'/[name]/[userId=int]', '/:name/:userId', { name: ParamValue<false>, userId: number }, { name: ParamValue<false>, userId: number }>,
-    '/[name]/24': RouteRecordInfo<'/[name]/24', '/:name/24', { name: ParamValue<false> }, { name: ParamValue<false> }>,
+    '/[...404]': RouteRecordInfo<'/[...404]', '/:404(.*)', { 404: ParamValue<false> }, { 404: ParamValue<false> }>,
     '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: ParamValue<false>, d: ParamValue<false> }, { b: ParamValue<false>, d: ParamValue<false> }>,
     '/b': RouteRecordInfo<'/b', '/b', Record<never, never>, Record<never, never>>,
     '/events/[when=date]': RouteRecordInfo<'/events/[when=date]', '/events/:when', { when: Param_date }, { when: Param_date }>,
+    '/u[name]': RouteRecordInfo<'/u[name]', '/u:name', { name: ParamValue<false> }, { name: ParamValue<false> }, '/u[name]/24' | '/u[name]/[userId=int]'>,
+    '/u[name]/[userId=int]': RouteRecordInfo<'/u[name]/[userId=int]', '/u:name/:userId', { name: ParamValue<false>, userId: number }, { name: ParamValue<false>, userId: number }>,
+    '/u[name]/24': RouteRecordInfo<'/u[name]/24', '/u:name/24', { name: ParamValue<false> }, { name: ParamValue<false> }>,
     '/users/[userId=int]': RouteRecordInfo<'/users/[userId=int]', '/users/:userId', { userId: number }, { userId: number }>,
     '/users/sub-[first]-[second]': RouteRecordInfo<'/users/sub-[first]-[second]', '/users/sub-:first-:second', { first: ParamValue<false>, second: ParamValue<false> }, { first: ParamValue<false>, second: ParamValue<false> }>,
   }
@@ -47,16 +48,8 @@ declare module 'vue-router/auto-routes' {
       routes: '/(home)'
       views: never
     }
-    'src/pages/[name].vue': {
-      routes: '/[name]' | '/[name]/[userId=int]' | '/[name]/24'
-      views: 'default'
-    }
-    'src/pages/[name]/[userId=int].vue': {
-      routes: '/[name]/[userId=int]'
-      views: never
-    }
-    'src/pages/[name]/24.vue': {
-      routes: '/[name]/24'
+    'src/pages/[...404].vue': {
+      routes: '/[...404]'
       views: never
     }
     'src/pages/a.[b].c.[d].vue': {
@@ -71,6 +64,18 @@ declare module 'vue-router/auto-routes' {
       routes: '/events/[when=date]'
       views: never
     }
+    'src/pages/u[name].vue': {
+      routes: '/u[name]' | '/u[name]/[userId=int]' | '/u[name]/24'
+      views: 'default'
+    }
+    'src/pages/u[name]/[userId=int].vue': {
+      routes: '/u[name]/[userId=int]'
+      views: never
+    }
+    'src/pages/u[name]/24.vue': {
+      routes: '/u[name]/24'
+      views: never
+    }
     'src/pages/users/[userId=int].vue': {
       routes: '/users/[userId=int]'
       views: never

From 5f95cde7e44b991c5710eff65d4a8db642438fa5 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 17:39:22 +0200
Subject: [PATCH 24/81] chore: add meta to page

---
 playground-experimental/src/pages/[...404].vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/playground-experimental/src/pages/[...404].vue b/playground-experimental/src/pages/[...404].vue
index 3a8551cb2..80eb68255 100644
--- a/playground-experimental/src/pages/[...404].vue
+++ b/playground-experimental/src/pages/[...404].vue
@@ -1,3 +1,12 @@
+<script setup lang="ts">
+definePage({
+  meta: {
+    title: 'Not Found',
+    description: 'This page does not exist.',
+  },
+})
+</script>
+
 <template>
   <main>
     <h1>Not Found</h1>

From 2d10fcf8bc936ebc073d3c665abcd7e8d33a512a Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 15 Aug 2025 18:09:15 +0200
Subject: [PATCH 25/81] feat: support meta properties

---
 .../src/pages/[...404].vue                    | 11 ++-
 .../generateRouteRecords.spec.ts.snap         |  8 +-
 src/codegen/generateRouteRecords.ts           |  7 +-
 src/codegen/generateRouteResolver.spec.ts     | 79 +++++++++++++++++++
 src/codegen/generateRouteResolver.ts          | 74 ++++++++++++++---
 src/runtime.ts                                | 30 +++++++
 6 files changed, 189 insertions(+), 20 deletions(-)

diff --git a/playground-experimental/src/pages/[...404].vue b/playground-experimental/src/pages/[...404].vue
index 80eb68255..2b5ffabf0 100644
--- a/playground-experimental/src/pages/[...404].vue
+++ b/playground-experimental/src/pages/[...404].vue
@@ -11,6 +11,15 @@ definePage({
   <main>
     <h1>Not Found</h1>
 
-    <p>{{ $route.params }}</p>
+    <pre>{{ $route.params }}</pre>
+    <pre>{{ $route.meta }}</pre>
   </main>
 </template>
+
+<route lang="json">
+{
+  "meta": {
+    "from block": true
+  }
+}
+</route>
diff --git a/src/codegen/__snapshots__/generateRouteRecords.spec.ts.snap b/src/codegen/__snapshots__/generateRouteRecords.spec.ts.snap
index 9005ff119..145d26c78 100644
--- a/src/codegen/__snapshots__/generateRouteRecords.spec.ts.snap
+++ b/src/codegen/__snapshots__/generateRouteRecords.spec.ts.snap
@@ -654,7 +654,7 @@ exports[`generateRouteRecord > route block > adds meta data 1`] = `
     meta: {
       "auth": true,
       "title": "Home"
-    }
+    },
   }
 ]"
 `;
@@ -672,7 +672,7 @@ exports[`generateRouteRecord > route block > handles named views with empty rout
     meta: {
       "auth": true,
       "title": "Home"
-    }
+    },
   }
 ]"
 `;
@@ -695,7 +695,7 @@ exports[`generateRouteRecord > route block > merges deep meta properties 1`] = `
           3
         ]
       }
-    }
+    },
   }
 ]"
 `;
@@ -710,7 +710,7 @@ exports[`generateRouteRecord > route block > merges multiple meta properties 1`]
     meta: {
       "one": true,
       "two": true
-    }
+    },
   }
 ]"
 `;
diff --git a/src/codegen/generateRouteRecords.ts b/src/codegen/generateRouteRecords.ts
index 3ac7738c9..ed0ebc75f 100644
--- a/src/codegen/generateRouteRecords.ts
+++ b/src/codegen/generateRouteRecords.ts
@@ -51,9 +51,6 @@ ${node
   const startIndent = ' '.repeat(indent * 2)
   const indentStr = ' '.repeat((indent + 1) * 2)
 
-  // TODO: should meta be defined a different way to allow preserving imports?
-  // const meta = node.value.overrides.meta
-
   // compute once since it's a getter
   const overrides = node.value.overrides
 
@@ -168,14 +165,14 @@ export function generatePageImport(
   return importName
 }
 
-function formatMeta(node: TreeNode, indent: string): string {
+export function formatMeta(node: TreeNode, indent: string): string {
   const meta = node.meta
   const formatted =
     meta &&
     meta
       .split('\n')
       .map((line) => indent + line)
-      .join('\n')
+      .join('\n') + ','
 
   return formatted ? '\n' + indent + 'meta: ' + formatted.trimStart() : ''
 }
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 8eb81f5f9..8660a9030 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -409,6 +409,9 @@ describe('generateRouteResolver', () => {
       "
       const r_0 = normalizeRouteRecord({
         /* internal name: '/a/b' */
+        meta: {
+          "requiresAuth": true
+        },
       })
       const r_1 = normalizeRouteRecord({
         name: '/a/b/c',
@@ -425,6 +428,82 @@ describe('generateRouteResolver', () => {
       "
     `)
   })
+
+  it('includes meta in route records with components', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    // Create a route with both component and meta
+    tree.insert('users', 'users.vue')
+    const usersNode = tree.children.get('users')!
+    usersNode.value.setEditOverride('meta', { requiresAuth: true, title: 'Users' })
+
+    const resolver = generateRouteResolver(
+      tree,
+      DEFAULT_OPTIONS,
+      new ImportsMap(),
+      new Map()
+    )
+
+    expect(resolver).toMatchInlineSnapshot(`
+      "
+      const r_0 = normalizeRouteRecord({
+        name: '/users',
+        path: new MatcherPatternPathStatic('/users'),
+        meta: {
+          "requiresAuth": true,
+          "title": "Users"
+        },
+        components: {
+          'default': () => import('users.vue')
+        },
+      })
+
+      export const resolver = createStaticResolver([
+        r_0,  // /users
+      ])
+      "
+    `)
+  })
+
+  it('handles definePage imports correctly', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    // Create a route with a component
+    tree.insert('profile', 'profile.vue')
+    const profileNode = tree.children.get('profile')!
+    
+    // Mark it as having definePage (this would normally be set by the plugin when parsing the file)
+    profileNode.hasDefinePage = true
+
+    const resolver = generateRouteResolver(
+      tree,
+      DEFAULT_OPTIONS,
+      new ImportsMap(),
+      new Map()
+    )
+
+    expect(resolver).toMatchInlineSnapshot(`
+      "
+
+      const r_0 = normalizeRouteRecord(
+        _mergeRouteRecordExperimental(
+          {
+            name: '/profile',
+            path: new MatcherPatternPathStatic('/profile'),
+            components: {
+              'default': () => import('profile.vue')
+            },
+            
+          },
+          _definePage_default_0
+        )
+      )
+
+
+      export const resolver = createStaticResolver([
+        r_0,  // /profile
+      ])
+      "
+    `)
+  })
 })
 
 describe('route prioritization in resolver', () => {
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index ed79805fc..0cc8fb751 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -1,9 +1,10 @@
+import { getLang } from '@vue-macros/common'
 import { PrefixTree, type TreeNode } from '../core/tree'
 import { ImportsMap } from '../core/utils'
 import { type ResolvedOptions } from '../options'
 import { ts } from '../utils'
 import { generateParamsOptions, ParamParsersMap } from './generateParamParsers'
-import { generatePageImport } from './generateRouteRecords'
+import { generatePageImport, formatMeta } from './generateRouteRecords'
 
 /**
  * Compare two score arrays for sorting routes by priority.
@@ -124,6 +125,22 @@ export function generateRouteRecord({
   let varName: string | null = null
   let recordDeclaration = ''
 
+  // Handle definePage imports
+  const definePageDataList: string[] = []
+  if (node.hasDefinePage) {
+    for (const [name, filePath] of node.value.components) {
+      const pageDataImport = `_definePage_${name}_${importsMap.size}`
+      definePageDataList.push(pageDataImport)
+      const lang = getLang(filePath)
+      importsMap.addDefault(
+        // TODO: apply the language used in the sfc
+        `${filePath}?definePage&` +
+          (lang === 'vue' ? 'vue&lang.tsx' : `lang.${lang}`),
+        pageDataImport
+      )
+    }
+  }
+
   if (!shouldSkipNode) {
     varName = `r_${state.id++}`
 
@@ -148,19 +165,28 @@ export function generateRouteRecord({
       recordComponents = ''
     }
 
-    recordDeclaration = `
-const ${varName} = normalizeRouteRecord({
+    const routeRecordObject = `{
   ${recordName}
-  ${generateRouteRecordPath({ node, importsMap, paramParsersMap })}
+  ${generateRouteRecordPath({ node, importsMap, paramParsersMap })}${formatMeta(node, '  ')}
   ${recordComponents}
   ${parentVar ? `parent: ${parentVar},` : ''}
-})
+}`
+
+    recordDeclaration =
+      definePageDataList.length > 0
+        ? `
+const ${varName} = normalizeRouteRecord(
+  ${generateRouteRecordMerge(routeRecordObject, definePageDataList, importsMap)}
+)
 `
-      .trim()
-      .split('\n')
-      // remove empty lines
-      .filter((l) => l.trimStart().length > 0)
-      .join('\n')
+        : `
+const ${varName} = normalizeRouteRecord(${routeRecordObject})
+`
+            .trim()
+            .split('\n')
+            // remove empty lines
+            .filter((l) => l.trimStart().length > 0)
+            .join('\n')
   }
 
   const children = node.getChildrenSorted().map((child) =>
@@ -230,3 +256,31 @@ export function generateRouteRecordPath({
     return `path: new MatcherPatternPathStatic('${node.fullPath}'),`
   }
 }
+
+/**
+ * Generates a merge call for route records with definePage data in the experimental resolver format.
+ */
+function generateRouteRecordMerge(
+  routeRecordObject: string,
+  definePageDataList: string[],
+  importsMap: ImportsMap
+): string {
+  if (definePageDataList.length === 0) {
+    return routeRecordObject
+  }
+
+  importsMap.add('unplugin-vue-router/runtime', '_mergeRouteRecordExperimental')
+
+  // Re-indent the route object to be 4 spaces (2 levels from normalizeRouteRecord)
+  const indentedRouteObject = routeRecordObject
+    .split('\n')
+    .map((line) => {
+      return line && `    ${line}`
+    })
+    .join('\n')
+
+  return `_mergeRouteRecordExperimental(
+${indentedRouteObject},
+${definePageDataList.map((name) => `    ${name}`).join(',\n')}
+  )`
+}
diff --git a/src/runtime.ts b/src/runtime.ts
index a0c8d2e24..604755187 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -99,3 +99,33 @@ export interface DefinePageQueryParamOptions {
    */
   repeatable?: boolean
 }
+
+/**
+ * Merges route record objects for the experimental resolver format.
+ * This function is specifically designed to work with objects that will be passed to normalizeRouteRecord().
+ *
+ * @internal
+ *
+ * @param main - main route record object
+ * @param routeRecords - route records to merge (from definePage imports)
+ * @returns merged route record object
+ */
+export function _mergeRouteRecordExperimental(
+  main: Record<string, any>,
+  ...routeRecords: Partial<DefinePage>[]
+): Record<string, any> {
+  return routeRecords.reduce((acc, routeRecord) => {
+    // Merge meta properties specially
+    const meta = Object.assign({}, acc.meta, routeRecord.meta)
+    
+    // Merge all other properties directly
+    Object.assign(acc, routeRecord)
+    
+    // Set the merged meta
+    if (Object.keys(meta).length > 0) {
+      acc.meta = meta
+    }
+    
+    return acc
+  }, { ...main })
+}

From 2b2a0fd546259a293465593f7d31ec5733ff21e8 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Fri, 15 Aug 2025 16:09:55 +0000
Subject: [PATCH 26/81] style: fix code style

---
 src/codegen/generateRouteResolver.spec.ts |  7 +++--
 src/runtime.ts                            | 31 +++++++++++++----------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 8660a9030..eb9cde571 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -434,7 +434,10 @@ describe('generateRouteResolver', () => {
     // Create a route with both component and meta
     tree.insert('users', 'users.vue')
     const usersNode = tree.children.get('users')!
-    usersNode.value.setEditOverride('meta', { requiresAuth: true, title: 'Users' })
+    usersNode.value.setEditOverride('meta', {
+      requiresAuth: true,
+      title: 'Users',
+    })
 
     const resolver = generateRouteResolver(
       tree,
@@ -469,7 +472,7 @@ describe('generateRouteResolver', () => {
     // Create a route with a component
     tree.insert('profile', 'profile.vue')
     const profileNode = tree.children.get('profile')!
-    
+
     // Mark it as having definePage (this would normally be set by the plugin when parsing the file)
     profileNode.hasDefinePage = true
 
diff --git a/src/runtime.ts b/src/runtime.ts
index 604755187..fc37c35da 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -114,18 +114,21 @@ export function _mergeRouteRecordExperimental(
   main: Record<string, any>,
   ...routeRecords: Partial<DefinePage>[]
 ): Record<string, any> {
-  return routeRecords.reduce((acc, routeRecord) => {
-    // Merge meta properties specially
-    const meta = Object.assign({}, acc.meta, routeRecord.meta)
-    
-    // Merge all other properties directly
-    Object.assign(acc, routeRecord)
-    
-    // Set the merged meta
-    if (Object.keys(meta).length > 0) {
-      acc.meta = meta
-    }
-    
-    return acc
-  }, { ...main })
+  return routeRecords.reduce(
+    (acc, routeRecord) => {
+      // Merge meta properties specially
+      const meta = Object.assign({}, acc.meta, routeRecord.meta)
+
+      // Merge all other properties directly
+      Object.assign(acc, routeRecord)
+
+      // Set the merged meta
+      if (Object.keys(meta).length > 0) {
+        acc.meta = meta
+      }
+
+      return acc
+    },
+    { ...main }
+  )
 }

From 43ef24c171159865a3486641cf3f9834a6d1cf9d Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva@users.noreply.github.com>
Date: Sat, 16 Aug 2025 14:19:08 +0200
Subject: [PATCH 27/81] Update src/codegen/generateParamParsers.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 src/codegen/generateParamParsers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
index 844348006..d861baa75 100644
--- a/src/codegen/generateParamParsers.ts
+++ b/src/codegen/generateParamParsers.ts
@@ -14,7 +14,7 @@ export type ParamParsersMap = Map<
   }
 >
 
-export async function warnMissingParamParsers(
+export function warnMissingParamParsers(
   tree: PrefixTree,
   paramParsers: ParamParsersMap
 ) {

From 54eb0a929be1b49c2566caaeaf5c4667d4b543d4 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 13:58:35 +0200
Subject: [PATCH 28/81] chore: delete unused file

---
 playground-experimental/src/utils.ts | 40 ----------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 playground-experimental/src/utils.ts

diff --git a/playground-experimental/src/utils.ts b/playground-experimental/src/utils.ts
deleted file mode 100644
index 07a8d448d..000000000
--- a/playground-experimental/src/utils.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { inject, toValue, onUnmounted } from 'vue'
-import type { RouteLocation, RouteLocationNormalizedLoaded } from 'vue-router'
-import { viewDepthKey, useRoute, useRouter } from 'vue-router'
-import type { RouteNamedMap } from 'vue-router/auto-routes'
-
-type NavigationReturn = RouteLocation | boolean | void
-
-export function useParamMatcher<Name extends keyof RouteNamedMap>(
-  _name: Name,
-  fn: (
-    to: RouteLocationNormalizedLoaded<Name>
-  ) => NavigationReturn | Promise<NavigationReturn>
-) {
-  const route = useRoute()
-  const router = useRouter()
-  const depth = inject(viewDepthKey, 0)
-  // we only need it the first time
-  const matchedRecord = route.matched[toValue(depth) - 1]?.name
-  console.log(matchedRecord)
-
-  if (!matchedRecord) return
-
-  console.log('add guard')
-
-  const removeGuard = router.beforeEach((to) => {
-    console.log('beforeEach', to)
-    if (to.matched.find((record) => record.name === matchedRecord)) {
-      return fn(to as RouteLocationNormalizedLoaded<Name>)
-    }
-  })
-
-  onUnmounted(removeGuard)
-}
-
-export function dummy(arg: unknown) {
-  return 'ok'
-}
-
-export const dummy_id = 'dummy_id'
-export const dummy_number = 42

From b07c37afb05b5ca1d0a5e585b37f86da4743ef3c Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 14:12:03 +0200
Subject: [PATCH 29/81] chore: simplify playground

---
 playground-experimental/src/App.vue          | 42 +-------------------
 playground-experimental/src/page-outside.vue |  5 +++
 playground-experimental/typed-router.d.ts    |  5 +++
 playground-experimental/vite.config.ts       | 28 ++++---------
 4 files changed, 19 insertions(+), 61 deletions(-)
 create mode 100644 playground-experimental/src/page-outside.vue

diff --git a/playground-experimental/src/App.vue b/playground-experimental/src/App.vue
index 67048a788..e4b430cd4 100644
--- a/playground-experimental/src/App.vue
+++ b/playground-experimental/src/App.vue
@@ -1,52 +1,12 @@
 <script setup lang="ts">
-import { useLink, useRoute } from 'vue-router'
-import type {
-  RouteLocationNormalizedLoaded,
-  RouteLocationResolved,
-  RouteLocation,
-} from 'vue-router'
+import { useRoute } from 'vue-router'
 import { ref } from 'vue'
 import { routes } from 'vue-router/auto-routes'
 
 console.log(`We have ${routes.length} routes.`)
 
 const router = useRouter()
-
 const targetRoute = ref('')
-
-function _test() {
-  const b = function test(
-    a: RouteLocationResolved<'/[name]'>,
-    b: RouteLocationNormalizedLoaded<'/[name]'>,
-    c: RouteLocation<'/[name]'>
-  ) {
-    return {
-      a,
-      b,
-      c,
-    }
-  }
-
-  router.resolve('/:name')
-  router.resolve({ name: '/[name]', params: { name: 'hello' } }).params.name
-
-  useLink({ to: '/articles/2' }).route.value.name
-  useLink({ to: { path: '/articles/:id' } })
-  useLink({ to: { name: '/[name]', params: { name: 2 } } }).route.value.params
-    .name
-  // useLink({ name: '/[name]', params: { name: 2 } }).route.value.params.name
-  useLink({ to: ref({ name: '/[name]', params: { name: 2 } }) }).route.value
-    .name
-
-  const customRoute = useRoute('/(home)')
-
-  return { b, customRoute }
-}
-
-// this is always false, it's just for types
-if (Math.random() > 2) {
-  _test()
-}
 </script>
 
 <template>
diff --git a/playground-experimental/src/page-outside.vue b/playground-experimental/src/page-outside.vue
new file mode 100644
index 000000000..2848777a2
--- /dev/null
+++ b/playground-experimental/src/page-outside.vue
@@ -0,0 +1,5 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>Page outside of <code>pages</code></h1>
+</template>
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
index 851ee10ad..9461f16a5 100644
--- a/playground-experimental/typed-router.d.ts
+++ b/playground-experimental/typed-router.d.ts
@@ -26,6 +26,7 @@ declare module 'vue-router/auto-routes' {
     '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: ParamValue<false>, d: ParamValue<false> }, { b: ParamValue<false>, d: ParamValue<false> }>,
     '/b': RouteRecordInfo<'/b', '/b', Record<never, never>, Record<never, never>>,
     '/events/[when=date]': RouteRecordInfo<'/events/[when=date]', '/events/:when', { when: Param_date }, { when: Param_date }>,
+    '/manually-added': RouteRecordInfo<'/manually-added', '/manually-added', Record<never, never>, Record<never, never>>,
     '/u[name]': RouteRecordInfo<'/u[name]', '/u:name', { name: ParamValue<false> }, { name: ParamValue<false> }, '/u[name]/24' | '/u[name]/[userId=int]'>,
     '/u[name]/[userId=int]': RouteRecordInfo<'/u[name]/[userId=int]', '/u:name/:userId', { name: ParamValue<false>, userId: number }, { name: ParamValue<false>, userId: number }>,
     '/u[name]/24': RouteRecordInfo<'/u[name]/24', '/u:name/24', { name: ParamValue<false> }, { name: ParamValue<false> }>,
@@ -64,6 +65,10 @@ declare module 'vue-router/auto-routes' {
       routes: '/events/[when=date]'
       views: never
     }
+    'src/page-outside.vue': {
+      routes: '/manually-added'
+      views: never
+    }
     'src/pages/u[name].vue': {
       routes: '/u[name]' | '/u[name]/[userId=int]' | '/u[name]/24'
       views: 'default'
diff --git a/playground-experimental/vite.config.ts b/playground-experimental/vite.config.ts
index ffbb999f9..4f0871cbc 100644
--- a/playground-experimental/vite.config.ts
+++ b/playground-experimental/vite.config.ts
@@ -1,6 +1,5 @@
-import { fileURLToPath, URL } from 'url'
+import { fileURLToPath, URL } from 'node:url'
 import { defineConfig } from 'vite'
-import { join } from 'node:path'
 import Markdown from 'unplugin-vue-markdown/vite'
 // @ts-ignore: the plugin should not be checked in the playground
 import VueRouter from '../src/vite'
@@ -8,6 +7,7 @@ import { VueRouterAutoImports } from '../src'
 import Vue from '@vitejs/plugin-vue'
 import AutoImport from 'unplugin-auto-import/vite'
 import VueDevtools from 'vite-plugin-vue-devtools'
+import { join, relative } from 'node:path'
 
 export default defineConfig({
   clearScreen: false,
@@ -75,7 +75,10 @@ export default defineConfig({
         // }
       },
       beforeWriteFiles(root) {
-        // root.insert('/from-root', join(__dirname, './src/pages/index.vue'))
+        root.insert(
+          '/manually-added',
+          join(__dirname, './src/page-outside.vue')
+        )
       },
       routesFolder: [
         // can add multiple routes folders
@@ -94,26 +97,11 @@ export default defineConfig({
           src: 'src/features',
           filePatterns: '*/pages/**/*',
           path: (file) => {
-            const prefix = 'src/features'
-            // +1 for the starting slash
-            file = file
-              .slice(file.lastIndexOf(prefix) + prefix.length + 1)
-              .replace('/pages', '')
-            // console.log('👉 FILE', file)
-            return file
+            return relative('src/features', file).replace(/^pages\//, '')
           },
         },
       ],
-      exclude: [
-        '**/ignored/**',
-        // '**/ignored/**/*',
-        '**/__*',
-        '**/__**/*',
-        '**/*.component.vue',
-        // resolve(__dirname, './src/pages/ignored'),
-        //
-        // './src/pages/**/*.spec.ts',
-      ],
+      exclude: ['**/ignored/**', '**/__*', '**/__**/*', '**/*.component.vue'],
     }),
     Vue({
       include: [/\.vue$/, /\.md$/],

From 4e12c2f82cec388c3d8d09e65173f57565f35e8f Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 14:12:11 +0200
Subject: [PATCH 30/81] chore: todo in editable tree

---
 src/core/extendRoutes.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/extendRoutes.ts b/src/core/extendRoutes.ts
index 4bf0514cd..76ef84933 100644
--- a/src/core/extendRoutes.ts
+++ b/src/core/extendRoutes.ts
@@ -47,6 +47,8 @@ export class EditableTreeNode {
       // but in other places we need to instruct the path is at the root so we change it afterwards
       addBackLeadingSlash = !this.node.isRoot()
     }
+    // TODO: if options.experimental.paramMatchers, should insert the raw path as [thing]
+    // and warn if a path contains a :
     const node = this.node.insertParsedPath(path, filePath)
     const editable = new EditableTreeNode(node)
     if (addBackLeadingSlash) {

From f97c01101ebaab9c70ec9ce7a88cb3c6b10d809c Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 14:19:27 +0200
Subject: [PATCH 31/81] refactor: glob for param parsers

---
 src/core/context.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/context.ts b/src/core/context.ts
index 76ca61159..329bb082f 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -29,6 +29,7 @@ import {
   warnMissingParamParsers,
 } from '../codegen/generateParamParsers'
 import picomatch from 'picomatch'
+import { PRIVATE_TYPES } from '@babel/types'
 
 export function createRoutesContext(options: ResolvedOptions) {
   const { dts: preferDTS, root, routesFolder } = options
@@ -68,7 +69,8 @@ export function createRoutesContext(options: ResolvedOptions) {
       return
     }
 
-    const isParamParserMatch = picomatch('*.{ts,js}')
+    const PARAM_PARSER_GLOB = '*.{ts,js}'
+    const isParamParserMatch = picomatch(PARAM_PARSER_GLOB)
 
     // get the initial list of pages
     await Promise.all([
@@ -123,7 +125,7 @@ export function createRoutesContext(options: ResolvedOptions) {
             })
           )
         )
-        return glob('*', {
+        return glob(PARAM_PARSER_GLOB, {
           cwd: folder,
           onlyFiles: true,
           expandDirectories: false,

From 9630947f89d7425d177492af4c2a5f612ee0e7e4 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 14:19:39 +0200
Subject: [PATCH 32/81] fix: escape regex in paths

---
 src/core/tree.ts          |  3 ++-
 src/core/treeNodeValue.ts | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/core/tree.ts b/src/core/tree.ts
index b0548b592..edcb22a33 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -1,6 +1,7 @@
 import { type ResolvedOptions } from '../options'
 import {
   createTreeNodeValue,
+  escapeRegex,
   TreeNodeValueOptions,
   TreeRouteParam,
 } from './treeNodeValue'
@@ -291,7 +292,7 @@ export class TreeNode {
       if (node.value.isParam() && node.value.re) {
         re = node.value.re + (re ? '\\/' : '') + re
       } else {
-        re = node.value.pathSegment + (re ? '\\/' : '') + re
+        re = escapeRegex(node.value.pathSegment) + (re ? '\\/' : '') + re
       }
 
       node = node.parent
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index a33275b7d..6ebe824a6 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -238,6 +238,15 @@ export interface TreeRouteParam {
  */
 const REGEX_CHARS_RE = /[.+*?^${}()[\]/\\]/g
 
+/**
+ * Escapes regex characters in a string to be used in a regex pattern.
+ * @param str - The string to escape.
+ *
+ * @internal
+ */
+export const escapeRegex = (str: string): string =>
+  str.replace(REGEX_CHARS_RE, '\\$&')
+
 export class TreeNodeValueParam extends _TreeNodeValueBase {
   params: TreeRouteParam[]
   override _type: TreeNodeType.param = TreeNodeType.param
@@ -275,7 +284,7 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
       .filter(Boolean)
       .map((segment) => {
         if (typeof segment === 'string') {
-          return segment.replace(REGEX_CHARS_RE, '\\$&')
+          return escapeRegex(segment)
         }
         return segment.isSplat
           ? '(.*)'

From be007b1c48a1c510d559e83e84799a5ae541f8bb Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 14:19:46 +0200
Subject: [PATCH 33/81] chore: import from node:fs

---
 src/utils/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/index.ts b/src/utils/index.ts
index 9ebdc98a1..ce07fa035 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,4 +1,4 @@
-import { access, constants } from 'fs/promises'
+import { access, constants } from 'node:fs/promises'
 
 /**
  * Maybe a promise maybe not

From 30e84559c895ec070e132c0a9ce4ade118219a7f Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 14:24:09 +0200
Subject: [PATCH 34/81] chore: unused import'

---
 src/core/context.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/context.ts b/src/core/context.ts
index 329bb082f..162ad0c69 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -29,7 +29,6 @@ import {
   warnMissingParamParsers,
 } from '../codegen/generateParamParsers'
 import picomatch from 'picomatch'
-import { PRIVATE_TYPES } from '@babel/types'
 
 export function createRoutesContext(options: ResolvedOptions) {
   const { dts: preferDTS, root, routesFolder } = options

From c50eddddff3409132d21cabdeb1b61d6a60ded87 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 14:25:07 +0200
Subject: [PATCH 35/81] chore: unused error

---
 src/codegen/generateParamParsers.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
index d861baa75..1f0bf5cc0 100644
--- a/src/codegen/generateParamParsers.ts
+++ b/src/codegen/generateParamParsers.ts
@@ -104,9 +104,6 @@ export function generateParamsOptions(
   importsMap: ImportsMap,
   paramParsers: ParamParsersMap
 ) {
-  if (!paramParsers) {
-    throw new Error('what')
-  }
   const paramOptions = params.map((param) => {
     const repeatable = param.repeatable ? `repeat: true, ` : ''
     return `

From 24ca324545ce8c175abee71c2c3366e721d5936b Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 14:31:42 +0200
Subject: [PATCH 36/81] refactor: simpler merge

---
 src/runtime.ts | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/runtime.ts b/src/runtime.ts
index fc37c35da..230c9b33f 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -114,21 +114,10 @@ export function _mergeRouteRecordExperimental(
   main: Record<string, any>,
   ...routeRecords: Partial<DefinePage>[]
 ): Record<string, any> {
-  return routeRecords.reduce(
-    (acc, routeRecord) => {
-      // Merge meta properties specially
-      const meta = Object.assign({}, acc.meta, routeRecord.meta)
-
-      // Merge all other properties directly
-      Object.assign(acc, routeRecord)
-
-      // Set the merged meta
-      if (Object.keys(meta).length > 0) {
-        acc.meta = meta
-      }
+  return routeRecords.reduce((acc, routeRecord) => {
+    Object.assign(acc, routeRecord)
+    acc.meta = { ...acc.meta, ...routeRecord.meta }
 
-      return acc
-    },
-    { ...main }
-  )
+    return acc
+  }, main)
 }

From 3788f5e8bd442b9bef26a1523f62f1b3fc2d6c52 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 14:32:53 +0200
Subject: [PATCH 37/81] fix: types in helper

---
 src/runtime.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/runtime.ts b/src/runtime.ts
index 230c9b33f..6fb013939 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -1,4 +1,5 @@
 import type { RouteRecordRaw } from 'vue-router'
+import type { EXPERIMENTAL_RouteRecordRaw } from 'vue-router/experimental'
 
 /**
  * Defines properties of the route for the current page component.
@@ -111,9 +112,9 @@ export interface DefinePageQueryParamOptions {
  * @returns merged route record object
  */
 export function _mergeRouteRecordExperimental(
-  main: Record<string, any>,
+  main: EXPERIMENTAL_RouteRecordRaw,
   ...routeRecords: Partial<DefinePage>[]
-): Record<string, any> {
+): EXPERIMENTAL_RouteRecordRaw {
   return routeRecords.reduce((acc, routeRecord) => {
     Object.assign(acc, routeRecord)
     acc.meta = { ...acc.meta, ...routeRecord.meta }

From b7b4ed8c5cf6b836459fbe948af985a4a1383df9 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 15:03:10 +0200
Subject: [PATCH 38/81] chore: fix __dirname usage

---
 playground/vite.config.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/playground/vite.config.ts b/playground/vite.config.ts
index 4dbd5a986..74eda8630 100644
--- a/playground/vite.config.ts
+++ b/playground/vite.config.ts
@@ -9,6 +9,8 @@ import Vue from '@vitejs/plugin-vue'
 import AutoImport from 'unplugin-auto-import/vite'
 import VueDevtools from 'vite-plugin-vue-devtools'
 
+const __dirname = fileURLToPath(new URL('.', import.meta.url))
+
 export default defineConfig({
   clearScreen: false,
   resolve: {

From d511a60f499375cd2930457871996fa48de3a5fe Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 15:06:23 +0200
Subject: [PATCH 39/81] chore

---
 src/runtime.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/runtime.ts b/src/runtime.ts
index 6fb013939..b00731cd0 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -1,5 +1,4 @@
 import type { RouteRecordRaw } from 'vue-router'
-import type { EXPERIMENTAL_RouteRecordRaw } from 'vue-router/experimental'
 
 /**
  * Defines properties of the route for the current page component.
@@ -112,9 +111,14 @@ export interface DefinePageQueryParamOptions {
  * @returns merged route record object
  */
 export function _mergeRouteRecordExperimental(
-  main: EXPERIMENTAL_RouteRecordRaw,
+  // NOTE: we can't import from experimental because it changes the types of `children`
+  // import type { EXPERIMENTAL_RouteRecordRaw } from 'vue-router/experimental'
+  main: {
+    [x: string]: unknown
+    meta?: Record<string, unknown>
+  },
   ...routeRecords: Partial<DefinePage>[]
-): EXPERIMENTAL_RouteRecordRaw {
+) {
   return routeRecords.reduce((acc, routeRecord) => {
     Object.assign(acc, routeRecord)
     acc.meta = { ...acc.meta, ...routeRecord.meta }

From c692ef28431331dec1c6b7fab65fc3362b21a743 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 16 Aug 2025 16:33:14 +0200
Subject: [PATCH 40/81] chore: color scheme

---
 playground-experimental/index.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/playground-experimental/index.html b/playground-experimental/index.html
index 7795da29a..e69792de0 100644
--- a/playground-experimental/index.html
+++ b/playground-experimental/index.html
@@ -4,6 +4,11 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   </head>
+  <style>
+    :root {
+      color-scheme: light dark;
+    }
+  </style>
   <body>
     <a
       href="/__inspect/#/module?id=/__vue-router/auto-routes&index=0"

From 30ec6544b3267947b5dc9522e6bcbe152eb5f05b Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sun, 17 Aug 2025 14:36:11 +0200
Subject: [PATCH 41/81] refactor: miss in date param parser

---
 package.json                                  |  2 +-
 playground-experimental/package.json          |  2 +-
 .../src/pages/users/[userId=int].vue          | 13 ++++++------
 playground-experimental/src/params/date.ts    |  9 +++------
 pnpm-lock.yaml                                | 20 +++++++++----------
 5 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index f5bb92cee..3ab486e73 100644
--- a/package.json
+++ b/package.json
@@ -204,7 +204,7 @@
     "vitepress-plugin-llms": "^1.7.5",
     "vitest": "^3.2.4",
     "vue": "^3.5.21",
-    "vue-router": "https://pkg.pr.new/vue-router@96d8a89",
+    "vue-router": "https://pkg.pr.new/vue-router@34703fb",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index 1ddbabb5f..9903f4e67 100644
--- a/playground-experimental/package.json
+++ b/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@96d8a89"
+    "vue-router": "https://pkg.pr.new/vue-router@34703fb"
   }
 }
diff --git a/playground-experimental/src/pages/users/[userId=int].vue b/playground-experimental/src/pages/users/[userId=int].vue
index 7f3172413..998d39518 100644
--- a/playground-experimental/src/pages/users/[userId=int].vue
+++ b/playground-experimental/src/pages/users/[userId=int].vue
@@ -3,12 +3,13 @@ const route = useRoute()
 route.params.userId
 
 definePage({
-  query: {
-    page: {
-      type: 'int',
-      optional: true,
-    },
-  },
+  path: '/users/:userId',
+  // query: {
+  //   page: {
+  //     type: 'int',
+  //     optional: true,
+  //   },
+  // },
   meta: {
     // te: 3, 2
   },
diff --git a/playground-experimental/src/params/date.ts b/playground-experimental/src/params/date.ts
index 5be1cec51..27e506003 100644
--- a/playground-experimental/src/params/date.ts
+++ b/playground-experimental/src/params/date.ts
@@ -1,14 +1,10 @@
-import { type ParamParser } from 'vue-router/experimental'
-
-// NOTE: should be imported from vue-router
-const invalid = (...args: ConstructorParameters<typeof Error>) =>
-  new Error(...args)
+import { type ParamParser, miss } from 'vue-router/experimental'
 
 export const parser: ParamParser<Date, string> = {
   get: (value: string): Date => {
     const asDate = new Date(value)
     if (Number.isNaN(asDate.getTime())) {
-      throw invalid(`Invalid date: "${value}"`)
+      throw miss(`Invalid date: "${value}"`)
     }
 
     return asDate
@@ -17,5 +13,6 @@ export const parser: ParamParser<Date, string> = {
     value
       .toISOString()
       // allows keeping simple dates like 2023-10-01 without time
+      // while still being able to parse full dates like 2023-10-01T12:00:00.000Z
       .replace('T00:00:00.000Z', ''),
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 683a30a30..43c1b5bb9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -169,11 +169,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@96d8a89
-        version: https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@34703fb
+        version: https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -261,8 +261,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@96d8a89
-        version: https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@34703fb
+        version: https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -6863,8 +6863,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@https://pkg.pr.new/vue-router@96d8a89:
-    resolution: {tarball: https://pkg.pr.new/vue-router@96d8a89}
+  vue-router@https://pkg.pr.new/vue-router@34703fb:
+    resolution: {tarball: https://pkg.pr.new/vue-router@34703fb}
     version: 4.5.1
     peerDependencies:
       vue: ^3.2.0
@@ -14573,17 +14573,17 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@https://pkg.pr.new/vue-router@96d8a89(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)

From c2c702f784c2cc68e68931346c4bff2603a4d535 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sun, 17 Aug 2025 14:37:44 +0200
Subject: [PATCH 42/81] chore: update vue router usage

---
 src/codegen/generateRouteResolver.spec.ts |  43 ++++++---
 src/codegen/generateRouteResolver.ts      |  12 ++-
 src/core/context.ts                       |   5 +-
 src/runtime-experimental.ts               | 104 ++++++++++++++++++++++
 src/runtime.ts                            |  41 +--------
 5 files changed, 143 insertions(+), 62 deletions(-)
 create mode 100644 src/runtime-experimental.ts

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index eb9cde571..e519e6a88 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -56,7 +56,7 @@ describe('generateRouteRecordPath', () => {
     expect(
       generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathCustomParams(
+      "path: new MatcherPatternPathDynamic(
           /^\\/a\\/([^/]+?)$/i,
           {
             b: {},
@@ -75,7 +75,7 @@ describe('generateRouteRecordPath', () => {
         paramParsersMap: new Map(),
       })
     ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathCustomParams(
+      "path: new MatcherPatternPathDynamic(
           /^\\/a\\/([^/]+?)\\/([^/]+?)$/i,
           {
             b: {},
@@ -91,7 +91,7 @@ describe('generateRouteRecordPath', () => {
     expect(
       generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathCustomParams(
+      "path: new MatcherPatternPathDynamic(
           /^\\/a\\/([^/]+?)?$/i,
           {
             b: {},
@@ -106,7 +106,7 @@ describe('generateRouteRecordPath', () => {
     expect(
       generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathCustomParams(
+      "path: new MatcherPatternPathDynamic(
           /^\\/a\\/(.+?)$/i,
           {
             b: {repeat: true, },
@@ -121,7 +121,7 @@ describe('generateRouteRecordPath', () => {
     expect(
       generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathCustomParams(
+      "path: new MatcherPatternPathDynamic(
           /^\\/a\\/(.+?)?$/i,
           {
             b: {repeat: true, },
@@ -139,7 +139,7 @@ describe('generateRouteRecordPath', () => {
     expect(
       generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathCustomParams(
+      "path: new MatcherPatternPathDynamic(
           /^\\/a\\/a-([^/]+?)-c-([^/]+?)$/i,
           {
             b: {},
@@ -243,7 +243,7 @@ describe('generateRouteResolver', () => {
         },
       })
 
-      export const resolver = createStaticResolver([
+      export const resolver = createFixedResolver([
         r_2,  // /b/c/d
         r_3,  // /b/e/f
         r_1,  // /b/c
@@ -274,7 +274,7 @@ describe('generateRouteResolver', () => {
       new Map()
     )
 
-    expect(resolver.replace(/^.*?createStaticResolver/s, ''))
+    expect(resolver.replace(/^.*?createFixedResolver/s, ''))
       .toMatchInlineSnapshot(`
         "([
           r_10,  // /b/a-b
@@ -340,7 +340,7 @@ describe('generateRouteResolver', () => {
         },
       })
 
-      export const resolver = createStaticResolver([
+      export const resolver = createFixedResolver([
         r_2,  // /b/c/d
         r_3,  // /b/e/f
         r_1,  // /b/c
@@ -381,7 +381,7 @@ describe('generateRouteResolver', () => {
         parent: r_0,
       })
 
-      export const resolver = createStaticResolver([
+      export const resolver = createFixedResolver([
         r_1,  // /a/b/c/e
         r_0,  // /a
       ])
@@ -422,7 +422,7 @@ describe('generateRouteResolver', () => {
         parent: r_0,
       })
 
-      export const resolver = createStaticResolver([
+      export const resolver = createFixedResolver([
         r_1,  // /a/b/c
       ])
       "
@@ -460,7 +460,7 @@ describe('generateRouteResolver', () => {
         },
       })
 
-      export const resolver = createStaticResolver([
+      export const resolver = createFixedResolver([
         r_0,  // /users
       ])
       "
@@ -494,14 +494,13 @@ describe('generateRouteResolver', () => {
             components: {
               'default': () => import('profile.vue')
             },
-            
           },
           _definePage_default_0
         )
       )
 
 
-      export const resolver = createStaticResolver([
+      export const resolver = createFixedResolver([
         r_0,  // /profile
       ])
       "
@@ -605,6 +604,22 @@ describe('route prioritization in resolver', () => {
     ])
   })
 
+  it('handles catch all with prefix before generic param', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+
+    tree.insert('api/v1/users', 'api/v1/users.vue')
+    tree.insert('api/v1/[type]', 'api/v1/[type].vue')
+    tree.insert('api/v1/[type]/c', 'api/v1/[type].vue')
+    tree.insert('api/v1/teams/[...id]', 'api/v1/teams/[...id].vue')
+
+    expect(getRouteOrderFromResolver(tree)).toEqual([
+      '/api/v1/users',
+      '/api/v1/teams/:id(.*)',
+      '/api/v1/:type/c',
+      '/api/v1/:type',
+    ])
+  })
+
   it('handles complex subsegments in deeply nested routes', () => {
     const tree = new PrefixTree(DEFAULT_OPTIONS)
 
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index 0cc8fb751..26a00e6f7 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -77,16 +77,15 @@ export function generateRouteResolver(
     })
   )
 
-  importsMap.add('vue-router/experimental', 'createStaticResolver')
+  importsMap.add('vue-router/experimental', 'createFixedResolver')
   importsMap.add('vue-router/experimental', 'MatcherPatternPathStatic')
-  importsMap.add('vue-router/experimental', 'MatcherPatternPathCustomParams')
-  importsMap.add('vue-router/experimental', 'MatcherPatternPathStar')
+  importsMap.add('vue-router/experimental', 'MatcherPatternPathDynamic')
   importsMap.add('vue-router/experimental', 'normalizeRouteRecord')
 
   return ts`
 ${records.join('\n\n')}
 
-export const resolver = createStaticResolver([
+export const resolver = createFixedResolver([
 ${state.matchableRecords
   .sort((a, b) => compareRouteScore(a.score, b.score))
   .map(
@@ -168,8 +167,7 @@ export function generateRouteRecord({
     const routeRecordObject = `{
   ${recordName}
   ${generateRouteRecordPath({ node, importsMap, paramParsersMap })}${formatMeta(node, '  ')}
-  ${recordComponents}
-  ${parentVar ? `parent: ${parentVar},` : ''}
+  ${recordComponents}${parentVar ? `\n  parent: ${parentVar},` : ''}
 }`
 
     recordDeclaration =
@@ -247,7 +245,7 @@ export function generateRouteRecordPath({
   }
   const params = node.params
   if (params.length > 0) {
-    return `path: new MatcherPatternPathCustomParams(
+    return `path: new MatcherPatternPathDynamic(
     ${node.regexp},
     ${generateParamsOptions(node.params, importsMap, paramParsersMap)},
     ${JSON.stringify(node.matcherParts)},
diff --git a/src/core/context.ts b/src/core/context.ts
index 162ad0c69..f4ff9d5a3 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -140,7 +140,10 @@ export function createRoutesContext(options: ResolvedOptions) {
               relativePath: relative(options.root, absolutePath),
             })
           }
-          logger.log('Parsed param parsers', [...paramParsers])
+          logger.log(
+            'Parsed param parsers',
+            [...paramParsers].map((p) => p[0])
+          )
         })
       }) || []),
     ])
diff --git a/src/runtime-experimental.ts b/src/runtime-experimental.ts
new file mode 100644
index 000000000..b7d754205
--- /dev/null
+++ b/src/runtime-experimental.ts
@@ -0,0 +1,104 @@
+import { EXPERIMENTAL_RouteRecord_Matchable } from 'vue-router/dist/router-DpX2dUg6.mjs'
+
+/**
+ * Defines properties of the route for the current page component.
+ *
+ * @param route - route information to be added to this page
+ * @deprecated - use `definePage` instead
+ */
+export const _definePage = (route: DefinePage) => route
+
+/**
+ * Defines properties of the route for the current page component.
+ *
+ * @param route - route information to be added to this page
+ */
+export const definePage = (route: DefinePage) => route
+
+/**
+ * Type to define a page. Can be augmented to add custom properties.
+ */
+export interface DefinePage
+  extends Partial<
+    Pick<EXPERIMENTAL_RouteRecord_Matchable, 'meta' | 'redirect'>
+  > {
+  /**
+   * A route name. If not provided, the name will be generated based on the file path.
+   * Can be set to `false` to remove the name from types.
+   */
+  name?: string | false
+
+  // TODO: figure out a syntax that makes sense and is type safe:
+  // - should allow to change the type of path params either to a src/params file or just write
+  // the function inline (which means we need to extract the function type). The issue is that there might be a lot of edge cases about imports and local declarations of variables and types
+  params?: {}
+  // TODO: add a custom serialization based on the query object completely that
+  // allows and extracts a function
+  // query?: Record<string, QueryParamType | DefinePageQueryParamOptions>
+}
+
+/**
+ * TODO:
+ * - User should be able to define a lax object matcher with a validation library
+ *   - should be easy to use if they throw inside the param
+ */
+
+export type QueryParamType = 'int' | 'bool'
+
+/**
+ * Configures how to extract a route param from a specific query parameter.
+ */
+export interface DefinePageQueryParamOptions {
+  /**
+   * The type of the query parameter. Allowed values are native param parsers
+   * and any parser in the {@link https://uvr.esm.is/TODO | params folder }.
+   */
+  type: QueryParamType
+
+  /**
+   * Defines whether the query parameter can be omitted or not. If false, the
+   * route won't match if the query parameter is not present.
+   *
+   * @default false
+   */
+  optional?: boolean
+
+  /**
+   * Can the query parameter be repeated? If true, it will always return an
+   * array of values. If false, it will return the first value and ignore the
+   * rest.
+   *
+   * @default false
+   */
+  repeatable?: boolean
+}
+
+/**
+ * Merges route record objects for the experimental resolver format.
+ * This function is specifically designed to work with objects that will be passed to normalizeRouteRecord().
+ *
+ * @internal
+ *
+ * @param main - main route record object
+ * @param routeRecords - route records to merge (from definePage imports)
+ * @returns merged route record object
+ */
+export function _mergeRouteRecord(
+  // NOTE: we can't import from experimental because it changes the types of `children`
+  // import type { EXPERIMENTAL_RouteRecordRaw } from 'vue-router/experimental'
+  main: {
+    [x: string]: unknown
+    meta?: Record<string, unknown>
+  },
+  ...routeRecords: Partial<DefinePage>[]
+) {
+  return routeRecords.reduce((acc, routeRecord) => {
+    Object.assign(acc, routeRecord)
+    acc.meta = { ...acc.meta, ...routeRecord.meta }
+
+    return acc
+  }, main)
+}
+
+// FIXME: refactor and remove
+export const _mergeRouteRecordExperimental = _mergeRouteRecord
diff --git a/src/runtime.ts b/src/runtime.ts
index b00731cd0..7718822ef 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -58,48 +58,9 @@ export interface DefinePage
    * Can be set to `false` to remove the name from types.
    */
   name?: string | false
-
-  // TODO: add a custom serialization based on the query object completely that
-  // allows and extracts a function
-  query?: Record<string, QueryParamType | DefinePageQueryParamOptions>
-}
-
-/**
- * TODO:
- * - User should be able to define a lax object matcher with a validation library
- *   - should be easy to use if they throw inside the param
- */
-
-export type QueryParamType = 'int' | 'bool'
-
-/**
- * Configures how to extract a route param from a specific query parameter.
- */
-export interface DefinePageQueryParamOptions {
-  /**
-   * The type of the query parameter. Allowed values are native param parsers
-   * and any parser in the {@link https://uvr.esm.is/TODO | params folder }.
-   */
-  type: QueryParamType
-
-  /**
-   * Defines whether the query parameter can be omitted or not. If false, the
-   * route won't match if the query parameter is not present.
-   *
-   * @default false
-   */
-  optional?: boolean
-
-  /**
-   * Can the query parameter be repeated? If true, it will always return an
-   * array of values. If false, it will return the first value and ignore the
-   * rest.
-   *
-   * @default false
-   */
-  repeatable?: boolean
 }
 
+// TODO: remove as it's in runtime-experimental
 /**
  * Merges route record objects for the experimental resolver format.
  * This function is specifically designed to work with objects that will be passed to normalizeRouteRecord().

From 91e1bcb0d7e4259ca37ef80fa616aea0af00ce1c Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sun, 17 Aug 2025 14:59:21 +0200
Subject: [PATCH 43/81] feat: handle splats

---
 package.json                              |   2 +-
 playground-experimental/package.json      |   2 +-
 pnpm-lock.yaml                            |  20 ++---
 src/codegen/generateRouteResolver.spec.ts |  37 ++++++++
 src/core/tree.ts                          |   9 +-
 src/runtime-experimental.ts               | 104 ----------------------
 src/runtime.ts                            |  10 +--
 7 files changed, 60 insertions(+), 124 deletions(-)
 delete mode 100644 src/runtime-experimental.ts

diff --git a/package.json b/package.json
index 3ab486e73..55ada2f44 100644
--- a/package.json
+++ b/package.json
@@ -204,7 +204,7 @@
     "vitepress-plugin-llms": "^1.7.5",
     "vitest": "^3.2.4",
     "vue": "^3.5.21",
-    "vue-router": "https://pkg.pr.new/vue-router@34703fb",
+    "vue-router": "https://pkg.pr.new/vue-router@2d1abf5",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index 9903f4e67..1d76862f2 100644
--- a/playground-experimental/package.json
+++ b/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@34703fb"
+    "vue-router": "https://pkg.pr.new/vue-router@2d1abf5"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 43c1b5bb9..3e9e831d7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -169,11 +169,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@34703fb
-        version: https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@2d1abf5
+        version: https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -261,8 +261,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@34703fb
-        version: https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@2d1abf5
+        version: https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -6863,8 +6863,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@https://pkg.pr.new/vue-router@34703fb:
-    resolution: {tarball: https://pkg.pr.new/vue-router@34703fb}
+  vue-router@https://pkg.pr.new/vue-router@2d1abf5:
+    resolution: {tarball: https://pkg.pr.new/vue-router@2d1abf5}
     version: 4.5.1
     peerDependencies:
       vue: ^3.2.0
@@ -14573,17 +14573,17 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@https://pkg.pr.new/vue-router@34703fb(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index e519e6a88..a8e1528dc 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -149,6 +149,43 @@ describe('generateRouteRecordPath', () => {
         ),"
     `)
   })
+
+  it('works with a catch all route', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+      '[...all]',
+      '[...all].vue'
+    )
+    expect(
+      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "path: new MatcherPatternPathDynamic(
+          /^\\/(.*)$/i,
+          {
+            all: {},
+          },
+          [1],
+        ),"
+    `)
+  })
+
+  it('works with a splat param with a prefix', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+      'a/some-[id]/[...all]',
+      'a/some-[id]/[...all].vue'
+    )
+    expect(
+      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "path: new MatcherPatternPathDynamic(
+          /^\\/a\\/some-([^/]+?)\\/(.*)$/i,
+          {
+            id: {},
+            all: {},
+          },
+          ["a",["some-",0],1],
+        ),"
+    `)
+  })
 })
 
 describe('generateRouteRecord', () => {
diff --git a/src/core/tree.ts b/src/core/tree.ts
index edcb22a33..70fba9b49 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -329,8 +329,13 @@ export class TreeNode {
     let node: TreeNode | undefined = this
 
     while (node && !node.isRoot()) {
-      const subSegments = node.value.subSegments.map(
-        (segment) => (typeof segment === 'string' ? segment : 0) /* param */
+      const subSegments = node.value.subSegments.map((segment) =>
+        typeof segment === 'string'
+          ? segment
+          : // param
+            segment.isSplat
+            ? 1
+            : 0
       )
 
       if (subSegments.length > 1) {
diff --git a/src/runtime-experimental.ts b/src/runtime-experimental.ts
deleted file mode 100644
index b7d754205..000000000
--- a/src/runtime-experimental.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { EXPERIMENTAL_RouteRecord_Matchable } from 'vue-router/dist/router-DpX2dUg6.mjs'
-
-/**
- * Defines properties of the route for the current page component.
- *
- * @param route - route information to be added to this page
- * @deprecated - use `definePage` instead
- */
-export const _definePage = (route: DefinePage) => route
-
-/**
- * Defines properties of the route for the current page component.
- *
- * @param route - route information to be added to this page
- */
-export const definePage = (route: DefinePage) => route
-
-/**
- * Type to define a page. Can be augmented to add custom properties.
- */
-export interface DefinePage
-  extends Partial<
-    Pick<EXPERIMENTAL_RouteRecord_Matchable, 'meta' | 'redirect'>
-  > {
-  /**
-   * A route name. If not provided, the name will be generated based on the file path.
-   * Can be set to `false` to remove the name from types.
-   */
-  name?: string | false
-
-  // TODO: figure out a syntax that makes sense and is type safe:
-  // - should allow to change the type of path params either to a src/params file or just write
-  // the function inline (which means we need to extract the function type). The issue is that there might be a lot of edge cases about imports and local declarations of variables and types
-  params?: {}
-  // TODO: add a custom serialization based on the query object completely that
-  // allows and extracts a function
-  // query?: Record<string, QueryParamType | DefinePageQueryParamOptions>
-}
-
-/**
- * TODO:
- * - User should be able to define a lax object matcher with a validation library
- *   - should be easy to use if they throw inside the param
- */
-
-export type QueryParamType = 'int' | 'bool'
-
-/**
- * Configures how to extract a route param from a specific query parameter.
- */
-export interface DefinePageQueryParamOptions {
-  /**
-   * The type of the query parameter. Allowed values are native param parsers
-   * and any parser in the {@link https://uvr.esm.is/TODO | params folder }.
-   */
-  type: QueryParamType
-
-  /**
-   * Defines whether the query parameter can be omitted or not. If false, the
-   * route won't match if the query parameter is not present.
-   *
-   * @default false
-   */
-  optional?: boolean
-
-  /**
-   * Can the query parameter be repeated? If true, it will always return an
-   * array of values. If false, it will return the first value and ignore the
-   * rest.
-   *
-   * @default false
-   */
-  repeatable?: boolean
-}
-
-/**
- * Merges route record objects for the experimental resolver format.
- * This function is specifically designed to work with objects that will be passed to normalizeRouteRecord().
- *
- * @internal
- *
- * @param main - main route record object
- * @param routeRecords - route records to merge (from definePage imports)
- * @returns merged route record object
- */
-export function _mergeRouteRecord(
-  // NOTE: we can't import from experimental because it changes the types of `children`
-  // import type { EXPERIMENTAL_RouteRecordRaw } from 'vue-router/experimental'
-  main: {
-    [x: string]: unknown
-    meta?: Record<string, unknown>
-  },
-  ...routeRecords: Partial<DefinePage>[]
-) {
-  return routeRecords.reduce((acc, routeRecord) => {
-    Object.assign(acc, routeRecord)
-    acc.meta = { ...acc.meta, ...routeRecord.meta }
-
-    return acc
-  }, main)
-}
-
-// FIXME: refactor and remove
-export const _mergeRouteRecordExperimental = _mergeRouteRecord
diff --git a/src/runtime.ts b/src/runtime.ts
index 7718822ef..64beadbb0 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -80,10 +80,8 @@ export function _mergeRouteRecordExperimental(
   },
   ...routeRecords: Partial<DefinePage>[]
 ) {
-  return routeRecords.reduce((acc, routeRecord) => {
-    Object.assign(acc, routeRecord)
-    acc.meta = { ...acc.meta, ...routeRecord.meta }
-
-    return acc
-  }, main)
+  for (const record of routeRecords) {
+    main.meta = { ...main.meta, ...record.meta }
+  }
+  return main
 }

From 892932f436d1337d6042ef3ac41cb2d8df82c056 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 18 Aug 2025 13:24:18 +0200
Subject: [PATCH 44/81] chore: playground ts

---
 playground/tsconfig.json | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/playground/tsconfig.json b/playground/tsconfig.json
index 3bfd00252..a2baae089 100644
--- a/playground/tsconfig.json
+++ b/playground/tsconfig.json
@@ -5,23 +5,16 @@
     "./src/**/*.ts",
     "./src/**/*.vue",
     "./typed-router.d.ts",
-    "./auto-imports.d.ts",
-    "../src"
+    "./auto-imports.d.ts"
   ],
   "compilerOptions": {
     "baseUrl": ".",
     "composite": true,
     "moduleResolution": "Bundler",
     "paths": {
-      "@/*": [
-        "./src/*"
-      ],
-      "unplugin-vue-router/runtime": [
-        "../src/runtime.ts"
-      ],
-      "unplugin-vue-router/types": [
-        "../src/types.ts"
-      ],
+      "@/*": ["./src/*"],
+      "unplugin-vue-router/runtime": ["../src/runtime.ts"],
+      "unplugin-vue-router/types": ["../src/types.ts"],
       "unplugin-vue-router/data-loaders": [
         "../src/data-loaders/entries/index.ts"
       ],
@@ -30,8 +23,8 @@
       ],
       "unplugin-vue-router/data-loaders/pinia-colada": [
         "../src/data-loaders/entries/pinia-colada.ts"
-      ],
-    },
+      ]
+    }
   },
   "vueCompilerOptions": {
     "plugins": [

From 836b0f028801055f206840791a0206200d902787 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 18 Aug 2025 13:24:31 +0200
Subject: [PATCH 45/81] refactor: no use of fs watcher internal

---
 src/codegen/generateRouteResolver.spec.ts | 2 +-
 src/core/context.ts                       | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index a8e1528dc..b0f6e9621 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -646,7 +646,7 @@ describe('route prioritization in resolver', () => {
 
     tree.insert('api/v1/users', 'api/v1/users.vue')
     tree.insert('api/v1/[type]', 'api/v1/[type].vue')
-    tree.insert('api/v1/[type]/c', 'api/v1/[type].vue')
+    tree.insert('api/v1/[type]/c', 'api/v1/[type]/c.vue')
     tree.insert('api/v1/teams/[...id]', 'api/v1/teams/[...id].vue')
 
     expect(getRouteOrderFromResolver(tree)).toEqual([
diff --git a/src/core/context.ts b/src/core/context.ts
index f4ff9d5a3..3aeed7a44 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -121,7 +121,8 @@ export function createRoutesContext(options: ResolvedOptions) {
 
                 return !isParamParserMatch(relative(folder, filePath))
               },
-            })
+            }),
+            folder
           )
         )
         return glob(PARAM_PARSER_GLOB, {
@@ -212,12 +213,12 @@ export function createRoutesContext(options: ResolvedOptions) {
     server?.updateRoutes()
   }
 
-  function setupParamParserWatcher(watcher: FSWatcher) {
+  function setupParamParserWatcher(watcher: FSWatcher, cwd: string) {
     logger.log(`🤖 Scanning param parsers in ${watcher.options.cwd}`)
     return watcher
       .on('add', (file) => {
         const name = parsePathe(file).name
-        const absolutePath = resolve(watcher.options.cwd!, file)
+        const absolutePath = resolve(cwd, file)
         paramParsers.set(name, {
           name,
           typeName: `Param_${name}`,

From 5a12ed9fc131787322e3713e3743948bdb2aafd4 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Tue, 19 Aug 2025 16:22:11 +0200
Subject: [PATCH 46/81] refactor: up vue-router

---
 package.json                              |  2 +-
 playground-experimental/package.json      |  2 +-
 pnpm-lock.yaml                            | 20 ++++++++++----------
 src/codegen/generateRouteResolver.spec.ts |  2 +-
 src/codegen/generateRouteResolver.ts      |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 55ada2f44..bc8c2e762 100644
--- a/package.json
+++ b/package.json
@@ -204,7 +204,7 @@
     "vitepress-plugin-llms": "^1.7.5",
     "vitest": "^3.2.4",
     "vue": "^3.5.21",
-    "vue-router": "https://pkg.pr.new/vue-router@2d1abf5",
+    "vue-router": "https://pkg.pr.new/vue-router@90ec562",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index 1d76862f2..6a46937ef 100644
--- a/playground-experimental/package.json
+++ b/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@2d1abf5"
+    "vue-router": "https://pkg.pr.new/vue-router@90ec562"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3e9e831d7..768525b62 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -169,11 +169,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@2d1abf5
-        version: https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@90ec562
+        version: https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -261,8 +261,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@2d1abf5
-        version: https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@90ec562
+        version: https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -6863,8 +6863,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@https://pkg.pr.new/vue-router@2d1abf5:
-    resolution: {tarball: https://pkg.pr.new/vue-router@2d1abf5}
+  vue-router@https://pkg.pr.new/vue-router@90ec562:
+    resolution: {tarball: https://pkg.pr.new/vue-router@90ec562}
     version: 4.5.1
     peerDependencies:
       vue: ^3.2.0
@@ -14573,17 +14573,17 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@https://pkg.pr.new/vue-router@2d1abf5(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index b0f6e9621..273e22450 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -524,7 +524,7 @@ describe('generateRouteResolver', () => {
       "
 
       const r_0 = normalizeRouteRecord(
-        _mergeRouteRecordExperimental(
+        _mergeRouteRecord(
           {
             name: '/profile',
             path: new MatcherPatternPathStatic('/profile'),
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index 26a00e6f7..ee7992c0a 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -267,7 +267,7 @@ function generateRouteRecordMerge(
     return routeRecordObject
   }
 
-  importsMap.add('unplugin-vue-router/runtime', '_mergeRouteRecordExperimental')
+  importsMap.add('vue-router/experimental', '_mergeRouteRecord')
 
   // Re-indent the route object to be 4 spaces (2 levels from normalizeRouteRecord)
   const indentedRouteObject = routeRecordObject
@@ -277,7 +277,7 @@ function generateRouteRecordMerge(
     })
     .join('\n')
 
-  return `_mergeRouteRecordExperimental(
+  return `_mergeRouteRecord(
 ${indentedRouteObject},
 ${definePageDataList.map((name) => `    ${name}`).join(',\n')}
   )`

From bf0fc9cc7408d574dc6e19879226241f7cdcf2ac Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 20 Aug 2025 13:55:53 +0200
Subject: [PATCH 47/81] chore: rename

---
 .../src/pages/{[...404].vue => [...path].vue}    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 rename playground-experimental/src/pages/{[...404].vue => [...path].vue} (52%)

diff --git a/playground-experimental/src/pages/[...404].vue b/playground-experimental/src/pages/[...path].vue
similarity index 52%
rename from playground-experimental/src/pages/[...404].vue
rename to playground-experimental/src/pages/[...path].vue
index 2b5ffabf0..53b50a450 100644
--- a/playground-experimental/src/pages/[...404].vue
+++ b/playground-experimental/src/pages/[...path].vue
@@ -1,8 +1,24 @@
 <script setup lang="ts">
+import { definePage } from 'unplugin-vue-router/experimental-param-parsers'
+import doc from './[...404].vue?raw'
+
+const route = useRoute()
+route.params.path
+
 definePage({
   meta: {
     title: 'Not Found',
     description: 'This page does not exist.',
+    docLength: doc.length,
+  },
+  params: {
+    query: {
+      page: {
+        parser: 'int',
+        default: 1,
+        format: 'value',
+      },
+    },
   },
 })
 </script>

From 408cf878fa197bb371b9441288cc9bf0792c644e Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 20 Aug 2025 13:55:59 +0200
Subject: [PATCH 48/81] chore: typo

---
 playground-experimental/src/pages/b.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playground-experimental/src/pages/b.vue b/playground-experimental/src/pages/b.vue
index 9522e259e..2ec140b33 100644
--- a/playground-experimental/src/pages/b.vue
+++ b/playground-experimental/src/pages/b.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup></script>
 
 <template>
-  <h1>Home</h1>
+  <h1>Page B</h1>
 </template>

From 34cebfa8ad2461f627942f2d59c9f6bf645879e6 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 20 Aug 2025 14:04:59 +0200
Subject: [PATCH 49/81] refactor: improve type for param parsers

---
 package.json                                  |  2 +-
 playground-experimental/package.json          |  2 +-
 .../src/pages/users/[userId=int].vue          | 23 +++--
 playground-experimental/typed-router.d.ts     |  6 +-
 pnpm-lock.yaml                                | 20 ++--
 src/runtime.ts                                | 99 ++++++++++++++-----
 6 files changed, 107 insertions(+), 45 deletions(-)

diff --git a/package.json b/package.json
index bc8c2e762..1d0555e2b 100644
--- a/package.json
+++ b/package.json
@@ -204,7 +204,7 @@
     "vitepress-plugin-llms": "^1.7.5",
     "vitest": "^3.2.4",
     "vue": "^3.5.21",
-    "vue-router": "https://pkg.pr.new/vue-router@90ec562",
+    "vue-router": "https://pkg.pr.new/vue-router@3c06a16",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index 6a46937ef..143c26a47 100644
--- a/playground-experimental/package.json
+++ b/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@90ec562"
+    "vue-router": "https://pkg.pr.new/vue-router@3c06a16"
   }
 }
diff --git a/playground-experimental/src/pages/users/[userId=int].vue b/playground-experimental/src/pages/users/[userId=int].vue
index 998d39518..c11c23a73 100644
--- a/playground-experimental/src/pages/users/[userId=int].vue
+++ b/playground-experimental/src/pages/users/[userId=int].vue
@@ -1,15 +1,22 @@
 <script lang="ts" setup>
 const route = useRoute()
 route.params.userId
+route.params.anyParam
+route.params.page
 
 definePage({
-  path: '/users/:userId',
-  // query: {
-  //   page: {
-  //     type: 'int',
-  //     optional: true,
-  //   },
-  // },
+  // this doesn't work in custom param version and should warn
+  // path: '/users/:userId',
+  params: {
+    query: {
+      anyParam: {},
+      page: {
+        parser: 'int',
+        default: 1,
+        format: 'value',
+      },
+    },
+  },
   meta: {
     // te: 3, 2
   },
@@ -18,4 +25,6 @@ definePage({
 
 <template>
   <h1>{{ String($route.name) }} - {{ $route.path }}</h1>
+
+  <pre>{{ route.params }}</pre>
 </template>
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
index 9461f16a5..0deb595c2 100644
--- a/playground-experimental/typed-router.d.ts
+++ b/playground-experimental/typed-router.d.ts
@@ -22,7 +22,7 @@ declare module 'vue-router/auto-routes' {
    */
   export interface RouteNamedMap {
     '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
-    '/[...404]': RouteRecordInfo<'/[...404]', '/:404(.*)', { 404: ParamValue<false> }, { 404: ParamValue<false> }>,
+    '/[...path]': RouteRecordInfo<'/[...path]', '/:path(.*)', { path: ParamValue<false> }, { path: ParamValue<false> }>,
     '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: ParamValue<false>, d: ParamValue<false> }, { b: ParamValue<false>, d: ParamValue<false> }>,
     '/b': RouteRecordInfo<'/b', '/b', Record<never, never>, Record<never, never>>,
     '/events/[when=date]': RouteRecordInfo<'/events/[when=date]', '/events/:when', { when: Param_date }, { when: Param_date }>,
@@ -49,8 +49,8 @@ declare module 'vue-router/auto-routes' {
       routes: '/(home)'
       views: never
     }
-    'src/pages/[...404].vue': {
-      routes: '/[...404]'
+    'src/pages/[...path].vue': {
+      routes: '/[...path]'
       views: never
     }
     'src/pages/a.[b].c.[d].vue': {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 768525b62..3b0716664 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -169,11 +169,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@90ec562
-        version: https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@3c06a16
+        version: https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -261,8 +261,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@90ec562
-        version: https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@3c06a16
+        version: https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -6863,8 +6863,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@https://pkg.pr.new/vue-router@90ec562:
-    resolution: {tarball: https://pkg.pr.new/vue-router@90ec562}
+  vue-router@https://pkg.pr.new/vue-router@3c06a16:
+    resolution: {tarball: https://pkg.pr.new/vue-router@3c06a16}
     version: 4.5.1
     peerDependencies:
       vue: ^3.2.0
@@ -14573,17 +14573,17 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@https://pkg.pr.new/vue-router@90ec562(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
diff --git a/src/runtime.ts b/src/runtime.ts
index 64beadbb0..6459679bd 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -1,4 +1,4 @@
-import type { RouteRecordRaw } from 'vue-router'
+import type { RouteRecordRaw, TypesConfig } from 'vue-router'
 
 /**
  * Defines properties of the route for the current page component.
@@ -58,30 +58,83 @@ export interface DefinePage
    * Can be set to `false` to remove the name from types.
    */
   name?: string | false
+
+  /**
+   * Custom parameters for the route. Requires `experimental.paramMatchers` enabled.
+   *
+   * @experimental
+   */
+  params?: {
+    path?: Record<string, ParamParserType>
+
+    /**
+     * Parameters extracted from the query.
+     */
+    query?: Record<string, DefinePageQueryParamOptions | ParamParserType>
+  }
 }
 
-// TODO: remove as it's in runtime-experimental
+export type ParamParserType_Native = 'int' | 'bool'
+
+export type ParamParserType =
+  | (TypesConfig extends Record<'ParamParsers', infer ParamParsers>
+      ? ParamParsers
+      : never)
+  | ParamParserType_Native
+
 /**
- * Merges route record objects for the experimental resolver format.
- * This function is specifically designed to work with objects that will be passed to normalizeRouteRecord().
- *
- * @internal
- *
- * @param main - main route record object
- * @param routeRecords - route records to merge (from definePage imports)
- * @returns merged route record object
+ * Configures how to extract a route param from a specific query parameter.
  */
-export function _mergeRouteRecordExperimental(
-  // NOTE: we can't import from experimental because it changes the types of `children`
-  // import type { EXPERIMENTAL_RouteRecordRaw } from 'vue-router/experimental'
-  main: {
-    [x: string]: unknown
-    meta?: Record<string, unknown>
-  },
-  ...routeRecords: Partial<DefinePage>[]
-) {
-  for (const record of routeRecords) {
-    main.meta = { ...main.meta, ...record.meta }
-  }
-  return main
+export interface DefinePageQueryParamOptions<T = unknown> {
+  /**
+   * The type of the query parameter. Allowed values are native param parsers
+   * and any parser in the {@link https://uvr.esm.is/TODO | params folder }. If
+   * not provided, the value will kept as is.
+   */
+  parser?: ParamParserType
+
+  /**
+   * Default value if the query parameter is missing or if the match fails
+   * (e.g. a invalid number is passed to the int param parser). If not provided
+   * and the param parser throws, the route will not match.
+   */
+  default?: (() => T) | T
+
+  /**
+   * How to format the query parameter value.
+   *
+   * - 'value' - keep the first value only and pass that to parser
+   * - 'array' - keep all values (even one or none) as an array and pass that to parser
+   * - 'both' - keep it as passed to the query, so this can be a single value or an array
+   *
+   * @default 'both'
+   */
+  format?: 'value' | 'array' | 'both'
 }
+
+definePage({
+  params: {
+    path: {
+      // key autocompletes because it's based on the types of the RouteMap
+      // or maybe no autocomplete becuase changing this changes the file too
+      userId: 'int', // autocompletes
+    },
+    query: {
+      p: 'int', // short version: no default, format both
+      page: {
+        parser: 'int', // autocomplete int
+        default: 1, // default value when '', null or undefined, if provided, we catch the match error, and set the default
+        format: 'value', // keep the first value only and pass that to parser
+        // format: 'array', // keep all values as an array and pass that to parser
+        // format: 'both', // keep it as passed to the query, so this can be a single value or an array
+      },
+    },
+  },
+})
+
+/**
+ * TODO: native parsers ideas:
+ * - json -> just JSON.parse(value)
+ * - boolean -> 'true' | 'false' -> boolean
+ * - number -> Number(value) -> NaN if not a number
+ */

From 04255a5bcc66d3e9492c6e75f12c2e1bab47c344 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 20 Aug 2025 14:10:39 +0200
Subject: [PATCH 50/81] refactor: rename paramMatchers to paramParsers

---
 playground-experimental/vite.config.ts |  2 +-
 playground/vite.config.ts              |  7 +++--
 src/codegen/generateRouteMap.ts        |  2 +-
 src/core/context.ts                    |  6 ++--
 src/core/extendRoutes.ts               |  2 +-
 src/options.ts                         | 38 +++++++++++++-------------
 src/runtime.ts                         |  2 +-
 7 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/playground-experimental/vite.config.ts b/playground-experimental/vite.config.ts
index 4f0871cbc..896ff0333 100644
--- a/playground-experimental/vite.config.ts
+++ b/playground-experimental/vite.config.ts
@@ -50,7 +50,7 @@ export default defineConfig({
       // getRouteName: getPascalCaseRouteName,
       experimental: {
         autoExportsDataLoaders: ['src/loaders/**/*', '@/loaders/**/*'],
-        paramMatchers: true,
+        paramParsers: true,
       },
       extendRoute(route) {
         // example of deleting routes
diff --git a/playground/vite.config.ts b/playground/vite.config.ts
index 74eda8630..69d2c7a30 100644
--- a/playground/vite.config.ts
+++ b/playground/vite.config.ts
@@ -52,13 +52,14 @@ export default defineConfig({
       // getRouteName: getPascalCaseRouteName,
       experimental: {
         autoExportsDataLoaders: ['src/loaders/**/*', '@/loaders/**/*'],
-        paramMatchers: false,
+        paramParsers: false,
       },
       extendRoute(route) {
         route.params.forEach((param) => {
           // transform kebab-case to camelCase
-          param.paramName = param.paramName.replace(/-([a-z])/g, (g) =>
-            g[1].toUpperCase()
+          param.paramName = param.paramName.replace(
+            /-([a-z])/g,
+            (g) => g[1]?.toUpperCase() || ''
           )
         })
 
diff --git a/src/codegen/generateRouteMap.ts b/src/codegen/generateRouteMap.ts
index ce732f0ab..b56c2188f 100644
--- a/src/codegen/generateRouteMap.ts
+++ b/src/codegen/generateRouteMap.ts
@@ -43,7 +43,7 @@ export function generateRouteRecordInfo(
   let paramParsers: Array<string | null> = []
   let paramType: string = ''
 
-  if (options.experimental.paramMatchers) {
+  if (options.experimental.paramParsers) {
     paramParsers = generateParamsTypes(params, paramParsersMap)
     paramType = EXPERIMENTAL_generateRouteParams(node, paramParsers)
   }
diff --git a/src/core/context.ts b/src/core/context.ts
index 3aeed7a44..60ca87b29 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -106,7 +106,7 @@ export function createRoutesContext(options: ResolvedOptions) {
             )
           )
         }),
-      ...(options.experimental.paramMatchers?.dir.map((folder) => {
+      ...(options.experimental.paramParsers?.dir.map((folder) => {
         watchers.push(
           setupParamParserWatcher(
             fsWatch('.', {
@@ -336,8 +336,8 @@ if (import.meta.hot) {
 
   function generateDTS() {
     if (
-      options.experimental.paramMatchers &&
-      options.experimental.paramMatchers.dir.length > 0
+      options.experimental.paramParsers &&
+      options.experimental.paramParsers.dir.length > 0
     ) {
       warnMissingParamParsers(routeTree, paramParsers)
     }
diff --git a/src/core/extendRoutes.ts b/src/core/extendRoutes.ts
index 76ef84933..cb18b7e84 100644
--- a/src/core/extendRoutes.ts
+++ b/src/core/extendRoutes.ts
@@ -47,7 +47,7 @@ export class EditableTreeNode {
       // but in other places we need to instruct the path is at the root so we change it afterwards
       addBackLeadingSlash = !this.node.isRoot()
     }
-    // TODO: if options.experimental.paramMatchers, should insert the raw path as [thing]
+    // TODO: if options.experimental.paramParsers, should insert the raw path as [thing]
     // and warn if a path contains a :
     const node = this.node.insertParsedPath(path, filePath)
     const editable = new EditableTreeNode(node)
diff --git a/src/options.ts b/src/options.ts
index d6f89797a..0209385ca 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -229,11 +229,11 @@ export interface Options {
     /**
      * Enable experimental support for the new custom resolvers.
      */
-    paramMatchers?: boolean | ParamMatcherOptions
+    paramParsers?: boolean | ParamParsersOptions
   }
 }
 
-export interface ParamMatcherOptions {
+export interface ParamParsersOptions {
   /**
    * Folder(s) to scan for param matchers. Set to an empty array to disable the feature.
    *
@@ -242,9 +242,9 @@ export interface ParamMatcherOptions {
   dir?: string | string[]
 }
 
-export const DEFAULT_PARAM_MATCHER_OPTIONS = {
+export const DEFAULT_PARAM_PARSERS_OPTIONS = {
   dir: ['src/params'],
-} satisfies Required<ParamMatcherOptions>
+} satisfies Required<ParamParsersOptions>
 
 export const DEFAULT_OPTIONS = {
   extensions: ['.vue'],
@@ -321,21 +321,21 @@ export function resolveOptions(options: Options) {
     src: resolve(root, routeOption.src),
   }))
 
-  const paramMatchers = options.experimental?.paramMatchers
-    ? options.experimental.paramMatchers === true
-      ? DEFAULT_PARAM_MATCHER_OPTIONS
+  const paramParsers = options.experimental?.paramParsers
+    ? options.experimental.paramParsers === true
+      ? DEFAULT_PARAM_PARSERS_OPTIONS
       : {
-          ...DEFAULT_PARAM_MATCHER_OPTIONS,
-          ...options.experimental.paramMatchers,
+          ...DEFAULT_PARAM_PARSERS_OPTIONS,
+          ...options.experimental.paramParsers,
         }
-    : // this way we can do paramMatchers?.dir
+    : // this way we can do paramParsers?.dir
       undefined
 
-  const paramMatchersDir = (
-    paramMatchers?.dir
-      ? isArray(paramMatchers.dir)
-        ? paramMatchers.dir
-        : [paramMatchers.dir]
+  const paramParsersDir = (
+    paramParsers?.dir
+      ? isArray(paramParsers.dir)
+        ? paramParsers.dir
+        : [paramParsers.dir]
       : []
   ).map((dir) => resolve(root, dir))
 
@@ -349,10 +349,10 @@ export function resolveOptions(options: Options) {
   const experimental = {
     ...options.experimental,
     autoExportsDataLoaders,
-    // keep undefined if paramMatchers is not set
-    paramMatchers: paramMatchers && {
-      ...paramMatchers,
-      dir: paramMatchersDir,
+    // keep undefined if paramParsers is not set
+    paramParsers: paramParsers && {
+      ...paramParsers,
+      dir: paramParsersDir,
     },
   }
 
diff --git a/src/runtime.ts b/src/runtime.ts
index 6459679bd..0fdd552d5 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -60,7 +60,7 @@ export interface DefinePage
   name?: string | false
 
   /**
-   * Custom parameters for the route. Requires `experimental.paramMatchers` enabled.
+   * Custom parameters for the route. Requires `experimental.paramParsers` enabled.
    *
    * @experimental
    */

From 97e2163b68e30886c7da0689a340c0cb3adeb830 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 20 Aug 2025 14:11:20 +0200
Subject: [PATCH 51/81] chore: wrong imports

---
 playground-experimental/src/pages/[...path].vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/playground-experimental/src/pages/[...path].vue b/playground-experimental/src/pages/[...path].vue
index 53b50a450..66c5b6084 100644
--- a/playground-experimental/src/pages/[...path].vue
+++ b/playground-experimental/src/pages/[...path].vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import { definePage } from 'unplugin-vue-router/experimental-param-parsers'
-import doc from './[...404].vue?raw'
+import doc from '../main.ts?raw'
 
 const route = useRoute()
 route.params.path

From 96f0c8ea00702a5ac38eec8dbaed2fc93328ba10 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 21 Aug 2025 09:16:47 +0200
Subject: [PATCH 52/81] chore: rename not found in playground

---
 playground-experimental/src/pages/[...path].vue | 1 +
 playground-experimental/typed-router.d.ts       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/playground-experimental/src/pages/[...path].vue b/playground-experimental/src/pages/[...path].vue
index 66c5b6084..876955e1b 100644
--- a/playground-experimental/src/pages/[...path].vue
+++ b/playground-experimental/src/pages/[...path].vue
@@ -10,6 +10,7 @@ definePage({
     description: 'This page does not exist.',
     docLength: doc.length,
   },
+  name: 'not-found',
   params: {
     query: {
       page: {
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
index 0deb595c2..226f01709 100644
--- a/playground-experimental/typed-router.d.ts
+++ b/playground-experimental/typed-router.d.ts
@@ -22,7 +22,7 @@ declare module 'vue-router/auto-routes' {
    */
   export interface RouteNamedMap {
     '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
-    '/[...path]': RouteRecordInfo<'/[...path]', '/:path(.*)', { path: ParamValue<false> }, { path: ParamValue<false> }>,
+    'not-found': RouteRecordInfo<'not-found', '/:path(.*)', { path: ParamValue<false> }, { path: ParamValue<false> }>,
     '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: ParamValue<false>, d: ParamValue<false> }, { b: ParamValue<false>, d: ParamValue<false> }>,
     '/b': RouteRecordInfo<'/b', '/b', Record<never, never>, Record<never, never>>,
     '/events/[when=date]': RouteRecordInfo<'/events/[when=date]', '/events/:when', { when: Param_date }, { when: Param_date }>,
@@ -50,7 +50,7 @@ declare module 'vue-router/auto-routes' {
       views: never
     }
     'src/pages/[...path].vue': {
-      routes: '/[...path]'
+      routes: 'not-found'
       views: never
     }
     'src/pages/a.[b].c.[d].vue': {

From 5a44c0a9cbc47c901de2df3caff078d47985d64b Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 21 Aug 2025 09:17:02 +0200
Subject: [PATCH 53/81] chore: inline

---
 src/codegen/generateRouteMap.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/codegen/generateRouteMap.ts b/src/codegen/generateRouteMap.ts
index b56c2188f..5de352128 100644
--- a/src/codegen/generateRouteMap.ts
+++ b/src/codegen/generateRouteMap.ts
@@ -39,12 +39,11 @@ export function generateRouteRecordInfo(
   options: ResolvedOptions,
   paramParsersMap: ParamParsersMap
 ): string {
-  const params = node.params
   let paramParsers: Array<string | null> = []
   let paramType: string = ''
 
   if (options.experimental.paramParsers) {
-    paramParsers = generateParamsTypes(params, paramParsersMap)
+    paramParsers = generateParamsTypes(node.params, paramParsersMap)
     paramType = EXPERIMENTAL_generateRouteParams(node, paramParsers)
   }
   const typeParams = [

From a6d23dd12e9e3af50f7e4ad48836c1bd2e77f50a Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 21 Aug 2025 15:50:09 +0200
Subject: [PATCH 54/81] feat: extract param parsers from definePage

---
 playground-experimental/src/App.vue           |   7 +-
 playground-experimental/src/pages/(home).vue  |   2 +
 .../src/pages/[...path].vue                   |   2 +
 src/codegen/generateRouteResolver.ts          |   2 +-
 .../__snapshots__/definePage.spec.ts.snap     |   8 ++
 src/core/context.ts                           |  56 ++++++--
 src/core/customBlock.ts                       |   2 +
 src/core/definePage.spec.ts                   | 128 +++++++++++++-----
 src/core/definePage.ts                        | 124 ++++++++++++++++-
 src/core/tree.ts                              |  39 ++++--
 src/core/treeNodeValue.ts                     |   6 +
 src/core/utils.ts                             |  11 ++
 src/core/vite/index.ts                        |  48 +++----
 src/index.ts                                  |  38 +-----
 src/runtime.ts                                |   4 +-
 15 files changed, 342 insertions(+), 135 deletions(-)

diff --git a/playground-experimental/src/App.vue b/playground-experimental/src/App.vue
index e4b430cd4..19683d635 100644
--- a/playground-experimental/src/App.vue
+++ b/playground-experimental/src/App.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
-import { useRoute } from 'vue-router'
 import { ref } from 'vue'
-import { routes } from 'vue-router/auto-routes'
-
-console.log(`We have ${routes.length} routes.`)
 
 const router = useRouter()
+
+console.log(`We have ${router.getRoutes().length} routes.`)
+
 const targetRoute = ref('')
 </script>
 
diff --git a/playground-experimental/src/pages/(home).vue b/playground-experimental/src/pages/(home).vue
index 9522e259e..746ed526b 100644
--- a/playground-experimental/src/pages/(home).vue
+++ b/playground-experimental/src/pages/(home).vue
@@ -2,4 +2,6 @@
 
 <template>
   <h1>Home</h1>
+
+  <p>This is the homepage.</p>
 </template>
diff --git a/playground-experimental/src/pages/[...path].vue b/playground-experimental/src/pages/[...path].vue
index 876955e1b..6e4570837 100644
--- a/playground-experimental/src/pages/[...path].vue
+++ b/playground-experimental/src/pages/[...path].vue
@@ -3,12 +3,14 @@ import doc from '../main.ts?raw'
 
 const route = useRoute()
 route.params.path
+route.params.page
 
 definePage({
   meta: {
     title: 'Not Found',
     description: 'This page does not exist.',
     docLength: doc.length,
+    number: 27,
   },
   name: 'not-found',
   params: {
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index ee7992c0a..6891310bb 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -248,7 +248,7 @@ export function generateRouteRecordPath({
     return `path: new MatcherPatternPathDynamic(
     ${node.regexp},
     ${generateParamsOptions(node.params, importsMap, paramParsersMap)},
-    ${JSON.stringify(node.matcherParts)},
+    ${JSON.stringify(node.matcherPatternPathDynamicParts)},
   ),`
   } else {
     return `path: new MatcherPatternPathStatic('${node.fullPath}'),`
diff --git a/src/core/__snapshots__/definePage.spec.ts.snap b/src/core/__snapshots__/definePage.spec.ts.snap
index 0d160ad0b..daf0be88e 100644
--- a/src/core/__snapshots__/definePage.spec.ts.snap
+++ b/src/core/__snapshots__/definePage.spec.ts.snap
@@ -24,8 +24,16 @@ export default {
 
 exports[`definePage > imports > removes default import if not used 1`] = `"export default {name: 'ok'}"`;
 
+exports[`definePage > imports > removes default unused imports 1`] = `"export default {name: 'ok'}"`;
+
 exports[`definePage > imports > removes star imports if not used 1`] = `"export default {name: 'ok'}"`;
 
+exports[`definePage > imports > removes unused imports 1`] = `"export default {name: 'ok'}"`;
+
+exports[`definePage > imports > removes unused imports 2`] = `"export default {name: 'ok'}"`;
+
+exports[`definePage > imports > removes unused star imports 1`] = `"export default {name: 'ok'}"`;
+
 exports[`definePage > imports > works when combining named and default imports 1`] = `
 "import my_var, {my_func} from './lib'
 export default {
diff --git a/src/core/context.ts b/src/core/context.ts
index 60ca87b29..91b1a3414 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -17,7 +17,7 @@ import {
 } from './RoutesFolderWatcher'
 import { generateDTS as _generateDTS } from '../codegen/generateDTS'
 import { generateVueRouterProxy as _generateVueRouterProxy } from '../codegen/vueRouterModule'
-import { definePageTransform, extractDefinePageNameAndPath } from './definePage'
+import { definePageTransform, extractDefinePageInfo } from './definePage'
 import { EditableTreeNode } from './extendRoutes'
 import { isPackageExists as isPackageInstalled } from 'local-pkg'
 import { ts } from '../utils'
@@ -162,10 +162,7 @@ export function createRoutesContext(options: ResolvedOptions) {
     // TODO: cache the result of parsing the SFC (in the extractDefinePageAndName) so the transform can reuse the parsing
     node.hasDefinePage ||= content.includes('definePage')
     // TODO: track if it changed and to not always trigger HMR
-    const definedPageNameAndPath = extractDefinePageNameAndPath(
-      content,
-      filePath
-    )
+    const definedPageInfo = extractDefinePageInfo(content, filePath)
     // TODO: track if it changed and if generateRoutes should be called again
     const routeBlock = getRouteBlock(filePath, content, options)
     // TODO: should warn if hasDefinePage and customRouteBlock
@@ -173,7 +170,7 @@ export function createRoutesContext(options: ResolvedOptions) {
 
     node.setCustomRouteBlock(filePath, {
       ...routeBlock,
-      ...definedPageNameAndPath,
+      ...definedPageInfo,
     })
   }
 
@@ -188,9 +185,6 @@ export function createRoutesContext(options: ResolvedOptions) {
     if (triggerExtendRoute) {
       await options.extendRoute?.(new EditableTreeNode(node))
     }
-
-    // TODO: trigger HMR vue-router/auto
-    server?.updateRoutes()
   }
 
   async function updatePage({ filePath, routePath }: HandlerContext) {
@@ -209,8 +203,6 @@ export function createRoutesContext(options: ResolvedOptions) {
   function removePage({ filePath, routePath }: HandlerContext) {
     logger.log(`remove "${routePath}" for "${filePath}"`)
     routeTree.removeChild(filePath)
-    // TODO: HMR vue-router/auto
-    server?.updateRoutes()
   }
 
   function setupParamParserWatcher(watcher: FSWatcher, cwd: string) {
@@ -271,7 +263,43 @@ export function createRoutesContext(options: ResolvedOptions) {
       imports += '\n'
     }
 
-    const newAutoRoutes = `${imports}${resolverCode}\n`
+    const hmr = ts`
+export function handleHotUpdate(_router, _hotUpdateCallback) {
+  if (import.meta.hot) {
+    import.meta.hot.data.router = _router
+    import.meta.hot.data.router_hotUpdateCallback = _hotUpdateCallback
+  }
+}
+
+if (import.meta.hot) {
+  import.meta.hot.accept((mod) => {
+    console.log('🔥 HMRRRR')
+    import.meta.hot.invalidate('[unplugin-vue-router:HMR] reloading resolver')
+    return
+    const router = import.meta.hot.data.router
+    if (!router) {
+      import.meta.hot.invalidate('[unplugin-vue-router:HMR] Cannot replace the resolver because there is no active router. Reloading.')
+      return
+    }
+    // TODO:
+    router._hmrReplaceResolver(mod.resolver)
+    // call the hotUpdateCallback for custom updates
+    import.meta.hot.data.router_hotUpdateCallback?.(mod.routes)
+    const route = router.currentRoute.value
+    router.replace({
+      ...route,
+      // NOTE: we should be able to just do ...route but the router
+      // currently skips resolving and can give errors with renamed routes
+      // so we explicitly set remove matched and name
+      name: undefined,
+      matched: undefined,
+      params: {},
+      force: true
+    })
+  })
+}`
+
+    const newAutoRoutes = `${imports}${resolverCode}\n${hmr}`
 
     // prepend it to the code
     return newAutoRoutes
@@ -384,6 +412,10 @@ if (import.meta.hot) {
         await fs.writeFile(dts, content, 'utf-8')
         logger.timeLog('writeConfigFiles', 'wrote dts file')
         lastDTS = content
+        // TODO: only update routes if routes changed (this includes definePage changes)
+        // but do not update routes if only the component want updated
+        // currently, this doesn't trigger if definePage meta properties changed
+        server?.updateRoutes()
       }
     }
     logger.timeEnd('writeConfigFiles')
diff --git a/src/core/customBlock.ts b/src/core/customBlock.ts
index 75c30d72d..02fbc13e3 100644
--- a/src/core/customBlock.ts
+++ b/src/core/customBlock.ts
@@ -4,6 +4,7 @@ import JSON5 from 'json5'
 import { parse as YAMLParser } from 'yaml'
 import { RouteRecordRaw } from 'vue-router'
 import { warn } from './utils'
+import type { DefinePage } from '../runtime'
 
 export function getRouteBlock(
   path: string,
@@ -24,6 +25,7 @@ export interface CustomRouteBlock
     >
   > {
   name?: string | undefined | false
+  params?: DefinePage['params']
 }
 
 function parseCustomBlock(
diff --git a/src/core/definePage.spec.ts b/src/core/definePage.spec.ts
index 07d92d4f8..ee073a7d8 100644
--- a/src/core/definePage.spec.ts
+++ b/src/core/definePage.spec.ts
@@ -1,8 +1,11 @@
 import { TransformResult } from 'vite'
 import { expect, describe, it } from 'vitest'
-import { definePageTransform, extractDefinePageNameAndPath } from './definePage'
+import { definePageTransform, extractDefinePageInfo } from './definePage'
+import { ts } from '../utils'
 
-const sampleCode = `
+const vue = String.raw
+
+const sampleCode = vue`
 <script setup>
 const a = 1
 definePage({
@@ -31,7 +34,7 @@ describe('definePage', () => {
   describe('imports', () => {
     it('keeps used named imports', async () => {
       const result = (await definePageTransform({
-        code: `
+        code: vue`
 <script setup>
 import { my_var, not_used, my_func, my_num } from './lib'
 definePage({
@@ -53,7 +56,7 @@ definePage({
 
     it('keeps used default imports', async () => {
       const result = (await definePageTransform({
-        code: `
+        code: vue`
 <script setup>
 import my_var from './lib'
 definePage({
@@ -69,9 +72,9 @@ definePage({
       expect(result?.code).toMatchSnapshot()
     })
 
-    it('removes default import if not used', async () => {
-      const result = (await definePageTransform({
-        code: `
+    it('removes default unused imports', async () => {
+      const resultDefault = (await definePageTransform({
+        code: vue`
 <script setup>
 import my_var from './lib'
 definePage({name: 'ok'})
@@ -79,34 +82,34 @@ definePage({name: 'ok'})
 `,
         id: 'src/pages/with-imports.vue&definePage&vue&lang.ts',
       })) as Exclude<TransformResult, string>
-      expect(result).toHaveProperty('code')
-      expect(result?.code).toMatchSnapshot()
+      expect(resultDefault).toHaveProperty('code')
+      expect(resultDefault?.code).toMatchSnapshot()
     })
 
-    it('works with star imports', async () => {
-      const result = (await definePageTransform({
-        code: `
+    it('removes unused star imports', async () => {
+      const resultStar = (await definePageTransform({
+        code: vue`
 <script setup>
 import * as lib from './my-lib'
-definePage({
-  meta: {
-    [lib.my_var]: 'hello',
-  }
-  })
+definePage({name: 'ok'})
 </script>
 `,
         id: 'src/pages/with-imports.vue&definePage&vue&lang.ts',
       })) as Exclude<TransformResult, string>
-      expect(result).toHaveProperty('code')
-      expect(result?.code).toMatchSnapshot()
+      expect(resultStar).toHaveProperty('code')
+      expect(resultStar?.code).toMatchSnapshot()
     })
 
-    it('removes star imports if not used', async () => {
+    it('works with star imports', async () => {
       const result = (await definePageTransform({
-        code: `
+        code: vue`
 <script setup>
 import * as lib from './my-lib'
-definePage({name: 'ok'})
+definePage({
+  meta: {
+    [lib.my_var]: 'hello',
+  }
+  })
 </script>
 `,
         id: 'src/pages/with-imports.vue&definePage&vue&lang.ts',
@@ -117,7 +120,7 @@ definePage({name: 'ok'})
 
     it('works when combining named and default imports', async () => {
       const result = (await definePageTransform({
-        code: `
+        code: vue`
 <script setup>
 import my_var, { not_used, my_func, not_used_either } from './lib'
 definePage({
@@ -136,7 +139,7 @@ definePage({
   })
 
   it('works with jsx', async () => {
-    const code = `
+    const code = ts`
     const a = 1
     definePage({
       name: 'custom',
@@ -154,7 +157,7 @@ definePage({
   })
 
   it('throws if definePage uses a variable from the setup', async () => {
-    const code = `
+    const code = vue`
 <script setup>
 const a = 1
 definePage({
@@ -171,19 +174,74 @@ definePage({
     }).rejects.toThrowError()
   })
 
-  it('extracts name and path', async () => {
-    expect(
-      await extractDefinePageNameAndPath(sampleCode, 'src/pages/basic.vue')
-    ).toEqual({
+  it('extracts name and path', () => {
+    expect(extractDefinePageInfo(sampleCode, 'src/pages/basic.vue')).toEqual({
       name: 'custom',
       path: '/custom',
     })
   })
 
+  it('extracts all types of params', () => {
+    const codeWithAllParams = vue`
+<script setup>
+definePage({
+  params: {
+    path: {
+      userId: 'int',
+      isActive: 'bool'
+    },
+    query: {
+      page: {
+        parser: 'int',
+        default: 1,
+        format: 'value',
+      },
+      enabled: 'bool',
+      count: {
+        parser: 'int',
+        default: 42
+      },
+      active: {
+        default: 'none',
+      },
+    }
+  }
+})
+</script>
+`
+    expect(
+      extractDefinePageInfo(codeWithAllParams, 'src/pages/test.vue')
+    ).toEqual({
+      params: {
+        path: {
+          userId: 'int',
+          isActive: 'bool',
+        },
+        query: {
+          page: {
+            parser: 'int',
+            default: 1,
+            format: 'value',
+          },
+          enabled: {
+            parser: 'bool',
+          },
+          count: {
+            parser: 'int',
+            default: 42,
+          },
+          active: {
+            default: 'none',
+          },
+        },
+      },
+    })
+  })
+
   it('extract name skipped when non existent', async () => {
     expect(
-      await extractDefinePageNameAndPath(
-        `
+      extractDefinePageInfo(
+        vue`
 <script setup>
 const a = 1
 const b = 1
@@ -199,7 +257,7 @@ const b = 1
   })
 
   it('works with comments', async () => {
-    const code = `
+    const code = vue`
 <script setup>
 // definePage
 </script>
@@ -240,15 +298,15 @@ const b = 1
         id: 'src/pages/definePage.vue?definePage&vue',
       })
     ).toMatchObject({
-      code: `\
+      code: ts`
 export default {
   name: 'custom',
   path: '/custom',
-}`,
+}`.trim(),
     })
 
     expect(
-      await extractDefinePageNameAndPath(sampleCode, 'src/pages/definePage.vue')
+      extractDefinePageInfo(sampleCode, 'src/pages/definePage.vue')
     ).toEqual({
       name: 'custom',
       path: '/custom',
diff --git a/src/core/definePage.ts b/src/core/definePage.ts
index ca420eb1e..9d1089425 100644
--- a/src/core/definePage.ts
+++ b/src/core/definePage.ts
@@ -11,15 +11,16 @@ import type { Thenable, TransformResult } from 'unplugin'
 import type {
   CallExpression,
   Node,
+  ObjectExpression,
   ObjectProperty,
   Program,
   Statement,
   StringLiteral,
 } from '@babel/types'
 import { walkAST } from 'ast-walker-scope'
-import { CustomRouteBlock } from './customBlock'
 import { warn } from './utils'
 import { ParsedStaticImport, findStaticImports, parseStaticImport } from 'mlly'
+import type { DefinePage, ParamParserType } from 'unplugin-vue-router/runtime'
 
 const MACRO_DEFINE_PAGE = 'definePage'
 export const MACRO_DEFINE_PAGE_QUERY = /[?&]definePage\b/
@@ -186,10 +187,18 @@ export function definePageTransform({
   }
 }
 
-export function extractDefinePageNameAndPath(
+type DefinePageParamsInfo = DefinePage['params']
+
+export interface DefinePageInfo {
+  name?: string | false
+  path?: string
+  params?: DefinePage['params']
+}
+
+export function extractDefinePageInfo(
   sfcCode: string,
   id: string
-): { name?: string | false; path?: string } | null | undefined {
+): DefinePageInfo | null | undefined {
   if (!sfcCode.includes(MACRO_DEFINE_PAGE)) return
 
   const { ast, definePageNodes } = getCodeAst(sfcCode, id)
@@ -216,7 +225,7 @@ export function extractDefinePageNameAndPath(
     )
   }
 
-  const routeInfo: Pick<CustomRouteBlock, 'name' | 'path'> = {}
+  const routeInfo: DefinePageInfo = {}
 
   for (const prop of routeRecord.properties) {
     if (prop.type === 'ObjectProperty' && prop.key.type === 'Identifier') {
@@ -238,6 +247,10 @@ export function extractDefinePageNameAndPath(
         } else {
           routeInfo.path = prop.value.value
         }
+      } else if (prop.key.name === 'params') {
+        if (prop.value.type === 'ObjectExpression') {
+          routeInfo.params = extractParamsInfo(prop.value, id)
+        }
       }
     }
   }
@@ -245,6 +258,109 @@ export function extractDefinePageNameAndPath(
   return routeInfo
 }
 
+function extractParamsInfo(
+  paramsObj: ObjectExpression,
+  id: string
+): DefinePageParamsInfo {
+  const params: DefinePageParamsInfo = {}
+
+  for (const prop of paramsObj.properties) {
+    if (prop.type === 'ObjectProperty' && prop.key.type === 'Identifier') {
+      if (prop.key.name === 'query' && prop.value.type === 'ObjectExpression') {
+        params.query = extractQueryParams(prop.value, id)
+      } else if (
+        prop.key.name === 'path' &&
+        prop.value.type === 'ObjectExpression'
+      ) {
+        params.path = extractPathParams(prop.value, id)
+      }
+    }
+  }
+
+  return params
+}
+
+function extractQueryParams(
+  queryObj: ObjectExpression,
+  _id: string
+): NonNullable<DefinePageInfo['params']>['query'] {
+  const queryParams: NonNullable<DefinePageInfo['params']>['query'] = {}
+
+  for (const prop of queryObj.properties) {
+    if (prop.type === 'ObjectProperty' && prop.key.type === 'Identifier') {
+      const paramName = prop.key.name
+
+      // we normalize short form for convenience
+      if (prop.value.type === 'StringLiteral') {
+        queryParams[paramName] = {
+          parser: prop.value.value as ParamParserType,
+        }
+      } else if (prop.value.type === 'ObjectExpression') {
+        // Full form: param: { parser: 'int', default: 1, format: 'value' }
+        const paramInfo: (typeof queryParams)[string] = {}
+
+        for (const paramProp of prop.value.properties) {
+          if (
+            paramProp.type === 'ObjectProperty' &&
+            paramProp.key.type === 'Identifier'
+          ) {
+            if (
+              paramProp.key.name === 'parser' &&
+              paramProp.value.type === 'StringLiteral'
+            ) {
+              paramInfo.parser = paramProp.value.value as ParamParserType
+            } else if (
+              paramProp.key.name === 'format' &&
+              paramProp.value.type === 'StringLiteral'
+            ) {
+              paramInfo.format = paramProp.value.value as
+                | 'value'
+                | 'array'
+                | 'both'
+            } else if (paramProp.key.name === 'default') {
+              // Handle different literal types for default values
+              if (paramProp.value.type === 'NumericLiteral') {
+                paramInfo.default = paramProp.value.value
+              } else if (paramProp.value.type === 'StringLiteral') {
+                paramInfo.default = paramProp.value.value
+              } else if (paramProp.value.type === 'BooleanLiteral') {
+                paramInfo.default = paramProp.value.value
+              } else if (paramProp.value.type === 'NullLiteral') {
+                paramInfo.default = null
+              }
+              // TODO: handle function expressions for default values
+            }
+          }
+        }
+
+        queryParams[paramName] = paramInfo
+      }
+    }
+  }
+
+  return queryParams
+}
+
+function extractPathParams(
+  pathObj: ObjectExpression,
+  _id: string
+): NonNullable<DefinePageInfo['params']>['path'] {
+  const pathParams: NonNullable<DefinePageInfo['params']>['path'] = {}
+
+  for (const prop of pathObj.properties) {
+    if (
+      prop.type === 'ObjectProperty' &&
+      prop.key.type === 'Identifier' &&
+      prop.value.type === 'StringLiteral'
+    ) {
+      // TODO: we should check if the value is a valid parser type
+      pathParams[prop.key.name] = prop.value.value as ParamParserType
+    }
+  }
+
+  return pathParams
+}
+
 // TODO: use
 export function extractRouteAlias(
   aliasValue: ObjectProperty['value'],
diff --git a/src/core/tree.ts b/src/core/tree.ts
index 70fba9b49..83c62faba 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -270,6 +270,9 @@ export class TreeNode {
       : ''
   }
 
+  /**
+   * Array of route params for this node. It includes all the params from the parents as well.
+   */
   get params(): TreeRouteParam[] {
     const params = this.value.isParam() ? [...this.value.params] : []
     let node = this.parent
@@ -284,6 +287,26 @@ export class TreeNode {
     return params
   }
 
+  /**
+   * Array of route params coming from the path. It includes all the params from the parents as well.
+   */
+  get pathParams(): TreeRouteParam[] {
+    const params = this.value.isParam() ? [...this.value.params] : []
+    let node = this.parent
+    // add all the params from the parents
+    while (node) {
+      if (node.value.isParam()) {
+        params.unshift(...node.value.params)
+      }
+      node = node.parent
+    }
+
+    return params
+  }
+
+  /**
+   * Generates a regexp based on this node and its parents. This regexp is used by the custom resolver
+   */
   get regexp(): string {
     let re = ''
     let node: TreeNode | undefined = this
@@ -313,18 +336,10 @@ export class TreeNode {
     return scores
   }
 
-  get matcherParams() {
-    const params: Record<string, { repeat?: boolean }> = {}
-    for (const param of this.params) {
-      params[param.paramName] = {
-        repeat: param.repeatable,
-        // TODO: parser
-      }
-    }
-    return params
-  }
-
-  get matcherParts(): TreeNodeValueMatcherPart {
+  /**
+   * Returns an array of matcher parts that is consumed by MatcherPatternPathDynamic to render the path.
+   */
+  get matcherPatternPathDynamicParts(): TreeNodeValueMatcherPart {
     const parts: TreeNodeValueMatcherPart = []
     let node: TreeNode | undefined = this
 
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index 6ebe824a6..9a95c2dd9 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -1,6 +1,7 @@
 import type { RouteRecordRaw } from 'vue-router'
 import { CustomRouteBlock } from './customBlock'
 import { joinPath, mergeRouteRecordOverride, warn } from './utils'
+import type { DefinePage } from 'unplugin-vue-router/runtime'
 
 export const enum TreeNodeType {
   static,
@@ -11,6 +12,11 @@ export const enum TreeNodeType {
 export interface RouteRecordOverride
   extends Partial<Pick<RouteRecordRaw, 'meta' | 'props' | 'alias' | 'path'>> {
   name?: string | undefined | false
+
+  /**
+   * Param Parsers information.
+   */
+  params?: DefinePage['params']
 }
 
 export type SubSegment = string | TreeRouteParam
diff --git a/src/core/utils.ts b/src/core/utils.ts
index 63f269b49..c5773b2e2 100644
--- a/src/core/utils.ts
+++ b/src/core/utils.ts
@@ -199,6 +199,17 @@ export function mergeRouteRecordOverride(
       merged[key] = newAlias.concat(a.alias || [], b.alias || [])
     } else if (key === 'meta') {
       merged[key] = mergeDeep(a[key] || {}, b[key] || {})
+    } else if (key === 'params') {
+      merged[key] = {
+        path: {
+          ...a[key]?.path,
+          ...b[key]?.path,
+        },
+        query: {
+          ...a[key]?.query,
+          ...b[key]?.query,
+        },
+      }
     } else {
       // @ts-expect-error: TS cannot see it's the same key
       merged[key] = b[key] ?? a[key]
diff --git a/src/core/vite/index.ts b/src/core/vite/index.ts
index 1fa1cb974..f59b79782 100644
--- a/src/core/vite/index.ts
+++ b/src/core/vite/index.ts
@@ -1,33 +1,17 @@
 import { type ViteDevServer } from 'vite'
 import { type ServerContext } from '../../options'
-import { MODULE_ROUTES_PATH, asVirtualId } from '../moduleConstants'
+import {
+  MODULE_RESOLVER_PATH,
+  MODULE_ROUTES_PATH,
+  asVirtualId,
+} from '../moduleConstants'
 
 export function createViteContext(server: ViteDevServer): ServerContext {
   function invalidate(path: string) {
-    const { moduleGraph } = server
-    const foundModule = moduleGraph.getModuleById(path)
+    const foundModule = server.moduleGraph.getModuleById(path)
+    // console.log(`🟣 Invalidating module: ${path}, found: ${!!foundModule}`)
     if (foundModule) {
-      moduleGraph.invalidateModule(foundModule, undefined, undefined, true)
-      // for (const mod of foundModule.importers) {
-      //   console.log(`Invalidating ${mod.url}`)
-      //   moduleGraph.invalidateModule(mod)
-      // }
-      setTimeout(() => {
-        console.log(`Sending update for ${foundModule.url}`)
-        server.ws.send({
-          type: 'update',
-          updates: [
-            {
-              acceptedPath: path,
-              path: path,
-              // NOTE: this was in the
-              // timestamp: ROUTES_LAST_LOAD_TIME.value,
-              timestamp: Date.now(),
-              type: 'js-update',
-            },
-          ],
-        })
-      }, 100)
+      return server.reloadModule(foundModule)
     }
     return !!foundModule
   }
@@ -43,11 +27,17 @@ export function createViteContext(server: ViteDevServer): ServerContext {
    * Triggers HMR for the vue-router/auto-routes module.
    */
   async function updateRoutes() {
-    const modId = asVirtualId(MODULE_ROUTES_PATH)
-    const mod = server.moduleGraph.getModuleById(modId)
-    if (mod) {
-      return server.reloadModule(mod)
-    }
+    const autoRoutesMod = server.moduleGraph.getModuleById(
+      asVirtualId(MODULE_ROUTES_PATH)
+    )
+    const autoResolvedMod = server.moduleGraph.getModuleById(
+      asVirtualId(MODULE_RESOLVER_PATH)
+    )
+
+    await Promise.all([
+      autoRoutesMod && server.reloadModule(autoRoutesMod),
+      autoResolvedMod && server.reloadModule(autoResolvedMod),
+    ])
   }
 
   return {
diff --git a/src/index.ts b/src/index.ts
index 799e7e1c0..573ee818d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -21,7 +21,6 @@ import {
 import { createViteContext } from './core/vite'
 import { join } from 'pathe'
 import { appendExtensionListToPattern } from './core/utils'
-import { MACRO_DEFINE_PAGE_QUERY } from './core/definePage'
 import { createAutoExportPlugin } from './data-loaders/auto-exports'
 
 export type * from './types'
@@ -158,46 +157,11 @@ export default createUnplugin<Options | undefined>((opt = {}, _meta) => {
         },
       },
 
-      // improves DX
+      // for HMR
       vite: {
         configureServer(server) {
           ctx.setServerContext(createViteContext(server))
         },
-
-        handleHotUpdate: {
-          order: 'post',
-          handler({ server, file, modules }) {
-            // console.log(`🔥 HMR ${file}`)
-            const moduleList = server.moduleGraph.getModulesByFile(file)
-            const definePageModule = Array.from(moduleList || []).find(
-              (mod) => {
-                return mod?.id && MACRO_DEFINE_PAGE_QUERY.test(mod.id)
-              }
-            )
-
-            if (definePageModule) {
-              // console.log(`Updating ${definePageModule.file}`)
-              const routesModule = server.moduleGraph.getModuleById(
-                asVirtualId(MODULE_ROUTES_PATH)
-              )
-
-              if (!routesModule) {
-                console.error('🔥 HMR routes module not found')
-                return
-              }
-
-              return [
-                ...modules,
-                // TODO: only if the definePage changed
-                definePageModule,
-                // TODO: only if ether the definePage or the route block changed
-                routesModule,
-              ]
-            }
-
-            return // for ts
-          },
-        },
       },
     },
   ]
diff --git a/src/runtime.ts b/src/runtime.ts
index 0fdd552d5..fe70753c9 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -98,7 +98,9 @@ export interface DefinePageQueryParamOptions<T = unknown> {
    * (e.g. a invalid number is passed to the int param parser). If not provided
    * and the param parser throws, the route will not match.
    */
-  default?: (() => T) | T
+  default?: T
+  // TODO: handle function syntax
+  // default?: (() => T) | T
 
   /**
    * How to format the query parameter value.

From 2a41d6e8b7f12dce34e5807b712643239a559b08 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 26 Sep 2025 17:30:30 +0200
Subject: [PATCH 55/81] chore: remov efor merge

---
 playground-experimental/typed-router.d.ts | 104 ----------------------
 1 file changed, 104 deletions(-)
 delete mode 100644 playground-experimental/typed-router.d.ts

diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
deleted file mode 100644
index 226f01709..000000000
--- a/playground-experimental/typed-router.d.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/* eslint-disable */
-/* prettier-ignore */
-// @ts-nocheck
-// Generated by unplugin-vue-router. ‼️ DO NOT MODIFY THIS FILE ‼️
-// It's recommended to commit this file.
-// Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.
-
-// Custom route params parsers
-type Param_date = ReturnType<NonNullable<typeof import('./src/params/date.ts').parser['get']>>
-
-declare module 'vue-router/auto-routes' {
-  import type {
-    RouteRecordInfo,
-    ParamValue,
-    ParamValueOneOrMore,
-    ParamValueZeroOrMore,
-    ParamValueZeroOrOne,
-  } from 'vue-router'
-
-  /**
-   * Route name map generated by unplugin-vue-router
-   */
-  export interface RouteNamedMap {
-    '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
-    'not-found': RouteRecordInfo<'not-found', '/:path(.*)', { path: ParamValue<false> }, { path: ParamValue<false> }>,
-    '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: ParamValue<false>, d: ParamValue<false> }, { b: ParamValue<false>, d: ParamValue<false> }>,
-    '/b': RouteRecordInfo<'/b', '/b', Record<never, never>, Record<never, never>>,
-    '/events/[when=date]': RouteRecordInfo<'/events/[when=date]', '/events/:when', { when: Param_date }, { when: Param_date }>,
-    '/manually-added': RouteRecordInfo<'/manually-added', '/manually-added', Record<never, never>, Record<never, never>>,
-    '/u[name]': RouteRecordInfo<'/u[name]', '/u:name', { name: ParamValue<false> }, { name: ParamValue<false> }, '/u[name]/24' | '/u[name]/[userId=int]'>,
-    '/u[name]/[userId=int]': RouteRecordInfo<'/u[name]/[userId=int]', '/u:name/:userId', { name: ParamValue<false>, userId: number }, { name: ParamValue<false>, userId: number }>,
-    '/u[name]/24': RouteRecordInfo<'/u[name]/24', '/u:name/24', { name: ParamValue<false> }, { name: ParamValue<false> }>,
-    '/users/[userId=int]': RouteRecordInfo<'/users/[userId=int]', '/users/:userId', { userId: number }, { userId: number }>,
-    '/users/sub-[first]-[second]': RouteRecordInfo<'/users/sub-[first]-[second]', '/users/sub-:first-:second', { first: ParamValue<false>, second: ParamValue<false> }, { first: ParamValue<false>, second: ParamValue<false> }>,
-  }
-
-  /**
-   * Route file to route info map by unplugin-vue-router.
-   * Used by the volar plugin to automatically type useRoute()
-   *
-   * Each key is a file path relative to the project root with 2 properties:
-   * - routes: union of route names of the possible routes when in this page (passed to useRoute<...>())
-   * - views: names of nested views (can be passed to <RouterView name="...">)
-   *
-   * @internal
-   */
-  export interface _RouteFileInfoMap {
-    'src/pages/(home).vue': {
-      routes: '/(home)'
-      views: never
-    }
-    'src/pages/[...path].vue': {
-      routes: 'not-found'
-      views: never
-    }
-    'src/pages/a.[b].c.[d].vue': {
-      routes: '/a.[b].c.[d]'
-      views: never
-    }
-    'src/pages/b.vue': {
-      routes: '/b'
-      views: never
-    }
-    'src/pages/events/[when=date].vue': {
-      routes: '/events/[when=date]'
-      views: never
-    }
-    'src/page-outside.vue': {
-      routes: '/manually-added'
-      views: never
-    }
-    'src/pages/u[name].vue': {
-      routes: '/u[name]' | '/u[name]/[userId=int]' | '/u[name]/24'
-      views: 'default'
-    }
-    'src/pages/u[name]/[userId=int].vue': {
-      routes: '/u[name]/[userId=int]'
-      views: never
-    }
-    'src/pages/u[name]/24.vue': {
-      routes: '/u[name]/24'
-      views: never
-    }
-    'src/pages/users/[userId=int].vue': {
-      routes: '/users/[userId=int]'
-      views: never
-    }
-    'src/pages/users/sub-[first]-[second].vue': {
-      routes: '/users/sub-[first]-[second]'
-      views: never
-    }
-  }
-
-  /**
-   * Get a union of possible route names in a certain route component file.
-   * Used by the volar plugin to automatically type useRoute()
-   *
-   * @internal
-   */
-  export type _RouteNamesForFilePath<FilePath extends string> =
-    _RouteFileInfoMap extends Record<FilePath, infer Info>
-      ? Info['routes']
-      : keyof RouteNamedMap
-}

From 1fa44b138a5ab21f42cd73bf253523cab11b89cc Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 23 Aug 2025 14:41:54 +0200
Subject: [PATCH 56/81] feat: handle query types

---
 client.d.ts                                   |   5 +-
 package.json                                  |   3 +-
 playground-experimental/package.json          |   2 +-
 .../src/pages/[...path].vue                   |   3 +-
 .../src/pages/blog/[[slugOptional]]+.vue      |   7 +
 .../src/pages/blog/[slug]+.vue                |   7 +
 .../src/pages/blog/info/(info).vue            |  30 +++
 .../src/pages/blog/info/[[section]].vue       |   7 +
 .../src/pages/tests/[[optional]]/end.vue      |   7 +
 playground-experimental/src/router.ts         |   7 +-
 playground-experimental/typed-router.d.ts     | 129 ++++++++++
 pnpm-lock.yaml                                |  20 +-
 src/codegen/generateParamParsers.ts           |  53 +---
 src/codegen/generateRouteMap.ts               |  10 +-
 src/codegen/generateRouteParams.ts            |  34 +--
 src/codegen/generateRouteResolver.spec.ts     | 238 ++++++++++++++++++
 src/codegen/generateRouteResolver.ts          |  68 ++++-
 .../__snapshots__/definePage.spec.ts.snap     |   8 -
 src/core/context.ts                           |  16 +-
 src/core/customBlock.ts                       |  16 +-
 src/core/definePage.spec.ts                   |   6 +-
 src/core/definePage.ts                        |  39 ++-
 src/core/extendRoutes.ts                      |   6 +-
 src/core/tree.spec.ts                         |  87 ++++++-
 src/core/tree.ts                              |  24 +-
 src/core/treeNodeValue.ts                     | 119 +++++++--
 src/core/utils.ts                             |   4 +-
 src/runtime.ts                                |  23 +-
 src/types.ts                                  |   4 +-
 29 files changed, 803 insertions(+), 179 deletions(-)
 create mode 100644 playground-experimental/src/pages/blog/[[slugOptional]]+.vue
 create mode 100644 playground-experimental/src/pages/blog/[slug]+.vue
 create mode 100644 playground-experimental/src/pages/blog/info/(info).vue
 create mode 100644 playground-experimental/src/pages/blog/info/[[section]].vue
 create mode 100644 playground-experimental/src/pages/tests/[[optional]]/end.vue
 create mode 100644 playground-experimental/typed-router.d.ts

diff --git a/client.d.ts b/client.d.ts
index fed885230..cfd519568 100644
--- a/client.d.ts
+++ b/client.d.ts
@@ -8,9 +8,12 @@ declare module 'vue-router/auto-routes' {
 
   /**
    * Setups hot module replacement for routes.
+   *
    * @param router - The router instance
    * @param hotUpdateCallback - Callback to be called after replacing the routes and before the navigation
+   *
    * @example
+   *
    * ```ts
    * import { createRouter, createWebHistory } from 'vue-router'
    * import { routes, handleHotUpdate } from 'vue-router/auto-routes'
@@ -19,7 +22,7 @@ declare module 'vue-router/auto-routes' {
    *   routes,
    * })
    * if (import.meta.hot) {
-   * handleHotUpdate(router)
+   *   handleHotUpdate(router)
    * }
    * ```
    */
diff --git a/package.json b/package.json
index 1d0555e2b..598ea3c2a 100644
--- a/package.json
+++ b/package.json
@@ -171,7 +171,6 @@
     "@posva/prompts": "^2.4.4",
     "@shikijs/vitepress-twoslash": "3.13.0",
     "@tanstack/vue-query": "^5.89.0",
-    "@types/node": "^22.18.6",
     "@types/node": "^24.3.0",
     "@types/picomatch": "^4.0.2",
     "@vitest/coverage-v8": "^3.2.4",
@@ -204,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@3c06a16",
+    "vue-router": "https://pkg.pr.new/vue-router@4b05bce",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index 143c26a47..b3bac1dd9 100644
--- a/playground-experimental/package.json
+++ b/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@3c06a16"
+    "vue-router": "https://pkg.pr.new/vue-router@4b05bce"
   }
 }
diff --git a/playground-experimental/src/pages/[...path].vue b/playground-experimental/src/pages/[...path].vue
index 6e4570837..200e47339 100644
--- a/playground-experimental/src/pages/[...path].vue
+++ b/playground-experimental/src/pages/[...path].vue
@@ -18,7 +18,7 @@ definePage({
       page: {
         parser: 'int',
         default: 1,
-        format: 'value',
+        format: 'array',
       },
     },
   },
@@ -29,6 +29,7 @@ definePage({
   <main>
     <h1>Not Found</h1>
 
+    <pre>{{ $route.params }}</pre>
     <pre>{{ $route.params }}</pre>
     <pre>{{ $route.meta }}</pre>
   </main>
diff --git a/playground-experimental/src/pages/blog/[[slugOptional]]+.vue b/playground-experimental/src/pages/blog/[[slugOptional]]+.vue
new file mode 100644
index 000000000..76cf19383
--- /dev/null
+++ b/playground-experimental/src/pages/blog/[[slugOptional]]+.vue
@@ -0,0 +1,7 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>Blog</h1>
+
+  <pre>{{ $route.params }}</pre>
+</template>
diff --git a/playground-experimental/src/pages/blog/[slug]+.vue b/playground-experimental/src/pages/blog/[slug]+.vue
new file mode 100644
index 000000000..76cf19383
--- /dev/null
+++ b/playground-experimental/src/pages/blog/[slug]+.vue
@@ -0,0 +1,7 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>Blog</h1>
+
+  <pre>{{ $route.params }}</pre>
+</template>
diff --git a/playground-experimental/src/pages/blog/info/(info).vue b/playground-experimental/src/pages/blog/info/(info).vue
new file mode 100644
index 000000000..42c010722
--- /dev/null
+++ b/playground-experimental/src/pages/blog/info/(info).vue
@@ -0,0 +1,30 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>Blog Info - Index</h1>
+
+  <ul>
+    <li>
+      <RouterLink
+        :to="{
+          name: '/blog/info/[[section]]',
+          params: {
+            section: null,
+          },
+        }"
+        >Go to Section null</RouterLink
+      >
+    </li>
+    <li>
+      <RouterLink
+        :to="{
+          name: '/blog/info/[[section]]',
+          params: {
+            section: '1',
+          },
+        }"
+        >Go to Section 1</RouterLink
+      >
+    </li>
+  </ul>
+</template>
diff --git a/playground-experimental/src/pages/blog/info/[[section]].vue b/playground-experimental/src/pages/blog/info/[[section]].vue
new file mode 100644
index 000000000..ca35246d7
--- /dev/null
+++ b/playground-experimental/src/pages/blog/info/[[section]].vue
@@ -0,0 +1,7 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>Blog Info</h1>
+
+  <pre>{{ $route.params }}</pre>
+</template>
diff --git a/playground-experimental/src/pages/tests/[[optional]]/end.vue b/playground-experimental/src/pages/tests/[[optional]]/end.vue
new file mode 100644
index 000000000..4f5b429ed
--- /dev/null
+++ b/playground-experimental/src/pages/tests/[[optional]]/end.vue
@@ -0,0 +1,7 @@
+<script lang="ts" setup></script>
+
+<template>
+  <h1>Optional param in the middle</h1>
+
+  <p>{{ $route.fullPath }}</p>
+</template>
diff --git a/playground-experimental/src/router.ts b/playground-experimental/src/router.ts
index cb785aca7..13d6dc9ab 100644
--- a/playground-experimental/src/router.ts
+++ b/playground-experimental/src/router.ts
@@ -1,5 +1,6 @@
 import { experimental_createRouter } from 'vue-router/experimental'
-import { resolver } from 'vue-router/auto-resolver'
+import { resolver, handleHotUpdate } from 'vue-router/auto-resolver'
+
 import {
   type RouteRecordInfo,
   type ParamValue,
@@ -11,6 +12,10 @@ export const router = experimental_createRouter({
   resolver,
 })
 
+if (import.meta.hot) {
+  handleHotUpdate(router)
+}
+
 // manual extension of route types
 declare module 'vue-router/auto-routes' {
   export interface RouteNamedMap {
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
new file mode 100644
index 000000000..35da66123
--- /dev/null
+++ b/playground-experimental/typed-router.d.ts
@@ -0,0 +1,129 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-router. ‼️ DO NOT MODIFY THIS FILE ‼️
+// It's recommended to commit this file.
+// Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.
+
+// Custom route params parsers
+type Param_date = ReturnType<NonNullable<typeof import('./src/params/date.ts').parser['get']>>
+
+declare module 'vue-router/auto-routes' {
+  import type {
+    RouteRecordInfo,
+    ParamValue,
+    ParamValueOneOrMore,
+    ParamValueZeroOrMore,
+    ParamValueZeroOrOne,
+  } from 'vue-router'
+
+  /**
+   * Route name map generated by unplugin-vue-router
+   */
+  export interface RouteNamedMap {
+    '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
+    'not-found': RouteRecordInfo<'not-found', '/:path(.*)', { path: string, page?: number }, { path: string, page: number }>,
+    '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: string, d: string }, { b: string, d: string }>,
+    '/b': RouteRecordInfo<'/b', '/b', Record<never, never>, Record<never, never>>,
+    '/blog/[slug]+': RouteRecordInfo<'/blog/[slug]+', '/blog/:slug+', { slug: string[] }, { slug: [string, ...string[]] }>,
+    '/blog/[[slugOptional]]+': RouteRecordInfo<'/blog/[[slugOptional]]+', '/blog/:slugOptional*', { slugOptional?: string[] }, { slugOptional: string[] }>,
+    '/blog/info/(info)': RouteRecordInfo<'/blog/info/(info)', '/blog/info', Record<never, never>, Record<never, never>>,
+    '/blog/info/[[section]]': RouteRecordInfo<'/blog/info/[[section]]', '/blog/info/:section?', { section?: string | null }, { section: string | null }>,
+    '/events/[when=date]': RouteRecordInfo<'/events/[when=date]', '/events/:when', { when: string }, { when: string }>,
+    '/manually-added': RouteRecordInfo<'/manually-added', '/manually-added', Record<never, never>, Record<never, never>>,
+    '/tests/[[optional]]/end': RouteRecordInfo<'/tests/[[optional]]/end', '/tests/:optional?/end', { optional?: string | null }, { optional: string | null }>,
+    '/u[name]': RouteRecordInfo<'/u[name]', '/u:name', { name: string }, { name: string }, '/u[name]/24' | '/u[name]/[userId=int]'>,
+    '/u[name]/[userId=int]': RouteRecordInfo<'/u[name]/[userId=int]', '/u:name/:userId', { name: string, userId: string }, { name: string, userId: string }>,
+    '/u[name]/24': RouteRecordInfo<'/u[name]/24', '/u:name/24', { name: string }, { name: string }>,
+    '/users/[userId=int]': RouteRecordInfo<'/users/[userId=int]', '/users/:userId', { userId: string, anyParam: null, page?: number }, { userId: string, anyParam: null, page: number }>,
+    '/users/sub-[first]-[second]': RouteRecordInfo<'/users/sub-[first]-[second]', '/users/sub-:first-:second', { first: string, second: string }, { first: string, second: string }>,
+  }
+
+  /**
+   * Route file to route info map by unplugin-vue-router.
+   * Used by the volar plugin to automatically type useRoute()
+   *
+   * Each key is a file path relative to the project root with 2 properties:
+   * - routes: union of route names of the possible routes when in this page (passed to useRoute<...>())
+   * - views: names of nested views (can be passed to <RouterView name="...">)
+   *
+   * @internal
+   */
+  export interface _RouteFileInfoMap {
+    'src/pages/(home).vue': {
+      routes: '/(home)'
+      views: never
+    }
+    'src/pages/[...path].vue': {
+      routes: 'not-found'
+      views: never
+    }
+    'src/pages/a.[b].c.[d].vue': {
+      routes: '/a.[b].c.[d]'
+      views: never
+    }
+    'src/pages/b.vue': {
+      routes: '/b'
+      views: never
+    }
+    'src/pages/blog/[slug]+.vue': {
+      routes: '/blog/[slug]+'
+      views: never
+    }
+    'src/pages/blog/[[slugOptional]]+.vue': {
+      routes: '/blog/[[slugOptional]]+'
+      views: never
+    }
+    'src/pages/blog/info/(info).vue': {
+      routes: '/blog/info/(info)'
+      views: never
+    }
+    'src/pages/blog/info/[[section]].vue': {
+      routes: '/blog/info/[[section]]'
+      views: never
+    }
+    'src/pages/events/[when=date].vue': {
+      routes: '/events/[when=date]'
+      views: never
+    }
+    'src/page-outside.vue': {
+      routes: '/manually-added'
+      views: never
+    }
+    'src/pages/tests/[[optional]]/end.vue': {
+      routes: '/tests/[[optional]]/end'
+      views: never
+    }
+    'src/pages/u[name].vue': {
+      routes: '/u[name]' | '/u[name]/[userId=int]' | '/u[name]/24'
+      views: 'default'
+    }
+    'src/pages/u[name]/[userId=int].vue': {
+      routes: '/u[name]/[userId=int]'
+      views: never
+    }
+    'src/pages/u[name]/24.vue': {
+      routes: '/u[name]/24'
+      views: never
+    }
+    'src/pages/users/[userId=int].vue': {
+      routes: '/users/[userId=int]'
+      views: never
+    }
+    'src/pages/users/sub-[first]-[second].vue': {
+      routes: '/users/sub-[first]-[second]'
+      views: never
+    }
+  }
+
+  /**
+   * Get a union of possible route names in a certain route component file.
+   * Used by the volar plugin to automatically type useRoute()
+   *
+   * @internal
+   */
+  export type _RouteNamesForFilePath<FilePath extends string> =
+    _RouteFileInfoMap extends Record<FilePath, infer Info>
+      ? Info['routes']
+      : keyof RouteNamedMap
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3b0716664..a862614db 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -169,11 +169,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@3c06a16
-        version: https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@4b05bce
+        version: https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -261,8 +261,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@3c06a16
-        version: https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@4b05bce
+        version: https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -6863,8 +6863,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@https://pkg.pr.new/vue-router@3c06a16:
-    resolution: {tarball: https://pkg.pr.new/vue-router@3c06a16}
+  vue-router@https://pkg.pr.new/vue-router@4b05bce:
+    resolution: {tarball: https://pkg.pr.new/vue-router@4b05bce}
     version: 4.5.1
     peerDependencies:
       vue: ^3.2.0
@@ -14573,17 +14573,17 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@https://pkg.pr.new/vue-router@3c06a16(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
index 1f0bf5cc0..654ddf43a 100644
--- a/src/codegen/generateParamParsers.ts
+++ b/src/codegen/generateParamParsers.ts
@@ -1,7 +1,5 @@
-import { camelCase } from 'scule'
-import { TreeRouteParam } from '../core/treeNodeValue'
+import { TreePathParam, TreeQueryParam } from '../core/treeNodeValue'
 import { ImportsMap } from '../core/utils'
-import { ts } from '../utils'
 import { PrefixTree } from '../core/tree'
 
 export type ParamParsersMap = Map<
@@ -31,29 +29,6 @@ export function warnMissingParamParsers(
   }
 }
 
-/**
- * Generates the import statement for a parameter parser type.
- *
- * @param paramParserPath - The path to the parameter parser file.
- */
-export function generateParamParserType(param: TreeRouteParam): string | null {
-  if (!param.parser) {
-    return null
-  }
-  // TODO: actualpath
-  // const nameWithExtension = basename(param.paramName)
-  const name = camelCase(param.parser)
-
-  // TODO: treat custom parsers first
-
-  // native parsers
-  if (name === 'int') {
-    return 'number'
-  }
-
-  return `Param_${name}`
-}
-
 export function generateParamParsersTypesDeclarations(
   paramParsers: ParamParsersMap
 ) {
@@ -66,7 +41,7 @@ export function generateParamParsersTypesDeclarations(
 }
 
 export function generateParamsTypes(
-  params: TreeRouteParam[],
+  params: (TreePathParam | TreeQueryParam)[],
   parparsersMap: ParamParsersMap
 ): Array<string | null> {
   return params.map((param) => {
@@ -81,8 +56,8 @@ export function generateParamsTypes(
   })
 }
 
-function generateParamParserOptions(
-  param: TreeRouteParam,
+export function generateParamParserOptions(
+  param: TreePathParam | TreeQueryParam,
   importsMap: ImportsMap,
   paramParsers: ParamParsersMap
 ): string {
@@ -94,13 +69,14 @@ function generateParamParserOptions(
     return ` ...${varName}, `
   } else if (param.parser === 'int') {
     importsMap.add('vue-router/experimental', `PARAM_PARSER_INT`)
-    return ` ...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 ''
 }
 
-export function generateParamsOptions(
-  params: TreeRouteParam[],
+export function generatePathParamsOptions(
+  params: TreePathParam[],
   importsMap: ImportsMap,
   paramParsers: ParamParsersMap
 ) {
@@ -115,16 +91,3 @@ ${param.paramName}: {${generateParamParserOptions(param, importsMap, paramParser
       ${paramOptions.join('\n      ')}
     }`
 }
-
-export function generateParamParserListTypes(parserNames: string[]) {
-  return parserNames.length
-    ? ts`
-declare module 'vue-router' {
-  export interface TypesConfig {
-    ParamParsers:
-${parserNames.map((name) => `      | '${name}'`).join('\n')}
-  }
-}
-`.trimStart()
-    : ''
-}
diff --git a/src/codegen/generateRouteMap.ts b/src/codegen/generateRouteMap.ts
index 5de352128..da4908964 100644
--- a/src/codegen/generateRouteMap.ts
+++ b/src/codegen/generateRouteMap.ts
@@ -40,17 +40,19 @@ export function generateRouteRecordInfo(
   paramParsersMap: ParamParsersMap
 ): string {
   let paramParsers: Array<string | null> = []
-  let paramType: string = ''
 
   if (options.experimental.paramParsers) {
     paramParsers = generateParamsTypes(node.params, paramParsersMap)
-    paramType = EXPERIMENTAL_generateRouteParams(node, paramParsers)
   }
   const typeParams = [
     `'${node.name}'`,
     `'${node.fullPath}'`,
-    paramType || generateRouteParams(node, true),
-    paramType || generateRouteParams(node, false),
+    options.experimental.paramParsers
+      ? EXPERIMENTAL_generateRouteParams(node, paramParsers, true)
+      : generateRouteParams(node, true),
+    options.experimental.paramParsers
+      ? EXPERIMENTAL_generateRouteParams(node, paramParsers, false)
+      : generateRouteParams(node, false),
   ]
 
   if (node.children.size > 0) {
diff --git a/src/codegen/generateRouteParams.ts b/src/codegen/generateRouteParams.ts
index a396b9a1b..c296c5c53 100644
--- a/src/codegen/generateRouteParams.ts
+++ b/src/codegen/generateRouteParams.ts
@@ -1,8 +1,10 @@
 import { TreeNode } from '../core/tree'
+import { isTreeParamOptional } from '../core/treeNodeValue'
 
 export function generateRouteParams(node: TreeNode, isRaw: boolean): string {
-  // node.params is a getter so we compute it once
-  const nodeParams = node.params
+  // node.pathParams is a getter so we compute it once
+  // this version does not support query params
+  const nodeParams = node.pathParams
   return nodeParams.length > 0
     ? `{ ${nodeParams
         .map(
@@ -23,7 +25,8 @@ export function generateRouteParams(node: TreeNode, isRaw: boolean): string {
 
 export function EXPERIMENTAL_generateRouteParams(
   node: TreeNode,
-  types: Array<string | null>
+  types: Array<string | null>,
+  isRaw: boolean
 ) {
   // node.params is a getter so we compute it once
   const nodeParams = node.params
@@ -31,17 +34,18 @@ export function EXPERIMENTAL_generateRouteParams(
     ? `{ ${nodeParams
         .map((param, i) => {
           const type = types[i]
-          const isRaw = false
-          return `${param.paramName}${param.optional ? '?' : ''}: ${
-            type
-              ? type || '/* INVALID */ unknown'
-              : param.modifier === '+'
-                ? `ParamValueOneOrMore<${isRaw}>`
-                : param.modifier === '*'
-                  ? `ParamValueZeroOrMore<${isRaw}>`
-                  : param.modifier === '?'
-                    ? `ParamValueZeroOrOne<${isRaw}>`
-                    : `ParamValue<${isRaw}>`
+          return `${param.paramName}${
+            isRaw && isTreeParamOptional(param) ? '?' : ''
+          }: ${
+            'modifier' in param
+              ? param.repeatable
+                ? param.optional || isRaw // in raw mode, the tuple version is annoying to pass
+                  ? 'string[]'
+                  : '[string, ...string[]]'
+                : param.optional
+                  ? 'string | null'
+                  : 'string'
+              : type
           }`
         })
         .join(', ')} }`
@@ -49,7 +53,7 @@ export function EXPERIMENTAL_generateRouteParams(
       'Record<never, never>'
 }
 
-// TODO: refactor to ParamValueRaw and ParamValue ?
+// TODO: Remove in favor of inline types because it's easier to read
 
 /**
  * Utility type for raw and non raw params like :id+
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 273e22450..2e2a9bcf9 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -5,6 +5,7 @@ import {
   generateRouteResolver,
   generateRouteRecord,
   generateRouteRecordPath,
+  generateRouteRecordQuery,
 } from './generateRouteResolver'
 import { ImportsMap } from '../core/utils'
 import { ParamParsersMap } from './generateParamParsers'
@@ -188,6 +189,202 @@ describe('generateRouteRecordPath', () => {
   })
 })
 
+describe('generateRouteRecordQuery', () => {
+  let importsMap!: ImportsMap
+  beforeEach(() => {
+    importsMap = new ImportsMap()
+  })
+
+  it('returns empty string for non-matchable nodes without query params', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    const node = tree.insert('a/b', 'a/b.vue').parent! // non-matchable parent
+    expect(
+      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+    ).toBe('')
+  })
+
+  it('generates query params for non-matchable nodes when they have query params', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    const node = tree.insert('a/b', 'a/b.vue').parent! // non-matchable parent
+    // Add query params to the non-matchable parent
+    node.value.setEditOverride('params', {
+      query: { search: {} },
+    })
+    expect(
+      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "query: [
+          new MatcherPatternQueryParam('search', 'search', 'both')
+        ],"
+    `)
+  })
+
+  it('does not includes query params from parent nodes', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    const parentNode = tree.insert('parent', 'parent.vue')
+    const childNode = tree.insert('parent/child', 'parent/child.vue')
+
+    // Add query params to parent
+    parentNode.value.setEditOverride('params', {
+      query: {
+        parentParam: {},
+      },
+    })
+
+    // Add query params to child
+    childNode.value.setEditOverride('params', {
+      query: {
+        childParam: { parser: 'int' },
+      },
+    })
+
+    expect(
+      generateRouteRecordQuery({
+        importsMap,
+        node: childNode,
+        paramParsersMap: new Map(),
+      })
+    ).toMatchInlineSnapshot(`
+      "query: [
+          new MatcherPatternQueryParam('childParam', 'childParam', 'both', PARAM_PARSER_INT)
+        ],"
+    `)
+  })
+
+  it('returns empty string when no query params', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
+    expect(
+      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+    ).toBe('')
+  })
+
+  it('generates query property with single query param', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
+    // Mock the queryParams getter
+    node.value.setEditOverride('params', {
+      query: { search: {} },
+    })
+    expect(
+      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "query: [
+          new MatcherPatternQueryParam('search', 'search', 'both')
+        ],"
+    `)
+  })
+
+  it('generates query property with multiple query params', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
+    node.value.setEditOverride('params', {
+      query: {
+        search: {},
+        page: { parser: 'int' },
+        active: { parser: 'bool' },
+      },
+    })
+    expect(
+      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "query: [
+          new MatcherPatternQueryParam('search', 'search', 'both'),
+          new MatcherPatternQueryParam('page', 'page', 'both', PARAM_PARSER_INT),
+          new MatcherPatternQueryParam('active', 'active', 'both')
+        ],"
+    `)
+  })
+
+  it('adds MatcherPatternQueryParam import', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
+    node.value.setEditOverride('params', {
+      query: { search: {} },
+    })
+
+    generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+
+    expect(importsMap.toString()).toContain(
+      "import { MatcherPatternQueryParam } from 'vue-router/experimental'"
+    )
+  })
+
+  it('generates query param with format value', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
+    node.value.setEditOverride('params', {
+      query: { search: { format: 'value' } },
+    })
+    expect(
+      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "query: [
+          new MatcherPatternQueryParam('search', 'search', 'value')
+        ],"
+    `)
+  })
+
+  it('generates query param with format array', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
+    node.value.setEditOverride('params', {
+      query: { tags: { format: 'array' } },
+    })
+    expect(
+      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "query: [
+          new MatcherPatternQueryParam('tags', 'tags', 'array')
+        ],"
+    `)
+  })
+
+  it('generates query param with default value', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
+    node.value.setEditOverride('params', {
+      query: { limit: { default: '10' } },
+    })
+    expect(
+      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "query: [
+          new MatcherPatternQueryParam('limit', 'limit', 'both', {}, 10)
+        ],"
+    `)
+  })
+
+  it('generates query param with format and default value', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
+    node.value.setEditOverride('params', {
+      query: { page: { parser: 'int', format: 'value', default: '1' } },
+    })
+    expect(
+      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "query: [
+          new MatcherPatternQueryParam('page', 'page', 'value', PARAM_PARSER_INT, 1)
+        ],"
+    `)
+  })
+
+  it('generates mixed query params with different configurations', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
+    node.value.setEditOverride('params', {
+      query: {
+        q: { format: 'value' },
+        tags: { format: 'array' },
+        limit: { parser: 'int', default: '20' },
+        active: { default: 'true' },
+      },
+    })
+    expect(
+      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+    ).toMatchInlineSnapshot(`
+      "query: [
+          new MatcherPatternQueryParam('q', 'q', 'value'),
+          new MatcherPatternQueryParam('tags', 'tags', 'array'),
+          new MatcherPatternQueryParam('limit', 'limit', 'both', PARAM_PARSER_INT, 20),
+          new MatcherPatternQueryParam('active', 'active', 'both', {}, true)
+        ],"
+    `)
+  })
+})
+
 describe('generateRouteRecord', () => {
   it('serializes a simple static path', () => {
     const tree = new PrefixTree(DEFAULT_OPTIONS)
@@ -543,6 +740,47 @@ describe('generateRouteResolver', () => {
       "
     `)
   })
+
+  it('includes query property in route records with query params', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    tree.insert('search', 'search.vue')
+    const searchNode = tree.children.get('search')!
+
+    // Add query params
+    searchNode.value.setEditOverride('params', {
+      query: {
+        q: {},
+        limit: { parser: 'int' },
+      },
+    })
+
+    const resolver = generateRouteResolver(
+      tree,
+      DEFAULT_OPTIONS,
+      new ImportsMap(),
+      new Map()
+    )
+
+    expect(resolver).toMatchInlineSnapshot(`
+      "
+      const r_0 = normalizeRouteRecord({
+        name: '/search',
+        path: new MatcherPatternPathStatic('/search'),
+        query: [
+          new MatcherPatternQueryParam('q', 'q', 'both'),
+          new MatcherPatternQueryParam('limit', 'limit', 'both', PARAM_PARSER_INT)
+        ],
+        components: {
+          'default': () => import('search.vue')
+        },
+      })
+
+      export const resolver = createFixedResolver([
+        r_0,  // /search
+      ])
+      "
+    `)
+  })
 })
 
 describe('route prioritization in resolver', () => {
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index 6891310bb..237c4213b 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -3,7 +3,11 @@ import { PrefixTree, type TreeNode } from '../core/tree'
 import { ImportsMap } from '../core/utils'
 import { type ResolvedOptions } from '../options'
 import { ts } from '../utils'
-import { generateParamsOptions, ParamParsersMap } from './generateParamParsers'
+import {
+  generatePathParamsOptions,
+  generateParamParserOptions,
+  ParamParsersMap,
+} from './generateParamParsers'
 import { generatePageImport, formatMeta } from './generateRouteRecords'
 
 /**
@@ -164,9 +168,16 @@ export function generateRouteRecord({
       recordComponents = ''
     }
 
+    const queryProperty = generateRouteRecordQuery({
+      node,
+      importsMap,
+      paramParsersMap,
+    })
     const routeRecordObject = `{
   ${recordName}
-  ${generateRouteRecordPath({ node, importsMap, paramParsersMap })}${formatMeta(node, '  ')}
+  ${generateRouteRecordPath({ node, importsMap, paramParsersMap })}${
+    queryProperty ? `\n  ${queryProperty}` : ''
+  }${formatMeta(node, '  ')}
   ${recordComponents}${parentVar ? `\n  parent: ${parentVar},` : ''}
 }`
 
@@ -243,11 +254,11 @@ export function generateRouteRecordPath({
   if (!node.isMatchable()) {
     return ''
   }
-  const params = node.params
+  const params = node.pathParams
   if (params.length > 0) {
     return `path: new MatcherPatternPathDynamic(
     ${node.regexp},
-    ${generateParamsOptions(node.params, importsMap, paramParsersMap)},
+    ${generatePathParamsOptions(params, importsMap, paramParsersMap)},
     ${JSON.stringify(node.matcherPatternPathDynamicParts)},
   ),`
   } else {
@@ -255,6 +266,55 @@ export function generateRouteRecordPath({
   }
 }
 
+/**
+ * Generates the `query` property of a route record for the static resolver.
+ */
+export function generateRouteRecordQuery({
+  node,
+  importsMap,
+  paramParsersMap,
+}: {
+  node: TreeNode
+  importsMap: ImportsMap
+  paramParsersMap: ParamParsersMap
+}) {
+  const queryParams = node.queryParams
+  if (queryParams.length === 0) {
+    return ''
+  }
+
+  importsMap.add('vue-router/experimental', 'MatcherPatternQueryParam')
+
+  return `query: [
+${queryParams
+  .map((param) => {
+    const parserOptions = generateParamParserOptions(
+      param,
+      importsMap,
+      paramParsersMap
+    )
+
+    const args = [
+      `'${param.paramName}'`,
+      // TODO: allow param.queryKey
+      `'${param.paramName}'`,
+      `'${param.format}'`,
+    ]
+
+    if (parserOptions || param.defaultValue !== undefined) {
+      args.push(parserOptions || '{}')
+    }
+
+    if (param.defaultValue !== undefined) {
+      args.push(param.defaultValue)
+    }
+
+    return `    new MatcherPatternQueryParam(${args.join(', ')})`
+  })
+  .join(',\n')}
+  ],`
+}
+
 /**
  * Generates a merge call for route records with definePage data in the experimental resolver format.
  */
diff --git a/src/core/__snapshots__/definePage.spec.ts.snap b/src/core/__snapshots__/definePage.spec.ts.snap
index daf0be88e..6b1dee935 100644
--- a/src/core/__snapshots__/definePage.spec.ts.snap
+++ b/src/core/__snapshots__/definePage.spec.ts.snap
@@ -22,16 +22,8 @@ export default {
 }"
 `;
 
-exports[`definePage > imports > removes default import if not used 1`] = `"export default {name: 'ok'}"`;
-
 exports[`definePage > imports > removes default unused imports 1`] = `"export default {name: 'ok'}"`;
 
-exports[`definePage > imports > removes star imports if not used 1`] = `"export default {name: 'ok'}"`;
-
-exports[`definePage > imports > removes unused imports 1`] = `"export default {name: 'ok'}"`;
-
-exports[`definePage > imports > removes unused imports 2`] = `"export default {name: 'ok'}"`;
-
 exports[`definePage > imports > removes unused star imports 1`] = `"export default {name: 'ok'}"`;
 
 exports[`definePage > imports > works when combining named and default imports 1`] = `
diff --git a/src/core/context.ts b/src/core/context.ts
index 91b1a3414..b242bca21 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -273,27 +273,19 @@ export function handleHotUpdate(_router, _hotUpdateCallback) {
 
 if (import.meta.hot) {
   import.meta.hot.accept((mod) => {
-    console.log('🔥 HMRRRR')
-    import.meta.hot.invalidate('[unplugin-vue-router:HMR] reloading resolver')
-    return
     const router = import.meta.hot.data.router
     if (!router) {
       import.meta.hot.invalidate('[unplugin-vue-router:HMR] Cannot replace the resolver because there is no active router. Reloading.')
       return
     }
-    // TODO:
     router._hmrReplaceResolver(mod.resolver)
     // call the hotUpdateCallback for custom updates
-    import.meta.hot.data.router_hotUpdateCallback?.(mod.routes)
+    import.meta.hot.data.router_hotUpdateCallback?.(mod.resolver)
     const route = router.currentRoute.value
     router.replace({
-      ...route,
-      // NOTE: we should be able to just do ...route but the router
-      // currently skips resolving and can give errors with renamed routes
-      // so we explicitly set remove matched and name
-      name: undefined,
-      matched: undefined,
-      params: {},
+      path: route.path,
+      query: route.query,
+      hash: route.hash,
       force: true
     })
   })
diff --git a/src/core/customBlock.ts b/src/core/customBlock.ts
index 02fbc13e3..27a34e922 100644
--- a/src/core/customBlock.ts
+++ b/src/core/customBlock.ts
@@ -4,7 +4,7 @@ import JSON5 from 'json5'
 import { parse as YAMLParser } from 'yaml'
 import { RouteRecordRaw } from 'vue-router'
 import { warn } from './utils'
-import type { DefinePage } from '../runtime'
+import type { DefinePageQueryParamOptions } from '../runtime'
 
 export function getRouteBlock(
   path: string,
@@ -25,7 +25,19 @@ export interface CustomRouteBlock
     >
   > {
   name?: string | undefined | false
-  params?: DefinePage['params']
+
+  params?: {
+    path?: Record<string, string>
+
+    query?: Record<string, string | CustomRouteBlockQueryParamOptions>
+  }
+}
+
+export interface CustomRouteBlockQueryParamOptions {
+  parser?: string
+  format?: DefinePageQueryParamOptions['format']
+  // TODO: queryKey?: string
+  default?: string
 }
 
 function parseCustomBlock(
diff --git a/src/core/definePage.spec.ts b/src/core/definePage.spec.ts
index ee073a7d8..214a84a87 100644
--- a/src/core/definePage.spec.ts
+++ b/src/core/definePage.spec.ts
@@ -220,7 +220,7 @@ definePage({
         query: {
           page: {
             parser: 'int',
-            default: 1,
+            default: '1',
             format: 'value',
           },
           enabled: {
@@ -228,10 +228,10 @@ definePage({
           },
           count: {
             parser: 'int',
-            default: 42,
+            default: '42',
           },
           active: {
-            default: 'none',
+            default: "'none'",
           },
         },
       },
diff --git a/src/core/definePage.ts b/src/core/definePage.ts
index 9d1089425..10158240d 100644
--- a/src/core/definePage.ts
+++ b/src/core/definePage.ts
@@ -20,7 +20,8 @@ import type {
 import { walkAST } from 'ast-walker-scope'
 import { warn } from './utils'
 import { ParsedStaticImport, findStaticImports, parseStaticImport } from 'mlly'
-import type { DefinePage, ParamParserType } from 'unplugin-vue-router/runtime'
+import type { ParamParserType } from 'unplugin-vue-router/runtime'
+import { CustomRouteBlock } from './customBlock'
 
 const MACRO_DEFINE_PAGE = 'definePage'
 export const MACRO_DEFINE_PAGE_QUERY = /[?&]definePage\b/
@@ -187,12 +188,12 @@ export function definePageTransform({
   }
 }
 
-type DefinePageParamsInfo = DefinePage['params']
+type DefinePageParamsInfo = NonNullable<CustomRouteBlock['params']>
 
 export interface DefinePageInfo {
   name?: string | false
   path?: string
-  params?: DefinePage['params']
+  params?: CustomRouteBlock['params']
 }
 
 export function extractDefinePageInfo(
@@ -318,17 +319,29 @@ function extractQueryParams(
                 | 'array'
                 | 'both'
             } else if (paramProp.key.name === 'default') {
-              // Handle different literal types for default values
-              if (paramProp.value.type === 'NumericLiteral') {
-                paramInfo.default = paramProp.value.value
-              } else if (paramProp.value.type === 'StringLiteral') {
-                paramInfo.default = paramProp.value.value
-              } else if (paramProp.value.type === 'BooleanLiteral') {
-                paramInfo.default = paramProp.value.value
-              } else if (paramProp.value.type === 'NullLiteral') {
-                paramInfo.default = null
+              if (
+                typeof paramProp.value.extra?.raw === 'string' &&
+                paramProp.value.extra
+              ) {
+                paramInfo.default = paramProp.value.extra.raw
+              } else {
+                warn(
+                  `No raw value parsed in definePage() for query param "${paramName}". This is a bug, open an issue on https://github.com/posva/unplugin-vue-router and provide the definePage() code.`
+                )
+                if (paramProp.value.type === 'NumericLiteral') {
+                  paramInfo.default = String(paramProp.value.value)
+                } else if (paramProp.value.type === 'StringLiteral') {
+                  paramInfo.default = JSON.stringify(paramProp.value.value)
+                } else if (paramProp.value.type === 'BooleanLiteral') {
+                  paramInfo.default = String(paramProp.value.value)
+                } else if (paramProp.value.type === 'NullLiteral') {
+                  paramInfo.default = 'null'
+                } else {
+                  warn(
+                    `Unrecognized default value in definePage() for query param "${paramName}". Typeof value: ${paramProp.value.type}. This is a bug, open an issue on https://github.com/posva/unplugin-vue-router and provide the definePage() code.`
+                  )
+                }
               }
-              // TODO: handle function expressions for default values
             }
           }
         }
diff --git a/src/core/extendRoutes.ts b/src/core/extendRoutes.ts
index cb18b7e84..23b2fa1fd 100644
--- a/src/core/extendRoutes.ts
+++ b/src/core/extendRoutes.ts
@@ -171,11 +171,11 @@ export class EditableTreeNode {
   }
 
   /**
-   * Array of the route params and all of its parent's params. Note that changing the params will not update the path,
-   * you need to update both.
+   * Array of the route params and all of its parent's params. Note that
+   * changing the params will not update the path, you need to update both.
    */
   get params() {
-    return this.node.params
+    return this.node.pathParams
   }
 
   /**
diff --git a/src/core/tree.spec.ts b/src/core/tree.spec.ts
index 97c51e007..deceece76 100644
--- a/src/core/tree.spec.ts
+++ b/src/core/tree.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import { DEFAULT_OPTIONS, resolveOptions } from '../options'
 import { PrefixTree } from './tree'
-import { TreeNodeType, type TreeRouteParam } from './treeNodeValue'
+import { TreeNodeType, type TreePathParam } from './treeNodeValue'
 import { resolve } from 'pathe'
 import { mockWarn } from '../../tests/vitest-mock-warn'
 
@@ -555,7 +555,7 @@ describe('Tree', () => {
       modifier: '',
       optional: false,
       repeatable: false,
-    } satisfies Partial<TreeRouteParam>)
+    } satisfies Partial<TreePathParam>)
   })
 
   it('removes trailing slash from path but not from name', () => {
@@ -687,4 +687,87 @@ describe('Tree', () => {
       })
     })
   })
+
+  describe('Query params from definePage', () => {
+    it('extracts query params from route overrides', () => {
+      const tree = new PrefixTree(RESOLVED_OPTIONS)
+      const node = tree.insert('users', 'users.vue')
+
+      // Simulate definePage params extraction
+      node.setCustomRouteBlock('users.vue', {
+        params: {
+          query: {
+            search: {},
+            limit: { parser: 'int', default: '10' },
+            tags: { parser: 'bool' },
+            other: { default: '"defaultValue"' },
+          },
+        },
+      })
+
+      expect(node.queryParams).toEqual([
+        {
+          paramName: 'search',
+          parser: null,
+          format: 'both',
+          defaultValue: undefined,
+        },
+        {
+          paramName: 'limit',
+          parser: 'int',
+          format: 'both',
+          defaultValue: '10',
+        },
+        {
+          paramName: 'tags',
+          parser: 'bool',
+          format: 'both',
+          defaultValue: undefined,
+        },
+        {
+          paramName: 'other',
+          parser: null,
+          format: 'both',
+          defaultValue: '"defaultValue"',
+        },
+      ])
+    })
+
+    it('returns empty array when no query params defined', () => {
+      const tree = new PrefixTree(RESOLVED_OPTIONS)
+      const node = tree.insert('about', 'about.vue')
+
+      expect(node.queryParams).toEqual([])
+    })
+
+    it('params includes both path and query params', () => {
+      const tree = new PrefixTree(RESOLVED_OPTIONS)
+      const node = tree.insert('posts/[id]', 'posts/[id].vue')
+
+      node.setCustomRouteBlock('posts/[id].vue', {
+        params: {
+          query: {
+            tab: {},
+            expand: { parser: 'bool', default: 'false' },
+          },
+        },
+      })
+
+      // Should have 1 path param + 2 query params
+      expect(node.params).toHaveLength(3)
+      expect(node.params[0]).toMatchObject({ paramName: 'id' }) // path param
+      expect(node.params[1]).toMatchObject({
+        paramName: 'tab',
+        parser: null,
+        format: 'both',
+        defaultValue: undefined,
+      }) // query param
+      expect(node.params[2]).toMatchObject({
+        paramName: 'expand',
+        parser: 'bool',
+        format: 'both',
+        defaultValue: 'false',
+      }) // query param
+    })
+  })
 })
diff --git a/src/core/tree.ts b/src/core/tree.ts
index 83c62faba..4148f6ed4 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -3,7 +3,8 @@ import {
   createTreeNodeValue,
   escapeRegex,
   TreeNodeValueOptions,
-  TreeRouteParam,
+  TreePathParam,
+  TreeQueryParam,
 } from './treeNodeValue'
 import type { TreeNodeValue } from './treeNodeValue'
 import { CustomRouteBlock } from './customBlock'
@@ -273,14 +274,12 @@ export class TreeNode {
   /**
    * Array of route params for this node. It includes all the params from the parents as well.
    */
-  get params(): TreeRouteParam[] {
-    const params = this.value.isParam() ? [...this.value.params] : []
+  get params(): (TreePathParam | TreeQueryParam)[] {
+    const params = [...this.value.params]
     let node = this.parent
     // add all the params from the parents
     while (node) {
-      if (node.value.isParam()) {
-        params.unshift(...node.value.params)
-      }
+      params.unshift(...node.value.params)
       node = node.parent
     }
 
@@ -290,13 +289,13 @@ export class TreeNode {
   /**
    * Array of route params coming from the path. It includes all the params from the parents as well.
    */
-  get pathParams(): TreeRouteParam[] {
-    const params = this.value.isParam() ? [...this.value.params] : []
+  get pathParams(): TreePathParam[] {
+    const params = this.value.isParam() ? [...this.value.pathParams] : []
     let node = this.parent
     // add all the params from the parents
     while (node) {
       if (node.value.isParam()) {
-        params.unshift(...node.value.params)
+        params.unshift(...node.value.pathParams)
       }
       node = node.parent
     }
@@ -304,6 +303,13 @@ export class TreeNode {
     return params
   }
 
+  /**
+   * Array of query params extracted from definePage. Only returns query params from this specific node.
+   */
+  get queryParams(): TreeQueryParam[] {
+    return this.value.queryParams
+  }
+
   /**
    * Generates a regexp based on this node and its parents. This regexp is used by the custom resolver
    */
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index 9a95c2dd9..90e464f9d 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -1,7 +1,9 @@
 import type { RouteRecordRaw } from 'vue-router'
-import { CustomRouteBlock } from './customBlock'
+import {
+  CustomRouteBlock,
+  CustomRouteBlockQueryParamOptions,
+} from './customBlock'
 import { joinPath, mergeRouteRecordOverride, warn } from './utils'
-import type { DefinePage } from 'unplugin-vue-router/runtime'
 
 export const enum TreeNodeType {
   static,
@@ -16,10 +18,19 @@ export interface RouteRecordOverride
   /**
    * Param Parsers information.
    */
-  params?: DefinePage['params']
+  params?: {
+    path?: Record<string, string>
+
+    query?: Record<string, string | RouteRecordOverrideQueryParamOptions>
+  }
+}
+
+export interface RouteRecordOverrideQueryParamOptions
+  extends CustomRouteBlockQueryParamOptions {
+  default?: string
 }
 
-export type SubSegment = string | TreeRouteParam
+export type SubSegment = string | TreePathParam
 
 // internal name used for overrides done by the user at build time
 export const EDITS_OVERRIDE_NAME = '@@edits'
@@ -51,7 +62,7 @@ class _TreeNodeValueBase {
    * Overrides defined by each file. The map is necessary to handle named views.
    */
   private _overrides = new Map<string, RouteRecordOverride>()
-  // TODO: cache the overrides generation
+  // TODO: measure perf bottlenecks with large trees and use caching if it can potentially improve
 
   /**
    * View name (Vue Router feature) mapped to their corresponding file. By default, the view name is `default` unless
@@ -94,6 +105,50 @@ class _TreeNodeValueBase {
     return joinPath(this.parent?.fullPath ?? '', pathSegment)
   }
 
+  /**
+   * Gets all the query params for the node. This does not include params from parent nodes.
+   */
+  get queryParams(): TreeQueryParam[] {
+    const paramsQuery = this.overrides.params?.query
+    if (!paramsQuery) {
+      return []
+    }
+
+    const queryParams: TreeQueryParam[] = []
+
+    for (var paramName in paramsQuery) {
+      var config = paramsQuery[paramName]
+      // shouldn't happen
+      if (!config) continue
+      if (typeof config === 'string') {
+        queryParams.push({
+          paramName,
+          parser: config,
+          // TODO: change to value
+          format: 'both',
+        })
+      } else {
+        queryParams.push({
+          paramName,
+          parser: config.parser || null,
+          // TODO: change to value
+          format: config.format || 'both',
+          defaultValue: config.default,
+        })
+      }
+    }
+
+    return queryParams
+  }
+
+  /**
+   * Gets all the params for the node including path and query params. This
+   * does not include params from parent nodes.
+   */
+  get params(): (TreePathParam | TreeQueryParam)[] {
+    return [...(this.isParam() ? this.pathParams : []), ...this.queryParams]
+  }
+
   toString(): string {
     return this.pathSegment || '<index>'
   }
@@ -229,7 +284,7 @@ export class TreeNodeValueGroup extends _TreeNodeValueBase {
   }
 }
 
-export interface TreeRouteParam {
+export interface TreePathParam {
   paramName: string
   modifier: string
   optional: boolean
@@ -238,6 +293,30 @@ export interface TreeRouteParam {
   parser: string | null
 }
 
+export interface TreeQueryParam {
+  paramName: string
+
+  queryKey?: string
+
+  parser: string | null
+
+  format: 'value' | 'array' | 'both'
+
+  /**
+   * Expression to be passed as is to the default value of the param.
+   */
+  defaultValue?: string
+}
+
+export function isTreeParamOptional(
+  param: TreePathParam | TreeQueryParam
+): boolean {
+  if ('optional' in param) {
+    return param.optional
+  }
+  return param.defaultValue !== undefined
+}
+
 /**
  * To escape regex characters in the path segment.
  * @internal
@@ -254,18 +333,16 @@ export const escapeRegex = (str: string): string =>
   str.replace(REGEX_CHARS_RE, '\\$&')
 
 export class TreeNodeValueParam extends _TreeNodeValueBase {
-  params: TreeRouteParam[]
   override _type: TreeNodeType.param = TreeNodeType.param
 
   constructor(
     rawSegment: string,
     parent: TreeNodeValue | undefined,
-    params: TreeRouteParam[],
+    public pathParams: TreePathParam[],
     pathSegment: string,
     subSegments: SubSegment[]
   ) {
     super(rawSegment, parent, pathSegment, subSegments)
-    this.params = params
   }
 
   // Calculate score for each subsegment to handle mixed static/param parts
@@ -307,7 +384,9 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
           this.params
             .map(
               (p) =>
-                `${p.paramName}${p.modifier}` + (p.parser ? '=' + p.parser : '')
+                ('format' in p ? '?' : '') +
+                `${p.paramName}${'modifier' in p ? p.modifier : ''}` +
+                (p.parser ? '=' + p.parser : '')
             )
             .join(', ') +
           ')'
@@ -394,17 +473,17 @@ export function createTreeNodeValue(
     }
   }
 
-  const [pathSegment, params, subSegments] =
+  const [pathSegment, pathParams, subSegments] =
     options.format === 'path'
       ? parseRawPathSegment(segment)
       : // by default, we use the file format
         parseFileSegment(segment, options)
 
-  if (params.length) {
+  if (pathParams.length) {
     return new TreeNodeValueParam(
       segment,
       parent,
-      params,
+      pathParams,
       pathSegment,
       subSegments
     )
@@ -446,14 +525,14 @@ const IS_VARIABLE_CHAR_RE = /[0-9a-zA-Z_]/
 function parseFileSegment(
   segment: string,
   { dotNesting = true }: ParseSegmentOptions = {}
-): [string, TreeRouteParam[], SubSegment[]] {
+): [string, TreePathParam[], SubSegment[]] {
   let buffer = ''
   let paramParserBuffer = ''
   let state: ParseFileSegmentState = ParseFileSegmentState.static
-  const params: TreeRouteParam[] = []
+  const params: TreePathParam[] = []
   let pathSegment = ''
   const subSegments: SubSegment[] = []
-  let currentTreeRouteParam: TreeRouteParam = createEmptyRouteParam()
+  let currentTreeRouteParam: TreePathParam = createEmptyRouteParam()
 
   // position in segment
   let pos = 0
@@ -597,12 +676,12 @@ const IS_MODIFIER_RE = /[+*?]/
  */
 function parseRawPathSegment(
   segment: string
-): [string, TreeRouteParam[], SubSegment[]] {
+): [string, TreePathParam[], SubSegment[]] {
   let buffer = ''
   let state: ParseRawPathSegmentState = ParseRawPathSegmentState.static
-  const params: TreeRouteParam[] = []
+  const params: TreePathParam[] = []
   const subSegments: SubSegment[] = []
-  let currentTreeRouteParam: TreeRouteParam = createEmptyRouteParam()
+  let currentTreeRouteParam: TreePathParam = createEmptyRouteParam()
 
   // position in segment
   let pos = 0
@@ -728,7 +807,7 @@ function parseRawPathSegment(
  *
  * @returns an empty route param
  */
-function createEmptyRouteParam(): TreeRouteParam {
+function createEmptyRouteParam(): TreePathParam {
   return {
     paramName: '',
     parser: null,
diff --git a/src/core/utils.ts b/src/core/utils.ts
index c5773b2e2..cac6247d4 100644
--- a/src/core/utils.ts
+++ b/src/core/utils.ts
@@ -1,5 +1,5 @@
 import { TreeNode } from './tree'
-import type { RouteRecordOverride, TreeRouteParam } from './treeNodeValue'
+import type { RouteRecordOverride, TreePathParam } from './treeNodeValue'
 import { pascalCase } from 'scule'
 import {
   ResolvedOptions,
@@ -119,7 +119,7 @@ export function joinPath(...paths: string[]): string {
   return result || '/'
 }
 
-function paramToName({ paramName, modifier, isSplat }: TreeRouteParam) {
+function paramToName({ paramName, modifier, isSplat }: TreePathParam) {
   return `${isSplat ? '$' : ''}${
     paramName.charAt(0).toUpperCase() + paramName.slice(1)
   }${
diff --git a/src/runtime.ts b/src/runtime.ts
index fe70753c9..45d25e697 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -93,6 +93,9 @@ export interface DefinePageQueryParamOptions<T = unknown> {
    */
   parser?: ParamParserType
 
+  // TODO: allow customizing the name in the query string
+  // queryKey?: string
+
   /**
    * Default value if the query parameter is missing or if the match fails
    * (e.g. a invalid number is passed to the int param parser). If not provided
@@ -114,26 +117,6 @@ export interface DefinePageQueryParamOptions<T = unknown> {
   format?: 'value' | 'array' | 'both'
 }
 
-definePage({
-  params: {
-    path: {
-      // key autocompletes because it's based on the types of the RouteMap
-      // or maybe no autocomplete becuase changing this changes the file too
-      userId: 'int', // autocompletes
-    },
-    query: {
-      p: 'int', // short version: no default, format both
-      page: {
-        parser: 'int', // autocomplete int
-        default: 1, // default value when '', null or undefined, if provided, we catch the match error, and set the default
-        format: 'value', // keep the first value only and pass that to parser
-        // format: 'array', // keep all values as an array and pass that to parser
-        // format: 'both', // keep it as passed to the query, so this can be a single value or an array
-      },
-    },
-  },
-})
-
 /**
  * TODO: native parsers ideas:
  * - json -> just JSON.parse(value)
diff --git a/src/types.ts b/src/types.ts
index af4b1104c..db3554a38 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -6,7 +6,9 @@
 export type { Options } from './options'
 export type { TreeNode } from './core/tree'
 export type {
-  TreeNodeValueParam,
+  TreeNodeValue,
   TreeNodeValueStatic,
+  TreeNodeValueParam,
+  TreeNodeValueGroup,
 } from './core/treeNodeValue'
 export type { EditableTreeNode } from './core/extendRoutes'

From d01d990d305e6ce4bf718811106548e003465dd6 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 23 Aug 2025 14:47:04 +0200
Subject: [PATCH 57/81] chore: simpler check

---
 src/core/context.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/core/context.ts b/src/core/context.ts
index b242bca21..bb49f83d6 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -355,10 +355,7 @@ if (import.meta.hot) {
   }
 
   function generateDTS() {
-    if (
-      options.experimental.paramParsers &&
-      options.experimental.paramParsers.dir.length > 0
-    ) {
+    if (options.experimental.paramParsers?.dir.length) {
       warnMissingParamParsers(routeTree, paramParsers)
     }
 

From c9200450c6fe9558b8de23ba27b3eb752cceaef8 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 23 Aug 2025 14:48:31 +0200
Subject: [PATCH 58/81] feat: remove 'both' format for query params, default to
 'value'

---
 src/codegen/generateRouteResolver.spec.ts | 22 +++++++++++-----------
 src/core/definePage.ts                    |  5 +----
 src/core/tree.spec.ts                     | 12 ++++++------
 src/core/treeNodeValue.ts                 |  8 +++-----
 src/runtime.ts                            |  5 ++---
 5 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 2e2a9bcf9..58d9e8a1c 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -214,7 +214,7 @@ describe('generateRouteRecordQuery', () => {
       generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
       "query: [
-          new MatcherPatternQueryParam('search', 'search', 'both')
+          new MatcherPatternQueryParam('search', 'search', 'value')
         ],"
     `)
   })
@@ -246,7 +246,7 @@ describe('generateRouteRecordQuery', () => {
       })
     ).toMatchInlineSnapshot(`
       "query: [
-          new MatcherPatternQueryParam('childParam', 'childParam', 'both', PARAM_PARSER_INT)
+          new MatcherPatternQueryParam('childParam', 'childParam', 'value', PARAM_PARSER_INT)
         ],"
     `)
   })
@@ -268,7 +268,7 @@ describe('generateRouteRecordQuery', () => {
       generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
       "query: [
-          new MatcherPatternQueryParam('search', 'search', 'both')
+          new MatcherPatternQueryParam('search', 'search', 'value')
         ],"
     `)
   })
@@ -286,9 +286,9 @@ describe('generateRouteRecordQuery', () => {
       generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
       "query: [
-          new MatcherPatternQueryParam('search', 'search', 'both'),
-          new MatcherPatternQueryParam('page', 'page', 'both', PARAM_PARSER_INT),
-          new MatcherPatternQueryParam('active', 'active', 'both')
+          new MatcherPatternQueryParam('search', 'search', 'value'),
+          new MatcherPatternQueryParam('page', 'page', 'value', PARAM_PARSER_INT),
+          new MatcherPatternQueryParam('active', 'active', 'value')
         ],"
     `)
   })
@@ -343,7 +343,7 @@ describe('generateRouteRecordQuery', () => {
       generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
       "query: [
-          new MatcherPatternQueryParam('limit', 'limit', 'both', {}, 10)
+          new MatcherPatternQueryParam('limit', 'limit', 'value', {}, 10)
         ],"
     `)
   })
@@ -378,8 +378,8 @@ describe('generateRouteRecordQuery', () => {
       "query: [
           new MatcherPatternQueryParam('q', 'q', 'value'),
           new MatcherPatternQueryParam('tags', 'tags', 'array'),
-          new MatcherPatternQueryParam('limit', 'limit', 'both', PARAM_PARSER_INT, 20),
-          new MatcherPatternQueryParam('active', 'active', 'both', {}, true)
+          new MatcherPatternQueryParam('limit', 'limit', 'value', PARAM_PARSER_INT, 20),
+          new MatcherPatternQueryParam('active', 'active', 'value', {}, true)
         ],"
     `)
   })
@@ -767,8 +767,8 @@ describe('generateRouteResolver', () => {
         name: '/search',
         path: new MatcherPatternPathStatic('/search'),
         query: [
-          new MatcherPatternQueryParam('q', 'q', 'both'),
-          new MatcherPatternQueryParam('limit', 'limit', 'both', PARAM_PARSER_INT)
+          new MatcherPatternQueryParam('q', 'q', 'value'),
+          new MatcherPatternQueryParam('limit', 'limit', 'value', PARAM_PARSER_INT)
         ],
         components: {
           'default': () => import('search.vue')
diff --git a/src/core/definePage.ts b/src/core/definePage.ts
index 10158240d..d8f67f8ab 100644
--- a/src/core/definePage.ts
+++ b/src/core/definePage.ts
@@ -314,10 +314,7 @@ function extractQueryParams(
               paramProp.key.name === 'format' &&
               paramProp.value.type === 'StringLiteral'
             ) {
-              paramInfo.format = paramProp.value.value as
-                | 'value'
-                | 'array'
-                | 'both'
+              paramInfo.format = paramProp.value.value as 'value' | 'array'
             } else if (paramProp.key.name === 'default') {
               if (
                 typeof paramProp.value.extra?.raw === 'string' &&
diff --git a/src/core/tree.spec.ts b/src/core/tree.spec.ts
index deceece76..f84840574 100644
--- a/src/core/tree.spec.ts
+++ b/src/core/tree.spec.ts
@@ -709,25 +709,25 @@ describe('Tree', () => {
         {
           paramName: 'search',
           parser: null,
-          format: 'both',
+          format: 'value',
           defaultValue: undefined,
         },
         {
           paramName: 'limit',
           parser: 'int',
-          format: 'both',
+          format: 'value',
           defaultValue: '10',
         },
         {
           paramName: 'tags',
           parser: 'bool',
-          format: 'both',
+          format: 'value',
           defaultValue: undefined,
         },
         {
           paramName: 'other',
           parser: null,
-          format: 'both',
+          format: 'value',
           defaultValue: '"defaultValue"',
         },
       ])
@@ -759,13 +759,13 @@ describe('Tree', () => {
       expect(node.params[1]).toMatchObject({
         paramName: 'tab',
         parser: null,
-        format: 'both',
+        format: 'value',
         defaultValue: undefined,
       }) // query param
       expect(node.params[2]).toMatchObject({
         paramName: 'expand',
         parser: 'bool',
-        format: 'both',
+        format: 'value',
         defaultValue: 'false',
       }) // query param
     })
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index 90e464f9d..98f6d955c 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -124,15 +124,13 @@ class _TreeNodeValueBase {
         queryParams.push({
           paramName,
           parser: config,
-          // TODO: change to value
-          format: 'both',
+          format: 'value',
         })
       } else {
         queryParams.push({
           paramName,
           parser: config.parser || null,
-          // TODO: change to value
-          format: config.format || 'both',
+          format: config.format || 'value',
           defaultValue: config.default,
         })
       }
@@ -300,7 +298,7 @@ export interface TreeQueryParam {
 
   parser: string | null
 
-  format: 'value' | 'array' | 'both'
+  format: 'value' | 'array'
 
   /**
    * Expression to be passed as is to the default value of the param.
diff --git a/src/runtime.ts b/src/runtime.ts
index 45d25e697..d2682c77b 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -110,11 +110,10 @@ export interface DefinePageQueryParamOptions<T = unknown> {
    *
    * - 'value' - keep the first value only and pass that to parser
    * - 'array' - keep all values (even one or none) as an array and pass that to parser
-   * - 'both' - keep it as passed to the query, so this can be a single value or an array
    *
-   * @default 'both'
+   * @default 'value'
    */
-  format?: 'value' | 'array' | 'both'
+  format?: 'value' | 'array'
 }
 
 /**

From 6fdf4142924f0075589d9553fb66b025dc2431b8 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 23 Aug 2025 14:54:43 +0200
Subject: [PATCH 59/81] chore: bold

---
 src/core/tree.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/tree.ts b/src/core/tree.ts
index 4148f6ed4..01b1ade23 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -272,7 +272,7 @@ export class TreeNode {
   }
 
   /**
-   * Array of route params for this node. It includes all the params from the parents as well.
+   * Array of route params for this node. It includes **all** the params from the parents as well.
    */
   get params(): (TreePathParam | TreeQueryParam)[] {
     const params = [...this.value.params]

From c8799999f931e5d068dadd286bb93a07fd041884 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 23 Aug 2025 14:55:36 +0200
Subject: [PATCH 60/81] refactor: rename var

---
 src/core/context.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/core/context.ts b/src/core/context.ts
index bb49f83d6..24c8f7e30 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -54,7 +54,7 @@ export function createRoutesContext(options: ResolvedOptions) {
 
   // populated by the initial scan pages
   const watchers: Array<FSWatcher | RoutesFolderWatcher> = []
-  const paramParsers: ParamParsersMap = new Map()
+  const paramParsersMap: ParamParsersMap = new Map()
 
   async function scanPages(startWatchers = true) {
     if (options.extensions.length < 1) {
@@ -134,7 +134,7 @@ export function createRoutesContext(options: ResolvedOptions) {
             const name = parsePathe(file).name
             // TODO: could be simplified to only one import that starts with / for vite
             const absolutePath = resolve(folder, file)
-            paramParsers.set(name, {
+            paramParsersMap.set(name, {
               name,
               typeName: `Param_${name}`,
               absolutePath,
@@ -143,7 +143,7 @@ export function createRoutesContext(options: ResolvedOptions) {
           }
           logger.log(
             'Parsed param parsers',
-            [...paramParsers].map((p) => p[0])
+            [...paramParsersMap].map((p) => p[0])
           )
         })
       }) || []),
@@ -211,7 +211,7 @@ export function createRoutesContext(options: ResolvedOptions) {
       .on('add', (file) => {
         const name = parsePathe(file).name
         const absolutePath = resolve(cwd, file)
-        paramParsers.set(name, {
+        paramParsersMap.set(name, {
           name,
           typeName: `Param_${name}`,
           absolutePath,
@@ -220,7 +220,7 @@ export function createRoutesContext(options: ResolvedOptions) {
         writeConfigFiles()
       })
       .on('unlink', (file) => {
-        paramParsers.delete(parsePathe(file).name)
+        paramParsersMap.delete(parsePathe(file).name)
         writeConfigFiles()
       })
   }
@@ -253,7 +253,7 @@ export function createRoutesContext(options: ResolvedOptions) {
       routeTree,
       options,
       importsMap,
-      paramParsers
+      paramParsersMap
     )
 
     // generate the list of imports
@@ -356,17 +356,17 @@ if (import.meta.hot) {
 
   function generateDTS() {
     if (options.experimental.paramParsers?.dir.length) {
-      warnMissingParamParsers(routeTree, paramParsers)
+      warnMissingParamParsers(routeTree, paramParsersMap)
     }
 
     const autoRoutes = _generateDTS({
       routesModule: MODULE_ROUTES_PATH,
-      routeNamedMap: generateRouteNamedMap(routeTree, options, paramParsers),
+      routeNamedMap: generateRouteNamedMap(routeTree, options, paramParsersMap),
       routeFileInfoMap: generateRouteFileInfoMap(routeTree, {
         root,
       }),
       paramsTypesDeclaration:
-        generateParamParsersTypesDeclarations(paramParsers),
+        generateParamParsersTypesDeclarations(paramParsersMap),
     })
 
     // TODO: parser auto copmlete for definePage

From 3b76a48f75f3cc275da512d9b71c3e678d03c90c Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 23 Aug 2025 14:58:30 +0200
Subject: [PATCH 61/81] chore: typo

---
 src/core/context.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/context.ts b/src/core/context.ts
index 24c8f7e30..0a6a88e4b 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -206,7 +206,7 @@ export function createRoutesContext(options: ResolvedOptions) {
   }
 
   function setupParamParserWatcher(watcher: FSWatcher, cwd: string) {
-    logger.log(`🤖 Scanning param parsers in ${watcher.options.cwd}`)
+    logger.log(`🤖 Scanning param parsers in ${cwd}`)
     return watcher
       .on('add', (file) => {
         const name = parsePathe(file).name

From 6375f51a5f5727e2605af8b936b721b02d497289 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sun, 24 Aug 2025 22:11:46 +0200
Subject: [PATCH 62/81] chore: update vr syntax

---
 package.json                              |  2 +-
 playground-experimental/package.json      |  2 +-
 pnpm-lock.yaml                            | 20 ++++++++++----------
 src/codegen/generateRouteResolver.spec.ts | 14 +++++++-------
 src/core/tree.ts                          |  4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 598ea3c2a..77016203a 100644
--- a/package.json
+++ b/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@4b05bce",
+    "vue-router": "https://pkg.pr.new/vue-router@3646b9c",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index b3bac1dd9..400a41199 100644
--- a/playground-experimental/package.json
+++ b/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@4b05bce"
+    "vue-router": "https://pkg.pr.new/vue-router@3646b9c"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a862614db..443474b4a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -169,11 +169,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@4b05bce
-        version: https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@3646b9c
+        version: https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -261,8 +261,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@4b05bce
-        version: https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@3646b9c
+        version: https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -6863,8 +6863,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@https://pkg.pr.new/vue-router@4b05bce:
-    resolution: {tarball: https://pkg.pr.new/vue-router@4b05bce}
+  vue-router@https://pkg.pr.new/vue-router@3646b9c:
+    resolution: {tarball: https://pkg.pr.new/vue-router@3646b9c}
     version: 4.5.1
     peerDependencies:
       vue: ^3.2.0
@@ -14573,17 +14573,17 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@https://pkg.pr.new/vue-router@4b05bce(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 58d9e8a1c..69520ee00 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -62,7 +62,7 @@ describe('generateRouteRecordPath', () => {
           {
             b: {},
           },
-          ["a",0],
+          ["a",1],
         ),"
     `)
   })
@@ -82,7 +82,7 @@ describe('generateRouteRecordPath', () => {
             b: {},
             c: {},
           },
-          ["a",0,0],
+          ["a",1,1],
         ),"
     `)
   })
@@ -97,7 +97,7 @@ describe('generateRouteRecordPath', () => {
           {
             b: {},
           },
-          ["a",0],
+          ["a",1],
         ),"
     `)
   })
@@ -112,7 +112,7 @@ describe('generateRouteRecordPath', () => {
           {
             b: {repeat: true, },
           },
-          ["a",0],
+          ["a",1],
         ),"
     `)
   })
@@ -127,7 +127,7 @@ describe('generateRouteRecordPath', () => {
           {
             b: {repeat: true, },
           },
-          ["a",0],
+          ["a",1],
         ),"
     `)
   })
@@ -164,7 +164,7 @@ describe('generateRouteRecordPath', () => {
           {
             all: {},
           },
-          [1],
+          [0],
         ),"
     `)
   })
@@ -183,7 +183,7 @@ describe('generateRouteRecordPath', () => {
             id: {},
             all: {},
           },
-          ["a",["some-",0],1],
+          ["a",["some-",0],0],
         ),"
     `)
   })
diff --git a/src/core/tree.ts b/src/core/tree.ts
index 01b1ade23..50d2f7164 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -355,8 +355,8 @@ export class TreeNode {
           ? segment
           : // param
             segment.isSplat
-            ? 1
-            : 0
+            ? 0
+            : 1
       )
 
       if (subSegments.length > 1) {

From 6ff699b801478498aa7f20123b5282647935b477 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 25 Aug 2025 18:00:51 +0200
Subject: [PATCH 63/81] refactor: adapt to new version

---
 package.json                              |  2 +-
 playground-experimental/package.json      |  2 +-
 pnpm-lock.yaml                            | 20 ++++++++++----------
 src/codegen/generateParamParsers.ts       | 22 +++++++++++++++++-----
 src/codegen/generateRouteResolver.spec.ts | 22 +++++++++++-----------
 5 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 77016203a..424c41c19 100644
--- a/package.json
+++ b/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",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index 400a41199..f2e3a9403 100644
--- a/playground-experimental/package.json
+++ b/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"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 443474b4a..883507d32 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -169,11 +169,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@3646b9c
-        version: https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@be1679c
+        version: https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -261,8 +261,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@3646b9c
-        version: https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@be1679c
+        version: https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -6863,8 +6863,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@https://pkg.pr.new/vue-router@3646b9c:
-    resolution: {tarball: https://pkg.pr.new/vue-router@3646b9c}
+  vue-router@https://pkg.pr.new/vue-router@be1679c:
+    resolution: {tarball: https://pkg.pr.new/vue-router@be1679c}
     version: 4.5.1
     peerDependencies:
       vue: ^3.2.0
@@ -14573,17 +14573,17 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@https://pkg.pr.new/vue-router@3646b9c(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
index 654ddf43a..1962fe29f 100644
--- a/src/codegen/generateParamParsers.ts
+++ b/src/codegen/generateParamParsers.ts
@@ -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)
   })
 
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 69520ee00..39bb9abd7 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.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],
         ),"

From 1c764aa4a9c5fa7bc3aec3cae5a09a8900b9b861 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 25 Aug 2025 18:00:59 +0200
Subject: [PATCH 64/81] test: todo

---
 src/codegen/generateRouteResolver.spec.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 39bb9abd7..1aeef8c18 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -45,8 +45,10 @@ describe('generateRouteRecordPath', () => {
 
   // TODO: we need to figure out an option for this
   it.todo('keeps trailing slashes', () => {
-    // currently, the `a/` gets converted to `a` in the tree (which is expected)
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/', 'a.vue')
+    const node = new PrefixTree({
+      ...DEFAULT_OPTIONS,
+      // trailingSlash: 'always',
+    }).insert('a', 'a.vue')
     expect(
       generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
     ).toBe(`path: new MatcherPatternPathStatic('/a/'),`)

From 83133aad7777eb6a970abb85d48be6c10af42078 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 25 Aug 2025 21:50:20 +0200
Subject: [PATCH 65/81] refactor: native parsers

---
 .../src/pages/[...path].vue                   | 11 +++++++-
 playground-experimental/typed-router.d.ts     |  2 +-
 src/codegen/generateParamParsers.ts           | 27 ++++++++++++++-----
 src/core/definePage.ts                        |  5 +---
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/playground-experimental/src/pages/[...path].vue b/playground-experimental/src/pages/[...path].vue
index 200e47339..09c4537eb 100644
--- a/playground-experimental/src/pages/[...path].vue
+++ b/playground-experimental/src/pages/[...path].vue
@@ -3,7 +3,11 @@ import doc from '../main.ts?raw'
 
 const route = useRoute()
 route.params.path
-route.params.page
+
+console.log('typeof', typeof route.params.active)
+console.log('value', route.params.active)
+console.log('typeof', typeof route.params.other)
+console.log('value', route.params.other)
 
 definePage({
   meta: {
@@ -20,6 +24,11 @@ definePage({
         default: 1,
         format: 'array',
       },
+      other: 'bool',
+      active: {
+        parser: 'bool',
+        default: false,
+      },
     },
   },
 })
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
index 35da66123..69212a436 100644
--- a/playground-experimental/typed-router.d.ts
+++ b/playground-experimental/typed-router.d.ts
@@ -22,7 +22,7 @@ declare module 'vue-router/auto-routes' {
    */
   export interface RouteNamedMap {
     '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
-    'not-found': RouteRecordInfo<'not-found', '/:path(.*)', { path: string, page?: number }, { path: string, page: number }>,
+    'not-found': RouteRecordInfo<'not-found', '/:path(.*)', { path: string, page?: number, other: boolean, active?: boolean }, { path: string, page: number, other: boolean, active: boolean }>,
     '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: string, d: string }, { b: string, d: string }>,
     '/b': RouteRecordInfo<'/b', '/b', Record<never, never>, Record<never, never>>,
     '/blog/[slug]+': RouteRecordInfo<'/blog/[slug]+', '/blog/:slug+', { slug: string[] }, { slug: [string, ...string[]] }>,
diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
index 1962fe29f..00b23a891 100644
--- a/src/codegen/generateParamParsers.ts
+++ b/src/codegen/generateParamParsers.ts
@@ -12,6 +12,14 @@ export type ParamParsersMap = Map<
   }
 >
 
+// just for type strictness
+const _NATIVE_PARAM_PARSERS = ['int', 'bool'] as const
+const NATIVE_PARAM_PARSERS = _NATIVE_PARAM_PARSERS as readonly string[]
+const NATIVE_PARAM_PARSERS_TYPES = {
+  int: 'number',
+  bool: 'boolean',
+} satisfies Record<(typeof _NATIVE_PARAM_PARSERS)[number], string>
+
 export function warnMissingParamParsers(
   tree: PrefixTree,
   paramParsers: ParamParsersMap
@@ -19,7 +27,7 @@ export function warnMissingParamParsers(
   for (const node of tree.getChildrenDeepSorted()) {
     for (const param of node.params) {
       if (param.parser && !paramParsers.has(param.parser)) {
-        if (param.parser !== 'int') {
+        if (!NATIVE_PARAM_PARSERS.includes(param.parser)) {
           console.warn(
             `Parameter parser "${param.parser}" not found for route "${node.fullPath}".`
           )
@@ -48,8 +56,10 @@ export function generateParamsTypes(
     if (param.parser) {
       if (parparsersMap.has(param.parser)) {
         return parparsersMap.get(param.parser)!.typeName
-      } else if (param.parser === 'int') {
-        return 'number'
+      } else if (param.parser in NATIVE_PARAM_PARSERS_TYPES) {
+        return NATIVE_PARAM_PARSERS_TYPES[
+          param.parser as keyof typeof NATIVE_PARAM_PARSERS_TYPES
+        ]
       }
     }
     return null
@@ -61,15 +71,18 @@ export function generateParamParserOptions(
   importsMap: ImportsMap,
   paramParsers: ParamParsersMap
 ): string {
+  if (!param.parser) return ''
+
   // we prioritize custom parsers to let users override them
-  if (param.parser && paramParsers.has(param.parser)) {
+  if (paramParsers.has(param.parser)) {
     const { name, absolutePath } = paramParsers.get(param.parser)!
     const varName = `PARAM_PARSER__${name}`
     importsMap.add(absolutePath, { name: 'parser', as: varName })
     return varName
-  } else if (param.parser === 'int') {
-    importsMap.add('vue-router/experimental', `PARAM_PARSER_INT`)
-    return `PARAM_PARSER_INT`
+  } else if (NATIVE_PARAM_PARSERS.includes(param.parser)) {
+    const varName = `PARAM_PARSER_${param.parser.toUpperCase()}`
+    importsMap.add('vue-router/experimental', varName)
+    return varName
   }
   return ''
 }
diff --git a/src/core/definePage.ts b/src/core/definePage.ts
index d8f67f8ab..3ec9cd185 100644
--- a/src/core/definePage.ts
+++ b/src/core/definePage.ts
@@ -316,10 +316,7 @@ function extractQueryParams(
             ) {
               paramInfo.format = paramProp.value.value as 'value' | 'array'
             } else if (paramProp.key.name === 'default') {
-              if (
-                typeof paramProp.value.extra?.raw === 'string' &&
-                paramProp.value.extra
-              ) {
+              if (typeof paramProp.value.extra?.raw === 'string') {
                 paramInfo.default = paramProp.value.extra.raw
               } else {
                 warn(

From bb72cff05e0f68a7c13bb1c885535e44d66223b5 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Tue, 26 Aug 2025 09:35:06 +0200
Subject: [PATCH 66/81] test: tests

---
 src/codegen/generateParamParsers.spec.ts  | 466 ++++++++++++++++++++++
 src/codegen/generateParamParsers.ts       |   4 +-
 src/codegen/generateRouteResolver.spec.ts |   2 +-
 3 files changed, 470 insertions(+), 2 deletions(-)
 create mode 100644 src/codegen/generateParamParsers.spec.ts

diff --git a/src/codegen/generateParamParsers.spec.ts b/src/codegen/generateParamParsers.spec.ts
new file mode 100644
index 000000000..9ec390a13
--- /dev/null
+++ b/src/codegen/generateParamParsers.spec.ts
@@ -0,0 +1,466 @@
+import { describe, expect, it } from 'vitest'
+import {
+  warnMissingParamParsers,
+  generateParamParsersTypesDeclarations,
+  generateParamsTypes,
+  generateParamParserOptions,
+  generatePathParamsOptions,
+  type ParamParsersMap,
+} from './generateParamParsers'
+import { PrefixTree } from '../core/tree'
+import { resolveOptions } from '../options'
+import { ImportsMap } from '../core/utils'
+import type { TreePathParam } from '../core/treeNodeValue'
+import { mockWarn } from '../../tests/vitest-mock-warn'
+
+const DEFAULT_OPTIONS = resolveOptions({})
+
+describe('warnMissingParamParsers', () => {
+  mockWarn()
+  it('shows no warnings for routes without param parsers', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    tree.insert('users', 'users.vue')
+    tree.insert('posts/[id]', 'posts/[id].vue')
+
+    const paramParsers: ParamParsersMap = new Map()
+
+    warnMissingParamParsers(tree, paramParsers)
+  })
+
+  it('shows no warnings for native parsers', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    tree.insert('users/[id=int]', 'users/[id=int].vue')
+    tree.insert('posts/[active=bool]', 'posts/[active=bool].vue')
+
+    const paramParsers: ParamParsersMap = new Map()
+
+    warnMissingParamParsers(tree, paramParsers)
+  })
+
+  it('warns for missing custom parsers', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    tree.insert('users/[id=uuid]', 'users/[id=uuid].vue')
+
+    const paramParsers: ParamParsersMap = new Map()
+
+    warnMissingParamParsers(tree, paramParsers)
+
+    expect(
+      'Parameter parser "uuid" not found for route "/users/:id".'
+    ).toHaveBeenWarned()
+  })
+
+  it('shows no warnings when custom parsers exist in map', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    tree.insert('users/[id=uuid]', 'users/[id=uuid].vue')
+
+    const paramParsers: ParamParsersMap = new Map([
+      [
+        'uuid',
+        {
+          name: 'uuid',
+          typeName: 'Param_uuid',
+          relativePath: 'parsers/uuid',
+          absolutePath: '/path/to/parsers/uuid',
+        },
+      ],
+    ])
+
+    warnMissingParamParsers(tree, paramParsers)
+  })
+})
+
+describe('generateParamParsersTypesDeclarations', () => {
+  it('returns empty string for empty param parsers map', () => {
+    const paramParsers: ParamParsersMap = new Map()
+    const result = generateParamParsersTypesDeclarations(paramParsers)
+    expect(result).toBe('')
+  })
+
+  it('generates single param parser type declaration', () => {
+    const paramParsers: ParamParsersMap = new Map([
+      [
+        'uuid',
+        {
+          name: 'uuid',
+          typeName: 'Param_uuid',
+          relativePath: 'parsers/uuid',
+          absolutePath: '/path/to/parsers/uuid',
+        },
+      ],
+    ])
+
+    const result = generateParamParsersTypesDeclarations(paramParsers)
+    expect(result).toBe(
+      `type Param_uuid = ReturnType<NonNullable<typeof import('./parsers/uuid').parser['get']>>`
+    )
+  })
+
+  it('generates multiple param parsers type declarations', () => {
+    const paramParsers: ParamParsersMap = new Map([
+      [
+        'uuid',
+        {
+          name: 'uuid',
+          typeName: 'Param_uuid',
+          relativePath: 'parsers/uuid',
+          absolutePath: '/path/to/parsers/uuid',
+        },
+      ],
+      [
+        'slug',
+        {
+          name: 'slug',
+          typeName: 'Param_slug',
+          relativePath: 'parsers/slug',
+          absolutePath: '/path/to/parsers/slug',
+        },
+      ],
+    ])
+
+    const result = generateParamParsersTypesDeclarations(paramParsers)
+    expect(result).toMatchInlineSnapshot(`
+      "type Param_uuid = ReturnType<NonNullable<typeof import('./parsers/uuid').parser['get']>>
+      type Param_slug = ReturnType<NonNullable<typeof import('./parsers/slug').parser['get']>>"
+    `)
+  })
+})
+
+describe('generateParamsTypes', () => {
+  it('returns null for params without parsers', () => {
+    const params: TreePathParam[] = [
+      {
+        paramName: 'id',
+        modifier: '',
+        optional: false,
+        repeatable: false,
+        isSplat: false,
+        parser: null,
+      },
+    ]
+    const paramParsers: ParamParsersMap = new Map()
+
+    const result = generateParamsTypes(params, paramParsers)
+    expect(result).toEqual([null])
+  })
+
+  it('returns correct type names for custom parsers', () => {
+    const params: TreePathParam[] = [
+      {
+        paramName: 'id',
+        modifier: '',
+        optional: false,
+        repeatable: false,
+        isSplat: false,
+        parser: 'uuid',
+      },
+    ]
+    const paramParsers: ParamParsersMap = new Map([
+      [
+        'uuid',
+        {
+          name: 'uuid',
+          typeName: 'Param_uuid',
+          relativePath: 'parsers/uuid',
+          absolutePath: '/path/to/parsers/uuid',
+        },
+      ],
+    ])
+
+    const result = generateParamsTypes(params, paramParsers)
+    expect(result).toEqual(['Param_uuid'])
+  })
+
+  it('returns correct types for native parsers', () => {
+    const params: TreePathParam[] = [
+      {
+        paramName: 'id',
+        modifier: '',
+        optional: false,
+        repeatable: false,
+        isSplat: false,
+        parser: 'int',
+      },
+      {
+        paramName: 'active',
+        modifier: '',
+        optional: false,
+        repeatable: false,
+        isSplat: false,
+        parser: 'bool',
+      },
+    ]
+    const paramParsers: ParamParsersMap = new Map()
+
+    const result = generateParamsTypes(params, paramParsers)
+    expect(result).toEqual(['number', 'boolean'])
+  })
+
+  it('handles mixed params with and without parsers', () => {
+    const params: TreePathParam[] = [
+      {
+        paramName: 'id',
+        modifier: '',
+        optional: false,
+        repeatable: false,
+        isSplat: false,
+        parser: 'uuid',
+      },
+      {
+        paramName: 'page',
+        modifier: '',
+        optional: false,
+        repeatable: false,
+        isSplat: false,
+        parser: null,
+      },
+      {
+        paramName: 'count',
+        modifier: '',
+        optional: false,
+        repeatable: false,
+        isSplat: false,
+        parser: 'int',
+      },
+    ]
+    const paramParsers: ParamParsersMap = new Map([
+      [
+        'uuid',
+        {
+          name: 'uuid',
+          typeName: 'Param_uuid',
+          relativePath: 'parsers/uuid',
+          absolutePath: '/path/to/parsers/uuid',
+        },
+      ],
+    ])
+
+    const result = generateParamsTypes(params, paramParsers)
+    expect(result).toEqual(['Param_uuid', null, 'number'])
+  })
+})
+
+describe('generateParamParserOptions', () => {
+  it('returns empty string for param without parser', () => {
+    const param: TreePathParam = {
+      paramName: 'id',
+      modifier: '',
+      optional: false,
+      repeatable: false,
+      isSplat: false,
+      parser: null,
+    }
+    const importsMap = new ImportsMap()
+    const paramParsers: ParamParsersMap = new Map()
+
+    const result = generateParamParserOptions(param, importsMap, paramParsers)
+    expect(result).toBe('')
+  })
+
+  it('generates import and returns variable for custom parser', () => {
+    const param: TreePathParam = {
+      paramName: 'id',
+      modifier: '',
+      optional: false,
+      repeatable: false,
+      isSplat: false,
+      parser: 'uuid',
+    }
+    const importsMap = new ImportsMap()
+    const paramParsers: ParamParsersMap = new Map([
+      [
+        'uuid',
+        {
+          name: 'uuid',
+          typeName: 'Param_uuid',
+          relativePath: 'parsers/uuid',
+          absolutePath: '/path/to/parsers/uuid',
+        },
+      ],
+    ])
+
+    const result = generateParamParserOptions(param, importsMap, paramParsers)
+    expect(result).toBe('PARAM_PARSER__uuid')
+    expect(importsMap.toString()).toContain(
+      `import { parser as PARAM_PARSER__uuid } from '/path/to/parsers/uuid'`
+    )
+  })
+
+  it('generates correct import for native int parser', () => {
+    const param: TreePathParam = {
+      paramName: 'id',
+      modifier: '',
+      optional: false,
+      repeatable: false,
+      isSplat: false,
+      parser: 'int',
+    }
+    const importsMap = new ImportsMap()
+    const paramParsers: ParamParsersMap = new Map()
+
+    const result = generateParamParserOptions(param, importsMap, paramParsers)
+    expect(result).toBe('PARAM_PARSER_INT')
+    expect(importsMap.toString()).toContain(
+      `import { PARAM_PARSER_INT } from 'vue-router/experimental'`
+    )
+  })
+
+  it('generates correct import for native bool parser', () => {
+    const param: TreePathParam = {
+      paramName: 'active',
+      modifier: '',
+      optional: false,
+      repeatable: false,
+      isSplat: false,
+      parser: 'bool',
+    }
+    const importsMap = new ImportsMap()
+    const paramParsers: ParamParsersMap = new Map()
+
+    const result = generateParamParserOptions(param, importsMap, paramParsers)
+    expect(result).toBe('PARAM_PARSER_BOOL')
+    expect(importsMap.toString()).toContain(
+      `import { PARAM_PARSER_BOOL } from 'vue-router/experimental'`
+    )
+  })
+
+  it('returns empty string for missing parser', () => {
+    const param: TreePathParam = {
+      paramName: 'id',
+      modifier: '',
+      optional: false,
+      repeatable: false,
+      isSplat: false,
+      parser: 'missing',
+    }
+    const importsMap = new ImportsMap()
+    const paramParsers: ParamParsersMap = new Map()
+
+    const result = generateParamParserOptions(param, importsMap, paramParsers)
+    expect(result).toBe('')
+  })
+})
+
+describe('generatePathParamsOptions', () => {
+  it('returns empty object for empty params array', () => {
+    const params: TreePathParam[] = []
+    const importsMap = new ImportsMap()
+    const paramParsers: ParamParsersMap = new Map()
+
+    const result = generatePathParamsOptions(params, importsMap, paramParsers)
+    expect(result).toBe(`{}`)
+  })
+
+  it('generates options for single param with parser', () => {
+    const params: TreePathParam[] = [
+      {
+        paramName: 'id',
+        modifier: '',
+        optional: false,
+        repeatable: false,
+        isSplat: false,
+        parser: 'int',
+      },
+    ]
+    const importsMap = new ImportsMap()
+    const paramParsers: ParamParsersMap = new Map()
+
+    const result = generatePathParamsOptions(params, importsMap, paramParsers)
+    expect(result).toContain('id: [PARAM_PARSER_INT]')
+  })
+
+  it('generates options for param without parser', () => {
+    const params: TreePathParam[] = [
+      {
+        paramName: 'slug',
+        modifier: '',
+        optional: false,
+        repeatable: false,
+        isSplat: false,
+        parser: null,
+      },
+    ]
+    const importsMap = new ImportsMap()
+    const paramParsers: ParamParsersMap = new Map()
+
+    const result = generatePathParamsOptions(params, importsMap, paramParsers)
+    expect(result).toContain('slug: [/* no parser */]')
+  })
+
+  it('includes repeatable and optional flags when present', () => {
+    const params: TreePathParam[] = [
+      {
+        paramName: 'tags',
+        modifier: '+',
+        optional: false,
+        repeatable: true,
+        isSplat: false,
+        parser: null,
+      },
+      {
+        paramName: 'category',
+        modifier: '?',
+        optional: true,
+        repeatable: false,
+        isSplat: false,
+        parser: null,
+      },
+    ]
+    const importsMap = new ImportsMap()
+    const paramParsers: ParamParsersMap = new Map()
+
+    const result = generatePathParamsOptions(params, importsMap, paramParsers)
+    expect(result).toContain('tags: [/* no parser */, /* repeatable: */ true]')
+    expect(result).toContain(
+      'category: [/* no parser */, /* repeatable: false */, /* optional: */ true]'
+    )
+  })
+
+  it('handles multiple params with different configurations', () => {
+    const params: TreePathParam[] = [
+      {
+        paramName: 'id',
+        modifier: '',
+        optional: false,
+        repeatable: false,
+        isSplat: false,
+        parser: 'uuid',
+      },
+      {
+        paramName: 'page',
+        modifier: '?',
+        optional: true,
+        repeatable: false,
+        isSplat: false,
+        parser: 'int',
+      },
+      {
+        paramName: 'tags',
+        modifier: '+',
+        optional: false,
+        repeatable: true,
+        isSplat: false,
+        parser: null,
+      },
+    ]
+    const importsMap = new ImportsMap()
+    const paramParsers: ParamParsersMap = new Map([
+      [
+        'uuid',
+        {
+          name: 'uuid',
+          typeName: 'Param_uuid',
+          relativePath: 'parsers/uuid',
+          absolutePath: '/path/to/parsers/uuid',
+        },
+      ],
+    ])
+
+    const result = generatePathParamsOptions(params, importsMap, paramParsers)
+    expect(result).toContain('id: [PARAM_PARSER__uuid]')
+    expect(result).toContain(
+      'page: [PARAM_PARSER_INT, /* repeatable: false */, /* optional: */ true]'
+    )
+    expect(result).toContain('tags: [/* no parser */, /* repeatable: */ true]')
+  })
+})
diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
index 00b23a891..e24e10cf2 100644
--- a/src/codegen/generateParamParsers.ts
+++ b/src/codegen/generateParamParsers.ts
@@ -112,7 +112,9 @@ ${param.paramName}: [${optionList.join(', ')}],
 `.slice(1, -1)
   })
 
-  return `{
+  return paramOptions.length === 0
+    ? '{}'
+    : `{
       ${paramOptions.join('\n      ')}
     }`
 }
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 1aeef8c18..c935d664c 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -290,7 +290,7 @@ describe('generateRouteRecordQuery', () => {
       "query: [
           new MatcherPatternQueryParam('search', 'search', 'value'),
           new MatcherPatternQueryParam('page', 'page', 'value', PARAM_PARSER_INT),
-          new MatcherPatternQueryParam('active', 'active', 'value')
+          new MatcherPatternQueryParam('active', 'active', 'value', PARAM_PARSER_BOOL)
         ],"
     `)
   })

From 5aa298a32bac445f1920ffd084dbd2c9588b7963 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 27 Aug 2025 14:22:30 +0200
Subject: [PATCH 67/81] fix: setup watchers only when needed

---
 src/core/context.ts | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/core/context.ts b/src/core/context.ts
index 0a6a88e4b..75ae089f5 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -107,24 +107,27 @@ export function createRoutesContext(options: ResolvedOptions) {
           )
         }),
       ...(options.experimental.paramParsers?.dir.map((folder) => {
-        watchers.push(
-          setupParamParserWatcher(
-            fsWatch('.', {
-              cwd: folder,
-              ignoreInitial: true,
-              ignorePermissionErrors: true,
-              ignored: (filePath, stats) => {
-                // let folders pass, they are ignored by the glob pattern
-                if (!stats || stats.isDirectory()) {
-                  return false
-                }
-
-                return !isParamParserMatch(relative(folder, filePath))
-              },
-            }),
-            folder
+        if (startWatchers) {
+          watchers.push(
+            setupParamParserWatcher(
+              fsWatch('.', {
+                cwd: folder,
+                ignoreInitial: true,
+                ignorePermissionErrors: true,
+                ignored: (filePath, stats) => {
+                  // let folders pass, they are ignored by the glob pattern
+                  if (!stats || stats.isDirectory()) {
+                    return false
+                  }
+
+                  return !isParamParserMatch(relative(folder, filePath))
+                },
+              }),
+              folder
+            )
           )
-        )
+        }
+
         return glob(PARAM_PARSER_GLOB, {
           cwd: folder,
           onlyFiles: true,

From b6dab9a63d5b465c9888688927c1b6eac00b918d Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 27 Aug 2025 14:27:40 +0200
Subject: [PATCH 68/81] feat: handle negative default querya params

---
 src/core/definePage.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/core/definePage.ts b/src/core/definePage.ts
index 3ec9cd185..fdb359632 100644
--- a/src/core/definePage.ts
+++ b/src/core/definePage.ts
@@ -330,6 +330,16 @@ function extractQueryParams(
                   paramInfo.default = String(paramProp.value.value)
                 } else if (paramProp.value.type === 'NullLiteral') {
                   paramInfo.default = 'null'
+                } else if (
+                  paramProp.value.type === 'UnaryExpression' &&
+                  (paramProp.value.operator === '-' ||
+                    paramProp.value.operator === '+' ||
+                    paramProp.value.operator === '!' ||
+                    paramProp.value.operator === '~') &&
+                  paramProp.value.argument.type === 'NumericLiteral'
+                ) {
+                  // support negative numeric literals: -1, -1.5
+                  paramInfo.default = `${paramProp.value.operator}${paramProp.value.argument.value}`
                 } else {
                   warn(
                     `Unrecognized default value in definePage() for query param "${paramName}". Typeof value: ${paramProp.value.type}. This is a bug, open an issue on https://github.com/posva/unplugin-vue-router and provide the definePage() code.`

From c03a6e57a689205243588d7b8e54ca97aef11631 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 27 Aug 2025 21:50:33 +0200
Subject: [PATCH 69/81] fix: pass null to splat params

---
 package.json                                  |  4 +-
 playground-experimental/package.json          |  2 +-
 .../src/pages/[...path].vue                   | 26 +++++++++++--
 .../src/pages/events/repeat/[when=date]+.vue  |  9 +++++
 .../src/pages/users/[userId=int].vue          |  4 +-
 playground-experimental/src/params/date.ts    | 35 ++++++++++++------
 playground-experimental/typed-router.d.ts     | 15 +++++---
 pnpm-lock.yaml                                | 33 ++++++++++++-----
 src/codegen/generateRouteParams.ts            | 37 ++++++++++++-------
 src/codegen/generateRouteResolver.spec.ts     |  8 ++++
 src/codegen/generateRouteResolver.ts          |  1 +
 src/core/definePage.ts                        |  3 ++
 src/core/tree.ts                              | 14 ++++++-
 src/core/treeNodeValue.ts                     | 30 +++++++++++++++
 14 files changed, 174 insertions(+), 47 deletions(-)
 create mode 100644 playground-experimental/src/pages/events/repeat/[when=date]+.vue

diff --git a/package.json b/package.json
index 424c41c19..17de35f45 100644
--- a/package.json
+++ b/package.json
@@ -139,6 +139,7 @@
     ]
   },
   "dependencies": {
+    "@babel/generator": "^7.28.3",
     "@vue-macros/common": "3.0.0",
     "@vue/language-core": "^3.0.7",
     "ast-walker-scope": "^0.8.2",
@@ -171,6 +172,7 @@
     "@posva/prompts": "^2.4.4",
     "@shikijs/vitepress-twoslash": "3.13.0",
     "@tanstack/vue-query": "^5.89.0",
+    "@types/babel__generator": "^7.27.0",
     "@types/node": "^24.3.0",
     "@types/picomatch": "^4.0.2",
     "@vitest/coverage-v8": "^3.2.4",
@@ -203,7 +205,7 @@
     "vitepress-plugin-llms": "^1.7.5",
     "vitest": "^3.2.4",
     "vue": "^3.5.21",
-    "vue-router": "https://pkg.pr.new/vue-router@be1679c",
+    "vue-router": "https://pkg.pr.new/vue-router@ecd1303",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index f2e3a9403..c44883a44 100644
--- a/playground-experimental/package.json
+++ b/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@be1679c"
+    "vue-router": "https://pkg.pr.new/vue-router@ecd1303"
   }
 }
diff --git a/playground-experimental/src/pages/[...path].vue b/playground-experimental/src/pages/[...path].vue
index 09c4537eb..4b83b0349 100644
--- a/playground-experimental/src/pages/[...path].vue
+++ b/playground-experimental/src/pages/[...path].vue
@@ -2,6 +2,7 @@
 import doc from '../main.ts?raw'
 
 const route = useRoute()
+const router = useRouter()
 route.params.path
 
 console.log('typeof', typeof route.params.active)
@@ -22,13 +23,30 @@ definePage({
       page: {
         parser: 'int',
         default: 1,
-        format: 'array',
+        format: 'value',
       },
-      other: 'bool',
-      active: {
+      other: {
         parser: 'bool',
         default: false,
       },
+      active: {
+        parser: 'bool',
+        default: true,
+      },
+
+      multi: {
+        format: 'array',
+      },
+
+      req: {
+        parser: 'int',
+        default: -1,
+      },
+
+      when: {
+        parser: 'date',
+        default: () => new Date(),
+      },
     },
   },
 })
@@ -39,7 +57,7 @@ definePage({
     <h1>Not Found</h1>
 
     <pre>{{ $route.params }}</pre>
-    <pre>{{ $route.params }}</pre>
+    <pre>{{ $route.query }}</pre>
     <pre>{{ $route.meta }}</pre>
   </main>
 </template>
diff --git a/playground-experimental/src/pages/events/repeat/[when=date]+.vue b/playground-experimental/src/pages/events/repeat/[when=date]+.vue
new file mode 100644
index 000000000..c34fc7056
--- /dev/null
+++ b/playground-experimental/src/pages/events/repeat/[when=date]+.vue
@@ -0,0 +1,9 @@
+<script lang="ts" setup>
+const route = useRoute()
+console.log(route.params.when)
+</script>
+
+<template>
+  <h1>Date</h1>
+  <pre>{{ typeof route.params.when }} - {{ route.params.when }}</pre>
+</template>
diff --git a/playground-experimental/src/pages/users/[userId=int].vue b/playground-experimental/src/pages/users/[userId=int].vue
index c11c23a73..4e7524625 100644
--- a/playground-experimental/src/pages/users/[userId=int].vue
+++ b/playground-experimental/src/pages/users/[userId=int].vue
@@ -9,7 +9,9 @@ definePage({
   // path: '/users/:userId',
   params: {
     query: {
-      anyParam: {},
+      anyParam: {
+        default: '',
+      },
       page: {
         parser: 'int',
         default: 1,
diff --git a/playground-experimental/src/params/date.ts b/playground-experimental/src/params/date.ts
index 27e506003..eb85e9bdc 100644
--- a/playground-experimental/src/params/date.ts
+++ b/playground-experimental/src/params/date.ts
@@ -1,18 +1,31 @@
-import { type ParamParser, miss } from 'vue-router/experimental'
+import { defineParamParser, miss } from 'vue-router/experimental'
 
-export const parser: ParamParser<Date, string> = {
-  get: (value: string): Date => {
-    const asDate = new Date(value)
-    if (Number.isNaN(asDate.getTime())) {
-      throw miss(`Invalid date: "${value}"`)
-    }
+function toDate(value: string): Date {
+  const asDate = new Date(value)
+  if (Number.isNaN(asDate.getTime())) {
+    throw miss(`Invalid date: "${value}"`)
+  }
 
-    return asDate
-  },
-  set: (value: Date): string =>
+  return asDate
+}
+
+function toString(value: Date): string {
+  return (
     value
       .toISOString()
       // allows keeping simple dates like 2023-10-01 without time
       // while still being able to parse full dates like 2023-10-01T12:00:00.000Z
-      .replace('T00:00:00.000Z', ''),
+      .replace('T00:00:00.000Z', '')
+  )
 }
+
+export const parser = defineParamParser({
+  get: (value: string | string[] | null) => {
+    if (!value) {
+      throw miss()
+    }
+    return Array.isArray(value) ? value.map(toDate) : toDate(value)
+  },
+  set: (value: Date | Date[]) =>
+    Array.isArray(value) ? value.map(toString) : toString(value),
+})
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
index 69212a436..36ebdcc52 100644
--- a/playground-experimental/typed-router.d.ts
+++ b/playground-experimental/typed-router.d.ts
@@ -22,20 +22,21 @@ declare module 'vue-router/auto-routes' {
    */
   export interface RouteNamedMap {
     '/(home)': RouteRecordInfo<'/(home)', '/', Record<never, never>, Record<never, never>>,
-    'not-found': RouteRecordInfo<'not-found', '/:path(.*)', { path: string, page?: number, other: boolean, active?: boolean }, { path: string, page: number, other: boolean, active: boolean }>,
+    'not-found': RouteRecordInfo<'not-found', '/:path(.*)', { path: string, page?: number, other?: boolean, active?: boolean, multi: string[], req?: number, when?: Exclude<Param_date, unknown[]> }, { path: string, page: number, other: boolean, active: boolean, multi: string[], req: number, when: Exclude<Param_date, unknown[]> }>,
     '/a.[b].c.[d]': RouteRecordInfo<'/a.[b].c.[d]', '/a/:b/c/:d', { b: string, d: string }, { b: string, d: string }>,
     '/b': RouteRecordInfo<'/b', '/b', Record<never, never>, Record<never, never>>,
-    '/blog/[slug]+': RouteRecordInfo<'/blog/[slug]+', '/blog/:slug+', { slug: string[] }, { slug: [string, ...string[]] }>,
+    '/blog/[slug]+': RouteRecordInfo<'/blog/[slug]+', '/blog/:slug+', { slug: string[] }, { slug: string[] }>,
     '/blog/[[slugOptional]]+': RouteRecordInfo<'/blog/[[slugOptional]]+', '/blog/:slugOptional*', { slugOptional?: string[] }, { slugOptional: string[] }>,
     '/blog/info/(info)': RouteRecordInfo<'/blog/info/(info)', '/blog/info', Record<never, never>, Record<never, never>>,
     '/blog/info/[[section]]': RouteRecordInfo<'/blog/info/[[section]]', '/blog/info/:section?', { section?: string | null }, { section: string | null }>,
-    '/events/[when=date]': RouteRecordInfo<'/events/[when=date]', '/events/:when', { when: string }, { when: string }>,
+    '/events/[when=date]': RouteRecordInfo<'/events/[when=date]', '/events/:when', { when: Exclude<Param_date, unknown[]> }, { when: Exclude<Param_date, unknown[]> }>,
+    '/events/repeat/[when=date]+': RouteRecordInfo<'/events/repeat/[when=date]+', '/events/repeat/:when+', { when: Extract<Param_date, unknown[]> }, { when: Extract<Param_date, unknown[]> }>,
     '/manually-added': RouteRecordInfo<'/manually-added', '/manually-added', Record<never, never>, Record<never, never>>,
     '/tests/[[optional]]/end': RouteRecordInfo<'/tests/[[optional]]/end', '/tests/:optional?/end', { optional?: string | null }, { optional: string | null }>,
     '/u[name]': RouteRecordInfo<'/u[name]', '/u:name', { name: string }, { name: string }, '/u[name]/24' | '/u[name]/[userId=int]'>,
-    '/u[name]/[userId=int]': RouteRecordInfo<'/u[name]/[userId=int]', '/u:name/:userId', { name: string, userId: string }, { name: string, userId: string }>,
+    '/u[name]/[userId=int]': RouteRecordInfo<'/u[name]/[userId=int]', '/u:name/:userId', { name: string, userId: number }, { name: string, userId: number }>,
     '/u[name]/24': RouteRecordInfo<'/u[name]/24', '/u:name/24', { name: string }, { name: string }>,
-    '/users/[userId=int]': RouteRecordInfo<'/users/[userId=int]', '/users/:userId', { userId: string, anyParam: null, page?: number }, { userId: string, anyParam: null, page: number }>,
+    '/users/[userId=int]': RouteRecordInfo<'/users/[userId=int]', '/users/:userId', { userId: number, anyParam?: string, page?: number }, { userId: number, anyParam: string, page: number }>,
     '/users/sub-[first]-[second]': RouteRecordInfo<'/users/sub-[first]-[second]', '/users/sub-:first-:second', { first: string, second: string }, { first: string, second: string }>,
   }
 
@@ -86,6 +87,10 @@ declare module 'vue-router/auto-routes' {
       routes: '/events/[when=date]'
       views: never
     }
+    'src/pages/events/repeat/[when=date]+.vue': {
+      routes: '/events/repeat/[when=date]+'
+      views: never
+    }
     'src/page-outside.vue': {
       routes: '/manually-added'
       views: never
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 883507d32..a0774afe2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,6 +8,9 @@ importers:
 
   .:
     dependencies:
+      '@babel/generator':
+        specifier: ^7.28.3
+        version: 7.28.3
       '@vue-macros/common':
         specifier: 3.0.0
         version: 3.0.0(vue@3.5.21(typescript@5.9.2))
@@ -75,6 +78,9 @@ importers:
       '@tanstack/vue-query':
         specifier: ^5.89.0
         version: 5.89.0(vue@3.5.21(typescript@5.9.2))
+      '@types/babel__generator':
+        specifier: ^7.27.0
+        version: 7.27.0
       '@types/node':
         specifier: ^24.3.0
         version: 24.3.0
@@ -169,11 +175,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@be1679c
-        version: https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@ecd1303
+        version: https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -261,8 +267,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@be1679c
-        version: https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@ecd1303
+        version: https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -2313,6 +2319,9 @@ packages:
   '@tybys/wasm-util@0.9.0':
     resolution: {integrity: sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==}
 
+  '@types/babel__generator@7.27.0':
+    resolution: {integrity: sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==}
+
   '@types/chai@5.2.2':
     resolution: {integrity: sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==}
 
@@ -6863,8 +6872,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@https://pkg.pr.new/vue-router@be1679c:
-    resolution: {tarball: https://pkg.pr.new/vue-router@be1679c}
+  vue-router@https://pkg.pr.new/vue-router@ecd1303:
+    resolution: {tarball: https://pkg.pr.new/vue-router@ecd1303}
     version: 4.5.1
     peerDependencies:
       vue: ^3.2.0
@@ -9158,6 +9167,10 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
+  '@types/babel__generator@7.27.0':
+    dependencies:
+      '@babel/types': 7.28.4
+
   '@types/chai@5.2.2':
     dependencies:
       '@types/deep-eql': 4.0.2
@@ -14573,17 +14586,17 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@https://pkg.pr.new/vue-router@be1679c(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
diff --git a/src/codegen/generateRouteParams.ts b/src/codegen/generateRouteParams.ts
index c296c5c53..5d85c75eb 100644
--- a/src/codegen/generateRouteParams.ts
+++ b/src/codegen/generateRouteParams.ts
@@ -1,5 +1,9 @@
 import { TreeNode } from '../core/tree'
-import { isTreeParamOptional } from '../core/treeNodeValue'
+import {
+  isTreeParamOptional,
+  isTreeParamRepeatable,
+  isTreePathParam,
+} from '../core/treeNodeValue'
 
 export function generateRouteParams(node: TreeNode, isRaw: boolean): string {
   // node.pathParams is a getter so we compute it once
@@ -33,19 +37,26 @@ export function EXPERIMENTAL_generateRouteParams(
   return nodeParams.length > 0
     ? `{ ${nodeParams
         .map((param, i) => {
+          const isOptional = isTreeParamOptional(param)
+          const isRepeatable = isTreeParamRepeatable(param)
+
           const type = types[i]
-          return `${param.paramName}${
-            isRaw && isTreeParamOptional(param) ? '?' : ''
-          }: ${
-            'modifier' in param
-              ? param.repeatable
-                ? param.optional || isRaw // in raw mode, the tuple version is annoying to pass
-                  ? 'string[]'
-                  : '[string, ...string[]]'
-                : param.optional
-                  ? 'string | null'
-                  : 'string'
-              : type
+
+          let extractedType: string
+
+          if (type?.startsWith('Param_')) {
+            extractedType = `${isRepeatable ? 'Extract' : 'Exclude'}<${type}, unknown[]>`
+          } else {
+            extractedType = `${type ?? 'string'}${isRepeatable ? '[]' : ''}`
+          }
+
+          extractedType +=
+            isTreePathParam(param) && isOptional && !isRepeatable
+              ? ' | null'
+              : ''
+
+          return `${param.paramName}${isRaw && isOptional ? '?' : ''}: ${
+            extractedType
           }`
         })
         .join(', ')} }`
diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index c935d664c..718d7b807 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -65,6 +65,7 @@ describe('generateRouteRecordPath', () => {
             b: [/* no parser */],
           },
           ["a",1],
+          /* trailingSlash */
         ),"
     `)
   })
@@ -85,6 +86,7 @@ describe('generateRouteRecordPath', () => {
             c: [/* no parser */],
           },
           ["a",1,1],
+          /* trailingSlash */
         ),"
     `)
   })
@@ -100,6 +102,7 @@ describe('generateRouteRecordPath', () => {
             b: [/* no parser */, /* repeatable: false */, /* optional: */ true],
           },
           ["a",1],
+          /* trailingSlash */
         ),"
     `)
   })
@@ -115,6 +118,7 @@ describe('generateRouteRecordPath', () => {
             b: [/* no parser */, /* repeatable: */ true],
           },
           ["a",1],
+          /* trailingSlash */
         ),"
     `)
   })
@@ -130,6 +134,7 @@ describe('generateRouteRecordPath', () => {
             b: [/* no parser */, /* repeatable: */ true, /* optional: */ true],
           },
           ["a",1],
+          /* trailingSlash */
         ),"
     `)
   })
@@ -149,6 +154,7 @@ describe('generateRouteRecordPath', () => {
             d: [/* no parser */],
           },
           ["a",["a-",0,"-c-",0]],
+          /* trailingSlash */
         ),"
     `)
   })
@@ -167,6 +173,7 @@ describe('generateRouteRecordPath', () => {
             all: [/* no parser */],
           },
           [0],
+          null,
         ),"
     `)
   })
@@ -186,6 +193,7 @@ describe('generateRouteRecordPath', () => {
             all: [/* no parser */],
           },
           ["a",["some-",0],0],
+          null,
         ),"
     `)
   })
diff --git a/src/codegen/generateRouteResolver.ts b/src/codegen/generateRouteResolver.ts
index 237c4213b..f43f32755 100644
--- a/src/codegen/generateRouteResolver.ts
+++ b/src/codegen/generateRouteResolver.ts
@@ -260,6 +260,7 @@ export function generateRouteRecordPath({
     ${node.regexp},
     ${generatePathParamsOptions(params, importsMap, paramParsersMap)},
     ${JSON.stringify(node.matcherPatternPathDynamicParts)},
+    ${node.isSplat ? 'null,' : '/* trailingSlash */'}
   ),`
   } else {
     return `path: new MatcherPatternPathStatic('${node.fullPath}'),`
diff --git a/src/core/definePage.ts b/src/core/definePage.ts
index fdb359632..97dd33d42 100644
--- a/src/core/definePage.ts
+++ b/src/core/definePage.ts
@@ -17,6 +17,7 @@ import type {
   Statement,
   StringLiteral,
 } from '@babel/types'
+import { generate } from '@babel/generator'
 import { walkAST } from 'ast-walker-scope'
 import { warn } from './utils'
 import { ParsedStaticImport, findStaticImports, parseStaticImport } from 'mlly'
@@ -340,6 +341,8 @@ function extractQueryParams(
                 ) {
                   // support negative numeric literals: -1, -1.5
                   paramInfo.default = `${paramProp.value.operator}${paramProp.value.argument.value}`
+                } else if (paramProp.value.type === 'ArrowFunctionExpression') {
+                  paramInfo.default = generate(paramProp.value).code
                 } else {
                   warn(
                     `Unrecognized default value in definePage() for query param "${paramName}". Typeof value: ${paramProp.value.type}. This is a bug, open an issue on https://github.com/posva/unplugin-vue-router and provide the definePage() code.`
diff --git a/src/core/tree.ts b/src/core/tree.ts
index 50d2f7164..1e02e3592 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -343,7 +343,15 @@ export class TreeNode {
   }
 
   /**
-   * Returns an array of matcher parts that is consumed by MatcherPatternPathDynamic to render the path.
+   * Is this node a splat (catch-all) param
+   */
+  get isSplat(): boolean {
+    return this.value.isParam() && this.value.pathParams.some((p) => p.isSplat)
+  }
+
+  /**
+   * Returns an array of matcher parts that is consumed by
+   * MatcherPatternPathDynamic to render the path.
    */
   get matcherPatternPathDynamicParts(): TreeNodeValueMatcherPart {
     const parts: TreeNodeValueMatcherPart = []
@@ -374,6 +382,10 @@ export class TreeNode {
     return parts
   }
 
+  /**
+   * Is this tree node matchable? A matchable node has at least one component
+   * and a name.
+   */
   isMatchable(): this is TreeNode & { name: string } {
     // a node is matchable if it has at least one component
     // and the name is not false
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index 98f6d955c..d303eacf5 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -306,6 +306,11 @@ export interface TreeQueryParam {
   defaultValue?: string
 }
 
+/**
+ * Checks if a TreePathParam or TreeQueryParam is optional.
+ *
+ * @internal
+ */
 export function isTreeParamOptional(
   param: TreePathParam | TreeQueryParam
 ): boolean {
@@ -315,6 +320,31 @@ export function isTreeParamOptional(
   return param.defaultValue !== undefined
 }
 
+/**
+ * Checks if a TreePathParam or TreeQueryParam is repeatable (array).
+ *
+ * @internal
+ */
+export function isTreeParamRepeatable(
+  param: TreePathParam | TreeQueryParam
+): boolean {
+  if ('repeatable' in param) {
+    return param.repeatable
+  }
+  return param.format === 'array'
+}
+
+/**
+ * Checks if a param is a TreePathParam.
+ *
+ * @internal
+ */
+export function isTreePathParam(
+  param: TreePathParam | TreeQueryParam
+): param is TreePathParam {
+  return 'modifier' in param
+}
+
 /**
  * To escape regex characters in the path segment.
  * @internal

From 8d4beefeeb6d4d4a2f33d19055e728e59aa467ec Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 27 Aug 2025 21:52:10 +0200
Subject: [PATCH 70/81] chore: simplify warn

---
 src/core/definePage.ts | 47 +++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/core/definePage.ts b/src/core/definePage.ts
index 97dd33d42..fe5bdfb21 100644
--- a/src/core/definePage.ts
+++ b/src/core/definePage.ts
@@ -319,35 +319,30 @@ function extractQueryParams(
             } else if (paramProp.key.name === 'default') {
               if (typeof paramProp.value.extra?.raw === 'string') {
                 paramInfo.default = paramProp.value.extra.raw
+              } else if (paramProp.value.type === 'NumericLiteral') {
+                paramInfo.default = String(paramProp.value.value)
+              } else if (paramProp.value.type === 'StringLiteral') {
+                paramInfo.default = JSON.stringify(paramProp.value.value)
+              } else if (paramProp.value.type === 'BooleanLiteral') {
+                paramInfo.default = String(paramProp.value.value)
+              } else if (paramProp.value.type === 'NullLiteral') {
+                paramInfo.default = 'null'
+              } else if (
+                paramProp.value.type === 'UnaryExpression' &&
+                (paramProp.value.operator === '-' ||
+                  paramProp.value.operator === '+' ||
+                  paramProp.value.operator === '!' ||
+                  paramProp.value.operator === '~') &&
+                paramProp.value.argument.type === 'NumericLiteral'
+              ) {
+                // support negative numeric literals: -1, -1.5
+                paramInfo.default = `${paramProp.value.operator}${paramProp.value.argument.value}`
+              } else if (paramProp.value.type === 'ArrowFunctionExpression') {
+                paramInfo.default = generate(paramProp.value).code
               } else {
                 warn(
-                  `No raw value parsed in definePage() for query param "${paramName}". This is a bug, open an issue on https://github.com/posva/unplugin-vue-router and provide the definePage() code.`
+                  `Unrecognized default value in definePage() for query param "${paramName}". Typeof value: "${paramProp.value.type}". This is a bug or a missing type of value, open an issue on https://github.com/posva/unplugin-vue-router and provide the definePage() code.`
                 )
-                if (paramProp.value.type === 'NumericLiteral') {
-                  paramInfo.default = String(paramProp.value.value)
-                } else if (paramProp.value.type === 'StringLiteral') {
-                  paramInfo.default = JSON.stringify(paramProp.value.value)
-                } else if (paramProp.value.type === 'BooleanLiteral') {
-                  paramInfo.default = String(paramProp.value.value)
-                } else if (paramProp.value.type === 'NullLiteral') {
-                  paramInfo.default = 'null'
-                } else if (
-                  paramProp.value.type === 'UnaryExpression' &&
-                  (paramProp.value.operator === '-' ||
-                    paramProp.value.operator === '+' ||
-                    paramProp.value.operator === '!' ||
-                    paramProp.value.operator === '~') &&
-                  paramProp.value.argument.type === 'NumericLiteral'
-                ) {
-                  // support negative numeric literals: -1, -1.5
-                  paramInfo.default = `${paramProp.value.operator}${paramProp.value.argument.value}`
-                } else if (paramProp.value.type === 'ArrowFunctionExpression') {
-                  paramInfo.default = generate(paramProp.value).code
-                } else {
-                  warn(
-                    `Unrecognized default value in definePage() for query param "${paramName}". Typeof value: ${paramProp.value.type}. This is a bug, open an issue on https://github.com/posva/unplugin-vue-router and provide the definePage() code.`
-                  )
-                }
               }
             }
           }

From ba060fa2c359306f034767b07be1999989d0502d Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 29 Aug 2025 11:17:11 +0200
Subject: [PATCH 71/81] feat: ensure consistent non trailing slash

---
 src/codegen/generateRouteResolver.spec.ts | 811 ++++++++++++++--------
 src/core/tree.ts                          |  50 +-
 src/core/treeNodeValue.ts                 |  20 +-
 src/core/utils.ts                         |  16 +
 4 files changed, 598 insertions(+), 299 deletions(-)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 718d7b807..c1f7cbbd9 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -54,31 +54,387 @@ describe('generateRouteRecordPath', () => {
     ).toBe(`path: new MatcherPatternPathStatic('/a/'),`)
   })
 
-  it('generates paths with params', () => {
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[b]', 'a.vue')
-    expect(
-      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
-    ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathDynamic(
-          /^\\/a\\/([^/]+?)$/i,
-          {
-            b: [/* no parser */],
-          },
-          ["a",1],
-          /* trailingSlash */
-        ),"
-    `)
-  })
+  describe('basic params [id] in all positions', () => {
+    it('only segment', () => {
+      const node = new PrefixTree(DEFAULT_OPTIONS).insert('[id]', '[id].vue')
+      expect(
+        generateRouteRecordPath({
+          importsMap,
+          node,
+          paramParsersMap: new Map(),
+        })
+      ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^\\/([^/]+?)$/i,
+            {
+              id: [/* no parser */],
+            },
+            [1],
+            /* trailingSlash */
+          ),"
+      `)
+    })
 
-  it('works with multiple params', () => {
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[b]/[c]', 'a.vue')
-    expect(
-      generateRouteRecordPath({
-        importsMap,
-        node,
-        paramParsersMap: new Map(),
+    it('first position', () => {
+      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+        '[id]/static',
+        '[id]/static.vue'
+      )
+      expect(
+        generateRouteRecordPath({
+          importsMap,
+          node,
+          paramParsersMap: new Map(),
+        })
+      ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^\\/([^/]+?)\\/static$/i,
+            {
+              id: [/* no parser */],
+            },
+            [1,"static"],
+            /* trailingSlash */
+          ),"
+      `)
+    })
+
+    it('middle position', () => {
+      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+        'static/[id]/more',
+        'static/[id]/more.vue'
+      )
+      expect(
+        generateRouteRecordPath({
+          importsMap,
+          node,
+          paramParsersMap: new Map(),
+        })
+      ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^\\/static\\/([^/]+?)\\/more$/i,
+            {
+              id: [/* no parser */],
+            },
+            ["static",1,"more"],
+            /* trailingSlash */
+          ),"
+      `)
+    })
+
+    it('last position', () => {
+      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+        'static/[id]',
+        'static/[id].vue'
+      )
+      expect(
+        generateRouteRecordPath({
+          importsMap,
+          node,
+          paramParsersMap: new Map(),
+        })
+      ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^\\/static\\/([^/]+?)$/i,
+            {
+              id: [/* no parser */],
+            },
+            ["static",1],
+            /* trailingSlash */
+          ),"
+      `)
+    })
+
+    describe('optional params [[id]] in all positions', () => {
+      it('only segment', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          '[[id]]',
+          '[[id]].vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^\\/([^/]+?)?$/i,
+            {
+              id: [/* no parser */, /* repeatable: false */, /* optional: */ true],
+            },
+            [1],
+            /* trailingSlash */
+          ),"
+      `)
       })
-    ).toMatchInlineSnapshot(`
+
+      it('first position', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          '[[id]]/static',
+          '[[id]]/static.vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^(?:\\/([^/]+?))?\\/static$/i,
+            {
+              id: [/* no parser */, /* repeatable: false */, /* optional: */ true],
+            },
+            [1,"static"],
+            /* trailingSlash */
+          ),"
+      `)
+      })
+
+      it('middle position', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          'static/[[id]]/more',
+          'static/[[id]]/more.vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^\\/static(?:\\/([^/]+?))?\\/more$/i,
+            {
+              id: [/* no parser */, /* repeatable: false */, /* optional: */ true],
+            },
+            ["static",1,"more"],
+            /* trailingSlash */
+          ),"
+      `)
+      })
+
+      it('last position', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          'static/[[id]]',
+          'static/[[id]].vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+          "path: new MatcherPatternPathDynamic(
+              /^\\/static(?:\\/([^/]+?))?$/i,
+              {
+                id: [/* no parser */, /* repeatable: false */, /* optional: */ true],
+              },
+              ["static",1],
+              /* trailingSlash */
+            ),"
+        `)
+      })
+    })
+
+    describe('repeatable params [id]+ in all positions', () => {
+      it('only segment', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          '[id]+',
+          '[id]+.vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^\\/(.+?)$/i,
+            {
+              id: [/* no parser */, /* repeatable: */ true],
+            },
+            [1],
+            /* trailingSlash */
+          ),"
+      `)
+      })
+
+      it('first position', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          '[id]+/static',
+          '[id]+/static.vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^\\/(.+?)\\/static$/i,
+            {
+              id: [/* no parser */, /* repeatable: */ true],
+            },
+            [1,"static"],
+            /* trailingSlash */
+          ),"
+      `)
+      })
+
+      it('middle position', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          'static/[id]+/more',
+          'static/[id]+/more.vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^\\/static\\/(.+?)\\/more$/i,
+            {
+              id: [/* no parser */, /* repeatable: */ true],
+            },
+            ["static",1,"more"],
+            /* trailingSlash */
+          ),"
+      `)
+      })
+
+      it('last position', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          'static/[id]+',
+          'static/[id]+.vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+          "path: new MatcherPatternPathDynamic(
+              /^\\/static\\/(.+?)$/i,
+              {
+                id: [/* no parser */, /* repeatable: */ true],
+              },
+              ["static",1],
+              /* trailingSlash */
+            ),"
+        `)
+      })
+    })
+
+    describe('optional repeatable params [[id]]+ in all positions', () => {
+      it('only segment', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          '[[id]]+',
+          '[[id]]+.vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^\\/(.+?)?$/i,
+            {
+              id: [/* no parser */, /* repeatable: */ true, /* optional: */ true],
+            },
+            [1],
+            /* trailingSlash */
+          ),"
+      `)
+      })
+
+      it('first position', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          '[[id]]+/static',
+          '[[id]]+/static.vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^(?:\\/(.+?))?\\/static$/i,
+            {
+              id: [/* no parser */, /* repeatable: */ true, /* optional: */ true],
+            },
+            [1,"static"],
+            /* trailingSlash */
+          ),"
+      `)
+      })
+
+      it('middle position', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          'static/[[id]]+/more',
+          'static/[[id]]+/more.vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+        "path: new MatcherPatternPathDynamic(
+            /^\\/static(?:\\/(.+?))?\\/more$/i,
+            {
+              id: [/* no parser */, /* repeatable: */ true, /* optional: */ true],
+            },
+            ["static",1,"more"],
+            /* trailingSlash */
+          ),"
+      `)
+      })
+
+      it('last position', () => {
+        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+          'static/[[id]]+',
+          'static/[[id]]+.vue'
+        )
+        expect(
+          generateRouteRecordPath({
+            importsMap,
+            node,
+            paramParsersMap: new Map(),
+          })
+        ).toMatchInlineSnapshot(`
+          "path: new MatcherPatternPathDynamic(
+              /^\\/static(?:\\/(.+?))?$/i,
+              {
+                id: [/* no parser */, /* repeatable: */ true, /* optional: */ true],
+              },
+              ["static",1],
+              /* trailingSlash */
+            ),"
+        `)
+      })
+    })
+
+    it('works with multiple params', () => {
+      const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[b]/[c]', 'a.vue')
+      expect(
+        generateRouteRecordPath({
+          importsMap,
+          node,
+          paramParsersMap: new Map(),
+        })
+      ).toMatchInlineSnapshot(`
       "path: new MatcherPatternPathDynamic(
           /^\\/a\\/([^/]+?)\\/([^/]+?)$/i,
           {
@@ -89,84 +445,44 @@ describe('generateRouteRecordPath', () => {
           /* trailingSlash */
         ),"
     `)
-  })
-
-  it('works with optional params', () => {
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[[b]]', 'a.vue')
-    expect(
-      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
-    ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathDynamic(
-          /^\\/a\\/([^/]+?)?$/i,
-          {
-            b: [/* no parser */, /* repeatable: false */, /* optional: */ true],
-          },
-          ["a",1],
-          /* trailingSlash */
-        ),"
-    `)
-  })
-
-  it('works with repeatable params', () => {
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[b]+', 'a.vue')
-    expect(
-      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
-    ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathDynamic(
-          /^\\/a\\/(.+?)$/i,
-          {
-            b: [/* no parser */, /* repeatable: */ true],
-          },
-          ["a",1],
-          /* trailingSlash */
-        ),"
-    `)
-  })
-
-  it('works with repeatable optional params', () => {
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[[b]]+', 'a.vue')
-    expect(
-      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
-    ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathDynamic(
-          /^\\/a\\/(.+?)?$/i,
-          {
-            b: [/* no parser */, /* repeatable: */ true, /* optional: */ true],
-          },
-          ["a",1],
-          /* trailingSlash */
-        ),"
-    `)
-  })
+    })
 
-  it('works with segments', () => {
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-      'a/a-[b]-c-[d]',
-      'a.vue'
-    )
-    expect(
-      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
-    ).toMatchInlineSnapshot(`
+    it('works with segments', () => {
+      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+        'a/a-[b]-c-[d]',
+        'a.vue'
+      )
+      expect(
+        generateRouteRecordPath({
+          importsMap,
+          node,
+          paramParsersMap: new Map(),
+        })
+      ).toMatchInlineSnapshot(`
       "path: new MatcherPatternPathDynamic(
           /^\\/a\\/a-([^/]+?)-c-([^/]+?)$/i,
           {
             b: [/* no parser */],
             d: [/* no parser */],
           },
-          ["a",["a-",0,"-c-",0]],
+          ["a",["a-",1,"-c-",1]],
           /* trailingSlash */
         ),"
     `)
-  })
+    })
 
-  it('works with a catch all route', () => {
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-      '[...all]',
-      '[...all].vue'
-    )
-    expect(
-      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
-    ).toMatchInlineSnapshot(`
+    it('works with a catch all route', () => {
+      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+        '[...all]',
+        '[...all].vue'
+      )
+      expect(
+        generateRouteRecordPath({
+          importsMap,
+          node,
+          paramParsersMap: new Map(),
+        })
+      ).toMatchInlineSnapshot(`
       "path: new MatcherPatternPathDynamic(
           /^\\/(.*)$/i,
           {
@@ -176,26 +492,31 @@ describe('generateRouteRecordPath', () => {
           null,
         ),"
     `)
-  })
+    })
 
-  it('works with a splat param with a prefix', () => {
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-      'a/some-[id]/[...all]',
-      'a/some-[id]/[...all].vue'
-    )
-    expect(
-      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
-    ).toMatchInlineSnapshot(`
+    it('works with a splat param with a prefix', () => {
+      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
+        'a/some-[id]/[...all]',
+        'a/some-[id]/[...all].vue'
+      )
+      expect(
+        generateRouteRecordPath({
+          importsMap,
+          node,
+          paramParsersMap: new Map(),
+        })
+      ).toMatchInlineSnapshot(`
       "path: new MatcherPatternPathDynamic(
           /^\\/a\\/some-([^/]+?)\\/(.*)$/i,
           {
             id: [/* no parser */],
             all: [/* no parser */],
           },
-          ["a",["some-",0],0],
+          ["a",["some-",1],0],
           null,
         ),"
     `)
+    })
   })
 })
 
@@ -213,6 +534,13 @@ describe('generateRouteRecordQuery', () => {
     ).toBe('')
   })
 
+  it('returns empty string when no query params in a matchable node', () => {
+    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
+    expect(
+      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
+    ).toBe('')
+  })
+
   it('generates query params for non-matchable nodes when they have query params', () => {
     const tree = new PrefixTree(DEFAULT_OPTIONS)
     const node = tree.insert('a/b', 'a/b.vue').parent! // non-matchable parent
@@ -261,13 +589,6 @@ describe('generateRouteRecordQuery', () => {
     `)
   })
 
-  it('returns empty string when no query params', () => {
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
-    expect(
-      generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
-    ).toBe('')
-  })
-
   it('generates query property with single query param', () => {
     const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
     // Mock the queryParams getter
@@ -311,12 +632,12 @@ describe('generateRouteRecordQuery', () => {
 
     generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
 
-    expect(importsMap.toString()).toContain(
-      "import { MatcherPatternQueryParam } from 'vue-router/experimental'"
-    )
+    expect(
+      importsMap.has('vue-router/experimental', 'MatcherPatternQueryParam')
+    ).toBe(true)
   })
 
-  it('generates query param with format value', () => {
+  it('generates query param with format "value"', () => {
     const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
     node.value.setEditOverride('params', {
       query: { search: { format: 'value' } },
@@ -330,7 +651,7 @@ describe('generateRouteRecordQuery', () => {
     `)
   })
 
-  it('generates query param with format array', () => {
+  it('generates query param with format "array"', () => {
     const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
     node.value.setEditOverride('params', {
       query: { tags: { format: 'array' } },
@@ -361,13 +682,13 @@ describe('generateRouteRecordQuery', () => {
   it('generates query param with format and default value', () => {
     const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
     node.value.setEditOverride('params', {
-      query: { page: { parser: 'int', format: 'value', default: '1' } },
+      query: { page: { parser: 'int', format: 'array', default: '1' } },
     })
     expect(
       generateRouteRecordQuery({ importsMap, node, paramParsersMap: new Map() })
     ).toMatchInlineSnapshot(`
       "query: [
-          new MatcherPatternQueryParam('page', 'page', 'value', PARAM_PARSER_INT, 1)
+          new MatcherPatternQueryParam('page', 'page', 'array', PARAM_PARSER_INT, 1)
         ],"
     `)
   })
@@ -497,44 +818,98 @@ describe('generateRouteResolver', () => {
     `)
   })
 
-  it('orders records based on specificity of paths', () => {
-    const tree = new PrefixTree(DEFAULT_OPTIONS)
-    const importsMap = new ImportsMap()
-    tree.insert('a', 'a.vue')
-    tree.insert('b/a-b', 'b/c/d.vue')
-    tree.insert('b/a-[a]', 'b/c/d.vue')
-    tree.insert('b/a-[a]+', 'b/c/d.vue')
-    tree.insert('b/a-[[a]]', 'b/c/d.vue')
-    tree.insert('b/a-[[a]]+', 'b/c/d.vue')
-    tree.insert('b/[a]', 'b/c.vue')
-    tree.insert('b/[a]+', 'b/c/d.vue')
-    tree.insert('b/[[a]]', 'b/c/d.vue')
-    tree.insert('b/[[a]]+', 'b/c/d.vue')
-    tree.insert('[...all]', 'b/c/f.vue')
-    const resolver = generateRouteResolver(
-      tree,
-      DEFAULT_OPTIONS,
-      importsMap,
-      new Map()
-    )
+  describe('route prioritization in resolver', () => {
+    function getRouteOrderFromResolver(tree: PrefixTree): string[] {
+      const resolver = generateRouteResolver(
+        tree,
+        DEFAULT_OPTIONS,
+        new ImportsMap(),
+        new Map()
+      )
 
-    expect(resolver.replace(/^.*?createFixedResolver/s, ''))
-      .toMatchInlineSnapshot(`
-        "([
-          r_10,  // /b/a-b
-          r_6,   // /b/a-:a
-          r_2,   // /b/:a
-          r_7,   // /b/a-:a?
-          r_3,   // /b/:a?
-          r_9,   // /b/a-:a+
-          r_5,   // /b/:a+
-          r_8,   // /b/a-:a*
-          r_4,   // /b/:a*
-          r_1,   // /a
-          r_0,   // /:all(.*)
-        ])
-        "
-      `)
+      // Extract the order from the resolver output
+      const lines = resolver.split('\n').filter((line) => line.includes('// /'))
+      return lines.map((line) => line.split('// ')[1] || '')
+    }
+
+    it('orders records based on specificity of paths', () => {
+      const tree = new PrefixTree(DEFAULT_OPTIONS)
+      // static at root
+      tree.insert('prefix', 'prefix.vue')
+
+      // params in the end
+      tree.insert('prefix/sub-end', 'prefix/sub-end.vue')
+      tree.insert('prefix/sub-[id]', 'prefix/sub-[id].vue')
+      // repeat can only be the whole segment
+      // tree.insert('prefix/sub-[repeat]+', 'prefix/sub-[repeat]+.vue')
+      tree.insert('prefix/sub-[[opt]]', 'prefix/sub-[[opt]].vue')
+      // repeat can only be the whole segment
+      // tree.insert('prefix/sub-[[optRepeat]]+', 'prefix/c/d.vue')
+      tree.insert('prefix/[id]', 'prefix/[id].vue')
+      tree.insert('prefix/[repeat]+', 'prefix/[repeat]+.vue')
+      tree.insert('prefix/[[opt]]', 'prefix/[[opt]].vue')
+      tree.insert('prefix/[[optRepeat]]+', 'prefix/[[optRepeat]]+.vue')
+      tree.insert('[...splat]', '[...splat].vue')
+
+      // params at root level
+      tree.insert('[id]', '[id].vue')
+      tree.insert('[[optional]]', '[[optional]].vue')
+      tree.insert('prefix-[id]-suffix', 'prefix-[id]-suffix.vue')
+
+      // params in the middle path parts
+      tree.insert('prefix/[id]/suffix', 'prefix/[id]/suffix.vue')
+      tree.insert('prefix/[[opt]]/suffix', 'prefix/[[opt]]/suffix.vue')
+      tree.insert('prefix/[repeat]+/suffix', 'prefix/[repeat]+/suffix.vue')
+      tree.insert(
+        'prefix/[[optRepeat]]+/suffix',
+        'prefix/[[optRepeat]]+/suffix.vue'
+      )
+      tree.insert('prefix/static/suffix', 'prefix/static/suffix.vue')
+      // sub-segments
+      tree.insert('prefix/[id]-end/suffix', 'prefix/[id]-end/suffix.vue')
+      tree.insert('prefix/[[opt]]-end/suffix', 'prefix/[[opt]]-end/suffix.vue')
+      tree.insert(
+        'prefix/sub-[id]-end/suffix',
+        'prefix/sub-[id]-end/suffix.vue'
+      )
+      tree.insert(
+        'prefix/sub-[[opt]]-end/suffix',
+        'prefix/sub-[[opt]]-end/suffix.vue'
+      )
+      tree.insert('prefix/sub-[id]/suffix', 'prefix/static-[id]/suffix.vue')
+      tree.insert('prefix/sub-[[opt]]/suffix', 'prefix/sub-[[opt]]/suffix.vue')
+
+      expect(getRouteOrderFromResolver(tree)).toEqual([
+        '/prefix/static/suffix',
+        '/prefix/sub-end',
+        '/prefix/sub-:id-end/suffix',
+        '/prefix/:id-end/suffix',
+        '/prefix/sub-:id/suffix',
+        '/prefix/sub-:id',
+        '/prefix/:id/suffix',
+        '/prefix/:id',
+        // this could be before /prefix/:id, but since it has a suffix, it works too
+        '/prefix/sub-:opt?-end/suffix',
+        '/prefix/:opt?-end/suffix',
+        '/prefix/sub-:opt?/suffix',
+        '/prefix/sub-:opt?', // FIXME: should be before /prefix/:id
+        '/prefix/:opt?/suffix',
+        '/prefix/:opt?',
+        '/prefix/:repeat+/suffix',
+        '/prefix/:repeat+',
+        '/prefix/:optRepeat*/suffix',
+        '/prefix/:optRepeat*',
+        '/prefix',
+        '/prefix-:id-suffix',
+        '/:id',
+        // one should never have both a regular id and an optional id in the same position
+        // because the optional one will never match
+        '/:optional?',
+        '/:splat(.*)',
+      ])
+    })
+
+    it.todo('warns on invalid repeatable params')
   })
 
   it('strips off empty parent records', () => {
@@ -792,137 +1167,3 @@ describe('generateRouteResolver', () => {
     `)
   })
 })
-
-describe('route prioritization in resolver', () => {
-  function getRouteOrderFromResolver(tree: PrefixTree): string[] {
-    const resolver = generateRouteResolver(
-      tree,
-      DEFAULT_OPTIONS,
-      new ImportsMap(),
-      new Map()
-    )
-
-    // Extract the order from the resolver output
-    const lines = resolver.split('\n').filter((line) => line.includes('// /'))
-    return lines.map((line) => line.split('// ')[1] || '')
-  }
-
-  it('prioritizes routes correctly in resolver output', () => {
-    const tree = new PrefixTree(DEFAULT_OPTIONS)
-
-    // Create routes with different specificity levels
-    tree.insert('static', 'static.vue')
-    tree.insert('[id]', '[id].vue')
-    tree.insert('[[optional]]', '[[optional]].vue')
-    tree.insert('prefix-[id]-suffix', 'prefix-[id]-suffix.vue')
-    tree.insert('[...all]', '[...all].vue')
-
-    // Routes should be ordered from most specific to least specific
-    expect(getRouteOrderFromResolver(tree)).toEqual([
-      '/static', // static routes first
-      '/prefix-:id-suffix', // mixed routes with static content
-      '/:id', // pure parameter routes
-      '/:optional?', // optional parameter routes
-      '/:all(.*)', // catch-all routes last
-    ])
-  })
-
-  it('handles nested route prioritization correctly', () => {
-    const tree = new PrefixTree(DEFAULT_OPTIONS)
-
-    // Create nested routes with different patterns
-    tree.insert('api/users', 'api/users.vue')
-    tree.insert('api/[resource]', 'api/[resource].vue')
-    tree.insert('prefix-[param]/static', 'prefix-[param]/static.vue')
-    tree.insert('[dynamic]/static', '[dynamic]/static.vue')
-    tree.insert('[x]/[y]', '[x]/[y].vue')
-
-    // Routes with more static content should come first
-    expect(getRouteOrderFromResolver(tree)).toEqual([
-      '/api/users', // all static segments
-      '/api/:resource', // static root, param child
-      '/prefix-:param/static', // mixed root, static child
-      '/:dynamic/static', // param root, static child
-      '/:x/:y', // all param segments
-    ])
-  })
-
-  it('orders complex mixed routes appropriately', () => {
-    const tree = new PrefixTree(DEFAULT_OPTIONS)
-
-    // Create routes with various subsegment complexity
-    tree.insert('users', 'users.vue') // pure static
-    tree.insert('prefix-[id]', 'prefix-[id].vue') // prefix + param
-    tree.insert('[id]-suffix', '[id]-suffix.vue') // param + suffix
-    tree.insert('pre-[a]-mid-[b]-end', 'complex.vue') // complex mixed
-    tree.insert('[a]-[b]', '[a]-[b].vue') // params with separator
-    tree.insert('[param]', '[param].vue') // pure param
-
-    expect(getRouteOrderFromResolver(tree)).toEqual([
-      '/users', // pure static wins
-      '/pre-:a-mid-:b-end', // most static content in mixed
-      '/:id-suffix', // static suffix
-      '/prefix-:id', // static prefix
-      '/:a-:b', // params with static separator
-      '/:param', // pure param last
-    ])
-  })
-
-  it('handles optional and repeatable params in nested contexts', () => {
-    const tree = new PrefixTree(DEFAULT_OPTIONS)
-
-    // Create nested routes with optional and repeatable params
-    tree.insert('api/static', 'api/static.vue')
-    tree.insert('api/[[optional]]', 'api/[[optional]].vue')
-    tree.insert('api/[required]', 'api/[required].vue')
-    tree.insert('api/[repeatable]+', 'api/[repeatable]+.vue')
-    tree.insert('api/[[optional]]+', 'api/[[optional]]+.vue')
-    tree.insert('api/[...catchall]', 'api/[...catchall].vue')
-
-    expect(getRouteOrderFromResolver(tree)).toEqual([
-      '/api/static', // static segment wins
-      '/api/:required', // required param
-      '/api/:optional?', // optional param
-      '/api/:repeatable+', // repeatable param
-      '/api/:optional*', // optional repeatable param
-      '/api/:catchall(.*)', // catch-all last
-    ])
-  })
-
-  it('handles catch all with prefix before generic param', () => {
-    const tree = new PrefixTree(DEFAULT_OPTIONS)
-
-    tree.insert('api/v1/users', 'api/v1/users.vue')
-    tree.insert('api/v1/[type]', 'api/v1/[type].vue')
-    tree.insert('api/v1/[type]/c', 'api/v1/[type]/c.vue')
-    tree.insert('api/v1/teams/[...id]', 'api/v1/teams/[...id].vue')
-
-    expect(getRouteOrderFromResolver(tree)).toEqual([
-      '/api/v1/users',
-      '/api/v1/teams/:id(.*)',
-      '/api/v1/:type/c',
-      '/api/v1/:type',
-    ])
-  })
-
-  it('handles complex subsegments in deeply nested routes', () => {
-    const tree = new PrefixTree(DEFAULT_OPTIONS)
-
-    // Create deeply nested routes with complex subsegment patterns
-    tree.insert('api/v1/users', 'api/v1/users.vue')
-    tree.insert('api/v1/user-[id]', 'api/v1/user-[id].vue')
-    tree.insert('api/v1/[type]/list', 'api/v1/[type]/list.vue')
-    tree.insert('api/v1/[type]/[id]', 'api/v1/[type]/[id].vue')
-    tree.insert('api/v1/prefix-[a]-mid-[b]', 'api/v1/prefix-[a]-mid-[b].vue')
-    tree.insert('api/v1/[x]-[y]-[z]', 'api/v1/[x]-[y]-[z].vue')
-
-    expect(getRouteOrderFromResolver(tree)).toEqual([
-      '/api/v1/users', // all static segments
-      '/api/v1/user-:id', // mixed with static prefix
-      '/api/v1/prefix-:a-mid-:b', // complex mixed pattern
-      '/api/v1/:x-:y-:z', // multiple params with separators (mixed subsegments rank higher)
-      '/api/v1/:type/list', // param + static child
-      '/api/v1/:type/:id', // all param segments
-    ])
-  })
-})
diff --git a/src/core/tree.ts b/src/core/tree.ts
index 1e02e3592..6b5e9f51e 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -314,20 +314,52 @@ export class TreeNode {
    * Generates a regexp based on this node and its parents. This regexp is used by the custom resolver
    */
   get regexp(): string {
-    let re = ''
     let node: TreeNode | undefined = this
+    // we build the node list from parent to child
+    const nodeList: TreeNode[] = []
+    while (node && !node.isRoot()) {
+      nodeList.unshift(node)
+      node = node.parent
+    }
 
-    while (node) {
-      if (node.value.isParam() && node.value.re) {
-        re = node.value.re + (re ? '\\/' : '') + re
+    let re = ''
+    for (var i = 0; i < nodeList.length; i++) {
+      node = nodeList[i]!
+      if (node.value.isParam()) {
+        var nodeRe = node.value.re
+        // Ensure we add a connecting slash
+        // if we already have something in the regexp and if the only part of
+        // the segment is an optional param, then the / must be put inside the
+        // non-capturing group
+        if (
+          // if we have a segment before or after
+          (re || i < nodeList.length - 1) &&
+          // if the only part of the segment is an optional (can be repeatable) param
+          node.value.subSegments.length === 1 &&
+          (node.value.subSegments.at(0) as TreePathParam).optional
+        ) {
+          // TODO: tweak if trailingSlash
+          re += `(?:\\/${
+            // we remove the ? at the end because we add it later
+            nodeRe.slice(0, -1)
+          })?`
+        } else {
+          re += (re ? '\\/' : '') + nodeRe
+        }
       } else {
-        re = escapeRegex(node.value.pathSegment) + (re ? '\\/' : '') + re
+        re += (re ? '\\/' : '') + escapeRegex(node.value.pathSegment)
       }
-
-      node = node.parent
     }
 
-    return '/^' + re + '$/i'
+    // TODO: trailingSlash
+    return (
+      '/^' +
+      // Avoid adding a leading slash if the first segment
+      // is an optional segment that already includes it
+      (re.startsWith('(?:\\/') ? '' : '\\/') +
+      re +
+      '$/i'
+    )
   }
 
   get score(): number[][] {
@@ -370,7 +402,7 @@ export class TreeNode {
       if (subSegments.length > 1) {
         parts.unshift(
           node.value.subSegments.map(
-            (segment) => (typeof segment === 'string' ? segment : 0) /* param */
+            (segment) => (typeof segment === 'string' ? segment : 1) /* param */
           )
         )
       } else if (subSegments.length === 1) {
diff --git a/src/core/treeNodeValue.ts b/src/core/treeNodeValue.ts
index d303eacf5..60616d78c 100644
--- a/src/core/treeNodeValue.ts
+++ b/src/core/treeNodeValue.ts
@@ -391,18 +391,28 @@ export class TreeNodeValueParam extends _TreeNodeValueBase {
   }
 
   get re(): string {
-    return this.subSegments
+    const paramRe = this.subSegments
       .filter(Boolean)
       .map((segment) => {
         if (typeof segment === 'string') {
           return escapeRegex(segment)
         }
-        return segment.isSplat
-          ? '(.*)'
-          : (segment.repeatable ? '(.+?)' : '([^/]+?)') +
-              (segment.optional ? '?' : '')
+
+        if (segment.isSplat) {
+          return '(.*)'
+        }
+
+        let re = segment.repeatable ? '(.+?)' : '([^/]+?)'
+
+        if (segment.optional) {
+          re += '?'
+        }
+
+        return re
       })
       .join('')
+
+    return paramRe
   }
 
   override toString(): string {
diff --git a/src/core/utils.ts b/src/core/utils.ts
index cac6247d4..cd69c96f4 100644
--- a/src/core/utils.ts
+++ b/src/core/utils.ts
@@ -330,6 +330,22 @@ export class ImportsMap {
     return this
   }
 
+  /**
+   * Check if the given path has the given import name.
+   *
+   * @param path - the path to check
+   * @param name - the import name to check
+   */
+  has(path: string, name: string): boolean {
+    return this.map.has(path) && this.map.get(path)!.has(name)
+  }
+
+  /**
+   * Add a default import. Alias for `add(path, { name: 'default', as })`.
+   *
+   * @param path - the path to import from
+   * @param as - the name to import as
+   */
   addDefault(path: string, as: string): this {
     return this.add(path, { name: 'default', as })
   }

From 1a9cdb2eb2bb2adb37d6ab06f40188def3632d67 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 29 Aug 2025 11:25:20 +0200
Subject: [PATCH 72/81] test: layouts

---
 src/codegen/generateRouteResolver.spec.ts | 94 +++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index c1f7cbbd9..466eb5840 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -818,6 +818,100 @@ describe('generateRouteResolver', () => {
     `)
   })
 
+  it('generates correct nested layouts', () => {
+    const tree = new PrefixTree(DEFAULT_OPTIONS)
+    const importsMap = new ImportsMap()
+    tree.insert('a', 'a.vue')
+    tree.insert('a/(a-home)', 'a/(a-home).vue')
+    tree.insert('a/b', 'a/b.vue')
+    tree.insert('a/b/c', 'a/b/c.vue')
+    tree.insert('a/b/(b-home)', 'a/b/(b-home).vue')
+    tree.insert('a/d', 'a/d.vue')
+    tree.insert('a/b/e', 'a/b/e.vue')
+
+    const resolver = generateRouteResolver(
+      tree,
+      DEFAULT_OPTIONS,
+      importsMap,
+      new Map()
+    )
+
+    // FIXME: there are conflicting paths here. The order is correct as nested routes appear higher but
+    // it should appeand a trailing slash to the children route or the parent
+    // Adding it to the parent makes the routing stable but also inconsistent trailing slash
+    // I think it's better to not have a stable routing to preserve stable trailing slash
+
+    expect(resolver).toMatchInlineSnapshot(`
+      "
+      const r_0 = normalizeRouteRecord({
+        name: '/a',
+        path: new MatcherPatternPathStatic('/a'),
+        components: {
+          'default': () => import('a.vue')
+        },
+      })
+      const r_1 = normalizeRouteRecord({
+        name: '/a/(a-home)',
+        path: new MatcherPatternPathStatic('/a'),
+        components: {
+          'default': () => import('a/(a-home).vue')
+        },
+        parent: r_0,
+      })
+      const r_2 = normalizeRouteRecord({
+        name: '/a/b',
+        path: new MatcherPatternPathStatic('/a/b'),
+        components: {
+          'default': () => import('a/b.vue')
+        },
+        parent: r_0,
+      })
+      const r_3 = normalizeRouteRecord({
+        name: '/a/b/(b-home)',
+        path: new MatcherPatternPathStatic('/a/b'),
+        components: {
+          'default': () => import('a/b/(b-home).vue')
+        },
+        parent: r_2,
+      })
+      const r_4 = normalizeRouteRecord({
+        name: '/a/b/c',
+        path: new MatcherPatternPathStatic('/a/b/c'),
+        components: {
+          'default': () => import('a/b/c.vue')
+        },
+        parent: r_2,
+      })
+      const r_5 = normalizeRouteRecord({
+        name: '/a/b/e',
+        path: new MatcherPatternPathStatic('/a/b/e'),
+        components: {
+          'default': () => import('a/b/e.vue')
+        },
+        parent: r_2,
+      })
+      const r_6 = normalizeRouteRecord({
+        name: '/a/d',
+        path: new MatcherPatternPathStatic('/a/d'),
+        components: {
+          'default': () => import('a/d.vue')
+        },
+        parent: r_0,
+      })
+
+      export const resolver = createFixedResolver([
+        r_3,  // /a/b
+        r_4,  // /a/b/c
+        r_5,  // /a/b/e
+        r_1,  // /a
+        r_2,  // /a/b
+        r_6,  // /a/d
+        r_0,  // /a
+      ])
+      "
+    `)
+  })
+
   describe('route prioritization in resolver', () => {
     function getRouteOrderFromResolver(tree: PrefixTree): string[] {
       const resolver = generateRouteResolver(

From 191b4544ae36d2d7742f451ad72a77d82f33ffc3 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 29 Aug 2025 14:51:38 +0200
Subject: [PATCH 73/81] test: improve tests for regexp

---
 src/codegen/generateRouteResolver.spec.ts | 498 ----------------------
 src/core/tree.spec.ts                     | 217 ++++++++++
 2 files changed, 217 insertions(+), 498 deletions(-)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index 466eb5840..ad3875b00 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -4,7 +4,6 @@ import { resolveOptions } from '../options'
 import {
   generateRouteResolver,
   generateRouteRecord,
-  generateRouteRecordPath,
   generateRouteRecordQuery,
 } from './generateRouteResolver'
 import { ImportsMap } from '../core/utils'
@@ -23,503 +22,6 @@ beforeEach(() => {
   }
 })
 
-describe('generateRouteRecordPath', () => {
-  let importsMap!: ImportsMap
-  beforeEach(() => {
-    importsMap = new ImportsMap()
-  })
-
-  it('generates static paths', () => {
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a', 'a.vue')
-    expect(
-      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
-    ).toBe(`path: new MatcherPatternPathStatic('/a'),`)
-  })
-
-  it('works with multiple segments', () => {
-    const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/b/c', 'a/b/c.vue')
-    expect(
-      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
-    ).toBe(`path: new MatcherPatternPathStatic('/a/b/c'),`)
-  })
-
-  // TODO: we need to figure out an option for this
-  it.todo('keeps trailing slashes', () => {
-    const node = new PrefixTree({
-      ...DEFAULT_OPTIONS,
-      // trailingSlash: 'always',
-    }).insert('a', 'a.vue')
-    expect(
-      generateRouteRecordPath({ importsMap, node, paramParsersMap: new Map() })
-    ).toBe(`path: new MatcherPatternPathStatic('/a/'),`)
-  })
-
-  describe('basic params [id] in all positions', () => {
-    it('only segment', () => {
-      const node = new PrefixTree(DEFAULT_OPTIONS).insert('[id]', '[id].vue')
-      expect(
-        generateRouteRecordPath({
-          importsMap,
-          node,
-          paramParsersMap: new Map(),
-        })
-      ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^\\/([^/]+?)$/i,
-            {
-              id: [/* no parser */],
-            },
-            [1],
-            /* trailingSlash */
-          ),"
-      `)
-    })
-
-    it('first position', () => {
-      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-        '[id]/static',
-        '[id]/static.vue'
-      )
-      expect(
-        generateRouteRecordPath({
-          importsMap,
-          node,
-          paramParsersMap: new Map(),
-        })
-      ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^\\/([^/]+?)\\/static$/i,
-            {
-              id: [/* no parser */],
-            },
-            [1,"static"],
-            /* trailingSlash */
-          ),"
-      `)
-    })
-
-    it('middle position', () => {
-      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-        'static/[id]/more',
-        'static/[id]/more.vue'
-      )
-      expect(
-        generateRouteRecordPath({
-          importsMap,
-          node,
-          paramParsersMap: new Map(),
-        })
-      ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^\\/static\\/([^/]+?)\\/more$/i,
-            {
-              id: [/* no parser */],
-            },
-            ["static",1,"more"],
-            /* trailingSlash */
-          ),"
-      `)
-    })
-
-    it('last position', () => {
-      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-        'static/[id]',
-        'static/[id].vue'
-      )
-      expect(
-        generateRouteRecordPath({
-          importsMap,
-          node,
-          paramParsersMap: new Map(),
-        })
-      ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^\\/static\\/([^/]+?)$/i,
-            {
-              id: [/* no parser */],
-            },
-            ["static",1],
-            /* trailingSlash */
-          ),"
-      `)
-    })
-
-    describe('optional params [[id]] in all positions', () => {
-      it('only segment', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          '[[id]]',
-          '[[id]].vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^\\/([^/]+?)?$/i,
-            {
-              id: [/* no parser */, /* repeatable: false */, /* optional: */ true],
-            },
-            [1],
-            /* trailingSlash */
-          ),"
-      `)
-      })
-
-      it('first position', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          '[[id]]/static',
-          '[[id]]/static.vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^(?:\\/([^/]+?))?\\/static$/i,
-            {
-              id: [/* no parser */, /* repeatable: false */, /* optional: */ true],
-            },
-            [1,"static"],
-            /* trailingSlash */
-          ),"
-      `)
-      })
-
-      it('middle position', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          'static/[[id]]/more',
-          'static/[[id]]/more.vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^\\/static(?:\\/([^/]+?))?\\/more$/i,
-            {
-              id: [/* no parser */, /* repeatable: false */, /* optional: */ true],
-            },
-            ["static",1,"more"],
-            /* trailingSlash */
-          ),"
-      `)
-      })
-
-      it('last position', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          'static/[[id]]',
-          'static/[[id]].vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-          "path: new MatcherPatternPathDynamic(
-              /^\\/static(?:\\/([^/]+?))?$/i,
-              {
-                id: [/* no parser */, /* repeatable: false */, /* optional: */ true],
-              },
-              ["static",1],
-              /* trailingSlash */
-            ),"
-        `)
-      })
-    })
-
-    describe('repeatable params [id]+ in all positions', () => {
-      it('only segment', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          '[id]+',
-          '[id]+.vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^\\/(.+?)$/i,
-            {
-              id: [/* no parser */, /* repeatable: */ true],
-            },
-            [1],
-            /* trailingSlash */
-          ),"
-      `)
-      })
-
-      it('first position', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          '[id]+/static',
-          '[id]+/static.vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^\\/(.+?)\\/static$/i,
-            {
-              id: [/* no parser */, /* repeatable: */ true],
-            },
-            [1,"static"],
-            /* trailingSlash */
-          ),"
-      `)
-      })
-
-      it('middle position', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          'static/[id]+/more',
-          'static/[id]+/more.vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^\\/static\\/(.+?)\\/more$/i,
-            {
-              id: [/* no parser */, /* repeatable: */ true],
-            },
-            ["static",1,"more"],
-            /* trailingSlash */
-          ),"
-      `)
-      })
-
-      it('last position', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          'static/[id]+',
-          'static/[id]+.vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-          "path: new MatcherPatternPathDynamic(
-              /^\\/static\\/(.+?)$/i,
-              {
-                id: [/* no parser */, /* repeatable: */ true],
-              },
-              ["static",1],
-              /* trailingSlash */
-            ),"
-        `)
-      })
-    })
-
-    describe('optional repeatable params [[id]]+ in all positions', () => {
-      it('only segment', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          '[[id]]+',
-          '[[id]]+.vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^\\/(.+?)?$/i,
-            {
-              id: [/* no parser */, /* repeatable: */ true, /* optional: */ true],
-            },
-            [1],
-            /* trailingSlash */
-          ),"
-      `)
-      })
-
-      it('first position', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          '[[id]]+/static',
-          '[[id]]+/static.vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^(?:\\/(.+?))?\\/static$/i,
-            {
-              id: [/* no parser */, /* repeatable: */ true, /* optional: */ true],
-            },
-            [1,"static"],
-            /* trailingSlash */
-          ),"
-      `)
-      })
-
-      it('middle position', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          'static/[[id]]+/more',
-          'static/[[id]]+/more.vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-        "path: new MatcherPatternPathDynamic(
-            /^\\/static(?:\\/(.+?))?\\/more$/i,
-            {
-              id: [/* no parser */, /* repeatable: */ true, /* optional: */ true],
-            },
-            ["static",1,"more"],
-            /* trailingSlash */
-          ),"
-      `)
-      })
-
-      it('last position', () => {
-        const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-          'static/[[id]]+',
-          'static/[[id]]+.vue'
-        )
-        expect(
-          generateRouteRecordPath({
-            importsMap,
-            node,
-            paramParsersMap: new Map(),
-          })
-        ).toMatchInlineSnapshot(`
-          "path: new MatcherPatternPathDynamic(
-              /^\\/static(?:\\/(.+?))?$/i,
-              {
-                id: [/* no parser */, /* repeatable: */ true, /* optional: */ true],
-              },
-              ["static",1],
-              /* trailingSlash */
-            ),"
-        `)
-      })
-    })
-
-    it('works with multiple params', () => {
-      const node = new PrefixTree(DEFAULT_OPTIONS).insert('a/[b]/[c]', 'a.vue')
-      expect(
-        generateRouteRecordPath({
-          importsMap,
-          node,
-          paramParsersMap: new Map(),
-        })
-      ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathDynamic(
-          /^\\/a\\/([^/]+?)\\/([^/]+?)$/i,
-          {
-            b: [/* no parser */],
-            c: [/* no parser */],
-          },
-          ["a",1,1],
-          /* trailingSlash */
-        ),"
-    `)
-    })
-
-    it('works with segments', () => {
-      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-        'a/a-[b]-c-[d]',
-        'a.vue'
-      )
-      expect(
-        generateRouteRecordPath({
-          importsMap,
-          node,
-          paramParsersMap: new Map(),
-        })
-      ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathDynamic(
-          /^\\/a\\/a-([^/]+?)-c-([^/]+?)$/i,
-          {
-            b: [/* no parser */],
-            d: [/* no parser */],
-          },
-          ["a",["a-",1,"-c-",1]],
-          /* trailingSlash */
-        ),"
-    `)
-    })
-
-    it('works with a catch all route', () => {
-      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-        '[...all]',
-        '[...all].vue'
-      )
-      expect(
-        generateRouteRecordPath({
-          importsMap,
-          node,
-          paramParsersMap: new Map(),
-        })
-      ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathDynamic(
-          /^\\/(.*)$/i,
-          {
-            all: [/* no parser */],
-          },
-          [0],
-          null,
-        ),"
-    `)
-    })
-
-    it('works with a splat param with a prefix', () => {
-      const node = new PrefixTree(DEFAULT_OPTIONS).insert(
-        'a/some-[id]/[...all]',
-        'a/some-[id]/[...all].vue'
-      )
-      expect(
-        generateRouteRecordPath({
-          importsMap,
-          node,
-          paramParsersMap: new Map(),
-        })
-      ).toMatchInlineSnapshot(`
-      "path: new MatcherPatternPathDynamic(
-          /^\\/a\\/some-([^/]+?)\\/(.*)$/i,
-          {
-            id: [/* no parser */],
-            all: [/* no parser */],
-          },
-          ["a",["some-",1],0],
-          null,
-        ),"
-    `)
-    })
-  })
-})
-
 describe('generateRouteRecordQuery', () => {
   let importsMap!: ImportsMap
   beforeEach(() => {
diff --git a/src/core/tree.spec.ts b/src/core/tree.spec.ts
index f84840574..c8688ff69 100644
--- a/src/core/tree.spec.ts
+++ b/src/core/tree.spec.ts
@@ -651,6 +651,223 @@ describe('Tree', () => {
     expect(`"(home" is missing the closing ")"`).toHaveBeenWarned()
   })
 
+  describe('path regexp', () => {
+    it('generates static paths', () => {
+      const node = new PrefixTree(RESOLVED_OPTIONS).insert('a', 'a.vue')
+      expect(node.regexp).toBe('/^\\/a$/i')
+    })
+
+    it('works with multiple segments', () => {
+      const node = new PrefixTree(RESOLVED_OPTIONS).insert('a/b/c', 'a/b/c.vue')
+      expect(node.regexp).toBe('/^\\/a\\/b\\/c$/i')
+    })
+
+    describe('basic params [id] in all positions', () => {
+      it('only segment', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert('[id]', '[id].vue')
+        expect(node.regexp).toBe('/^\\/([^/]+?)$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([1])
+      })
+
+      it('first position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          '[id]/static',
+          '[id]/static.vue'
+        )
+        expect(node.regexp).toBe('/^\\/([^/]+?)\\/static$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([1, 'static'])
+      })
+
+      it('middle position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          'static/[id]/more',
+          'static/[id]/more.vue'
+        )
+        expect(node.regexp).toBe('/^\\/static\\/([^/]+?)\\/more$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([
+          'static',
+          1,
+          'more',
+        ])
+      })
+
+      it('last position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          'static/[id]',
+          'static/[id].vue'
+        )
+        expect(node.regexp).toBe('/^\\/static\\/([^/]+?)$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual(['static', 1])
+      })
+    })
+
+    describe('optional params [[id]] in all positions', () => {
+      it('only segment', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          '[[id]]',
+          '[[id]].vue'
+        )
+        expect(node.regexp).toBe('/^\\/([^/]+?)?$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([1])
+      })
+
+      it('first position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          '[[id]]/static',
+          '[[id]]/static.vue'
+        )
+        expect(node.regexp).toBe('/^(?:\\/([^/]+?))?\\/static$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([1, 'static'])
+      })
+
+      it('middle position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          'static/[[id]]/more',
+          'static/[[id]]/more.vue'
+        )
+        expect(node.regexp).toBe('/^\\/static(?:\\/([^/]+?))?\\/more$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([
+          'static',
+          1,
+          'more',
+        ])
+      })
+
+      it('last position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          'static/[[id]]',
+          'static/[[id]].vue'
+        )
+        expect(node.regexp).toBe('/^\\/static(?:\\/([^/]+?))?$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual(['static', 1])
+      })
+    })
+
+    describe('repeatable params [id]+ in all positions', () => {
+      it('only segment', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          '[id]+',
+          '[id]+.vue'
+        )
+        expect(node.regexp).toBe('/^\\/(.+?)$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([1])
+      })
+
+      it('first position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          '[id]+/static',
+          '[id]+/static.vue'
+        )
+        expect(node.regexp).toBe('/^\\/(.+?)\\/static$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([1, 'static'])
+      })
+
+      it('middle position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          'static/[id]+/more',
+          'static/[id]+/more.vue'
+        )
+        expect(node.regexp).toBe('/^\\/static\\/(.+?)\\/more$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([
+          'static',
+          1,
+          'more',
+        ])
+      })
+
+      it('last position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          'static/[id]+',
+          'static/[id]+.vue'
+        )
+        expect(node.regexp).toBe('/^\\/static\\/(.+?)$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual(['static', 1])
+      })
+    })
+
+    describe('optional repeatable params [[id]]+ in all positions', () => {
+      it('only segment', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          '[[id]]+',
+          '[[id]]+.vue'
+        )
+        expect(node.regexp).toBe('/^\\/(.+?)?$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([1])
+      })
+
+      it('first position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          '[[id]]+/static',
+          '[[id]]+/static.vue'
+        )
+        expect(node.regexp).toBe('/^(?:\\/(.+?))?\\/static$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([1, 'static'])
+      })
+
+      it('middle position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          'static/[[id]]+/more',
+          'static/[[id]]+/more.vue'
+        )
+        expect(node.regexp).toBe('/^\\/static(?:\\/(.+?))?\\/more$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual([
+          'static',
+          1,
+          'more',
+        ])
+      })
+
+      it('last position', () => {
+        const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+          'static/[[id]]+',
+          'static/[[id]]+.vue'
+        )
+        expect(node.regexp).toBe('/^\\/static(?:\\/(.+?))?$/i')
+        expect(node.matcherPatternPathDynamicParts).toEqual(['static', 1])
+      })
+    })
+
+    it('works with multiple params', () => {
+      const node = new PrefixTree(RESOLVED_OPTIONS).insert('a/[b]/[c]', 'a.vue')
+      expect(node.regexp).toBe('/^\\/a\\/([^/]+?)\\/([^/]+?)$/i')
+      expect(node.matcherPatternPathDynamicParts).toEqual(['a', 1, 1])
+    })
+
+    it('works with segments', () => {
+      const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+        'a/a-[b]-c-[d]',
+        'a.vue'
+      )
+      expect(node.regexp).toBe('/^\\/a\\/a-([^/]+?)-c-([^/]+?)$/i')
+      expect(node.matcherPatternPathDynamicParts).toEqual([
+        'a',
+        ['a-', 1, '-c-', 1],
+      ])
+    })
+
+    it('works with a catch all route', () => {
+      const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+        '[...all]',
+        '[...all].vue'
+      )
+      expect(node.regexp).toBe('/^\\/(.*)$/i')
+      expect(node.matcherPatternPathDynamicParts).toEqual([0])
+    })
+
+    it('works with a splat param with a prefix', () => {
+      const node = new PrefixTree(RESOLVED_OPTIONS).insert(
+        'a/some-[id]/[...all]',
+        'a/some-[id]/[...all].vue'
+      )
+      expect(node.regexp).toBe('/^\\/a\\/some-([^/]+?)\\/(.*)$/i')
+      expect(node.matcherPatternPathDynamicParts).toEqual([
+        'a',
+        ['some-', 1],
+        0,
+      ])
+    })
+  })
+
   // TODO: check warns with different order
   it.todo(`warns when a group's path conflicts with an existing file`)
 

From b54ec25b50e13bb8e30221aec8cf4df2dfef6afd Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 30 Aug 2025 22:02:29 +0200
Subject: [PATCH 74/81] test: typo

---
 src/codegen/generateRouteResolver.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/codegen/generateRouteResolver.spec.ts b/src/codegen/generateRouteResolver.spec.ts
index ad3875b00..2808183b2 100644
--- a/src/codegen/generateRouteResolver.spec.ts
+++ b/src/codegen/generateRouteResolver.spec.ts
@@ -472,7 +472,7 @@ describe('generateRouteResolver', () => {
         'prefix/sub-[[opt]]-end/suffix',
         'prefix/sub-[[opt]]-end/suffix.vue'
       )
-      tree.insert('prefix/sub-[id]/suffix', 'prefix/static-[id]/suffix.vue')
+      tree.insert('prefix/sub-[id]/suffix', 'prefix/sub-[id]/suffix.vue')
       tree.insert('prefix/sub-[[opt]]/suffix', 'prefix/sub-[[opt]]/suffix.vue')
 
       expect(getRouteOrderFromResolver(tree)).toEqual([

From 067d3ef3a87bdc6fca7cccbfd5d1c811f878d74c Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sat, 30 Aug 2025 22:04:26 +0200
Subject: [PATCH 75/81] refactor: simplify branch

---
 src/core/tree.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/core/tree.ts b/src/core/tree.ts
index 6b5e9f51e..66633fada 100644
--- a/src/core/tree.ts
+++ b/src/core/tree.ts
@@ -400,11 +400,7 @@ export class TreeNode {
       )
 
       if (subSegments.length > 1) {
-        parts.unshift(
-          node.value.subSegments.map(
-            (segment) => (typeof segment === 'string' ? segment : 1) /* param */
-          )
-        )
+        parts.unshift(subSegments)
       } else if (subSegments.length === 1) {
         parts.unshift(subSegments[0]!)
       }

From c19544206aa0b00a1a6d242d5850c3b1d72d5139 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 18 Sep 2025 14:14:53 +0200
Subject: [PATCH 76/81] chore: up router

---
 package.json                         |  2 +-
 playground-experimental/package.json |  2 +-
 pnpm-lock.yaml                       | 22 +++++++++++-----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 17de35f45..a2ff8009b 100644
--- a/package.json
+++ b/package.json
@@ -205,7 +205,7 @@
     "vitepress-plugin-llms": "^1.7.5",
     "vitest": "^3.2.4",
     "vue": "^3.5.21",
-    "vue-router": "https://pkg.pr.new/vue-router@ecd1303",
+    "vue-router": "https://pkg.pr.new/vue-router@7d6164a",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index c44883a44..a2ff2fd22 100644
--- a/playground-experimental/package.json
+++ b/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@ecd1303"
+    "vue-router": "https://pkg.pr.new/vue-router@7d6164a"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a0774afe2..d6be37818 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -175,11 +175,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@ecd1303
-        version: https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@7d6164a
+        version: https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -267,8 +267,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@ecd1303
-        version: https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@7d6164a
+        version: https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -6872,11 +6872,11 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@https://pkg.pr.new/vue-router@ecd1303:
-    resolution: {tarball: https://pkg.pr.new/vue-router@ecd1303}
+  vue-router@https://pkg.pr.new/vue-router@7d6164a:
+    resolution: {tarball: https://pkg.pr.new/vue-router@7d6164a}
     version: 4.5.1
     peerDependencies:
-      vue: ^3.2.0
+      vue: ^3.5.0
 
   vue-tsc@2.2.10:
     resolution: {integrity: sha512-jWZ1xSaNbabEV3whpIDMbjVSVawjAyW+x1n3JeGQo7S0uv2n9F/JMgWW90tGWNFRKya4YwKMZgCtr0vRAM7DeQ==}
@@ -14586,17 +14586,17 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@https://pkg.pr.new/vue-router@ecd1303(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)

From f463ebf9d4c1ef9307cd66cf7ad9c4ea48a5cb11 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 18 Sep 2025 17:45:26 +0200
Subject: [PATCH 77/81] feat: allow function in default

---
 src/runtime.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/runtime.ts b/src/runtime.ts
index d2682c77b..1371400f2 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -101,9 +101,7 @@ export interface DefinePageQueryParamOptions<T = unknown> {
    * (e.g. a invalid number is passed to the int param parser). If not provided
    * and the param parser throws, the route will not match.
    */
-  default?: T
-  // TODO: handle function syntax
-  // default?: (() => T) | T
+  default?: (() => T) | T
 
   /**
    * How to format the query parameter value.

From 060a79a1d1b77e01685c5c43f60d3c3774ef4dd0 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 18 Sep 2025 17:45:35 +0200
Subject: [PATCH 78/81] refactor: remove deprecated method

---
 src/runtime.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/runtime.ts b/src/runtime.ts
index 1371400f2..f34adb9b0 100644
--- a/src/runtime.ts
+++ b/src/runtime.ts
@@ -1,13 +1,5 @@
 import type { RouteRecordRaw, TypesConfig } from 'vue-router'
 
-/**
- * Defines properties of the route for the current page component.
- *
- * @param route - route information to be added to this page
- * @deprecated - use `definePage` instead
- */
-export const _definePage = (route: DefinePage) => route
-
 /**
  * Defines properties of the route for the current page component.
  *

From 2bb43d46edc27ca94cae1b160f3d965df3d44b4c Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 24 Sep 2025 15:43:18 +0200
Subject: [PATCH 79/81] chore: up vue-macros

Close #726
---
 package.json   |  2 +-
 pnpm-lock.yaml | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index a2ff8009b..0789f858a 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
   },
   "dependencies": {
     "@babel/generator": "^7.28.3",
-    "@vue-macros/common": "3.0.0",
+    "@vue-macros/common": "^3.0.0",
     "@vue/language-core": "^3.0.7",
     "ast-walker-scope": "^0.8.2",
     "chokidar": "^4.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d6be37818..70fdf69cd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,8 +12,8 @@ importers:
         specifier: ^7.28.3
         version: 7.28.3
       '@vue-macros/common':
-        specifier: 3.0.0
-        version: 3.0.0(vue@3.5.21(typescript@5.9.2))
+        specifier: ^3.0.0
+        version: 3.1.0(vue@3.5.21(typescript@5.9.2))
       '@vue/compiler-sfc':
         specifier: ^3.5.17
         version: 3.5.18
@@ -2518,18 +2518,18 @@ packages:
   '@volar/typescript@2.4.23':
     resolution: {integrity: sha512-lAB5zJghWxVPqfcStmAP1ZqQacMpe90UrP5RJ3arDyrhy4aCUQqmxPPLB2PWDKugvylmO41ljK7vZ+t6INMTag==}
 
-  '@vue-macros/common@3.0.0':
-    resolution: {integrity: sha512-WwzEv0Ky/HSGR/oZnh+pHJi8yvxW83XRQGIsKsn6t5MiF+KsHoMPuqJdm1VoGNJAuTqJtd1ZGSznnZKPMSKC8w==}
-    engines: {node: '>=20.19.0'}
+  '@vue-macros/common@3.0.0-beta.15':
+    resolution: {integrity: sha512-DMgq/rIh1H20WYNWU7krIbEfJRYDDhy7ix64GlT4AVUJZZWCZ5pxiYVJR3A3GmWQPkn7Pg7i3oIiGqu4JGC65w==}
+    engines: {node: '>=20.18.0'}
     peerDependencies:
       vue: ^2.7.0 || ^3.2.25
     peerDependenciesMeta:
       vue:
         optional: true
 
-  '@vue-macros/common@3.0.0-beta.15':
-    resolution: {integrity: sha512-DMgq/rIh1H20WYNWU7krIbEfJRYDDhy7ix64GlT4AVUJZZWCZ5pxiYVJR3A3GmWQPkn7Pg7i3oIiGqu4JGC65w==}
-    engines: {node: '>=20.18.0'}
+  '@vue-macros/common@3.1.0':
+    resolution: {integrity: sha512-YGpEYYfFkjQY0ZbtOX90KuxRs0JHLsMizxvArzemn4Uwc0X7iLIs/+8RETgnQgGyBenJU5CZW5qVGiedKA3j2g==}
+    engines: {node: '>=20.19.0'}
     peerDependencies:
       vue: ^2.7.0 || ^3.2.25
     peerDependenciesMeta:
@@ -9447,25 +9447,25 @@ snapshots:
       path-browserify: 1.0.1
       vscode-uri: 3.1.0
 
-  '@vue-macros/common@3.0.0(vue@3.5.21(typescript@5.9.2))':
+  '@vue-macros/common@3.0.0-beta.15(vue@3.5.18(typescript@5.9.2))':
     dependencies:
       '@vue/compiler-sfc': 3.5.21
       ast-kit: 2.1.2
       local-pkg: 1.1.2
       magic-string-ast: 1.0.2
-      unplugin-utils: 0.3.0
+      unplugin-utils: 0.2.5
     optionalDependencies:
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.18(typescript@5.9.2)
 
-  '@vue-macros/common@3.0.0-beta.15(vue@3.5.18(typescript@5.9.2))':
+  '@vue-macros/common@3.1.0(vue@3.5.21(typescript@5.9.2))':
     dependencies:
       '@vue/compiler-sfc': 3.5.21
       ast-kit: 2.1.2
       local-pkg: 1.1.2
       magic-string-ast: 1.0.2
-      unplugin-utils: 0.2.5
+      unplugin-utils: 0.3.0
     optionalDependencies:
-      vue: 3.5.18(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.9.2)
 
   '@vue/babel-helper-vue-transform-on@1.4.0': {}
 

From 5615002992ac88ff282bda4504e4990c1b1bdeab Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 25 Sep 2025 17:25:36 +0200
Subject: [PATCH 80/81] feat: type custom params

---
 client.d.ts                               |   2 +
 playground-experimental/typed-router.d.ts |   4 +
 playground/typed-router.d.ts              |   4 +
 src/codegen/generateDTS.ts                |   8 +-
 src/codegen/generateParamParsers.spec.ts  | 104 ++++++++++++++++++++++
 src/codegen/generateParamParsers.ts       |  16 ++++
 src/core/context.ts                       |   2 +
 7 files changed, 139 insertions(+), 1 deletion(-)

diff --git a/client.d.ts b/client.d.ts
index cfd519568..266ece901 100644
--- a/client.d.ts
+++ b/client.d.ts
@@ -34,9 +34,11 @@ declare module 'vue-router/auto-routes' {
 
 declare module 'vue-router' {
   import type { RouteNamedMap } from 'vue-router/auto-routes'
+  import type { ParamParserCustom } from 'vue-router/auto-resolver'
 
   export interface TypesConfig {
     RouteNamedMap: RouteNamedMap
+    ParamParsers: ParamParserCustom
   }
 }
 
diff --git a/playground-experimental/typed-router.d.ts b/playground-experimental/typed-router.d.ts
index 36ebdcc52..575766309 100644
--- a/playground-experimental/typed-router.d.ts
+++ b/playground-experimental/typed-router.d.ts
@@ -8,6 +8,10 @@
 // Custom route params parsers
 type Param_date = ReturnType<NonNullable<typeof import('./src/params/date.ts').parser['get']>>
 
+declare module 'vue-router/auto-resolver' {
+  export type ParamParserCustom = 'date'
+}
+
 declare module 'vue-router/auto-routes' {
   import type {
     RouteRecordInfo,
diff --git a/playground/typed-router.d.ts b/playground/typed-router.d.ts
index c4b6e56f2..46d7baf0a 100644
--- a/playground/typed-router.d.ts
+++ b/playground/typed-router.d.ts
@@ -5,6 +5,10 @@
 // It's recommended to commit this file.
 // Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.
 
+declare module 'vue-router/auto-resolver' {
+  export type ParamParserCustom = never
+}
+
 declare module 'vue-router/auto-routes' {
   import type {
     RouteRecordInfo,
diff --git a/src/codegen/generateDTS.ts b/src/codegen/generateDTS.ts
index ce3a1818e..f61df7fae 100644
--- a/src/codegen/generateDTS.ts
+++ b/src/codegen/generateDTS.ts
@@ -20,11 +20,13 @@ export function generateDTS({
   routeNamedMap,
   routeFileInfoMap,
   paramsTypesDeclaration,
+  customParamsType,
 }: {
   routesModule: string
   routeNamedMap: string
   routeFileInfoMap: string
   paramsTypesDeclaration: string
+  customParamsType: string
 }) {
   return ts`
 /* eslint-disable */
@@ -42,7 +44,11 @@ ${paramsTypesDeclaration}
 
 `.trimStart()
     : ''
-}declare module '${routesModule}' {
+}declare module 'vue-router/auto-resolver' {
+  export type ParamParserCustom = ${customParamsType}
+}
+
+declare module '${routesModule}' {
   import type {
     RouteRecordInfo,
     ParamValue,
diff --git a/src/codegen/generateParamParsers.spec.ts b/src/codegen/generateParamParsers.spec.ts
index 9ec390a13..9a36879d0 100644
--- a/src/codegen/generateParamParsers.spec.ts
+++ b/src/codegen/generateParamParsers.spec.ts
@@ -5,6 +5,7 @@ import {
   generateParamsTypes,
   generateParamParserOptions,
   generatePathParamsOptions,
+  generateParamParserCustomType,
   type ParamParsersMap,
 } from './generateParamParsers'
 import { PrefixTree } from '../core/tree'
@@ -464,3 +465,106 @@ describe('generatePathParamsOptions', () => {
     expect(result).toContain('tags: [/* no parser */, /* repeatable: */ true]')
   })
 })
+
+describe('generateParamParserCustomType', () => {
+  it('returns never for empty param parsers map', () => {
+    const paramParsers: ParamParsersMap = new Map()
+    const result = generateParamParserCustomType(paramParsers)
+    expect(result).toBe('never')
+  })
+
+  it('returns single quoted parser name for one parser', () => {
+    const paramParsers: ParamParsersMap = new Map([
+      [
+        'date',
+        {
+          name: 'date',
+          typeName: 'Param_date',
+          relativePath: 'parsers/date',
+          absolutePath: '/path/to/parsers/date',
+        },
+      ],
+    ])
+
+    const result = generateParamParserCustomType(paramParsers)
+    expect(result).toBe("'date'")
+  })
+
+  it('returns union of quoted parser names for multiple parsers in alphabetical order on separate lines', () => {
+    const paramParsers: ParamParsersMap = new Map([
+      [
+        'uuid',
+        {
+          name: 'uuid',
+          typeName: 'Param_uuid',
+          relativePath: 'parsers/uuid',
+          absolutePath: '/path/to/parsers/uuid',
+        },
+      ],
+      [
+        'date',
+        {
+          name: 'date',
+          typeName: 'Param_date',
+          relativePath: 'parsers/date',
+          absolutePath: '/path/to/parsers/date',
+        },
+      ],
+    ])
+
+    const result = generateParamParserCustomType(paramParsers)
+    expect(result).toBe("  | 'date'\n  | 'uuid'")
+  })
+
+  it('handles parser names with special characters correctly', () => {
+    const paramParsers: ParamParsersMap = new Map([
+      [
+        'custom-parser',
+        {
+          name: 'custom-parser',
+          typeName: 'Param_custom-parser',
+          relativePath: 'parsers/custom-parser',
+          absolutePath: '/path/to/parsers/custom-parser',
+        },
+      ],
+    ])
+
+    const result = generateParamParserCustomType(paramParsers)
+    expect(result).toBe("'custom-parser'")
+  })
+
+  it('formats multiple parsers with proper indentation for three or more types', () => {
+    const paramParsers: ParamParsersMap = new Map([
+      [
+        'uuid',
+        {
+          name: 'uuid',
+          typeName: 'Param_uuid',
+          relativePath: 'parsers/uuid',
+          absolutePath: '/path/to/parsers/uuid',
+        },
+      ],
+      [
+        'date',
+        {
+          name: 'date',
+          typeName: 'Param_date',
+          relativePath: 'parsers/date',
+          absolutePath: '/path/to/parsers/date',
+        },
+      ],
+      [
+        'slug',
+        {
+          name: 'slug',
+          typeName: 'Param_slug',
+          relativePath: 'parsers/slug',
+          absolutePath: '/path/to/parsers/slug',
+        },
+      ],
+    ])
+
+    const result = generateParamParserCustomType(paramParsers)
+    expect(result).toBe("  | 'date'\n  | 'slug'\n  | 'uuid'")
+  })
+})
diff --git a/src/codegen/generateParamParsers.ts b/src/codegen/generateParamParsers.ts
index e24e10cf2..ef56e0e76 100644
--- a/src/codegen/generateParamParsers.ts
+++ b/src/codegen/generateParamParsers.ts
@@ -87,6 +87,22 @@ export function generateParamParserOptions(
   return ''
 }
 
+export function generateParamParserCustomType(
+  paramParsers: ParamParsersMap
+): string {
+  const parserNames = Array.from(paramParsers.keys()).sort()
+
+  if (parserNames.length === 0) {
+    return 'never'
+  }
+
+  if (parserNames.length === 1) {
+    return `'${parserNames[0]}'`
+  }
+
+  return parserNames.map((name) => `  | '${name}'`).join('\n')
+}
+
 export function generatePathParamsOptions(
   params: TreePathParam[],
   importsMap: ImportsMap,
diff --git a/src/core/context.ts b/src/core/context.ts
index 75ae089f5..a3fb8bf2b 100644
--- a/src/core/context.ts
+++ b/src/core/context.ts
@@ -25,6 +25,7 @@ import { generateRouteResolver } from '../codegen/generateRouteResolver'
 import { type FSWatcher, watch as fsWatch } from 'chokidar'
 import {
   generateParamParsersTypesDeclarations,
+  generateParamParserCustomType,
   ParamParsersMap,
   warnMissingParamParsers,
 } from '../codegen/generateParamParsers'
@@ -370,6 +371,7 @@ if (import.meta.hot) {
       }),
       paramsTypesDeclaration:
         generateParamParsersTypesDeclarations(paramParsersMap),
+      customParamsType: generateParamParserCustomType(paramParsersMap),
     })
 
     // TODO: parser auto copmlete for definePage

From 8366aae6151db0a532fb7e15cc546fa86f1a6f24 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 26 Sep 2025 17:28:36 +0200
Subject: [PATCH 81/81] chore: up deps

---
 package.json                         |  2 +-
 playground-experimental/package.json |  2 +-
 pnpm-lock.yaml                       | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 0789f858a..b6bf3d5c8 100644
--- a/package.json
+++ b/package.json
@@ -205,7 +205,7 @@
     "vitepress-plugin-llms": "^1.7.5",
     "vitest": "^3.2.4",
     "vue": "^3.5.21",
-    "vue-router": "https://pkg.pr.new/vue-router@7d6164a",
+    "vue-router": "https://pkg.pr.new/vue-router@4f1a37a",
     "vue-router-mock": "^2.0.0",
     "vue-tsc": "^3.0.7",
     "vuefire": "^3.2.2",
diff --git a/playground-experimental/package.json b/playground-experimental/package.json
index a2ff2fd22..03ec9010f 100644
--- a/playground-experimental/package.json
+++ b/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@7d6164a"
+    "vue-router": "https://pkg.pr.new/vue-router@4f1a37a"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 70fdf69cd..012ef95ba 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -175,11 +175,11 @@ importers:
         specifier: ^3.5.21
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@7d6164a
-        version: https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@4f1a37a
+        version: https://pkg.pr.new/vue-router@4f1a37a(vue@3.5.21(typescript@5.9.2))
       vue-router-mock:
         specifier: ^2.0.0
-        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 2.0.0(vue-router@https://pkg.pr.new/vue-router@4f1a37a(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
       vue-tsc:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.2)
@@ -267,8 +267,8 @@ importers:
         specifier: ^3.5.18
         version: 3.5.21(typescript@5.9.2)
       vue-router:
-        specifier: https://pkg.pr.new/vue-router@7d6164a
-        version: https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2))
+        specifier: https://pkg.pr.new/vue-router@4f1a37a
+        version: https://pkg.pr.new/vue-router@4f1a37a(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.1
@@ -6872,8 +6872,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-router@https://pkg.pr.new/vue-router@7d6164a:
-    resolution: {tarball: https://pkg.pr.new/vue-router@7d6164a}
+  vue-router@https://pkg.pr.new/vue-router@4f1a37a:
+    resolution: {tarball: https://pkg.pr.new/vue-router@4f1a37a}
     version: 4.5.1
     peerDependencies:
       vue: ^3.5.0
@@ -14586,17 +14586,17 @@ snapshots:
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
+  vue-router-mock@2.0.0(vue-router@https://pkg.pr.new/vue-router@4f1a37a(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       vue: 3.5.21(typescript@5.9.2)
-      vue-router: https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2))
+      vue-router: https://pkg.pr.new/vue-router@4f1a37a(vue@3.5.21(typescript@5.9.2))
 
   vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)
 
-  vue-router@https://pkg.pr.new/vue-router@7d6164a(vue@3.5.21(typescript@5.9.2)):
+  vue-router@https://pkg.pr.new/vue-router@4f1a37a(vue@3.5.21(typescript@5.9.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.21(typescript@5.9.2)