@vesk/adapter 0.2.86 → 0.2.87

package/dist/platform-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform-handler.d.ts","sourceRoot":"","sources":["../src/platform-handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AASvE,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iFAAiF;IACjF,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAMpD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEtC;AAgBD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM,CA8MjF;AAED,MAAM,WAAW,qBAAqB;IACpC,kEAAkE;IAClE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4GzF;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"platform-handler.d.ts","sourceRoot":"","sources":["../src/platform-handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AASvE,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iFAAiF;IACjF,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAMpD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEtC;AAgBD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM,CAkOjF;AAED,MAAM,WAAW,qBAAqB;IACpC,kEAAkE;IAClE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4GzF;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}

package/dist/platform-handler.js

@@ -47,6 +47,17 @@ export function generatePlatformHandlerSource(input) {
     const hasEvents = !!input.hasEvents;
     let imports = '';
     const routeEntries = [];
+    const routeSpecificity = (path) => {
+        if (/:path\b|:rest\b|\[\.\.\./.test(path))
+            return 3; // catch-all
+        if (/:/.test(path))
+            return 2; // dynamic param
+        return 1; // static
+    };
+    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 = routeName(r.fullPath.split('/').filter(Boolean));
         const id = `__ssr_${toId(name)}`;
@@ -54,15 +65,16 @@ export function generatePlatformHandlerSource(input) {
         imports += `import { handle as ${id} } from ${JSON.stringify(funcPath)};\n`;
         const revalidate = 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}, ${revalidate}${tags}}`);
+        pushEntry(r.fullPath, 'ssr', id, `, ${revalidate}${tags}`);
     }
     for (const r of apiRoutes) {
         const name = apiRouteName(r.fullPath);
         const id = `__api_${toId(name)}`;
         const funcPath = `./server/api/${name}.js`;
         imports += `import { handle as ${id} } from ${JSON.stringify(funcPath)};\n`;
-        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';" : '';
@@ -87,7 +99,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 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/adapter",
-  "version": "0.2.86",
+  "version": "0.2.87",
   "type": "module",
   "description": "Vesk adapter — builds deployable .vesk/ output for Deno and Node serverless",
   "main": "./dist/index.js",
@@ -23,9 +23,9 @@
     "sharp": "^0.35.3"
   },
   "dependencies": {
-    "@vesk/compiler": "^0.2.86",
-    "@vesk/runtime": "^0.2.86",
-    "@vesk/types": "^0.2.86"
+    "@vesk/compiler": "^0.2.87",
+    "@vesk/runtime": "^0.2.87",
+    "@vesk/types": "^0.2.87"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",