@vesk/vesk-cli 0.2.85 → 0.2.87

package/dist/cli.js

@@ -37422,6 +37422,15 @@ function generatePlatformHandlerSource(input) {
   const hasEvents = !!input.hasEvents;
   let imports = "";
   const routeEntries = [];
+  const routeSpecificity = (path) => {
+    if (/:path\b|:rest\b|\[\.\.\./.test(path)) return 3;
+    if (/:/.test(path)) return 2;
+    return 1;
+  };
+  const pushEntry = (path, type, handler, extra) => {
+    const entry = `{ path: ${JSON.stringify(path)}, type: '${type}', handler: ${handler}${extra}}`;
+    routeEntries.push({ path, entry, specificity: routeSpecificity(path) });
+  };
   for (const r of ssrRoutes) {
     const name = routeName2(r.fullPath.split("/").filter(Boolean));
     const id = `__ssr_${toId(name)}`;
@@ -37430,7 +37439,7 @@ function generatePlatformHandlerSource(input) {
 `;
     const revalidate2 = r._revalidate != null ? `revalidate: ${r._revalidate}, ` : "";
     const tags = r._isrTags ? `tags: ${JSON.stringify(r._isrTags)}, ` : "";
-    routeEntries.push(`{ path: ${JSON.stringify(r.fullPath)}, type: 'ssr', handler: ${id}, ${revalidate2}${tags}}`);
+    pushEntry(r.fullPath, "ssr", id, `, ${revalidate2}${tags}`);
   }
   for (const r of apiRoutes) {
     const name = apiRouteName2(r.fullPath);
@@ -37438,8 +37447,9 @@ function generatePlatformHandlerSource(input) {
     const funcPath = `./server/api/${name}.js`;
     imports += `import { handle as ${id} } from ${JSON.stringify(funcPath)};
 `;
-    routeEntries.push(`{ path: ${JSON.stringify("/api" + r.fullPath)}, type: 'api', handler: ${id} }`);
+    pushEntry("/api" + r.fullPath, "api", id, "");
   }
+  routeEntries.sort((a, b) => a.specificity - b.specificity);
   const mwImport = hasMiddleware ? "import { execute as __executeMw } from './server/middleware.js';" : "";
   const hasMwLiteral = hasMiddleware ? "true" : "false";
   const eventsImport = hasEvents ? "import { executeStart as __eventsStart, executeRequest as __eventsRequest } from './server/events.js';" : "";
@@ -37461,7 +37471,7 @@ ${eventsImport}
 ${prerenderedList}
 ${isrCache}
 ${defaultNotFoundLine}
-const __routes = [${routeEntries.join(",\n")}];
+const __routes = [${routeEntries.map((e) => e.entry).join(",\n")}];
 
 async function __invokeRoute(route, request) {
   try {
@@ -50707,7 +50717,8 @@ function generateApiFunction(apiNode, _apiDir, outDir, options) {
     } catch {
     }
   }
-  const urlParts = apiNode.fullPath.split("/").filter(Boolean);
+  const routeParts = apiNode.fullPath.split("/").filter(Boolean);
+  const urlParts = routeParts[0] === "api" ? routeParts.slice(1) : routeParts;
   const extracts = [];
   let partIdx = 0;
   for (let i = 0; i < urlParts.length; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.85",
+  "version": "0.2.87",
   "type": "module",
   "description": "Vesk — compiler-first framework for the post-VDOM web. vesk dev, vesk build.",
   "bin": {
@@ -8,10 +8,10 @@
   },
   "main": "./dist/cli.js",
   "dependencies": {
-    "@vesk/adapter": "^0.2.85",
-    "@vesk/compiler": "^0.2.85",
-    "@vesk/plugin-tailwind": "^0.2.85",
-    "@vesk/runtime": "^0.2.85",
+    "@vesk/adapter": "^0.2.87",
+    "@vesk/compiler": "^0.2.87",
+    "@vesk/plugin-tailwind": "^0.2.87",
+    "@vesk/runtime": "^0.2.87",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",