@vesk/compiler 0.2.92 → 0.2.94

package/dist/module-imports.d.ts

@@ -106,7 +106,7 @@ export declare function resolveViaPackageExports(specifier: string, fromDir: str
 /** Rewrites an ESM program body (imports/exports removed) into CJS statements. */
 export declare function esmToCjs(body: Array<{
     type: string;
-} & Record<string, unknown>>): string;
+} & Record<string, unknown>>, rewriteImports?: ReadonlySet<string>): string;
 export interface BundledModuleData {
     /** Synthetic loader key (e.g. `__veskMod0`), referenced by deps/bindings. */
     key: string;
@@ -142,6 +142,13 @@ export interface ModuleEntry {
     dir: string;
     /** Relative specifier (as written) -> sibling module key. */
     deps: Record<string, string>;
+    /**
+     * Absolute path the entry was registered under. Kept so a plan can be
+     * replayed into a fresh registry (see `precompile.ts`), where the module
+     * key is derived from this path. Never emitted into the deployment
+     * registry (which only serializes code/dir/deps).
+     */
+    absPath?: string;
 }
 /**
  * Global registry of bundled module source code, shared across every SSR
@@ -159,7 +166,7 @@ export declare class ModuleRegistry {
     has(absPath: string): boolean;
     getKey(absPath: string): string | undefined;
     get size(): number;
-    /** Register a module's transpiled body, returning its globally-unique key. */
+    /** Register a module's transpiled body, returning its stable key. */
     register(absPath: string, entry: ModuleEntry): string;
     getModule(key: string): ModuleEntry | undefined;
     /** All registered modules as a plain object keyed by synthetic key, for

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

@@ -1 +1 @@
-{"version":3,"file":"module-imports.d.ts","sourceRoot":"","sources":["../src/module-imports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module-imports.d.ts","sourceRoot":"","sources":["../src/module-imports.ts"],"names":[],"mappings":"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"}

package/dist/module-imports.js

@@ -259,12 +259,21 @@ export function loadSsrModule(absPath) {
             }
             else {
                 exportsObj = {};
+                // Wrap exportsObj in a module object so CJS modules that do
+                // `module.exports = factory()` (e.g. qrcode-generator) have their
+                // export captured correctly. Without this, module.exports is replaced
+                // but exportsObj still points to the original empty object.
+                const moduleObj = { exports: exportsObj };
                 EVALUATING.set(absPath, exportsObj);
-                const ran = evaluateModuleFile(absPath, exportsObj, src);
+                const ran = evaluateModuleFile(absPath, moduleObj, src);
                 // Runtime evaluation failure (already warned) — give Node's own loader
                 // a chance before giving up.
                 if (!ran)
                     exportsObj = null;
+                // Prefer module.exports when a CJS module replaced it (e.g.
+                // qrcode-generator), otherwise fall back to exportsObj.
+                else if (moduleObj.exports !== exportsObj)
+                    exportsObj = moduleObj.exports;
             }
         }
         if (exportsObj === null) {
@@ -601,7 +610,7 @@ function createLazyBarrelExports(spec, dir) {
  * `src` carries a read+parse already done by the caller (either a barrel probe
  * or a plain load) so big files aren't read/parsed twice.
  */
-function evaluateModuleFile(absPath, exportsObj, src) {
+function evaluateModuleFile(absPath, moduleObj, src) {
     let raw;
     if (src) {
         raw = src.raw;
@@ -636,7 +645,7 @@ function evaluateModuleFile(absPath, exportsObj, src) {
         // Not parseable as ESM — run verbatim as CJS.
         try {
             const fn = new Function('require', 'module', 'exports', '__dirname', '__filename', raw);
-            fn(createModuleRequire(dirname(absPath)), { exports: exportsObj }, exportsObj, dirname(absPath), absPath);
+            fn(createModuleRequire(dirname(absPath)), moduleObj, moduleObj.exports, dirname(absPath), absPath);
         }
         catch (err) {
             console.warn(`[vesk] SSR: failed to load ${absPath}: ${err?.message ?? String(err)}`);
@@ -661,7 +670,7 @@ function evaluateModuleFile(absPath, exportsObj, src) {
     // ESM modules are always strict; mirror per-spec `this === undefined`.
     try {
         const fn = new Function('require', 'module', 'exports', '__dirname', '__filename', "'use strict';\n" + body);
-        fn(createModuleRequire(dirname(absPath)), { exports: exportsObj }, exportsObj, dirname(absPath), absPath);
+        fn(createModuleRequire(dirname(absPath)), moduleObj, moduleObj.exports, dirname(absPath), absPath);
     }
     catch (err) {
         console.warn(`[vesk] SSR: failed to load ${absPath}: ${err?.message ?? String(err)}`);
@@ -949,6 +958,12 @@ export function resolveImportPath(spec, fromDir) {
         const aliased = resolveAliasModule(spec, fromDir);
         if (aliased)
             return aliased;
+        // Bare npm specifiers (e.g. "vesk-qr") must resolve to absolute paths so
+        // the client-chunk bundler (esbuild from a temp dir) can find them in
+        // the app's node_modules via the package's exports map.
+        const resolved = resolveSsrModule(spec, fromDir);
+        if (resolved)
+            return isBuiltinPath(resolved) ? resolved.slice(BUILTIN_PREFIX.length) : resolved;
     }
     return spec;
 }
@@ -1161,8 +1176,13 @@ export function resolveViaPackageModuleField(specifier, fromDir) {
         if (statOrNull(pkgPath) !== null) {
             try {
                 const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-                if (typeof pkg.module === 'string' && pkg.module.length > 0) {
-                    const found = probeFile(resolve(join(dir, 'node_modules', pkgName), pkg.module));
+                const entry = typeof pkg.module === 'string' && pkg.module.length > 0
+                    ? pkg.module
+                    : typeof pkg.main === 'string' && pkg.main.length > 0
+                        ? pkg.main
+                        : null;
+                if (entry) {
+                    const found = probeFile(resolve(join(dir, 'node_modules', pkgName), entry));
                     if (found)
                         return toRealPath(found);
                 }
@@ -1325,10 +1345,82 @@ function exportGetter(lines, key, valueExpr) {
     lines.push(`Object.defineProperty(exports, ${JSON.stringify(key)}, { get: () => ${valueExpr}, enumerable: true });`);
 }
 let exportCounter = 0;
+/**
+ * `Promise.resolve().then(() => require("<spec>"))` as an AST expression.
+ * Reusing the original literal node keeps its raw quoting.
+ */
+function promiseOfRequire(sourceNode) {
+    return {
+        type: 'CallExpression',
+        optional: false,
+        callee: {
+            type: 'MemberExpression',
+            optional: false,
+            computed: false,
+            object: {
+                type: 'CallExpression',
+                optional: false,
+                callee: {
+                    type: 'MemberExpression',
+                    optional: false,
+                    computed: false,
+                    object: { type: 'Identifier', name: 'Promise' },
+                    property: { type: 'Identifier', name: 'resolve' },
+                },
+                arguments: [],
+            },
+            property: { type: 'Identifier', name: 'then' },
+        },
+        arguments: [
+            {
+                type: 'ArrowFunctionExpression',
+                id: null,
+                expression: true,
+                generator: false,
+                async: false,
+                params: [],
+                body: {
+                    type: 'CallExpression',
+                    optional: false,
+                    callee: { type: 'Identifier', name: 'require' },
+                    arguments: [sourceNode],
+                },
+            },
+        ],
+    };
+}
+/**
+ * Rewrites `import("<spec>")` for specifiers the SSR module bundle resolved
+ * (those present in the module's `deps`) into a promise of the same
+ * `require` the static-import rewrite emits.
+ *
+ * Registry bodies run inside `new Function`, where a native dynamic `import()`
+ * has no referrer and Node resolves it against the generated function's
+ * location (`/var/task` on Vercel). That directory ships no node_modules, so
+ * e.g. vesk-qr's lazy `import("qrcode-generator")` fails even though the
+ * encoder is already in the bundle. Routing it through the require shim makes
+ * it use `entry.deps`, exactly like a static import.
+ *
+ * Specifiers that were not bundled (framework-owned, `.vsk`, builtins) keep
+ * their original form: the shim and the host loader know how to handle them.
+ */
+function rewriteDynamicImports(node, specs) {
+    return walk(node, null, {
+        ImportExpression(n) {
+            const spec = stringLiteralValue(n.source);
+            if (!spec || !specs.has(spec))
+                return;
+            return promiseOfRequire(n.source);
+        },
+    });
+}
 /** Rewrites an ESM program body (imports/exports removed) into CJS statements. */
-export function esmToCjs(body) {
+export function esmToCjs(body, rewriteImports) {
+    const statements = rewriteImports
+        ? body.map((stmt) => rewriteDynamicImports(stmt, rewriteImports))
+        : body;
     const lines = [];
-    for (const stmt of body) {
+    for (const stmt of statements) {
         switch (stmt.type) {
             case 'ImportDeclaration': {
                 const source = printNode(stmt.source);
@@ -1437,6 +1529,35 @@ export function esmToCjs(body) {
     }
     return lines.join('\n');
 }
+/**
+ * Synthetic key for a module. Derived from the absolute path rather than the
+ * registry's insertion order so the SAME module always gets the same key in
+ * every build. Positional keys (`__veskMod${size}`) made cross-build plan
+ * caching unsafe: a second in-process build (the dev server after the prod
+ * build) started with an empty registry, served cached plans whose keys
+ * referred to modules it never registered, and emitted `export const
+ * __veskModules = {}`. Paired with the plan cache replaying each plan's
+ * modules into the fresh registry, a path-derived key makes that replay
+ * idempotent and collision-free.
+ */
+function moduleKeyFor(absPath) {
+    // Four independent FNV-1a 32-bit lanes → 128 bits of key space, which makes
+    // an accidental collision between two paths (which would silently swap one
+    // module for another) effectively impossible. Hand-rolled rather than
+    // `node:crypto` because this file is bundled into the edge/server runtime,
+    // where a `node:` import fails to resolve.
+    const seeds = [0x811c9dc5, 0x9e3779b1, 0x85ebca6b, 0xc2b2ae35];
+    let hex = '';
+    for (const seed of seeds) {
+        let h = seed >>> 0;
+        for (let i = 0; i < absPath.length; i++) {
+            h ^= absPath.charCodeAt(i);
+            h = Math.imul(h, 0x01000193) >>> 0;
+        }
+        hex += h.toString(16).padStart(8, '0');
+    }
+    return `__veskMod${hex}`;
+}
 /**
  * Global registry of bundled module source code, shared across every SSR
  * function in a single build. Without it, every page plan re-embedded the
@@ -1459,14 +1580,14 @@ export class ModuleRegistry {
     get size() {
         return this.data.size;
     }
-    /** Register a module's transpiled body, returning its globally-unique key. */
+    /** Register a module's transpiled body, returning its stable key. */
     register(absPath, entry) {
         const existing = this.keysByAbs.get(absPath);
         if (existing)
             return existing;
-        const key = `__veskMod${this.data.size}`;
+        const key = moduleKeyFor(absPath);
         this.keysByAbs.set(absPath, key);
-        this.data.set(key, entry);
+        this.data.set(key, { ...entry, absPath });
         return key;
     }
     getModule(key) {
@@ -1486,9 +1607,6 @@ export class ModuleRegistry {
         return `export const __veskModules = {${parts.join(',')}};\n`;
     }
 }
-function isRelativeSpec(spec) {
-    return spec.startsWith('./') || spec.startsWith('../');
-}
 function stringLiteralValue(node) {
     const n = node;
     if (n && (n.type === 'Literal' || n.type === 'StringLiteral') && typeof n.value === 'string') {
@@ -1503,41 +1621,51 @@ function stringLiteralValue(node) {
  */
 function collectModuleSpecifiers(ast) {
     const specs = new Set();
+    // Every type-specific visitor MUST call `next()`. zimmerframe only recurses
+    // into a node's children when its visitor does — the default visitor is the
+    // one that calls `next`. Without it, an `import()`/`require()` nested inside
+    // an exported function (e.g. vesk-qr's lazy encoder load) was never seen, so
+    // the module was neither bundled nor recorded in `deps`.
     walk(ast, null, {
-        ImportDeclaration(node) {
-            if (node.importKind === 'type')
-                return;
-            const v = stringLiteralValue(node.source);
-            if (v)
-                specs.add(v);
+        ImportDeclaration(node, ctx) {
+            if (node.importKind !== 'type') {
+                const v = stringLiteralValue(node.source);
+                if (v)
+                    specs.add(v);
+            }
+            ctx.next();
         },
-        ExportNamedDeclaration(node) {
-            if ((node.exportKind === 'type') || !node.source)
-                return;
-            const v = stringLiteralValue(node.source);
-            if (v)
-                specs.add(v);
+        ExportNamedDeclaration(node, ctx) {
+            if (node.exportKind !== 'type' && node.source) {
+                const v = stringLiteralValue(node.source);
+                if (v)
+                    specs.add(v);
+            }
+            ctx.next();
         },
-        ExportAllDeclaration(node) {
-            if (node.exportKind === 'type')
-                return;
-            const v = stringLiteralValue(node.source);
-            if (v)
-                specs.add(v);
+        ExportAllDeclaration(node, ctx) {
+            if (node.exportKind !== 'type') {
+                const v = stringLiteralValue(node.source);
+                if (v)
+                    specs.add(v);
+            }
+            ctx.next();
         },
-        CallExpression(node) {
+        CallExpression(node, ctx) {
             const callee = node.callee;
-            if (!callee || callee.type !== 'Identifier' || callee.name !== 'require')
-                return;
-            const args = (node.arguments || []);
-            const v = stringLiteralValue(args[0]);
-            if (v)
-                specs.add(v);
+            if (callee && callee.type === 'Identifier' && callee.name === 'require') {
+                const args = (node.arguments || []);
+                const v = stringLiteralValue(args[0]);
+                if (v)
+                    specs.add(v);
+            }
+            ctx.next();
         },
-        ImportExpression(node) {
+        ImportExpression(node, ctx) {
             const v = stringLiteralValue(node.source);
             if (v)
                 specs.add(v);
+            ctx.next();
         },
     });
     return specs;
@@ -1577,6 +1705,7 @@ export function collectModuleBundled(absPath, registry) {
     const cached = mtimeMs >= 0 ? bundledCodeCache.get(absPath) : undefined;
     let code;
     let specifiers;
+    let deps = null;
     if (cached && cached.mtimeMs === mtimeMs) {
         code = cached.code;
         specifiers = cached.specifiers;
@@ -1597,20 +1726,38 @@ export function collectModuleBundled(absPath, registry) {
             stripped = stripTsTypes(src.ast);
         stripped.body = (stripped.body || []).filter((n) => (n ? !isTypeOnlyStatement(n) : false));
         specifiers = [...collectModuleSpecifiers(src.ast)];
-        code = esmToCjs(stripped.body);
+        // Resolve the closure first: the emitter needs the set of specifiers that
+        // became registry modules so it can route `import("<spec>")` through the
+        // same require shim instead of leaving a bare dynamic import for the host
+        // loader (see `rewriteDynamicImports`).
+        deps = resolveBundledDeps(specifiers, dir, registry);
+        code = esmToCjs(stripped.body, new Set(Object.keys(deps)));
         bundledCodeCache.set(absPath, { mtimeMs, code, specifiers });
         evict(bundledCodeCache);
     }
+    if (!deps)
+        deps = resolveBundledDeps(specifiers, dir, registry);
+    return registry.register(absPath, { code, dir, deps });
+}
+/**
+ * Resolves every specifier a module reaches for into the registry key of its
+ * bundled closure. Compiler-owned (`@vesk/*`) targets are injected by the SSR
+ * require shim at runtime (`precompile-runtime.ts`), never bundled: their built
+ * JS may contain identifiers the `.vsk` grammar reserves (`component` in
+ * ripple-runtime.js) and would fail to parse here. `.vsk`/`.css`/`.md` carry no
+ * SSR value. Node builtins load natively through the shim.
+ */
+function resolveBundledDeps(specifiers, dir, registry) {
     const deps = {};
     for (const spec of specifiers) {
-        if (!isRelativeSpec(spec))
+        if (isCompilerOwnedTarget(spec) || isValueLessTarget(spec))
             continue;
         const depPath = resolveSsrModule(spec, dir);
-        if (!depPath)
+        if (!depPath || isBuiltinPath(depPath))
             continue;
         deps[spec] = collectModuleBundled(depPath, registry);
     }
-    return registry.register(absPath, { code, dir, deps });
+    return deps;
 }
 const bundledCodeCache = new Map();
 /**

package/dist/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAOtC,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;IACpB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,sDAAsD;IACtD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA0BD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,GAC9B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAAE,CAmMjD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwFlE;AA2DD,wBAAgB,gBAAgB,IAAI,OAAO,KAAK,CAAC,MAAM,CAEtD;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAM/D;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CA6EzE"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAOtC,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;IACpB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,sDAAsD;IACtD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA0BD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,GAC9B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAAE,CAmMjD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwFlE;AA2DD,wBAAgB,gBAAgB,IAAI,OAAO,KAAK,CAAC,MAAM,CAEtD;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAM/D;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CA+NzE"}