@vesk/compiler 0.2.93 → 0.2.94

package/dist/client-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-codegen.d.ts","sourceRoot":"","sources":["../src/client-codegen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAuB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAGL,cAAc,EAQd,gBAAgB,EAUjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAkGxD,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI1D;AAiDD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAgJlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAI5E;AAyCD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,EAAE,CAuB9F;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAY5F;AAoFD,qDAAqD;AACrD,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG,SAAS,CAQtE;AAiqED,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AAuKD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAwED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CAOpQ;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAyC5J;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAG/E;AAED,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"client-codegen.d.ts","sourceRoot":"","sources":["../src/client-codegen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAuB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAGL,cAAc,EAQd,gBAAgB,EAUjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAkGxD,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI1D;AAiDD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAgJlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAI5E;AAyCD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,EAAE,CAuB9F;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAY5F;AAoFD,qDAAqD;AACrD,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG,SAAS,CAQtE;AA0uED,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AAuKD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAwED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CAOpQ;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAyC5J;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAG/E;AAED,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/client-codegen.js

@@ -685,6 +685,7 @@ function emitNode(ctx, node, tracked, effectsVar, parentVar, compPrefix = '__com
             ctx.push(`    const __slot = createLayoutSlot(${ctx.walker}, ${parentVar});`);
             ctx.push(`    const __child = props.children(__slot.walker);`);
             ctx.push(`    if (__child && typeof __child.then === 'function') __pendingChild = __slot.track(__child);`);
+            ctx.push(`    else if (__child && __child.nodeType === 11) ${parentVar}.appendChild(__child);`);
             ctx.push(`  } else {`);
             ctx.push(`    ${parentVar}.appendChild(props.children);`);
             ctx.push(`  }`);
@@ -1269,6 +1270,65 @@ function emitFragment(ctx, nodes, tracked, effectsVar) {
     ctx.push(`return $f; })();`);
     return frag;
 }
+/**
+ * True when any node in the subtree is a layout `{props.children}` slot.
+ *
+ * A slot must be hydrated on the walker scoped to the element that will
+ * actually contain it. Building the children fragment eagerly on the caller's
+ * walker is only correct when the callee appends that fragment to its own
+ * mount point. A component that forwards children through a scoped container
+ * (e.g. a shell that renders `{props.children}` inside `<main>`) invokes the
+ * child hydrator with a sub-walker; passing an eagerly-built fragment skips
+ * that scope and lets the page claim the shell's own SSR root.
+ */
+function containsSlot(nodes) {
+    for (const node of nodes) {
+        if (node instanceof SlotNode)
+            return true;
+        if (node instanceof StaticNode) {
+            if (containsSlot(node.children))
+                return true;
+        }
+        else if (node instanceof ComponentCall) {
+            if (containsSlot(node.children))
+                return true;
+        }
+        else if (node instanceof OpaqueDynamicRegion) {
+            if (containsSlot(node.consequentNodes) || containsSlot(node.alternateNodes))
+                return true;
+        }
+        else if (node instanceof MapRegion) {
+            if (containsSlot(node.bodyTemplate) || containsSlot(node.alternateNodes))
+                return true;
+        }
+        else if (node instanceof WhileLoop) {
+            if (containsSlot(node.bodyTemplate))
+                return true;
+        }
+        else if (node instanceof ForLoop) {
+            if (containsSlot(node.bodyTemplate))
+                return true;
+        }
+        else if (node instanceof SwitchBlock) {
+            for (const c of node.cases)
+                if (containsSlot(c.body))
+                    return true;
+        }
+        else if (node instanceof TryCatch) {
+            if (containsSlot(node.bodyTemplate) || containsSlot(node.catchBody))
+                return true;
+        }
+        else if (node instanceof ServerBlock || node instanceof ClientBlock || node instanceof HeadBlock) {
+            if (containsSlot(node.children))
+                return true;
+        }
+        else if (node instanceof PropSlot) {
+            if (containsSlot(node.body))
+                return true;
+        }
+    }
+    return false;
+}
 function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix = '__components', skipK = 0, regionBudget) {
     const propsEntries = node.props.map((p) => {
         if (typeof p.value === 'string')
@@ -1406,20 +1466,56 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
             // fresh and let the runtime component adopt the existing root.
             if (wipeMount || ctx.selfClaimNames.has(node.componentName))
                 ctx.hydrate = false;
-            ctx.push(`const ${frag} = (() => { const $f = document.createDocumentFragment();`);
-            const savedEffects = ctx.effects;
-            ctx.effects = [];
-            for (const child of regChildren) {
-                const childVar = emitNode(ctx, child, tracked, effectsVar, '$f');
-                if (childVar)
-                    ctx.push(`$f.appendChild(${childVar});`);
+            // A slot nested under a compiled component must be built by that
+            // component's scoped walker, not the caller's. Pass children as a lazy
+            // hydrator so the callee can invoke it with the walker for the element
+            // that actually contains the slot (e.g. `<main>` in a shell). Eagerly
+            // building the fragment here hydrates the page against the shell's own
+            // SSR root, which detaches the shell on hydration.
+            const lazySlotChildren = ctx.hydrate && !plainTarget && !ctx.selfClaimNames.has(node.componentName) && containsSlot(regChildren);
+            if (lazySlotChildren) {
+                const fnVar = ctx.n();
+                const savedLines = ctx.lines;
+                const savedEffects = ctx.effects;
+                const savedWalker = ctx.walker;
+                ctx.lines = [];
+                ctx.effects = [];
+                ctx.walker = '__childWalker';
+                ctx.push(`const $f = document.createDocumentFragment();`);
+                for (const child of regChildren) {
+                    const childVar = emitNode(ctx, child, tracked, effectsVar, '$f');
+                    if (childVar)
+                        ctx.push(`$f.appendChild(${childVar});`);
+                }
+                for (const eff of ctx.effects)
+                    ctx.push(effectsVar ? `${effectsVar}.push(${effectBlockToHandlerExpr(eff)});` : eff);
+                ctx.push(`return $f;`);
+                const body = ctx.lines.join('\n');
+                ctx.lines = savedLines;
+                ctx.effects = savedEffects;
+                ctx.walker = savedWalker;
+                const asyncKw = ctx.isAsyncScope ? 'async ' : '';
+                ctx.push(`const ${fnVar} = ${asyncKw}(__childWalker) => {`);
+                ctx.push(indent(body));
+                ctx.push(`};`);
+                propsEntries.push(`children: ${fnVar}`);
+            }
+            else {
+                ctx.push(`const ${frag} = (() => { const $f = document.createDocumentFragment();`);
+                const savedEffects = ctx.effects;
+                ctx.effects = [];
+                for (const child of regChildren) {
+                    const childVar = emitNode(ctx, child, tracked, effectsVar, '$f');
+                    if (childVar)
+                        ctx.push(`$f.appendChild(${childVar});`);
+                }
+                for (const eff of ctx.effects)
+                    ctx.push(effectsVar ? `${effectsVar}.push(${effectBlockToHandlerExpr(eff)});` : eff);
+                ctx.effects = savedEffects;
+                ctx.push(`return $f; })();`);
+                propsEntries.push(`children: ${frag}`);
             }
-            for (const eff of ctx.effects)
-                ctx.push(effectsVar ? `${effectsVar}.push(${effectBlockToHandlerExpr(eff)});` : eff);
-            ctx.effects = savedEffects;
             ctx.hydrate = savedHydrate;
-            ctx.push(`return $f; })();`);
-            propsEntries.push(`children: ${frag}`);
         }
         // Deposit the residue for the child's first top-level claim (it runs on
         // this same walker with its own zero `topPendingSkip`). A region budget is
@@ -1667,7 +1763,7 @@ function emitTryCatch(ctx, node, tracked, effectsVar, parentVar, skipK = 0, regi
       ${effArr}.length = 0;
       __cleanup(${anchor}, ${endAnchor});
       try { ${asyncKw}${tryRenderComp}(); } catch(${catchParam}) { ${hasCatch ? `${asyncKw}${catchRenderComp}(${catchParam});` : 'throw ${catchParam};'} }
-    });
+    }, true);
   }`);
     return null;
 }
@@ -1766,7 +1862,7 @@ function emitOpaque(ctx, node, tracked, effTarget, parentVar, skipK = 0, regionB
           ${effInner}
           __iv = __new;
         }
-      });`;
+      }, true);`;
         if (effTarget) {
             ctx.push(`${effTarget}.push((() => {
       let __iv = ${branchInit};
@@ -1867,7 +1963,7 @@ function emitOpaque(ctx, node, tracked, effTarget, parentVar, skipK = 0, regionB
         ${renderBranch}
         __iv = __nv;
       }
-    });`;
+    }, true);`;
     // A static condition renders once; an effect referencing it would only ever
     // reference statement/loop-local bindings that are out of scope at the flush
     // site (e.g. `const pages = …; if (pages.length > 0)` inside a for-of body).
@@ -1973,7 +2069,7 @@ function emitWhileLoop(ctx, node, tracked, parentVar, skipK = 0, regionBudget) {
       __busy = false;
       __iv = (${condExpr});
     }
-  });
+  }, true);
 }`);
     return null;
 }
@@ -2087,7 +2183,7 @@ function emitForLoop(ctx, node, tracked, parentVar, skipK = 0, regionBudget) {
       __busy = false;
       __iv = (${srcExpr});
     }
-  });
+  }, true);
 }`);
     }
     else {
@@ -2156,7 +2252,7 @@ function emitForLoop(ctx, node, tracked, parentVar, skipK = 0, regionBudget) {
     __cleanup(${anchor}, ${endAnchor});
     ${ctx.isAsyncScope ? 'await ' : ''}${renderLoop}();
     __busy = false;
-  });
+  }, true);
 }`);
         }
     }
@@ -2233,7 +2329,7 @@ function emitSwitchBlock(ctx, node, tracked, parentVar, skipK = 0, regionBudget)
       __busy = false;
       __iv = (${discExpr});
     }
-  });
+  }, true);
 }`);
     return null;
 }
