@vesk/vesk-cli 0.2.78 → 0.2.80

package/dist/cli.js

@@ -50152,34 +50152,49 @@ function generateSsrFunction(routeNode, appDir, outDir, componentMap, options) {
   const errorPath = resolveErrorFile(routeNode.sourceDir, appDir);
   const errorSrc = errorPath ? readFileSync7(errorPath, "utf-8") : null;
   const errorComp = errorPath ? extractCompName(errorSrc) || "Error" : null;
-  const errorVars = errorPath ? `const _errorComp = ${JSON.stringify(errorComp)};
-const _errorCompiled = ${hydrateInvoke(precompilePlan(errorPath))};
-` : "const _errorComp = null;\nconst _errorCompiled = null;\n";
+  const errorCompDecl = errorPath ? `const _errorComp = ${JSON.stringify(errorComp)};
+` : "const _errorComp = null;\n";
+  const errorPlanExpr = errorPath ? hydrateInvoke(precompilePlan(errorPath)) : "null";
   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";
+  const notFoundCompDecl = notFoundPath ? `const _notFoundComp = ${JSON.stringify(notFoundComp)};
+` : "const _notFoundComp = null;\n";
+  const notFoundPlanExpr = notFoundPath ? hydrateInvoke(precompilePlan(notFoundPath)) : "null";
   let src2 = "";
   if (layoutDecls.length > 0) {
-    src2 = `const _pageComp = ${JSON.stringify(pageComp)};
+    src2 = errorCompDecl + notFoundCompDecl;
+    src2 += `const _pageComp = ${JSON.stringify(pageComp)};
 `;
-    src2 += `const _pageCompiled = (() => { try { return hydratePrecompile(${pagePlan}); } catch { return null; } })();
+    src2 += `let _pageCompiled = null;
+function __getPageCompiled() { if (!_pageCompiled) _pageCompiled = (() => { try { return hydratePrecompile(${pagePlan}); } catch { return null; } })(); return _pageCompiled; }
 `;
     src2 += `const _layoutCompList = [${layoutDecls.map((d) => d.comp).join(", ")}];
 `;
-    src2 += `const _layoutCompiledList = [
+    src2 += `let _layoutCompiledList = null;
+function __getLayoutCompiledList() { if (!_layoutCompiledList) { _layoutCompiledList = [
 ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
-];
+]; } return _layoutCompiledList; }
+`;
+    src2 += `let _errorCompiled = null;
+function __getErrorCompiled() { if (!_errorCompiled) _errorCompiled = ${errorPlanExpr}; return _errorCompiled; }
+`;
+    src2 += `let _notFoundCompiled = null;
+function __getNotFoundCompiled() { if (!_notFoundCompiled) _notFoundCompiled = ${notFoundPlanExpr}; return _notFoundCompiled; }
 `;
-    src2 += errorVars + notFoundVars;
   } else {
-    src2 = `const _comp = ${JSON.stringify(pageComp)};
+    src2 = errorCompDecl + notFoundCompDecl;
+    src2 += `const _comp = ${JSON.stringify(pageComp)};
 `;
-    src2 += `const _compiled = (() => { try { return hydratePrecompile(${pagePlan}); } catch { return null; } })();
+    src2 += `let _compiled = null;
+function __getCompiled() { if (!_compiled) _compiled = (() => { try { return hydratePrecompile(${pagePlan}); } catch { return null; } })(); return _compiled; }
+`;
+    src2 += `let _errorCompiled = null;
+function __getErrorCompiled() { if (!_errorCompiled) _errorCompiled = ${errorPlanExpr}; return _errorCompiled; }
+`;
+    src2 += `let _notFoundCompiled = null;
+function __getNotFoundCompiled() { if (!_notFoundCompiled) _notFoundCompiled = ${notFoundPlanExpr}; return _notFoundCompiled; }
 `;
-    src2 += errorVars + notFoundVars;
   }
   const urlParts = routeNode.fullPath.split("/").filter(Boolean);
   const paramExprs = buildParamExtraction(routeNode, urlParts);
@@ -50193,20 +50208,21 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
   let registryCode = "";
   const compRegEntries = [];
   const compMap = componentMap || /* @__PURE__ */ new Map();
+  const regPlans = [];
   for (const [compName, compPath] of compMap) {
     const plan = precompilePlan(compPath);
-    compRegEntries.push(`  (() => {
-    const _compiled = (() => { try { return hydratePrecompile(${plan}); } catch { return null; } })();
-    __componentRegistry.set(${JSON.stringify(compName)}, async (props, __registry, __vesk) => {
+    regPlans.push(`    __regPlans.set(${JSON.stringify(compName)}, ${JSON.stringify(plan)});`);
+    compRegEntries.push(`    __componentRegistry.set(${JSON.stringify(compName)}, async (props, __registry, __vesk) => {
+      let _compiled = __regCompiled.get(${JSON.stringify(compName)});
+      if (!_compiled) { _compiled = hydratePrecompile(__regPlans.get(${JSON.stringify(compName)})); __regCompiled.set(${JSON.stringify(compName)}, _compiled); }
       const result = await renderPage('', ${JSON.stringify(compName)}, props, __registry, { hydrate: true, cached: _compiled });
       return result.body;
-    });
-  })();`);
+    });`);
   }
   if (compRegEntries.length > 0) {
-    registryCode = "const __componentRegistry = new Map();\n{\n" + compRegEntries.join("\n") + "\n}\n";
+    registryCode = "const __componentRegistry = new Map();\nconst __regPlans = new Map();\nconst __regCompiled = new Map();\n{\n" + regPlans.join("\n") + "\n" + compRegEntries.join("\n") + "\n}\n";
   } else {
-    registryCode = "const __componentRegistry = new Map();\n";
+    registryCode = "const __componentRegistry = new Map();\nconst __regPlans = new Map();\nconst __regCompiled = new Map();\n";
   }
   let htmlFnCode;
   if (layoutDecls.length > 0) {
@@ -50214,7 +50230,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
       "async function __renderErrorBody(props) {",
       '  if (!_errorComp) throw props.error || new Error("Internal Server Error");',
       "  try {",
-      "    const result = await renderPage('', _errorComp, props, __componentRegistry, { hydrate: true, cached: _errorCompiled });",
+      "    const result = await renderPage('', _errorComp, props, __componentRegistry, { hydrate: true, cached: __getErrorCompiled() });",
       "    return result.body;",
       "  } catch {",
       `    return ${JSON.stringify(renderDefaultErrorFragment())};`,
@@ -50227,7 +50243,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
       "async function __renderNotFoundBody(props) {",
       "  if (!_notFoundComp) return null;",
       "  try {",
-      "    const result = await renderPage('', _notFoundComp, props, __componentRegistry, { hydrate: true, cached: _notFoundCompiled });",
+      "    const result = await renderPage('', _notFoundComp, props, __componentRegistry, { hydrate: true, cached: __getNotFoundCompiled() });",
       "    return result.body;",
       "  } catch {",
       "    return null;",
@@ -50241,11 +50257,11 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
       "  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] });",
+      "    const _inner = await renderPage('', _layoutCompList[_i], { params, children: _b }, __componentRegistry, { hydrate: true, cached: __getLayoutCompiledList()[_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 });",
+      "  return renderFullPage('', _layoutCompList[0], { params, children: _b }, __componentRegistry, { hydrate: true, cached: __getLayoutCompiledList()[0]" + bakedOptions + clientScriptOption + dataScriptOption + ", pageHead: _h });",
       "}",
       "",
       "async function __renderHtml(params, requestUrl) {",
@@ -50256,7 +50272,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
       "  let notFound = false;",
       "  const __expose = process.env.NODE_ENV !== 'production';",
       "  try {",
-      "    page = await renderPage('', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled });",
+      "    page = await renderPage('', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: __getPageCompiled() });",
       "  } catch (err) {",
       "    if (err && err.name === 'Redirect') throw err;",
       "    if (err && err.name === 'NotFoundError') {",
@@ -50293,7 +50309,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
       "  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) : '';",
       "  const props = { params, statusCode: 500, error: __expose ? message : 'Internal Server Error', stack: __expose ? stack : '', url: requestUrl || '' };",
-      "  return renderFullPage('', _errorComp, props, __componentRegistry, { hydrate: true, cached: _errorCompiled" + bakedOptions + clientScriptOption + dataScriptOption + " });",
+      "  return renderFullPage('', _errorComp, props, __componentRegistry, { hydrate: true, cached: __getErrorCompiled()" + bakedOptions + clientScriptOption + dataScriptOption + " });",
       "}",
       "",
       "async function __renderHtml(params, requestUrl) {",
@@ -50308,7 +50324,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
       // though it runs outside the ALS scope.
       "  const __streamToken = globalThis.__vsk_ssr_token || '';",
       "  try {",
-      "    stream = renderPageStream('', _comp, { params }, __componentRegistry, { hydrate: true, cached: _compiled" + bakedOptions + clientScriptOption + dataScriptOption + " });",
+      "    stream = renderPageStream('', _comp, { params }, __componentRegistry, { hydrate: true, cached: __getCompiled()" + bakedOptions + clientScriptOption + dataScriptOption + " });",
       "  } catch (err) {",
       "    if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
       "    const html = await __renderErrorFullPage(params, requestUrl, err);",
@@ -50382,7 +50398,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
         "    try {",
         "      let dataPage;",
         "      try {",
-        "        dataPage = await renderPage('', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled });",
+        "        dataPage = await renderPage('', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: __getPageCompiled() });",
         "      } catch (err) {",
         "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
         "        const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
@@ -50390,7 +50406,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
         "      }",
         "      let _dataHead = dataPage.head || '';",
         "      for (let _i = _layoutCompList.length - 1; _i >= 0; _i--) {",
-        "        const _dl = await renderPage('', _layoutCompList[_i], { params, children: '' }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i] });",
+        "        const _dl = await renderPage('', _layoutCompList[_i], { params, children: '' }, __componentRegistry, { hydrate: true, cached: __getLayoutCompiledList()[_i] });",
         "        _dataHead = (_dl.head || '') + _dataHead;",
         "      }",
         "      return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: _dataHead }), {",
@@ -50408,7 +50424,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
         "    try {",
         "      let dataPage;",
         "      try {",
-        "        dataPage = await renderPage('', _comp, { params }, __componentRegistry, { hydrate: true, cached: _compiled });",
+        "        dataPage = await renderPage('', _comp, { params }, __componentRegistry, { hydrate: true, cached: __getCompiled() });",
         "      } catch (err) {",
         "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
         "        const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",

package/package.json

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