@vesk/adapter 0.2.85 → 0.2.87

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"api-function.d.ts","sourceRoot":"","sources":["../src/api-function.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAOhF,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,kBAAkB,GAC3B;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAkQtD"}
1
+ {"version":3,"file":"api-function.d.ts","sourceRoot":"","sources":["../src/api-function.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAOhF,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,kBAAkB,GAC3B;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CA0QtD"}
@@ -41,7 +41,15 @@ export function generateApiFunction(apiNode, _apiDir, outDir, options) {
41
41
  // fall back to original source if stripping fails
42
42
  }
43
43
  }
44
- const urlParts = apiNode.fullPath.split('/').filter(Boolean);
44
+ // fullPath carries the leading "/api" mount prefix; the request's urlParts
45
+ // is built from url.pathname with "/api" already removed. Drop it here so
46
+ // segment indices line up for dynamic and catch-all extraction. Without this,
47
+ // a catch-all like `/api/auth/[...path]` matched against `/api/auth/signin/
48
+ // credentials` produced params.path="credentials" instead of
49
+ // "signin/credentials", so the auth catch-all could never route a
50
+ // multi-segment path and returned "Unknown auth endpoint."
51
+ const routeParts = apiNode.fullPath.split('/').filter(Boolean);
52
+ const urlParts = routeParts[0] === 'api' ? routeParts.slice(1) : routeParts;
45
53
  const extracts = [];
46
54
  let partIdx = 0;
47
55
  for (let i = 0; i < urlParts.length; i++) {
@@ -1 +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"}
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,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"}
@@ -47,6 +47,17 @@ export function generatePlatformHandlerSource(input) {
47
47
  const hasEvents = !!input.hasEvents;
48
48
  let imports = '';
49
49
  const routeEntries = [];
50
+ const routeSpecificity = (path) => {
51
+ if (/:path\b|:rest\b|\[\.\.\./.test(path))
52
+ return 3; // catch-all
53
+ if (/:/.test(path))
54
+ return 2; // dynamic param
55
+ return 1; // static
56
+ };
57
+ const pushEntry = (path, type, handler, extra) => {
58
+ const entry = `{ path: ${JSON.stringify(path)}, type: '${type}', handler: ${handler}${extra}}`;
59
+ routeEntries.push({ path, entry, specificity: routeSpecificity(path) });
60
+ };
50
61
  for (const r of ssrRoutes) {
51
62
  const name = routeName(r.fullPath.split('/').filter(Boolean));
52
63
  const id = `__ssr_${toId(name)}`;
@@ -54,15 +65,16 @@ export function generatePlatformHandlerSource(input) {
54
65
  imports += `import { handle as ${id} } from ${JSON.stringify(funcPath)};\n`;
55
66
  const revalidate = r._revalidate != null ? `revalidate: ${r._revalidate}, ` : '';
56
67
  const tags = r._isrTags ? `tags: ${JSON.stringify(r._isrTags)}, ` : '';
57
- routeEntries.push(`{ path: ${JSON.stringify(r.fullPath)}, type: 'ssr', handler: ${id}, ${revalidate}${tags}}`);
68
+ pushEntry(r.fullPath, 'ssr', id, `, ${revalidate}${tags}`);
58
69
  }
59
70
  for (const r of apiRoutes) {
60
71
  const name = apiRouteName(r.fullPath);
61
72
  const id = `__api_${toId(name)}`;
62
73
  const funcPath = `./server/api/${name}.js`;
63
74
  imports += `import { handle as ${id} } from ${JSON.stringify(funcPath)};\n`;
64
- routeEntries.push(`{ path: ${JSON.stringify('/api' + r.fullPath)}, type: 'api', handler: ${id} }`);
75
+ pushEntry('/api' + r.fullPath, 'api', id, '');
65
76
  }
77
+ routeEntries.sort((a, b) => a.specificity - b.specificity);
66
78
  const mwImport = hasMiddleware ? "import { execute as __executeMw } from './server/middleware.js';" : '';
67
79
  const hasMwLiteral = hasMiddleware ? 'true' : 'false';
68
80
  const eventsImport = hasEvents ? "import { executeStart as __eventsStart, executeRequest as __eventsRequest } from './server/events.js';" : '';
@@ -87,7 +99,7 @@ ${eventsImport}
87
99
  ${prerenderedList}
88
100
  ${isrCache}
89
101
  ${defaultNotFoundLine}
90
- const __routes = [${routeEntries.join(',\n')}];
102
+ const __routes = [${routeEntries.map((e) => e.entry).join(',\n')}];
91
103
 
92
104
  async function __invokeRoute(route, request) {
93
105
  try {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vesk/adapter",
3
- "version": "0.2.85",
3
+ "version": "0.2.87",
4
4
  "type": "module",
5
5
  "description": "Vesk adapter — builds deployable .vesk/ output for Deno and Node serverless",
6
6
  "main": "./dist/index.js",
@@ -23,9 +23,9 @@
23
23
  "sharp": "^0.35.3"
24
24
  },
25
25
  "dependencies": {
26
- "@vesk/compiler": "^0.2.85",
27
- "@vesk/runtime": "^0.2.85",
28
- "@vesk/types": "^0.2.85"
26
+ "@vesk/compiler": "^0.2.87",
27
+ "@vesk/runtime": "^0.2.87",
28
+ "@vesk/types": "^0.2.87"
29
29
  },
30
30
  "devDependencies": {
31
31
  "@types/ws": "^8.18.1",