@vesk/adapter 0.2.77 → 0.2.80

package/dist/ssr-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-function.d.ts","sourceRoot":"","sources":["../src/ssr-function.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAkB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7F;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQlG;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEjF;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEpF;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQvG;AAgED;;;2EAG2E;AAC3E,wBAAgB,qBAAqB,IAAI,MAAM,CA4C9C;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,kBAAkB,GAC3B;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CA+hBtD"}
+{"version":3,"file":"ssr-function.d.ts","sourceRoot":"","sources":["../src/ssr-function.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAkB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7F;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQlG;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEjF;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEpF;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQvG;AAgED;;;2EAG2E;AAC3E,wBAAgB,qBAAqB,IAAI,MAAM,CA4C9C;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,kBAAkB,GAC3B;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAqftD"}

package/dist/ssr-function.js

@@ -1,4 +1,4 @@
-import { readFileSync, existsSync, mkdirSync, writeFileSync } from 'node:fs';
+import { readFileSync, existsSync } from 'node:fs';
 import { resolve, relative, join } from 'node:path';
 import { resolveComponentName, precompileFile } from '@vesk/compiler/src/server-codegen';
 import { resolveCssUrls, hasBuiltGlobalCss } from '@vesk/adapter/src/css';
@@ -163,39 +163,6 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     const middlewareCode = options?.middlewareCode || null;
     const headExtra = options?.headExtra || null;
     const pagePath = resolve(appDir, routeNode.sourceDir, 'page.vsk');
-    // Precompiled plans are written to static files and fetched at render time
-    // instead of being embedded inline. Embedding every page/layout/error plan as
-    // inline JSON makes each SSR function module large enough to OOM on memory-
-    // constrained build containers (e.g. Vercel's 2048 MB serverless limit).
-    const plansDir = resolve(outDir, 'static', 'ssr-plans');
-    mkdirSync(plansDir, { recursive: true });
-    function writePlan(planKey, planJSON) {
-        const fileName = `plan-${planKey}.mjs`;
-        const planFile = resolve(plansDir, fileName);
-        writeFileSync(planFile, `export const plan = ${planJSON};\n`, 'utf-8');
-        // Return a relative path from the SSR function directory so dynamic
-        // import() inside the generated function resolves to the plan module.
-        return relative(resolve(outDir, 'server', 'functions'), planFile);
-    }
-    /** Generates a lazy getter that imports a precompiled plan module and compiles
-     *  it with hydratePrecompile on first use, caching the result. Import failures
-     *  degrade to null (renderPage falls back to compiling from source).
-     *  The IIFE form is a single expression so it can be placed anywhere — inside
-     *  array literals, object literals, or at module scope — without syntax errors.
-     */
-    function planGetterCode(varName, planUrl) {
-        return `const ${varName} = (() => {
-  let cache = null;
-  return async () => {
-    if (cache) return cache;
-    try {
-      const mod = await import(${JSON.stringify(planUrl)});
-      cache = hydratePrecompile(mod.plan);
-    } catch { cache = null; }
-    return cache;
-  };
-})();`;
-    }
     const parts = routeNode.fullPath.split('/').filter(Boolean);
     const name = routeName(parts);
     const funcDir = resolve(outDir, 'server', 'functions');
@@ -213,15 +180,15 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
         ...(routeNode.layout ? [{ sourceDir: routeNode.sourceDir, layoutCompName: routeNode.layout }] : []),
     ];
     const layoutDecls = [];
