@vesk/compiler 0.2.83 → 0.2.85

package/dist/module-imports.d.ts

@@ -125,20 +125,62 @@ export interface ModuleBindingData {
     /** `default` | `*` | named export. */
     kind: string;
 }
+/** Lightweight plan-level reference to a bundled module (no source code). */
+export interface ModuleRef {
+    /** Synthetic loader key (e.g. `__veskMod0`), referenced by deps/bindings. */
+    key: string;
+    /** Directory the module lived in at build time (require fallback anchor). */
+    dir: string;
+    /** Relative specifier (as written) -> sibling module key. */
+    deps: Record<string, string>;
+}
+/** What the registry stores per key: the transpiled body plus anchor dir/deps. */
+export interface ModuleEntry {
+    /** ESM->CJS rewritten body (or raw CJS / JSON `module.exports` body). */
+    code: string;
+    /** Directory the module lived in at build time (require fallback anchor). */
+    dir: string;
+    /** Relative specifier (as written) -> sibling module key. */
+    deps: Record<string, string>;
+}
+/**
+ * Global registry of bundled module source code, shared across every SSR
+ * function in a single build. Without it, every page plan re-embedded the
+ * full source of every module it transitively imports — a docs-style app
+ * whose 40 pages all import `lucide-vevk` stored its ~1.8 MB `buildSvgString`
+ * 40 times, inflating the single serverless handler to hundreds of megabytes
+ * and OOM-killing cold starts. Modules are registered once and every plan
+ * references them by key; the registry source is emitted into one shared file
+ * imported by every SSR function.
+ */
+export declare class ModuleRegistry {
+    private keysByAbs;
+    private data;
+    has(absPath: string): boolean;
+    getKey(absPath: string): string | undefined;
+    get size(): number;
+    /** Register a module's transpiled body, returning its globally-unique key. */
+    register(absPath: string, entry: ModuleEntry): string;
+    getModule(key: string): ModuleEntry | undefined;
+    /** All registered modules as a plain object keyed by synthetic key, for
+     *  passing to `hydratePrecompile` at SSR load time. */
+    modules(): Record<string, ModuleEntry>;
+    /** Emit a self-contained module registry source file. */
+    toModuleSource(): string;
+}
 export type ModuleCollector = {
-    keysByAbs: Map<string, string>;
-    modules: BundledModuleData[];
+    modules: ModuleRef[];
 };
 /**
  * Bundles one module file (plus its relative closure) into `collector`.
  * Returns the synthetic key loaded modules use to reference it.
  */
-export declare function collectModuleBundled(absPath: string, collector: ModuleCollector): string;
+export declare function collectModuleBundled(absPath: string, registry: ModuleRegistry): string;
 /**
  * Builds the module bundle + local-binding list for a set of import lines
  * (a `.vsk` file's `imports`). Framework-owned, `.vsk`, `.css` and markdown
  * targets are skipped exactly as `applyLocalModuleImports` skips them, so the
  * hydrate-time scope matches today's runtime module loader.
  */
-export declare function collectModuleBundle(importStrs: string[], fromDir: string | undefined, collector: ModuleCollector): ModuleBindingData[];
+export declare function collectModuleBundle(importStrs: string[], fromDir: string | undefined, registry: ModuleRegistry, collector: ModuleCollector): ModuleBindingData[];
 //# sourceMappingURL=module-imports.d.ts.map

package/dist/module-imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-imports.d.ts","sourceRoot":"","sources":["../src/module-imports.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAGlD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAyEtD,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAM7D;AAED,gEAAgE;AAChE,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAOzD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAgC1F;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAQpE;AAED,0FAA0F;AAC1F,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,UAAU,EAAE,MAAM,EAAE,EACpB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,IAAI,CAuBN;AAiBD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAsE7E;AAmFD,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,GAAG,IAAI,CAAC;IACrC,mEAAmE;IACnE,UAAU,CAAC,EAAE,SAAS,CAAC;CACxB;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CA+B/D;AAgbD,8DAA8D;AAC9D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAU/D;AAgDD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiB/E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAevE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA+ClF;AA6DD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAwCpF;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAyB9F;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiC1F;AAsGD,kFAAkF;AAClF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAiGxF;AAaD,MAAM,WAAW,iBAAiB;IAChC,6EAA6E;IAC7E,GAAG,EAAE,MAAM,CAAC;IACZ,yEAAyE;IACzE,IAAI,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,GAAG,EAAE,MAAM,CAAC;IACZ,6DAA6D;IAC7D,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,iBAAiB;IAChC,sDAAsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,2CAA2C;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,sCAAsC;IACtC,IAAI,EAAE,MAAM,CAAC;CACd;AAoDD,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,CAkExF;AAID;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,SAAS,EAAE,eAAe,GACzB,iBAAiB,EAAE,CAiBrB"}
+{"version":3,"file":"module-imports.d.ts","sourceRoot":"","sources":["../src/module-imports.ts"],"names":[],"mappings":"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"}

