@vesk/vesk-cli 0.2.86 → 0.2.88

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 {
@@ -37513,9 +37523,10 @@ function __matchPath(pattern, pathname) {
 }
 
 export async function handleRequest(request) {
-  const url = new URL(request.url);
-  const pathname = url.pathname;
-  const isDataRequest = request.headers.get('x-vesk-data') === '1';
+  try {
+    const url = new URL(request.url);
+    const pathname = url.pathname;
+    const isDataRequest = request.headers.get('x-vesk-data') === '1';
 ${serverStoreLine}
 
   if (__prerendered.has(pathname) && !isDataRequest) {
@@ -37610,6 +37621,17 @@ ${eventsRequestLine}
     status: 404,
     headers: { 'Content-Type': 'text/html' },
   });
+  } catch (e) {
+    // Any error that escapes the route (a thrown exception, a bad import, a
+    // middleware failure, ...) must not bubble out of handleRequest. On
+    // serverless platforms (Vercel, Netlify, Cloudflare) an uncaught throw is
+    // surfaced as FUNCTION_INVOCATION_FAILED \u2014 Next.js avoids this by wrapping
+    // its entry points the same way. Convert it into a proper 500 response.
+    return new Response(renderDefaultErrorPage({ url: request.url }), {
+      status: 500,
+      headers: { 'Content-Type': 'text/html' },
+    });
+  }
 }
 `;
 }
@@ -51087,13 +51109,39 @@ ${extracted.body}
     "      nextResult = await run(index + 1);",
     "      return nextResult;",
     "    }",
-    "    const result = await fn(ctx, next);",
-    "    if (result instanceof Response) return result;",
-    "    if (nextResult instanceof Response) return nextResult;",
-    "    if (!nextCalled) return run(index + 1);",
-    "    return null;",
+    "    try {",
+    "      const result = await fn(ctx, next);",
+    "      if (result instanceof Response) return result;",
+    "      if (nextResult instanceof Response) return nextResult;",
+    "      if (!nextCalled) return run(index + 1);",
+    "      return null;",
+    "    } catch (e) {",
+    "      if (e && typeof e === 'object' && e.name === 'Redirect') {",
+    "        return new Response(null, {",
+    "          status: Number(e.status) || 302,",
+    "          headers: { Location: String(e.url || '') },",
+    "        });",
+    "      }",
+    "      if (e instanceof TypeError && /Failed to parse URL from/.test(String(e.message))) {",
+    "        const msg = String(e.message);",
+    "        const prefix = 'Failed to parse URL from ';",
+    "        const start = msg.indexOf(prefix);",
+    "        const target = start === -1 ? '' : msg.slice(start + prefix.length).trim().split(' ')[0];",
+    "        return new Response(null, { status: 302, headers: { Location: target } });",
+    "      }",
+    "      throw e;",
+    "    }",
+    "  }",
+    "  let response = null;",
+    "  try {",
+    "    response = await run(0);",
+    "  } catch (e) {",
+    "    // Unexpected middleware errors must not crash the server. On serverless",
+    "    // platforms (Vercel, Netlify, Cloudflare) an uncaught throw surfaces as",
+    "    // FUNCTION_INVOCATION_FAILED \u2014 Next.js avoids this by wrapping entry",
+    "    // points the same way. Convert it into a 500 response.",
+    "    response = new Response(null, { status: 500 });",
     "  }",
-    "  const response = await run(0);",
     "  return { response, rewriteUrl };",
     "}",
     ""
@@ -51132,13 +51180,39 @@ ${extracted.body}
     "      ncResult = await run(index + 1);",
     "      return ncResult;",
     "    }",
-    "    const result = await fn(ctx, next);",
-    "    if (result instanceof Response) return result;",
-    "    if (ncResult instanceof Response) return ncResult;",
-    "    if (!nc) return run(index + 1);",
-    "    return null;",
+    "    try {",
+    "      const result = await fn(ctx, next);",
+    "      if (result instanceof Response) return result;",
+    "      if (ncResult instanceof Response) return ncResult;",
+    "      if (!nc) return run(index + 1);",
+    "      return null;",
+    "    } catch (e) {",
+    "      if (e && typeof e === 'object' && e.name === 'Redirect') {",
+    "        return new Response(null, {",
+    "          status: Number(e.status) || 302,",
+    "          headers: { Location: String(e.url || '') },",
+    "        });",
+    "      }",
+    "      if (e instanceof TypeError && /Failed to parse URL from/.test(String(e.message))) {",
+    "        const msg = String(e.message);",
+    "        const prefix = 'Failed to parse URL from ';",
+    "        const start = msg.indexOf(prefix);",
+    "        const target = start === -1 ? '' : msg.slice(start + prefix.length).trim().split(' ')[0];",
+    "        return new Response(null, { status: 302, headers: { Location: target } });",
+    "      }",
+    "      throw e;",
+    "    }",
+    "  }",
+    "  let response = null;",
+    "  try {",
+    "    response = await run(0);",
+    "  } catch (e) {",
+    "    // Unexpected middleware errors must not crash the server. On serverless",
+    "    // platforms (Vercel, Netlify, Cloudflare) an uncaught throw surfaces as",
+    "    // FUNCTION_INVOCATION_FAILED \u2014 Next.js avoids this by wrapping entry",
+    "    // points the same way. Convert it into a 500 response.",
+    "    response = new Response(null, { status: 500 });",
     "  }",
-    "  const response = await run(0);",
     "  return { response, rewriteUrl };",
     "}",
     ""
@@ -58339,6 +58413,10 @@ async function executeMiddlewareChain(chain, request, params, options = {}) {
           headers: { Location: err.url || "" }
         });
       }
+      if (e instanceof TypeError && /Failed to parse URL from/.test(String(e.message))) {
+        const target = /Failed to parse URL from (\S+)/.exec(String(e.message))?.[1] ?? "";
+        return new Response(null, { status: 302, headers: { Location: target } });
+      }
       throw e;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.86",
+  "version": "0.2.88",
   "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.86",
-    "@vesk/compiler": "^0.2.86",
-    "@vesk/plugin-tailwind": "^0.2.86",
-    "@vesk/runtime": "^0.2.86",
+    "@vesk/adapter": "^0.2.88",
+    "@vesk/compiler": "^0.2.88",
+    "@vesk/plugin-tailwind": "^0.2.88",
+    "@vesk/runtime": "^0.2.88",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",