@@ -2456,7 +2552,7 @@ function emitMap(ctx, node, tracked, effTarget, parentVar, skipK = 0, regionBudg
     ${effectsVar}.length = 0;
     __cleanup(${anchor}, ${endAnchor});
     if (__new) { ${initList}(); } else { ${aw}${emptyRenderName}(); }
-  })`);
+  }, true)`);
         }
         else {
             ctx.push(`${initList}();`);
@@ -2466,7 +2562,7 @@ function emitMap(ctx, node, tracked, effTarget, parentVar, skipK = 0, regionBudg
     const __nv = ${arrExpr};
     if (__first) { __first = false; __nv; ${breakReset}${reconciler}(${arrExpr}); return; }
     ${breakVar ? `if (${breakVar}) ${breakVar} = false;` : ''}${reconciler}(${arrExpr});
-  })`);
+  }, true)`);
         }
     }
     else {
@@ -2524,7 +2620,7 @@ ${renderAllItems('        ', null)}
     if (__new) {
 ${renderAllItems('      ', null)}
     } else { ${aw}${emptyRenderName}(${collectVar ? collectVar : ''}); }
-  })`);
+  }, true)`);
         }
         else {
             const collectVar = hyd ? ctx.n() : null;
@@ -2542,7 +2638,7 @@ ${renderAllItems('      ', null)}
     ${effectsVar}.length = 0;
     __cleanup(${anchor}, ${endAnchor});
 ${renderAllItems('    ', null)}
-  })`);
+  }, true)`);
         }
     }
     return null;

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

