@vesk/vesk-cli 0.2.69 → 0.2.70

package/dist/cli.js

@@ -49909,11 +49909,26 @@ function resolveCssUrls(opts) {
 
 // ../adapter/src/ssr-function.ts
 init_default_pages();
-function resolveErrorFile(sourceDir, appDir) {
+function resolveBoundaryFile(sourceDir, appDir, file) {
   const rel = relative(appDir, sourceDir).split("/").filter(Boolean);
   for (let depth = rel.length; depth >= 0; depth--) {
     const dir = depth === 0 ? appDir : join5(appDir, ...rel.slice(0, depth));
-    const p = join5(dir, "error.vsk");
+    const p = join5(dir, file);
+    if (existsSync8(p)) return p;
+  }
+  return null;
+}
+function resolveErrorFile(sourceDir, appDir) {
+  return resolveBoundaryFile(sourceDir, appDir, "error.vsk");
+}
+function resolveNotFoundFile(sourceDir, appDir) {
+  return resolveBoundaryFile(sourceDir, appDir, "not-found.vsk");
+}
+function resolveBoundaryFileForUrl(pathname, appDir, file) {
+  const segments = pathname.split("/").filter(Boolean);
+  for (let depth = segments.length; depth >= 0; depth--) {
+    const dir = join5(appDir, ...segments.slice(0, depth));
+    const p = join5(dir, file);
     if (existsSync8(p)) return p;
   }
   return null;
@@ -50053,6 +50068,12 @@ function generateSsrFunction(routeNode, appDir, outDir, componentMap, options) {
   const errorVars = errorPath ? `const _errorComp = ${JSON.stringify(errorComp)};
 const _errorCompiled = ${hydrateInvoke(precompilePlan(errorPath))};
 ` : "const _errorComp = null;\nconst _errorCompiled = null;\n";
+  const notFoundPath = resolveNotFoundFile(routeNode.sourceDir, appDir);
+  const notFoundSrc = notFoundPath ? readFileSync7(notFoundPath, "utf-8") : null;
+  const notFoundComp = notFoundPath ? extractCompName(notFoundSrc) || "NotFound" : null;
+  const notFoundVars = notFoundPath ? `const _notFoundComp = ${JSON.stringify(notFoundComp)};
+const _notFoundCompiled = ${hydrateInvoke(precompilePlan(notFoundPath))};
+` : "const _notFoundComp = null;\nconst _notFoundCompiled = null;\n";
   let src2 = "";
   if (layoutDecls.length > 0) {
     src2 = `const _pageComp = ${JSON.stringify(pageComp)};
@@ -50065,13 +50086,13 @@ const _errorCompiled = ${hydrateInvoke(precompilePlan(errorPath))};
 ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
 ];
 `;
-    src2 += errorVars;
+    src2 += errorVars + notFoundVars;
   } else {
     src2 = `const _comp = ${JSON.stringify(pageComp)};
 `;
     src2 += `const _compiled = (() => { try { return hydratePrecompile(${pagePlan}); } catch { return null; } })();
 `;
-    src2 += errorVars;
+    src2 += errorVars + notFoundVars;
   }
   const urlParts = routeNode.fullPath.split("/").filter(Boolean);
   const paramExprs = buildParamExtraction(routeNode, urlParts);
@@ -50113,30 +50134,66 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
       "  }",
       "}",
       "",
+      // Returns null rather than throwing when there is no boundary, so the
+      // caller can re-throw the original NotFoundError and let the server answer
+      // — a page with no not-found.vsk anywhere must still get a 404.
+      "async function __renderNotFoundBody(props) {",
+      "  if (!_notFoundComp) return null;",
+      "  try {",
+      "    const result = await renderPage('', _notFoundComp, props, __componentRegistry, { hydrate: true, cached: _notFoundCompiled });",
+      "    return result.body;",
+      "  } catch {",
+      "    return null;",
+      "  }",
+      "}",
+      "",
+      // The layout wrap, shared by the page / error / not-found paths. Extracted
+      // because three call sites that each re-implemented it is three chances to
+      // forget the head merge.
+      "async function __wrapLayouts(params, body, head) {",
+      "  let _b = body;",
+      '  let _h = head || "";',
+      "  for (let _i = _layoutCompList.length - 1; _i > 0; _i--) {",
+      "    const _inner = await renderPage('', _layoutCompList[_i], { params, children: _b }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i] });",
+      "    _b = _inner.body;",
+      "    if (_inner.head) _h = _inner.head + _h;",
+      "  }",
+      "  return renderFullPage('', _layoutCompList[0], { params, children: _b }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[0]" + bakedOptions + clientScriptOption + dataScriptOption + ", pageHead: _h });",
+      "}",
+      "",
       "async function __renderHtml(params, requestUrl) {",
       "  return withSsrStore(async () => {",
       "  resetPersistedStoreKeys();",
       "  let page;",
       "  let caughtError = null;",
+      "  let notFound = false;",
       "  const __expose = process.env.NODE_ENV !== 'production';",
       "  try {",
       "    page = await renderPage('', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled });",
       "  } catch (err) {",
-      "    if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
-      "    caughtError = err;",
-      "    const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
-      "    const stack = err && typeof err === 'object' && 'stack' in err ? String(err.stack) : '';",
-      "    page = { body: await __renderErrorBody({ params, statusCode: 500, error: __expose ? message : 'Internal Server Error', stack: __expose ? stack : '', url: requestUrl || '' }), head: '' };",
+      "    if (err && err.name === 'Redirect') throw err;",
+      "    if (err && err.name === 'NotFoundError') {",
+      // The boundary is chosen per-route at build time (resolveNotFoundFile walks
+      // this route's own directory up to the app root), so a nested
+      // app/admin/not-found.vsk answers /admin/* and the root one answers the
+      // rest — matching the client router's deepest-first chain walk.
+      "      const nfBody = await __renderNotFoundBody({ params, url: requestUrl || '' });",
+      "      if (nfBody !== null) {",
+      "        notFound = true;",
+      "        page = { body: nfBody, head: '' };",
+      "      } else {",
+      "        throw err;",
+      "      }",
+      "    } else {",
+      "      caughtError = err;",
+      "      const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
+      "      const stack = err && typeof err === 'object' && 'stack' in err ? String(err.stack) : '';",
+      "      page = { body: await __renderErrorBody({ params, statusCode: 500, error: __expose ? message : 'Internal Server Error', stack: __expose ? stack : '', url: requestUrl || '' }), head: '' };",
+      "    }",
       "  }",
       "  let _body = (caughtError ? '<!--vesk-ssr-error:' + (caughtError && typeof caughtError === 'object' && 'message' in caughtError ? encodeURIComponent(__expose ? String(caughtError.message) : 'Internal Server Error') : '') + '-->' : '') + page.body;",
-      "  let _head = page.head || '';",
-      "  for (let _i = _layoutCompList.length - 1; _i > 0; _i--) {",
-      "    const _inner = await renderPage('', _layoutCompList[_i], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i] });",
-      "    _body = _inner.body;",
-      "    if (_inner.head) _head = _inner.head + _head;",
-      "  }",
-      "  const html = await renderFullPage('', _layoutCompList[0], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[0]" + bakedOptions + clientScriptOption + dataScriptOption + ", pageHead: _head });",
-      "  return new Response(__injectStoreInit(html), { headers: { 'Content-Type': 'text/html' }, status: caughtError ? 500 : 200 });",
+      "  const html = await __wrapLayouts(params, _body, page.head || '');",
+      "  return new Response(__injectStoreInit(html), { headers: { 'Content-Type': 'text/html' }, status: notFound ? 404 : (caughtError ? 500 : 200) });",
       "  });",
       "}",
       ""
@@ -52505,6 +52562,7 @@ function generateManifest(routes, ssrRoutes, apiRoutes, staticRoutes, middleware
     if (r._isrTags) entry.tags = r._isrTags;
     routeEntries.push(entry);
   }
+  routeEntries.sort((a, b) => compareSpecificity(a.path, b.path));
   const apiEntries = [];
   for (const r of apiRoutes) {
     const urlParts = r.fullPath.split("/").filter(Boolean);
@@ -53430,17 +53488,29 @@ async function startProdServer(outDir, options) {
     const pageCssUrls = resolveCssUrls({
       enabled: hasBuiltGlobalCss(outDir)
     });
-    const nfPath = resolve14(appDir, "not-found.vsk");
-    let notFoundHtml = null;
-    if (existsSync16(nfPath)) {
-      try {
-        const runtimePath = resolve14(outDir, "server", "runtime.js");
-        const { renderFullPage: renderFullPage2, storeDataScriptGlobal } = await import(runtimePath);
-        const src2 = readFileSync18(nfPath, "utf-8");
-        const compName = resolveComponentName(src2) || "NotFound";
-        notFoundHtml = await renderFullPage2(src2, compName, { params: {}, url: url.pathname }, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: pageCssUrls, security: securityConfig?.security || {}, externalDataScript: storeDataScriptGlobal, sourcePath: nfPath, headExtra: bakedHeadExtra });
-      } catch {
+    const boundaryCache = /* @__PURE__ */ new Map();
+    async function renderBoundaryFile(file, pathname, props) {
+      const boundaryPath = resolveBoundaryFileForUrl(pathname, appDir, file);
+      if (!boundaryPath) return null;
+      const key = `${file}:${boundaryPath}`;
+      let html = boundaryCache.has(key) ? boundaryCache.get(key) : null;
+      if (html === null) {
+        try {
+          const runtimePath = resolve14(outDir, "server", "runtime.js");
+          const { renderFullPage: renderFullPage2, storeDataScriptGlobal } = await import(runtimePath);
+          const src2 = readFileSync18(boundaryPath, "utf-8");
+          const compName = resolveComponentName(src2) || (file === "error.vsk" ? "Error" : "NotFound");
+          html = await renderFullPage2(src2, compName, props, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: pageCssUrls, clientScriptUrl: buildConfig?.assets?.client?.url || "/_vesk/static/client.js", clientScriptIntegrity: buildConfig?.assets?.client?.integrity, security: securityConfig?.security || {}, externalDataScript: storeDataScriptGlobal, sourcePath: boundaryPath, headExtra: bakedHeadExtra });
+        } catch {
+          return null;
+        }
       }
+      return html;
+    }
+    let notFoundHtml = null;
+    {
+      const rendered = await renderBoundaryFile("not-found.vsk", url.pathname, { params: {}, url: url.pathname });
+      notFoundHtml = rendered;
     }
     for (const route of buildConfig.routes) {
       if (route.type === "ssr") {
@@ -53510,19 +53580,13 @@ async function startProdServer(outDir, options) {
               if (eventsMod) {
                 await executeError(err, { url: url.href, routePath: route.path, target: "node", status: 500 }, eventsMod);
               }
-              const errPath = resolve14(appDir, "error.vsk");
-              let errorHtml = null;
-              if (existsSync16(errPath)) {
-                try {
-                  const runtimePath = resolve14(outDir, "server", "runtime.js");
-                  const { renderFullPage: renderFullPage2, storeDataScriptGlobal } = await import(runtimePath);
-                  const src2 = readFileSync18(errPath, "utf-8");
-                  const compName = resolveComponentName(src2) || "Error";
-                  const expose = process.env.NODE_ENV !== "production";
-                  errorHtml = await renderFullPage2(src2, compName, { error: expose ? err.message : "Internal Server Error", stack: expose ? err.stack : "", statusCode: 500, url: url.pathname }, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: pageCssUrls, clientScriptUrl: buildConfig?.assets?.client?.url || "/_vesk/static/client.js", clientScriptIntegrity: buildConfig?.assets?.client?.integrity, security: securityConfig?.security || {}, externalDataScript: storeDataScriptGlobal, sourcePath: errPath, headExtra: bakedHeadExtra });
-                } catch {
-                }
-              }
+              const expose = process.env.NODE_ENV !== "production";
+              const errorHtml = await renderBoundaryFile("error.vsk", url.pathname, {
+                error: expose ? err.message : "Internal Server Error",
+                stack: expose ? err.stack : "",
+                statusCode: 500,
+                url: url.pathname
+              });
               res.writeHead(500, { "Content-Type": "text/html" });
               res.end(errorHtml || renderDefaultErrorPage({ message: process.env.NODE_ENV !== "production" ? err.message : void 0, url: url.pathname, headExtra: bakedHeadExtra }));
               return;

package/package.json

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