-    for (let li = 0; li < layoutStack.length; li++) {
-        const entry = layoutStack[li];
+    for (const entry of layoutStack) {
         const entryPath = resolve(appDir, entry.sourceDir, 'layout.vsk');
         const entrySrc = readFileSync(entryPath, 'utf-8');
         const entryComp = extractCompName(entrySrc) || 'Layout';
         const plan = precompilePlan(entryPath);
         layoutDecls.push({
             comp: JSON.stringify(entryComp),
-            planUrl: writePlan('layout-' + name + '-' + li, plan),
+            plan,
+            compiled: hydrateInvoke(plan),
         });
     }
     const pagePlan = precompilePlan(pagePath);
@@ -229,9 +196,8 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     const errorPath = resolveErrorFile(routeNode.sourceDir, appDir);
     const errorSrc = errorPath ? readFileSync(errorPath, 'utf-8') : null;
     const errorComp = errorPath ? (extractCompName(errorSrc) || 'Error') : null;
-    const errorVars = errorPath
-        ? `const _errorComp = ${JSON.stringify(errorComp)};\n${planGetterCode('_errorCompiled', writePlan('error-' + name, precompilePlan(errorPath)))}\n`
-        : 'const _errorComp = null;\nasync function _errorCompiled() { return null; }\n';
+    const errorCompDecl = errorPath ? `const _errorComp = ${JSON.stringify(errorComp)};\n` : 'const _errorComp = null;\n';
+    const errorPlanExpr = errorPath ? hydrateInvoke(precompilePlan(errorPath)) : 'null';
     // Not-found used to have no server-side resolution at all: a NotFoundError was
     // re-thrown out of the function and the prod server answered with the ROOT
     // not-found.vsk. A nested `app/admin/not-found.vsk` therefore did nothing on a
@@ -241,25 +207,24 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     const notFoundPath = resolveNotFoundFile(routeNode.sourceDir, appDir);
     const notFoundSrc = notFoundPath ? readFileSync(notFoundPath, 'utf-8') : null;
     const notFoundComp = notFoundPath ? (extractCompName(notFoundSrc) || 'NotFound') : null;
-    const notFoundVars = notFoundPath
-        ? `const _notFoundComp = ${JSON.stringify(notFoundComp)};\n${planGetterCode('_notFoundCompiled', writePlan('notfound-' + name, precompilePlan(notFoundPath)))}\n`
-        : 'const _notFoundComp = null;\nasync function _notFoundCompiled() { return null; }\n';
-    const pagePlanUrl = writePlan('page-' + name, pagePlan);
+    const notFoundCompDecl = notFoundPath ? `const _notFoundComp = ${JSON.stringify(notFoundComp)};\n` : 'const _notFoundComp = null;\n';
+    const notFoundPlanExpr = notFoundPath ? hydrateInvoke(precompilePlan(notFoundPath)) : 'null';
     let src = '';
     if (layoutDecls.length > 0) {
-        const pageGetter = planGetterCode('_pageCompiled', pagePlanUrl);
-        const layoutGetters = layoutDecls.map((d, i) => planGetterCode('_layoutCompiled_' + i, d.planUrl));
-        src = `const _pageComp = ${JSON.stringify(pageComp)};\n`;
-        src += pageGetter + '\n';
-        src += layoutGetters.join('\n') + '\n';
+        src = errorCompDecl + notFoundCompDecl;
+        src += `const _pageComp = ${JSON.stringify(pageComp)};\n`;
+        src += `let _pageCompiled = null;\nfunction __getPageCompiled() { if (!_pageCompiled) _pageCompiled = (() => { try { return hydratePrecompile(${pagePlan}); } catch { return null; } })(); return _pageCompiled; }\n`;
         src += `const _layoutCompList = [${layoutDecls.map((d) => d.comp).join(', ')}];\n`;
-        src += `const _layoutCompiledList = [${layoutDecls.map((_, i) => '_layoutCompiled_' + i).join(', ')}];\n`;
-        src += errorVars + notFoundVars;
+        src += `let _layoutCompiledList = null;\nfunction __getLayoutCompiledList() { if (!_layoutCompiledList) { _layoutCompiledList = [\n${layoutDecls.map((d) => '  ' + d.compiled + ',').join('\n')}\n]; } return _layoutCompiledList; }\n`;
+        src += `let _errorCompiled = null;\nfunction __getErrorCompiled() { if (!_errorCompiled) _errorCompiled = ${errorPlanExpr}; return _errorCompiled; }\n`;
+        src += `let _notFoundCompiled = null;\nfunction __getNotFoundCompiled() { if (!_notFoundCompiled) _notFoundCompiled = ${notFoundPlanExpr}; return _notFoundCompiled; }\n`;
     }
     else {
-        src = `const _comp = ${JSON.stringify(pageComp)};\n`;
-        src += planGetterCode('_compiled', pagePlanUrl) + '\n';
-        src += errorVars + notFoundVars;
+        src = errorCompDecl + notFoundCompDecl;
+        src += `const _comp = ${JSON.stringify(pageComp)};\n`;
+        src += `let _compiled = null;\nfunction __getCompiled() { if (!_compiled) _compiled = (() => { try { return hydratePrecompile(${pagePlan}); } catch { return null; } })(); return _compiled; }\n`;
+        src += `let _errorCompiled = null;\nfunction __getErrorCompiled() { if (!_errorCompiled) _errorCompiled = ${errorPlanExpr}; return _errorCompiled; }\n`;
+        src += `let _notFoundCompiled = null;\nfunction __getNotFoundCompiled() { if (!_notFoundCompiled) _notFoundCompiled = ${notFoundPlanExpr}; return _notFoundCompiled; }\n`;
     }
     const urlParts = routeNode.fullPath.split('/').filter(Boolean);
     const paramExprs = buildParamExtraction(routeNode, urlParts);
@@ -272,19 +237,17 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
     let registryCode = '';
     const compRegEntries = [];
     const compMap = componentMap || new Map();
-    let compCounter = 0;
+    const regPlans = [];
     for (const [compName, compPath] of compMap) {
         const plan = precompilePlan(compPath);
-        const compPlanUrl = writePlan('comp-' + name + '-' + compCounter, plan);
-        const compGetter = '_compiled_' + compCounter;
-        compCounter++;
-        compRegEntries.push(`  (() => {\n${planGetterCode(compGetter, compPlanUrl)}\n    __componentRegistry.set(${JSON.stringify(compName)}, async (props, __registry, __vesk) => {\n      const result = await renderPage('', ${JSON.stringify(compName)}, props, __registry, { hydrate: true, cached: await ${compGetter}() });\n      return result.body;\n    });\n  })();`);
+        regPlans.push(`    __regPlans.set(${JSON.stringify(compName)}, ${JSON.stringify(plan)});`);
+        compRegEntries.push(`    __componentRegistry.set(${JSON.stringify(compName)}, async (props, __registry, __vesk) => {\n      let _compiled = __regCompiled.get(${JSON.stringify(compName)});\n      if (!_compiled) { _compiled = hydratePrecompile(__regPlans.get(${JSON.stringify(compName)})); __regCompiled.set(${JSON.stringify(compName)}, _compiled); }\n      const result = await renderPage('', ${JSON.stringify(compName)}, props, __registry, { hydrate: true, cached: _compiled });\n      return result.body;\n    });`);
     }
     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) {
@@ -292,7 +255,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             '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: await _errorCompiled() });',
+            '    const result = await renderPage(\'\', _errorComp, props, __componentRegistry, { hydrate: true, cached: __getErrorCompiled() });',
             '    return result.body;',
             '  } catch {',
             `    return ${JSON.stringify(renderDefaultErrorFragment())};`,
@@ -305,7 +268,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             'async function __renderNotFoundBody(props) {',
             '  if (!_notFoundComp) return null;',
             '  try {',
-            '    const result = await renderPage(\'\', _notFoundComp, props, __componentRegistry, { hydrate: true, cached: await _notFoundCompiled() });',
+            '    const result = await renderPage(\'\', _notFoundComp, props, __componentRegistry, { hydrate: true, cached: __getNotFoundCompiled() });',
             '    return result.body;',
             '  } catch {',
             '    return null;',
@@ -319,11 +282,11 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             '  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: await _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: await _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) {',
@@ -334,7 +297,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             '  let notFound = false;',
             "  const __expose = process.env.NODE_ENV !== 'production';",
             '  try {',
-            '    page = await renderPage(\'\', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: await _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') {",
@@ -372,7 +335,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             "  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: await _errorCompiled()" + bakedOptions + clientScriptOption + dataScriptOption + " });",
+            "  return renderFullPage('', _errorComp, props, __componentRegistry, { hydrate: true, cached: __getErrorCompiled()" + bakedOptions + clientScriptOption + dataScriptOption + " });",
             '}',
             '',
             'async function __renderHtml(params, requestUrl) {',
@@ -387,7 +350,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             // though it runs outside the ALS scope.
             "  const __streamToken = globalThis.__vsk_ssr_token || '';",
             '  try {',
-            "    stream = renderPageStream('', _comp, { params }, __componentRegistry, { hydrate: true, cached: await _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);',
@@ -474,7 +437,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
                 '    try {',
                 '      let dataPage;',
                 '      try {',
-                "        dataPage = await renderPage('', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: await _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);',
@@ -482,7 +445,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
                 '      }',
                 '      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: await _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 }), {",
@@ -501,7 +464,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
                 '    try {',
                 '      let dataPage;',
                 '      try {',
-                "        dataPage = await renderPage('', _comp, { params }, __componentRegistry, { hydrate: true, cached: await _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/adapter",
-  "version": "0.2.77",
+  "version": "0.2.80",
   "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.77",
-    "@vesk/runtime": "^0.2.77",
-    "@vesk/types": "^0.2.77"
+    "@vesk/compiler": "^0.2.80",
+    "@vesk/runtime": "^0.2.80",
+    "@vesk/types": "^0.2.80"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",