@vesk/vesk-cli 0.2.83 → 0.2.85

package/dist/cli.js

@@ -20425,11 +20425,9 @@ function collectModuleSpecifiers(ast) {
   });
   return specs;
 }
-function collectModuleBundled(absPath, collector) {
-  const existing2 = collector.keysByAbs.get(absPath);
+function collectModuleBundled(absPath, registry) {
+  const existing2 = registry.getKey(absPath);
   if (existing2) return existing2;
-  const key = `__veskMod${collector.keysByAbs.size}`;
-  collector.keysByAbs.set(absPath, key);
   const dir = dirname2(absPath);
   if (absPath.endsWith(".json")) {
     let raw2 = "";
@@ -20438,8 +20436,7 @@ function collectModuleBundled(absPath, collector) {
     } catch (err) {
       raw2 = "{}";
     }
-    collector.modules.push({ key, code: `module.exports = ${raw2};`, dir, deps: {} });
-    return key;
+    return registry.register(absPath, { code: `module.exports = ${raw2};`, dir, deps: {} });
   }
   let mtimeMs = -1;
   try {
@@ -20457,8 +20454,7 @@ function collectModuleBundled(absPath, collector) {
     if (!src2 || !src2.ast) {
       if (src2?.parseError) throw src2.parseError;
       const raw2 = src2 ? src2.raw : "// unreadable during build\nmodule.exports = {};";
-      collector.modules.push({ key, code: raw2, dir, deps: {} });
-      return key;
+      return registry.register(absPath, { code: raw2, dir, deps: {} });
     }
     let stripped = src2.ast;
     if (hasTsSyntax(src2.ast)) stripped = stripTsTypes(src2.ast);
@@ -20473,14 +20469,14 @@ function collectModuleBundled(absPath, collector) {
     if (!isRelativeSpec(spec)) continue;
     const depPath = resolveSsrModule(spec, dir);
     if (!depPath) continue;
-    deps[spec] = collectModuleBundled(depPath, collector);
+    deps[spec] = collectModuleBundled(depPath, registry);
   }
-  collector.modules.push({ key, code, dir, deps });
-  return key;
+  return registry.register(absPath, { code, dir, deps });
 }
-function collectModuleBundle(importStrs, fromDir, collector) {
+function collectModuleBundle(importStrs, fromDir, registry, collector) {
   const bindings = [];
   if (!fromDir) return bindings;
+  const seenKeys = /* @__PURE__ */ new Set();
   for (const imp of importStrs) {
     const target = importModuleTarget(imp);
     if (!target || isCompilerOwnedTarget(target) || isValueLessTarget(target)) continue;
@@ -20488,14 +20484,19 @@ function collectModuleBundle(importStrs, fromDir, collector) {
     if (!resolved) {
       continue;
     }
-    const key = collectModuleBundled(resolved, collector);
+    const key = collectModuleBundled(resolved, registry);
+    const mod = registry.getModule(key);
+    if (mod && !seenKeys.has(key)) {
+      seenKeys.add(key);
+      collector.modules.push({ key, dir: mod.dir, deps: mod.deps });
+    }
     for (const pair of importBindingPairs(imp)) {
       bindings.push({ local: pair.local, key, kind: pair.imported });
     }
   }
   return bindings;
 }
-var RUNTIME_PREFIXES, EXTENSIONS, BUILTIN_PREFIX, BUILTIN_CACHE, MODULE_CACHE, MAX_CACHE_ENTRIES, depStack, rawSourceCache, BUILD_CACHE_MAX, BUILD_CACHE_EVICT, EVALUATING, EMPTY_ALIASES, ALIAS_CACHE, exportCounter, bundledCodeCache;
+var RUNTIME_PREFIXES, EXTENSIONS, BUILTIN_PREFIX, BUILTIN_CACHE, MODULE_CACHE, MAX_CACHE_ENTRIES, depStack, rawSourceCache, BUILD_CACHE_MAX, BUILD_CACHE_EVICT, EVALUATING, EMPTY_ALIASES, ALIAS_CACHE, exportCounter, ModuleRegistry, bundledCodeCache;
 var init_module_imports = __esm({
   "../compiler/src/module-imports.ts"() {
     "use strict";
@@ -20517,6 +20518,45 @@ var init_module_imports = __esm({
     EMPTY_ALIASES = { exact: /* @__PURE__ */ new Map(), wildcard: [] };
     ALIAS_CACHE = /* @__PURE__ */ new Map();
     exportCounter = 0;
+    ModuleRegistry = class {
+      keysByAbs = /* @__PURE__ */ new Map();
+      data = /* @__PURE__ */ new Map();
+      has(absPath) {
+        return this.keysByAbs.has(absPath);
+      }
+      getKey(absPath) {
+        return this.keysByAbs.get(absPath);
+      }
+      get size() {
+        return this.data.size;
+      }
+      /** Register a module's transpiled body, returning its globally-unique key. */
+      register(absPath, entry) {
+        const existing2 = this.keysByAbs.get(absPath);
+        if (existing2) return existing2;
+        const key = `__veskMod${this.data.size}`;
+        this.keysByAbs.set(absPath, key);
+        this.data.set(key, entry);
+        return key;
+      }
+      getModule(key) {
+        return this.data.get(key);
+      }
+      /** All registered modules as a plain object keyed by synthetic key, for
+       *  passing to `hydratePrecompile` at SSR load time. */
+      modules() {
+        return Object.fromEntries(this.data.entries());
+      }
+      /** Emit a self-contained module registry source file. */
+      toModuleSource() {
+        const parts = [];
+        for (const [key, entry] of this.data) {
+          parts.push(`${JSON.stringify(key)}: ${JSON.stringify({ code: entry.code, dir: entry.dir, deps: entry.deps })}`);
+        }
+        return `export const __veskModules = {${parts.join(",")}};
+`;
+      }
+    };
     bundledCodeCache = /* @__PURE__ */ new Map();
   }
 });
@@ -49923,17 +49963,18 @@ init_md_inline();
 init_module_imports();
 import { readFileSync as readFileSync4 } from "node:fs";
 import { dirname as dirname6 } from "node:path";
-function precompileFile(source, sourcePath2) {
-  if (sourcePath2 === void 0) return precompileFileInternal(source, sourcePath2, /* @__PURE__ */ new Set());
+function precompileFile(source, sourcePath2, registry) {
+  const reg = registry ?? new ModuleRegistry();
+  if (sourcePath2 === void 0) return precompileFileInternal(source, sourcePath2, /* @__PURE__ */ new Set(), reg);
   const hit = precompileCache.get(sourcePath2);
   if (hit !== void 0 && hit.source === source) return hit.plan;
-  const plan = precompileFileInternal(source, sourcePath2, /* @__PURE__ */ new Set());
+  const plan = precompileFileInternal(source, sourcePath2, /* @__PURE__ */ new Set(), reg);
   if (precompileCache.size >= 512) precompileCache.clear();
   precompileCache.set(sourcePath2, { source, plan });
   return plan;
 }
 var precompileCache = /* @__PURE__ */ new Map();
-function precompileFileInternal(source, sourcePath2, seenImportFiles) {
+function precompileFileInternal(source, sourcePath2, seenImportFiles, registry) {
   if (sourcePath2) {
     const dir = dirname6(sourcePath2);
     source = inlineMdImportsFrom(source, sourcePath2, guessProjectRoots(dir));
@@ -49954,8 +49995,8 @@ function precompileFileInternal(source, sourcePath2, seenImportFiles) {
   const topLevelCode = transformTopLevelForActions(ir.topLevelCode, "server");
   const metadataSource = ir.metadataSource || null;
   const runtimeImports = ir.imports.slice();
-  const collector = { keysByAbs: /* @__PURE__ */ new Map(), modules: [] };
-  const bindings = sourcePath2 !== void 0 ? collectModuleBundle(ir.imports, dirname6(sourcePath2), collector) : [];
+  const collector = { modules: [] };
+  const bindings = sourcePath2 !== void 0 ? collectModuleBundle(ir.imports, dirname6(sourcePath2), registry, collector) : [];
   const subFiles = [];
   if (sourcePath2 !== void 0) {
     const vskPaths = [
@@ -49967,7 +50008,7 @@ function precompileFileInternal(source, sourcePath2, seenImportFiles) {
       seenImportFiles.add(importPath);
       try {
         const importedSrc = readFileSync4(importPath, "utf-8");
-        const subPlan = precompileFileInternal(importedSrc, importPath, seenImportFiles);
+        const subPlan = precompileFileInternal(importedSrc, importPath, seenImportFiles, registry);
         subFiles.push({ importPath, plan: subPlan });
       } catch {
       }
@@ -50018,6 +50059,7 @@ function resolveCssUrls(opts) {
 
 // ../adapter/src/ssr-function.ts
 init_default_pages();
+init_module_imports();
 function resolveBoundaryFile(sourceDir, appDir, file) {
   const rel = relative(appDir, sourceDir).split("/").filter(Boolean);
   for (let depth = rel.length; depth >= 0; depth--) {
@@ -50052,12 +50094,12 @@ function routeName(segments) {
 function extractCompName(src2) {
   return resolveComponentName(src2);
 }
-function precompilePlan(entryPath) {
+function precompilePlan(entryPath, registry) {
   const src2 = readFileSync7(entryPath, "utf-8");
-  return JSON.stringify(precompileFile(src2, entryPath));
+  return JSON.stringify(precompileFile(src2, entryPath, registry));
 }
 function hydrateInvoke(planExpr) {
-  return `(() => { try { return hydratePrecompile(${planExpr}); } catch { return null; } })()`;
+  return `(() => { try { return hydratePrecompile(${planExpr}, __veskModules); } catch { return null; } })()`;
 }
 function buildParamExtraction(node, urlParts) {
   const parts = [];
@@ -50138,7 +50180,8 @@ function persistedStoreSsrCode() {
     ""
   ].join("\n");
 }
-function generateSsrFunction(routeNode, appDir, outDir, componentMap, options) {
+function generateSsrFunction(routeNode, appDir, outDir, componentMap, options, registry) {
+  const reg = registry ?? new ModuleRegistry();
   const ancestorLayouts = options?.ancestorLayouts || [];
   const middlewareCode = options?.middlewareCode || null;
   const headExtra = options?.headExtra || null;
@@ -50162,34 +50205,34 @@ function generateSsrFunction(routeNode, appDir, outDir, componentMap, options) {
     const entryPath = resolve7(appDir, entry.sourceDir, "layout.vsk");
     const entrySrc = readFileSync7(entryPath, "utf-8");
     const entryComp = extractCompName(entrySrc) || "Layout";
-    const plan = precompilePlan(entryPath);
+    const plan = precompilePlan(entryPath, reg);
     layoutDecls.push({
       comp: JSON.stringify(entryComp),
       plan,
       compiled: hydrateInvoke(plan)
     });
   }
-  const pagePlan = precompilePlan(pagePath);
+  const pagePlan = precompilePlan(pagePath, reg);
   const pageComp = extractCompName(readFileSync7(pagePath, "utf-8")) || "Page";
   const errorPath = resolveErrorFile(routeNode.sourceDir, appDir);
   const errorSrc = errorPath ? readFileSync7(errorPath, "utf-8") : null;
   const errorComp = errorPath ? extractCompName(errorSrc) || "Error" : null;
   const errorCompDecl = errorPath ? `const _errorComp = ${JSON.stringify(errorComp)};
 ` : "const _errorComp = null;\n";
-  const errorPlanExpr = errorPath ? hydrateInvoke(precompilePlan(errorPath)) : "null";
+  const errorPlanExpr = errorPath ? hydrateInvoke(precompilePlan(errorPath, reg)) : "null";
   const notFoundPath = resolveNotFoundFile(routeNode.sourceDir, appDir);
   const notFoundSrc = notFoundPath ? readFileSync7(notFoundPath, "utf-8") : null;
   const notFoundComp = notFoundPath ? extractCompName(notFoundSrc) || "NotFound" : null;
   const notFoundCompDecl = notFoundPath ? `const _notFoundComp = ${JSON.stringify(notFoundComp)};
 ` : "const _notFoundComp = null;\n";
-  const notFoundPlanExpr = notFoundPath ? hydrateInvoke(precompilePlan(notFoundPath)) : "null";
+  const notFoundPlanExpr = notFoundPath ? hydrateInvoke(precompilePlan(notFoundPath, reg)) : "null";
   let src2 = "";
   if (layoutDecls.length > 0) {
     src2 = errorCompDecl + notFoundCompDecl;
     src2 += `const _pageComp = ${JSON.stringify(pageComp)};
 `;
     src2 += `let _pageCompiled = null;
-function __getPageCompiled() { if (!_pageCompiled) _pageCompiled = (() => { try { return hydratePrecompile(${pagePlan}); } catch { return null; } })(); return _pageCompiled; }
+function __getPageCompiled() { if (!_pageCompiled) _pageCompiled = (() => { try { return hydratePrecompile(${pagePlan}, __veskModules); } catch { return null; } })(); return _pageCompiled; }
 `;
     src2 += `const _layoutCompList = [${layoutDecls.map((d) => d.comp).join(", ")}];
 `;
@@ -50209,7 +50252,7 @@ function __getNotFoundCompiled() { if (!_notFoundCompiled) _notFoundCompiled = $
     src2 += `const _comp = ${JSON.stringify(pageComp)};
 `;
     src2 += `let _compiled = null;
-function __getCompiled() { if (!_compiled) _compiled = (() => { try { return hydratePrecompile(${pagePlan}); } catch { return null; } })(); return _compiled; }
+function __getCompiled() { if (!_compiled) _compiled = (() => { try { return hydratePrecompile(${pagePlan}, __veskModules); } catch { return null; } })(); return _compiled; }
 `;
     src2 += `let _errorCompiled = null;
 function __getErrorCompiled() { if (!_errorCompiled) _errorCompiled = ${errorPlanExpr}; return _errorCompiled; }
@@ -50232,11 +50275,11 @@ function __getNotFoundCompiled() { if (!_notFoundCompiled) _notFoundCompiled = $
   const compMap = componentMap || /* @__PURE__ */ new Map();
   const regPlans = [];
   for (const [compName, compPath] of compMap) {
-    const plan = precompilePlan(compPath);
+    const plan = precompilePlan(compPath, reg);
     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); }
+      if (!_compiled) { _compiled = hydratePrecompile(__regPlans.get(${JSON.stringify(compName)}), __veskModules); __regCompiled.set(${JSON.stringify(compName)}, _compiled); }
       const result = await renderPage('', ${JSON.stringify(compName)}, props, __registry, { hydrate: true, cached: _compiled });
       return result.body;
     });`);
@@ -50594,6 +50637,7 @@ function __getNotFoundCompiled() { if (!_notFoundCompiled) _notFoundCompiled = $
     ""
   ].join("\n");
   const funcCode = [
+    "import { __veskModules } from '../__vesk-modules.mjs';",
     "import { renderFullPage, renderPageStream, renderPage, hydratePrecompile, parseCookies, getAction, validateActionInput, issuesToFieldMap, storeDataScriptGlobal, withSsrStore, assertSameOrigin, VeskRequest, installPersistedStoreServerHooks, persistedStoreCookieName, getPersistedStoreKeys, resetPersistedStoreKeys, buildStorePrePaintPayload, storeInitScriptGlobal, storeInitScriptTag } from '../runtime.js';",
     "",
     middlewareCode || "",
@@ -50625,6 +50669,7 @@ function __getNotFoundCompiled() { if (!_notFoundCompiled) _notFoundCompiled = $
 
 // ../adapter/dist/index.js
 init_actions();
+init_module_imports();
 
 // ../adapter/src/api-function.ts
 init_strip_ts();
@@ -54199,7 +54244,7 @@ async function build2(appDir, options) {
           mwCode = compileMiddlewareCode(mwSources);
         }
         const ssrAncestorLayouts = isStandalone ? [] : ancestorLayouts;
-        const { funcPath, funcCode, name } = generateSsrFunction(node, appDir, outDir, componentMap, { ancestorLayouts: ssrAncestorLayouts, middlewareCode: mwCode, headExtra: pluginHeadExtra, clientScriptUrl: clientUrl, clientScriptIntegrity: clientIntegrity });
+        const { funcPath, funcCode, name } = generateSsrFunction(node, appDir, outDir, componentMap, { ancestorLayouts: ssrAncestorLayouts, middlewareCode: mwCode, headExtra: pluginHeadExtra, clientScriptUrl: clientUrl, clientScriptIntegrity: clientIntegrity }, registry);
         writeFileSync12(funcPath, funcCode, "utf-8");
         const pagePath = resolve21(appDir, node.sourceDir, "page.vsk");
         if (existsSync22(pagePath)) {
@@ -54231,7 +54276,9 @@ async function build2(appDir, options) {
       walk9(node.children || [], childAncestorLayouts);
     }
   }
+  const registry = new ModuleRegistry();
   walk9(routeTree);
+  writeFileSync12(resolve21(outDir, "server", "__vesk-modules.mjs"), registry.toModuleSource(), "utf-8");
   markPhase("server runtime + ssr functions");
   const apiRoutes = [];
   function walkApi(nodes) {
@@ -64801,6 +64848,7 @@ function renderDefaultNotFoundPage2(opts = {}) {
 import { readFileSync as readFileSync36, existsSync as existsSync37 } from "node:fs";
 import { resolve as resolve33, relative as relative7, join as join26 } from "node:path";
 init_default_pages();
+init_module_imports();
 function resolveBoundaryFileForUrl2(pathname, appDir, file) {
   const segments = pathname.split("/").filter(Boolean);
   for (let depth = segments.length; depth >= 0; depth--) {

package/package.json

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