package/dist/module-imports.js

@@ -1437,6 +1437,55 @@ export function esmToCjs(body) {
     }
     return lines.join('\n');
 }
+/**
+ * Global registry of bundled module source code, shared across every SSR
+ * function in a single build. Without it, every page plan re-embedded the
+ * full source of every module it transitively imports — a docs-style app
+ * whose 40 pages all import `lucide-vevk` stored its ~1.8 MB `buildSvgString`
+ * 40 times, inflating the single serverless handler to hundreds of megabytes
+ * and OOM-killing cold starts. Modules are registered once and every plan
+ * references them by key; the registry source is emitted into one shared file
+ * imported by every SSR function.
+ */
+export class ModuleRegistry {
+    keysByAbs = new Map();
+    data = 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 existing = this.keysByAbs.get(absPath);
+        if (existing)
+            return existing;
+        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(',')}};\n`;
+    }
+}
 function isRelativeSpec(spec) {
     return spec.startsWith('./') || spec.startsWith('../');
 }
@@ -1497,12 +1546,10 @@ function collectModuleSpecifiers(ast) {
  * Bundles one module file (plus its relative closure) into `collector`.
  * Returns the synthetic key loaded modules use to reference it.
  */
-export function collectModuleBundled(absPath, collector) {
-    const existing = collector.keysByAbs.get(absPath);
+export function collectModuleBundled(absPath, registry) {
+    const existing = registry.getKey(absPath);
     if (existing)
         return existing;
-    const key = `__veskMod${collector.keysByAbs.size}`;
-    collector.keysByAbs.set(absPath, key);
     const dir = dirname(absPath);
     if (absPath.endsWith('.json')) {
         let raw = '';
@@ -1512,8 +1559,7 @@ export function collectModuleBundled(absPath, collector) {
         catch (err) {
             raw = '{}';
         }
-        collector.modules.push({ key, code: `module.exports = ${raw};`, dir, deps: {} });
-        return key;
+        return registry.register(absPath, { code: `module.exports = ${raw};`, dir, deps: {} });
     }
     // The transpiled code and the relative specifiers of a module do not depend
     // on which collector is asking, only on the file — and every `.vsk` compile
@@ -1544,8 +1590,7 @@ export function collectModuleBundled(absPath, collector) {
             if (src?.parseError)
                 throw src.parseError;
             const raw = src ? src.raw : '// unreadable during build\nmodule.exports = {};';
-            collector.modules.push({ key, code: raw, dir, deps: {} });
-            return key;
+            return registry.register(absPath, { code: raw, dir, deps: {} });
         }
         let stripped = src.ast;
         if (hasTsSyntax(src.ast))
@@ -1563,10 +1608,9 @@ export function collectModuleBundled(absPath, collector) {
         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 });
 }
 const bundledCodeCache = new Map();
 /**
@@ -1575,10 +1619,11 @@ const bundledCodeCache = new Map();
  * targets are skipped exactly as `applyLocalModuleImports` skips them, so the
  * hydrate-time scope matches today's runtime module loader.
  */
-export function collectModuleBundle(importStrs, fromDir, collector) {
+export function collectModuleBundle(importStrs, fromDir, registry, collector) {
     const bindings = [];
     if (!fromDir)
         return bindings;
+    const seenKeys = new Set();
     for (const imp of importStrs) {
         const target = importModuleTarget(imp);
         if (!target || isCompilerOwnedTarget(target) || isValueLessTarget(target))
@@ -1588,7 +1633,12 @@ export function collectModuleBundle(importStrs, fromDir, collector) {
             // Keep render behavior identical to the runtime loader (warn + skip).
             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 });
         }

package/dist/precompile-runtime.d.ts

@@ -1,12 +1,12 @@
 import type { CompileFileResult } from '@vesk/compiler/src/types';
-import type { BundledModuleData, ModuleBindingData } from '@vesk/compiler/src/module-imports';
+import type { ModuleBindingData, ModuleEntry, ModuleRef } from '@vesk/compiler/src/module-imports';
 export interface PrecompiledComponentEntry {
     name: string;
     /** Compiled component body source (`buildComponentMap`-style function code). */
     source: string;
     isAsync: boolean;
 }
-export type PrecompileBundledModule = BundledModuleData;
+export type PrecompileBundledModule = ModuleRef;
 export type PrecompileBinding = ModuleBindingData;
 export interface PrecompileSubFilePlan {
     importPath: string;
@@ -19,8 +19,8 @@ export interface PrecompileFilePlan {
     runtimeImports: string[];
     /** This file's own compiled components. */
     components: PrecompiledComponentEntry[];
-    /** The module bundle backing this file's local value imports. */
-    modules: PrecompileBundledModule[];
+    /** The module bundle backing this file's local value imports (keys into the shared __veskModules registry). */
+    modules: ModuleRef[];
     /** local name -> bundled module export. */
     bindings: PrecompileBinding[];
     /** Top-level statements, already `defineAction`-transformed for `server`. */
@@ -50,5 +50,5 @@ export declare function irFromJSON(value: unknown): unknown;
  * `precompile.ts` plan at SSR function load time. No source, no disk, no
  * syntax analysis — the plan is fully compiled at build time.
  */
-export declare function hydratePrecompile(plan: PrecompileFilePlan): CompileFileResult;
+export declare function hydratePrecompile(plan: PrecompileFilePlan, modules: Record<string, ModuleEntry>): CompileFileResult;
 //# sourceMappingURL=precompile-runtime.d.ts.map

package/dist/precompile-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"precompile-runtime.d.ts","sourceRoot":"","sources":["../src/precompile-runtime.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AA0BlE,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAe9F,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,CAAC;AAExD,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAElD,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,iFAAiF;IACjF,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC;IACnB,8DAA8D;IAC9D,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,2CAA2C;IAC3C,UAAU,EAAE,yBAAyB,EAAE,CAAC;IACxC,iEAAiE;IACjE,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,2CAA2C;IAC3C,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,6EAA6E;IAC7E,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,0DAA0D;IAC1D,QAAQ,EAAE,qBAAqB,EAAE,CAAC;IAClC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAqCD;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAiBhD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CA0BlD;AAoID;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,kBAAkB,GAAG,iBAAiB,CAE7E"}
+{"version":3,"file":"precompile-runtime.d.ts","sourceRoot":"","sources":["../src/precompile-runtime.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AA0BlE,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAenG,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,uBAAuB,GAAG,SAAS,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAElD,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,iFAAiF;IACjF,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC;IACnB,8DAA8D;IAC9D,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,2CAA2C;IAC3C,UAAU,EAAE,yBAAyB,EAAE,CAAC;IACxC,+GAA+G;IAC/G,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,2CAA2C;IAC3C,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,6EAA6E;IAC7E,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,0DAA0D;IAC1D,QAAQ,EAAE,qBAAqB,EAAE,CAAC;IAClC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAqCD;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAiBhD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CA0BlD;AA0ID;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,kBAAkB,EACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GACnC,iBAAiB,CAEnB"}

package/dist/precompile-runtime.js

@@ -97,30 +97,27 @@ export function irFromJSON(value) {
 // ---------------------------------------------------------------------------
 // Hydration.
 // ---------------------------------------------------------------------------
-function hydrateModuleScope(scope, plan) {
+function hydrateModuleScope(scope, plan, modules) {
     if (!plan.modules || plan.modules.length === 0)
         return;
-    const byKey = new Map();
-    for (const m of plan.modules)
-        byKey.set(m.key, m);
     const exportsByKey = new Map();
     const evaluateModule = (key) => {
         const existing = exportsByKey.get(key);
         if (existing)
             return existing;
-        const mod = byKey.get(key);
-        if (!mod)
+        const entry = modules[key];
+        if (!entry)
             return null;
         const exportsObj = {};
         exportsByKey.set(key, exportsObj);
         const moduleObj = { exports: exportsObj };
         const requireShim = (spec) => {
-            const depKey = mod.deps[spec];
+            const depKey = entry.deps[spec];
             if (depKey)
                 return evaluateModule(depKey) || {};
             // Framework runtime imports resolve to the instance the SSR bundle
             // already loaded. Leaving them to the real loader broke every
-            // serverless deployment: `mod.dir` is the BUILD-time absolute path
+            // serverless deployment: `entry.dir` is the BUILD-time absolute path
             // (/vercel/path0/src/_lib), which does not exist at runtime, so
             // `require('@vesk/runtime')` walked a market that was not there.
             if (spec === '@vesk/runtime' ||
@@ -135,7 +132,7 @@ function hydrateModuleScope(scope, plan) {
             // real loader. Anchor at the module's own dir first (dev/local), then at
             // the process cwd, which is the deployment root on serverless hosts.
             let lastErr;
-            for (const anchor of [mod.dir, process.cwd()]) {
+            for (const anchor of [entry.dir, process.cwd()]) {
                 try {
                     return createRequire(join(anchor, '__vesk__.js'))(spec);
                 }
@@ -143,16 +140,16 @@ function hydrateModuleScope(scope, plan) {
                     lastErr = err;
                 }
             }
-            throw new Error(`Cannot resolve '${spec}' required by ${mod.key} during SSR hydrate: ${lastErr?.message}`);
+            throw new Error(`Cannot resolve '${spec}' required by ${key} during SSR hydrate: ${lastErr?.message}`);
         };
         try {
-            const body = mod.code ? `'use strict';\n${mod.code}` : "'use strict';";
+            const body = entry.code ? `'use strict';\n${entry.code}` : "'use strict';";
             const fn = new Function('require', 'module', 'exports', '__dirname', '__filename', body);
-            fn(requireShim, moduleObj, moduleObj.exports, mod.dir, join(mod.dir, '__vesk__.js'));
+            fn(requireShim, moduleObj, moduleObj.exports, entry.dir, join(entry.dir, '__vesk__.js'));
         }
         catch (err) {
             exportsByKey.delete(key);
-            console.warn(`[vesk] SSR: failed to evaluate bundled module ${mod.key} (${mod.dir}): ` +
+            console.warn(`[vesk] SSR: failed to evaluate bundled module ${key} (${entry.dir}): ` +
                 `${err?.message ?? String(err)}`);
             return null;
         }
@@ -185,10 +182,10 @@ function hydrateModuleScope(scope, plan) {
         }
     }
 }
-function hydrateFile(plan, seen) {
+function hydrateFile(plan, seen, modules) {
     const ir = plan.ir ? irFromJSON(plan.ir) : new IRRoot([], [], new Set(), null, null, []);
     const __vesk = loadRuntimeImports(plan.runtimeImports || []);
-    hydrateModuleScope(__vesk, plan);
+    hydrateModuleScope(__vesk, plan, modules);
     evalTopLevelCode(plan.topLevelCode || [], __vesk);
     const componentMap = new Map();
     for (const entry of plan.components || []) {
@@ -206,7 +203,7 @@ function hydrateFile(plan, seen) {
         if (seen.has(sub.importPath))
             continue;
         seen.add(sub.importPath);
-        const subResult = hydrateFile(sub.plan, seen);
+        const subResult = hydrateFile(sub.plan, seen, modules);
         for (const [name, fn] of subResult.componentMap) {
             if (!componentMap.has(name))
                 componentMap.set(name, fn);
@@ -227,6 +224,6 @@ function hydrateFile(plan, seen) {
  * `precompile.ts` plan at SSR function load time. No source, no disk, no
  * syntax analysis — the plan is fully compiled at build time.
  */
-export function hydratePrecompile(plan) {
-    return hydrateFile(plan, new Set());
+export function hydratePrecompile(plan, modules) {
+    return hydrateFile(plan, new Set(), modules);
 }

package/dist/precompile.d.ts

@@ -1,3 +1,4 @@
+import { ModuleRegistry } from '@vesk/compiler/src/module-imports';
 import type { PrecompileFilePlan } from '@vesk/compiler/src/precompile-runtime';
 /**
  * Precompiles one `.vsk` file into a `PrecompileFilePlan` at BUILD time.
@@ -9,7 +10,7 @@ import type { PrecompileFilePlan } from '@vesk/compiler/src/precompile-runtime';
  * `CompileFileResult` at load time with `hydratePrecompile`, with no disk
  * access and no `.vsk` source embedded in the deployment.
  */
-export declare function precompileFile(source: string, sourcePath?: string): PrecompileFilePlan;
+export declare function precompileFile(source: string, sourcePath?: string, registry?: ModuleRegistry): PrecompileFilePlan;
 /** Drop the plan cache (tests, and any caller that compiles outside a build). */
 export declare function clearPrecompileCache(): void;
 //# sourceMappingURL=precompile.d.ts.map

package/dist/precompile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"precompile.d.ts","sourceRoot":"","sources":["../src/precompile.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,kBAAkB,EAGnB,MAAM,uCAAuC,CAAC;AAG/C;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAYtF;AAeD,iFAAiF;AACjF,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C"}
+{"version":3,"file":"precompile.d.ts","sourceRoot":"","sources":["../src/precompile.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,cAAc,EACf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EACV,kBAAkB,EAGnB,MAAM,uCAAuC,CAAC;AAG/C;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,cAAc,GACxB,kBAAkB,CAapB;AAeD,iFAAiF;AACjF,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C"}

package/dist/precompile.js

@@ -7,7 +7,7 @@ import { buildComponentEntries } from '@vesk/compiler/src/server-jsgen';
 import { transformTopLevelForActions } from '@vesk/compiler/src/actions';
 import { collectVskImportPaths, collectVskReexportPaths } from '@vesk/compiler/src/vsk-imports';
 import { inlineMdImportsFrom, guessProjectRoots } from '@vesk/compiler/src/md-inline';
-import { collectModuleBundle, } from '@vesk/compiler/src/module-imports';
+import { collectModuleBundle, ModuleRegistry, } from '@vesk/compiler/src/module-imports';
 import { irToJSON } from '@vesk/compiler/src/precompile-runtime';
 /**
  * Precompiles one `.vsk` file into a `PrecompileFilePlan` at BUILD time.
@@ -19,15 +19,16 @@ import { irToJSON } from '@vesk/compiler/src/precompile-runtime';
  * `CompileFileResult` at load time with `hydratePrecompile`, with no disk
  * access and no `.vsk` source embedded in the deployment.
  */
-export function precompileFile(source, sourcePath) {
+export function precompileFile(source, sourcePath, registry) {
+    const reg = registry ?? new ModuleRegistry();
     if (sourcePath === undefined)
-        return precompileFileInternal(source, sourcePath, new Set());
+        return precompileFileInternal(source, sourcePath, new Set(), reg);
     const hit = precompileCache.get(sourcePath);
     // Compare the source, not just the path: the dev server rebuilds in-process
     // and a stale plan would silently ship yesterday's component.
     if (hit !== undefined && hit.source === source)
         return hit.plan;
-    const plan = precompileFileInternal(source, sourcePath, new Set());
+    const plan = precompileFileInternal(source, sourcePath, new Set(), reg);
     // Bound it: plans are sizeable on a large app, and a watch session can
     // outlive many builds.
     if (precompileCache.size >= 512)
@@ -51,7 +52,7 @@ const precompileCache = new Map();
 export function clearPrecompileCache() {
     precompileCache.clear();
 }
-function precompileFileInternal(source, sourcePath, seenImportFiles) {
+function precompileFileInternal(source, sourcePath, seenImportFiles, registry) {
     if (sourcePath) {
         const dir = dirname(sourcePath);
         source = inlineMdImportsFrom(source, sourcePath, guessProjectRoots(dir));
@@ -76,8 +77,8 @@ function precompileFileInternal(source, sourcePath, seenImportFiles) {
     const topLevelCode = transformTopLevelForActions(ir.topLevelCode, 'server');
     const metadataSource = ir.metadataSource || null;
     const runtimeImports = ir.imports.slice();
-    const collector = { keysByAbs: new Map(), modules: [] };
-    const bindings = sourcePath !== undefined ? collectModuleBundle(ir.imports, dirname(sourcePath), collector) : [];
+    const collector = { modules: [] };
+    const bindings = sourcePath !== undefined ? collectModuleBundle(ir.imports, dirname(sourcePath), registry, collector) : [];
     const subFiles = [];
     if (sourcePath !== undefined) {
         const vskPaths = [
@@ -90,7 +91,7 @@ function precompileFileInternal(source, sourcePath, seenImportFiles) {
             seenImportFiles.add(importPath);
             try {
                 const importedSrc = readFileSync(importPath, 'utf-8');
-                const subPlan = precompileFileInternal(importedSrc, importPath, seenImportFiles);
+                const subPlan = precompileFileInternal(importedSrc, importPath, seenImportFiles, registry);
                 subFiles.push({ importPath, plan: subPlan });
             }
             catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/compiler",
-  "version": "0.2.83",
+  "version": "0.2.85",
   "type": "module",
   "description": "Vesk compiler — lexer, parser, semantic analysis, IR, codegen",
   "main": "./dist/index.js",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@sveltejs/acorn-typescript": "^1.0.0",
-    "@vesk/types": "^0.2.83",
+    "@vesk/types": "^0.2.85",
     "acorn": "^8.15.0",
     "esrap": "^2.3.0",
     "is-reference": "^3.0.0",