@@ -1345,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);
@@ -1457,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
@@ -1479,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) {
@@ -1520,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;
@@ -1594,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;
@@ -1614,17 +1726,30 @@ 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) {
-        // 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.
         if (isCompilerOwnedTarget(spec) || isValueLessTarget(spec))
             continue;
         const depPath = resolveSsrModule(spec, dir);
@@ -1632,7 +1757,7 @@ export function collectModuleBundled(absPath, registry) {
             continue;
         deps[spec] = collectModuleBundled(depPath, registry);
     }
-    return registry.register(absPath, { code, dir, deps });
+    return deps;
 }
 const bundledCodeCache = new Map();
 /**

package/dist/precompile.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"precompile.d.ts","sourceRoot":"","sources":["../src/precompile.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,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,CAsBpB;AA8CD,iFAAiF;AACjF,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C"}

package/dist/precompile.js

@@ -26,16 +26,54 @@ export function precompileFile(source, sourcePath, registry) {
     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)
+    if (hit !== undefined && hit.source === source) {
+        // A plan is only half of the output: it references module keys that live
+        // in the caller's registry. A second build in the same process (prod then
+        // dev under `e2e-setup`) starts with a fresh registry, so replaying the
+        // memoized plan without its modules left `__veskModules` empty and every
+        // bare-package import (`vesk-qr`, …) resolved to `undefined`. Keys are
+        // path-derived, so registering the same absPaths here is idempotent.
+        for (const { absPath, entry } of hit.modules)
+            reg.register(absPath, entry);
         return hit.plan;
+    }
     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)
         precompileCache.clear();
-    precompileCache.set(sourcePath, { source, plan });
+    precompileCache.set(sourcePath, { source, plan, modules: collectPlanModules(plan, reg) });
     return plan;
 }
+/**
+ * Every module entry a plan (and its nested `.vsk` sub-plans) resolves
+ * against, including transitive deps. The shared `__veskModules` registry
+ * must contain the whole closure, not just the keys named by `plan.modules`,
+ * or `evaluateModule` cannot walk `deps` at hydrate time.
+ */
+function collectPlanModules(plan, registry) {
+    const out = [];
+    const seen = new Set();
+    const visitKey = (key) => {
+        if (seen.has(key))
+            return;
+        seen.add(key);
+        const entry = registry.getModule(key);
+        if (!entry || !entry.absPath)
+            return;
+        out.push({ absPath: entry.absPath, entry });
+        for (const depKey of Object.values(entry.deps))
+            visitKey(depKey);
+    };
+    const visitPlan = (p) => {
+        for (const mod of p.modules)
+            visitKey(mod.key);
+        for (const sub of p.subFiles)
+            visitPlan(sub.plan);
+    };
+    visitPlan(plan);
+    return out;
+}
 /**
  * Compiled plans, keyed by absolute path.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/compiler",
-  "version": "0.2.93",
+  "version": "0.2.94",
   "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.93",
+    "@vesk/types": "^0.2.94",
     "acorn": "^8.15.0",
     "esrap": "^2.3.0",
     "is-reference": "^3.0.0",