Merge pull request #368 from jadedevin13/main

Update path-to-regexp and don't override the params on the routes handler

.changeset/four-guests-deny.md

@@ -0,0 +1,5 @@
+---
+"@vinxi/router": patch
+---
+
+Update path-to-regexp and don't override the params on the routes handler

packages/vinxi-router/api-handler.js

@@ -1,26 +1,23 @@
-import { pathToRegexp } from "path-to-regexp";
-import { eventHandler, toWebRequest } from "vinxi/http";
+import { match } from "path-to-regexp";
+import { eventHandler, toWebRequest, setContext } from "vinxi/http";
 import fileRoutes from "vinxi/routes";
 
 const routes = [
 	...fileRoutes.map((route) => ({
 		...route,
-		handler: async (event, params) => {
+		handler: async (event) => {
 			const mod = await route.$handler.import();
-			event.context['params'] = params
 			return await mod.default(event);
 		},
 	})),
 ];
 
 function createRouter(routes) {
 	const builtRoutes = routes.map((route) => {
-		const keys = [];
-		const regexp = pathToRegexp(route.path, keys);
+		const matcher = match(route.path);
 		return {
 			...route,
-			regexp,
-			keys,
+			matcher,
 		};
 	});
 
@@ -30,14 +27,10 @@ function createRouter(routes) {
 				const url = new URL(toWebRequest(event).url);
 				const path = url.pathname.replace(import.meta.env.BASE_URL, "");
 
-				const match = route.regexp.exec(path);
+				const match = route.matcher(path)
 				if (match) {
-					const params = {};
-					for (let i = 0; i < route.keys.length; i++) {
-						params[route.keys[i].name] = match[i + 1];
-					}
 					// add params to context object
-					event.context['params'] = params
+					setContext(event, 'params', { ...match.params });
 					return await route.handler(event);
 				}
 			}

packages/vinxi-router/api.js

@@ -17,7 +17,7 @@ class APIFileSystemRouter extends BaseFileSystemRouter {
 			.replace(/index$/, "")
 			.replace(/\[([^\/]+)\]/g, (_, m) => {
 				if (m.length > 3 && m.startsWith("...")) {
-					return `:${m.slice(3)}*`;
+					return `*${m.slice(3)}`;
 				}
 				if (m.length > 2 && m.startsWith("[") && m.endsWith("]")) {
 					return `:${m.slice(1, -1)}?`;

packages/vinxi-router/package.json

@@ -9,7 +9,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "path-to-regexp": "^6.2.1",
+    "path-to-regexp": "^8.0.0",
     "vite-tsconfig-paths": "^4.2.0"
   },
   "repository": {