@vesk/compiler 0.2.91 → 0.2.93

package/dist/acorn-ts-plugin/index.js

@@ -774,6 +774,7 @@ function generateJsxParser(acorn, acornTypeScript, Parser, jsxOptions) {
           return node;
         case tok.jsxTagStart:
         case tt.string:
+        case tt.backQuote:
           return this.parseExprAtom();
         default:
           this.raise(this.start, "JSX value should be either an expression or a quoted JSX text");

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;AAupED,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AAuKD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAuED,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;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"}

package/dist/client-codegen.js

@@ -539,6 +539,15 @@ class Ctx {
     // item element already claimed by key) instead of walking for a new element.
     rootClaim = false;
     walker = '__hydrate';
+    // Registry a hydrate-mode component call must resolve through. The hydrate
+    // bundle registers its functions under `__hydrators`, while non-hydrate
+    // nested renders (children of self-claiming components, client-only blocks,
+    // fresh map items) must keep calling the plain `__components` map. Emitting
+    // the hydrate registry name directly avoids the old global
+    // `__components` → `__hydrators` text rewrite, which also rewrote those
+    // nested fresh-render calls and handed them the 3-argument hydrator with no
+    // walker (`Cannot read properties of undefined (reading 'root')`).
+    hydrateRegistry = '__hydrators';
     asyncComps = new Set();
     isAsyncScope = false;
     // While emitting a loop body, names the boolean flag a `break` sets (see
@@ -1322,7 +1331,7 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
         const access = calleeExpr
             ?? (ctx.importedNames.has(node.componentName)
                 ? node.componentName
-                : `__components[${JSON.stringify(node.componentName)}]`);
+                : `${ctx.hydrateRegistry}[${JSON.stringify(node.componentName)}]`);
         // Registry lookups can resolve to `undefined` when a JSX tag names a
         // component that was never declared, imported, or registered (e.g.
         // `<Slot/>` in a framework where `{props.children}` is the channel).
@@ -2746,7 +2755,8 @@ function buildParamInit(paramNames, propsAlias = null) {
 }
 function buildComponentMap(irRoot, hydrate = false, alloc, markerless = true) {
     const mapLines = [];
-    mapLines.push(`const __components = {};`);
+    const registry = hydrate ? '__hydrators' : '__components';
+    mapLines.push(`const ${registry} = {};`);
     const asyncComps = computeAsyncComponents(irRoot.components);
     // Wipe-style router components (Link/NavLink) replace their SSR children on
     // hydration, so their children fragments must be rebuilt in full. Track the
@@ -2788,11 +2798,11 @@ function buildComponentMap(irRoot, hydrate = false, alloc, markerless = true) {
                 ? `__hydrate.claimOnly(undefined, (typeof __hydrate.takeSkipK === 'function' ? __hydrate.takeSkipK() : 0))`
                 : `__hydrate.claimOnly()`;
             const stub = `(props, __registry, __hydrate) => { return ${claimExpr}; }`;
-            mapLines.push(`__components[${JSON.stringify(comp.name)}] = ${stub};`);
+            mapLines.push(`${registry}[${JSON.stringify(comp.name)}] = ${stub};`);
             continue;
         }
         const code = generateComponent(comp, directNames, hydrate, asyncComps, linkNames, selfClaimNames, alloc, markerless);
-        mapLines.push(`__components[${JSON.stringify(comp.name)}] = ${code};`);
+        mapLines.push(`${registry}[${JSON.stringify(comp.name)}] = ${code};`);
     }
     mapLines.push(`function __cleanup(start, end) {`);
     mapLines.push(`\tlet n = start.nextSibling;`);
@@ -3117,13 +3127,14 @@ function emitClientFromIR(ir, options) {
     const importLines = ir.imports.length > 0 ? ir.imports.join('\n') + '\n' : '';
     const topCode = (options.includeTopLevel === false ? [] : transformTopLevelForActions(ir.topLevelCode, 'client')).join('\n') + '\n';
     const exportLines = [];
+    const registry = options.hydrate ? '__hydrators' : '__components';
     for (const comp of ir.components) {
         if (comp.exported) {
             if (comp.defaultExport) {
-                exportLines.push(`export default __components[${JSON.stringify(comp.name)}];`);
+                exportLines.push(`export default ${registry}[${JSON.stringify(comp.name)}];`);
             }
             else {
-                exportLines.push(`export const ${comp.name} = __components[${JSON.stringify(comp.name)}];`);
+                exportLines.push(`export const ${comp.name} = ${registry}[${JSON.stringify(comp.name)}];`);
             }
         }
     }

package/dist/errors.d.ts

@@ -104,6 +104,34 @@ export declare class VeskError extends Error {
     static attrJsxElement(context?: VeskErrorOptions & {
         attr?: string;
     }): VeskError;
+    /**
+     * A `{ ... }` block statement wrapping regular JS in statement mode.
+     * Vesk statement mode doesn't need braces around statements —
+     * `if (cond) { <jsx/> }` is written without the outer `{ }`.
+     */
+    static blockStatementInStatementMode(context?: VeskErrorOptions): VeskError;
+    /**
+     * An opening JSX tag was never closed, e.g. `<div><span>hello</div>`.
+     * Acorn reports this as "Expected corresponding JSX closing tag for <span>"
+     * or, when wrapped in a component body, as a generic "Unexpected token".
+     */
+    static jsxUnclosedTag(tagName: string, context?: VeskErrorOptions & {
+        closingTag?: string;
+        suggestedFix?: string;
+    }): VeskError;
+    /**
+     * A JSX closing tag doesn't match the most recent opening tag,
+     * e.g. `<div></span>`.
+     */
+    static jsxMismatchedTag(openingTag: string, closingTag: string, context?: VeskErrorOptions): VeskError;
+    /**
+     * JSX content was never terminated before end of file, e.g. `<div>` with no `>`.
+     */
+    static jsxUnterminated(context?: VeskErrorOptions): VeskError;
+    /**
+     * An empty JSX expression container `{}`, which is not allowed.
+     */
+    static jsxEmptyExpression(context?: VeskErrorOptions): VeskError;
     toString(): string;
     toJSON(): Record<string, unknown>;
 }

package/dist/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAoBxD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,GAAE,MAAU,GAAG,MAAM,GAAG,IAAI,CAWrG;AAqCD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAI,EAAE,KAAK,SAAI,GAAG,MAAM,CAkBrG;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAgBD,qBAAa,SAAU,SAAQ,KAAK;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,2CAA2C;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mGAAmG;IACnG,KAAK,CAAC,EAAE,MAAM,CAAC;gBAEH,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,gBAAqB;IAgBxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IA8BnG;;;;;;;;;;OAUG;IACH;;;;;;;;;;;;;;;;OAgBG;IACH,MAAM,CAAC,iBAAiB,CAAC,OAAO,GAAE,gBAAgB,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,SAAS;IAoBzF,MAAM,CAAC,kBAAkB,CAAC,OAAO,GAAE,gBAAgB,GAAG;QAAE,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAA;KAAO,GAAG,SAAS;IA6BpG,MAAM,CAAC,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAoB3D;;;;;;;;OAQG;IACH,MAAM,CAAC,eAAe,CACpB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAO,GACjE,SAAS;IAqBZ;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,CACzB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAC1E,SAAS;IAmBZ;;;;;;;OAOG;IACH,MAAM,CAAC,gBAAgB,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAC1D,SAAS;IAkBZ,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmBvF,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmBvF,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAO3G,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAYvG,MAAM,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmB/G,MAAM,CAAC,cAAc,CAAC,OAAO,GAAE,gBAAgB,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,SAAS;IAmBpF,QAAQ,IAAI,MAAM;IA0BlB,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAclC"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAoBxD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,GAAE,MAAU,GAAG,MAAM,GAAG,IAAI,CAWrG;AAqCD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAI,EAAE,KAAK,SAAI,GAAG,MAAM,CAkBrG;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAgBD,qBAAa,SAAU,SAAQ,KAAK;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,2CAA2C;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mGAAmG;IACnG,KAAK,CAAC,EAAE,MAAM,CAAC;gBAEH,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,gBAAqB;IAgBxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IA8BnG;;;;;;;;;;OAUG;IACH;;;;;;;;;;;;;;;;OAgBG;IACH,MAAM,CAAC,iBAAiB,CAAC,OAAO,GAAE,gBAAgB,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,SAAS;IAoBzF,MAAM,CAAC,kBAAkB,CAAC,OAAO,GAAE,gBAAgB,GAAG;QAAE,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAA;KAAO,GAAG,SAAS;IA6BpG,MAAM,CAAC,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAoB3D;;;;;;;;OAQG;IACH,MAAM,CAAC,eAAe,CACpB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAO,GACjE,SAAS;IAqBZ;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,CACzB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAC1E,SAAS;IAmBZ;;;;;;;OAOG;IACH,MAAM,CAAC,gBAAgB,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAC1D,SAAS;IAkBZ,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmBvF,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmBvF,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAO3G,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAYvG,MAAM,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmB/G,MAAM,CAAC,cAAc,CAAC,OAAO,GAAE,gBAAgB,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,SAAS;IAmBpF;;;;OAIG;IACH,MAAM,CAAC,6BAA6B,CAAC,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAoB/E;;;;OAIG;IACH,MAAM,CAAC,cAAc,CACnB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,gBAAgB,GAAG;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAO,GAC9E,SAAS;IAoBZ;;;OAGG;IACH,MAAM,CAAC,gBAAgB,CACrB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,gBAAqB,GAC7B,SAAS;IAkBZ;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAmBjE;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,OAAO,GAAE,gBAAqB,GAAG,SAAS;IAkBpE,QAAQ,IAAI,MAAM;IA6ClB,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAclC"}

package/dist/errors.js

@@ -389,38 +389,146 @@ export class VeskError extends Error {
             tip: 'JSX elements are content. They render inside an element or travel as a component prop — never as an attribute value on an HTML tag.',
         });
     }
+    /**
+     * A `{ ... }` block statement wrapping regular JS in statement mode.
+     * Vesk statement mode doesn't need braces around statements —
+     * `if (cond) { <jsx/> }` is written without the outer `{ }`.
+     */
+    static blockStatementInStatementMode(context = {}) {
+        return new VeskError('Unnecessary `{ ... }` block around statements in statement mode. Vesk statement mode does not use braces around `if`/`for`/`while`/etc. — write the statement directly.', {
+            ...context,
+            code: context.code || 'V0424',
+            suggestions: [
+                'Remove the outer `{ }` and write the statement directly:',
+                '  `{ if (cond) { <div/> } }` → `if (cond) { <div/> }`',
+                'Braces are only needed around JSX expression containers `{ expr }` inside JSX, not around statements.',
+            ],
+            nextSteps: [
+                'Delete the opening `{` and closing `}` that wrap the statement.',
+                'If you meant to group multiple statements, they can appear directly one after another in statement mode.',
+            ],
+            tip: 'Vesk statement mode accepts bare JSX, if/for/while/switch/try without wrapping braces — no `{ }` needed around statements.',
+        });
+    }
+    /**
+     * An opening JSX tag was never closed, e.g. `<div><span>hello</div>`.
+     * Acorn reports this as "Expected corresponding JSX closing tag for <span>"
+     * or, when wrapped in a component body, as a generic "Unexpected token".
+     */
+    static jsxUnclosedTag(tagName, context = {}) {
+        const closing = context.closingTag ?? `</${tagName}>`;
+        return new VeskError(`Unclosed JSX tag \`<${tagName}>\` — expected \`${closing}\` before the closing tag.`, {
+            ...context,
+            code: context.code || 'V0420',
+            suggestions: [
+                `Add \`${closing}\` to close the \`<${tagName}>\` tag.`,
+                `Every opening JSX tag must have a matching closing tag: \`<${tagName}></${tagName}>\`.`,
+            ],
+            nextSteps: [
+                context.suggestedFix ?? `Insert \`${closing}\` right before the tag that closes the parent element.`,
+                `Check that all JSX elements in this component are properly closed and nested.`,
+            ],
+            tip: `The \`<${tagName}>\` tag on the marked line was opened but never closed.`,
+        });
+    }
+    /**
+     * A JSX closing tag doesn't match the most recent opening tag,
+     * e.g. `<div></span>`.
+     */
+    static jsxMismatchedTag(openingTag, closingTag, context = {}) {
+        return new VeskError(`Expected closing tag \`</${openingTag}>\` to match \`<${openingTag}>\`, but found \`</${closingTag}>\`.`, {
+            ...context,
+            code: context.code || 'V0421',
+            suggestions: [
+                `Change \`</${closingTag}>\` to \`</${openingTag}>\` to close the \`<${openingTag}>\` tag.`,
+                `Or change the opening tag to \`<${closingTag}>\` if that was the intended element.`,
+            ],
+            nextSteps: [
+                `Fix the mismatched tag on the marked line so opening and closing tags agree.`,
+            ],
+            tip: `JSX closing tags must match their opening tag: \`<${openingTag}></${openingTag}>\`, not \`<${openingTag}></${closingTag}>\`.`,
+        });
+    }
+    /**
+     * JSX content was never terminated before end of file, e.g. `<div>` with no `>`.
+     */
+    static jsxUnterminated(context = {}) {
+        return new VeskError('Unterminated JSX contents — the JSX block was never closed before the end of the file.', {
+            ...context,
+            code: context.code || 'V0422',
+            suggestions: [
+                'Close the JSX element with `>` or `/>` before the end of the file.',
+                'Make sure every `<` that opens a JSX tag has a matching `>` (or `/>`).',
+            ],
+            nextSteps: [
+                'Add the missing `>` or `/>` to close the JSX tag.',
+                'Check that no string or comment is swallowing the closing bracket.',
+            ],
+            tip: 'The JSX block on the marked line was opened but never terminated.',
+        });
+    }
+    /**
+     * An empty JSX expression container `{}`, which is not allowed.
+     */
+    static jsxEmptyExpression(context = {}) {
+        return new VeskError('Empty JSX expression container `{}` — JSX expressions must contain a value.', {
+            ...context,
+            code: context.code || 'V0423',
+            suggestions: [
+                'Fill the braces with an expression: `{ count }`, `{ item.name }`, or `{ true }`.',
+                'If you meant literal braces, escape them: `{ \'{\' }` and `{ \'}\' }`.',
+            ],
+            nextSteps: [
+                'Replace `{}` with a real expression, or remove the empty braces.',
+            ],
+            tip: '`{}` is not valid JSX — put a value inside the braces.',
+        });
+    }
     toString() {
-        let out = this.code ? `[vesk ${this.code}] ${this.message}` : `[vesk] ${this.message}`;
+        const lines = [];
+        // Header: `error[V####]: message` — rustc-style error code first.
+        lines.push(this.code ? `error[${this.code}]: ${this.message}` : `error: ${this.message}`);
+        // Location: `--> file:line:col`
+        let loc = '  --> ';
+        let hasLoc = false;
         if (this.file) {
-            out += `\n  File: ${this.file}`;
-            if (this.line) {
-                out += `:${this.line}`;
-                if (this.column)
-                    out += `:${this.column}`;
-            }
-            if (this.line && this.column)
-                out += ` (line ${this.line}, column ${this.column})`;
-            else if (this.line)
-                out += ` (line ${this.line})`;
+            loc += this.file;
+            hasLoc = true;
         }
-        else if (this.line) {
-            out += `\n  at line ${this.line}${this.column ? `, column ${this.column}` : ''}`;
+        if (this.line) {
+            loc += `:${this.line}`;
+            hasLoc = true;
+        }
+        if (this.column) {
+            loc += `:${this.column}`;
+            hasLoc = true;
         }
-        if (this.code)
-            out += `\n\n${this.code}`;
-        if (this.suggestions.length) {
-            out += '\n\n  Suggestions:';
-            for (const s of this.suggestions.slice(0, 4))
-                out += `\n    • ${s}`;
+        if (hasLoc)
+            lines.push(loc);
+        // Code frame: source context with a `^` caret under the offending column.
+        if (this.frame) {
+            lines.push('  |');
+            for (const frameLine of this.frame.split('\n')) {
+                lines.push(`  ${frameLine}`);
+            }
         }
-        if (this.nextSteps.length) {
-            out += '\n\n  Next steps:';
-            for (const s of this.nextSteps.slice(0, 4))
-                out += `\n    • ${s}`;
+        else if (this.line) {
+            lines.push('  |');
         }
+        // Help lines, rustc-style `= help:` — tip first, then next steps / suggestions.
+        const help = [];
         if (this.tip)
-            out += `\n\n  Tip: ${this.tip}`;
-        return out;
+            help.push(this.tip);
+        for (const s of this.nextSteps)
+            help.push(s);
+        for (const s of this.suggestions)
+            help.push(s);
+        if (help.length) {
+            lines.push('  |');
+            for (const h of help)
+                lines.push(`= help: ${h}`);
+        }
+        return lines.join('\n');
     }
     toJSON() {
         return {

package/dist/ir-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ir-generator.d.ts","sourceRoot":"","sources":["../src/ir-generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAuBP,MAAM,uBAAuB,CAAC;AAkW/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCnL;AAsvDD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAsV9E"}
+{"version":3,"file":"ir-generator.d.ts","sourceRoot":"","sources":["../src/ir-generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAuBP,MAAM,uBAAuB,CAAC;AAkW/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCnL;AA0yDD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAsV9E"}

package/dist/ir-generator.js

@@ -974,6 +974,12 @@ function processAttribute(source, attr) {
         return { name, value: '' };
     if (attr.value.type === 'Literal')
         return { name, value: String(attr.value.value) };
+    if (attr.value.type === 'TemplateLiteral') {
+        // A bare backtick template literal in a JSX attribute, e.g.
+        // `<Link href=`/admin/learners/${id}` />`. It is a dynamic value, so it
+        // becomes an attribute binding rather than a static string.
+        return { name, value: toExpression(source, attr.value) };
+    }
     if (attr.value.type === 'JSXExpressionContainer') {
         const expr = attr.value.expression;
         if (expr.type === 'Literal')
@@ -1596,6 +1602,11 @@ function extractProps(source, element) {
                 }
                 value = toExpression(source, expr);
             }
+            else if (attr.value.type === 'TemplateLiteral') {
+                // A bare backtick template literal prop value, e.g.
+                // `<Comp href=`/admin/learners/${id}` />`.
+                value = toExpression(source, attr.value);
+            }
             else {
                 value = new Expression(JSON.stringify(attr.value.value));
             }
@@ -1765,6 +1776,8 @@ function isStatementMode(bodyStmts) {
     if (bodyStmts.some((s) => s.type === 'JSXElement' || s.type === 'JSXExpressionContainer' || s.type === 'JSXFragment'))
         return true;
     for (const stmt of bodyStmts) {
+        if (stmt.type === 'BlockStatement' && hasJSXInSubtree(stmt))
+            return true;
         if (stmt.type === 'IfStatement' && !isGuardClause(stmt) && hasJSXInSubtree(stmt))
             return true;
         if (stmt.type === 'ForOfStatement' && hasJSXInSubtree(stmt))
@@ -1928,6 +1941,57 @@ function processStatementModeBody(source, bodyStmts, filename) {
             if (refName)
                 nodes.push(new ComponentRef(refName));
         }
+        else if (stmt.type === 'VariableDeclaration') {
+            // Plain variable declarations (`const items = [1, 2, 3]`, `let x = 1`)
+            // that are not track() declarations are regular JavaScript. Emit them
+            // verbatim as runtime statements so they execute in statement mode.
+            const raw = getSource(source, stmt);
+            if (raw)
+                nodes.push(new RuntimeStatement(raw, stmt, source));
+        }
+        else if (stmt.type === 'BlockStatement') {
+            // Braces around statements are unnecessary in Vesk statement mode —
+            // `if (cond) { <jsx/> }` is written without the outer `{ }`. If the
+            // block contains only JSX children, unwrap them; otherwise give a
+            // clear error (braces around `if`/`for`/`const`/etc. are not needed).
+            const innerStmts = stmt.body || [];
+            const hasNonJSX = innerStmts.some((s) => s.type !== 'JSXElement' && s.type !== 'JSXExpressionContainer' && s.type !== 'JSXFragment');
+            if (hasNonJSX) {
+                const start = stmt.start ?? 0;
+                let line = 1;
+                let column = 1;
+                for (let i = 0; i < start && i < source.length; i++) {
+                    if (source.charCodeAt(i) === 10) {
+                        line++;
+                        column = 1;
+                    }
+                    else {
+                        column++;
+                    }
+                }
+                throw VeskError.blockStatementInStatementMode({
+                    file: filename || '',
+                    line,
+                    column,
+                    code: codeFrame(source, line, column),
+                });
+            }
+            // Pure JSX block: unwrap the children directly.
+            for (const child of innerStmts) {
+                if (child.type === 'JSXElement') {
+                    nodes.push(...processJSXElement(source, child));
+                }
+                else if (child.type === 'JSXExpressionContainer') {
+                    if (child.expression.type === 'JSXEmptyExpression')
+                        continue;
+                    nodes.push(...exprToIR(source, child.expression));
+                }
+                else if (child.type === 'JSXFragment') {
+                    for (const c of child.children)
+                        nodes.push(...processJSXChildren(source, [c]));
+                }
+            }
+        }
         else if (stmt.type === 'IfStatement') {
             // Guard-clause early return (`if (c) return X` with no else): everything
             // after this statement becomes the alternate branch, mirroring
@@ -2388,7 +2452,7 @@ export function generateIR(ast, source, filename) {
                 for (const spec of node.specifiers) {
                     if (spec.importKind === 'type')
                         continue;
-                    if (spec.type === 'ImportSpecifier') {
+                    if (spec.type === 'ImportSpecifier' || spec.type === 'ImportDefaultSpecifier' || spec.type === 'ImportNamespaceSpecifier') {
                         importedNames.add(spec.local.name);
                     }
                 }

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);
                 }
@@ -1486,9 +1506,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') {
@@ -1603,10 +1620,15 @@ export function collectModuleBundled(absPath, registry) {
     }
     const deps = {};
     for (const spec of specifiers) {
-        if (!isRelativeSpec(spec))
+        // 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);
-        if (!depPath)
+        if (!depPath || isBuiltinPath(depPath))
             continue;
         deps[spec] = collectModuleBundled(depPath, registry);
     }

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"}

package/dist/parser.js

@@ -573,26 +573,317 @@ export function parse(source, options = {}) {
             column = (err.loc.column ?? 0) + 1;
         }
         else {
-            const m = err.message.match(/\((\d+):(\d+)\)/);
-            if (m) {
-                line = parseInt(m[1], 10);
-                column = parseInt(m[2], 10) + 1;
+            // Parse "(line:column)" from the message without regex.
+            const parenOpen = err.message.indexOf('(');
+            if (parenOpen >= 0) {
+                const parenClose = err.message.indexOf(')', parenOpen);
+                if (parenClose > parenOpen) {
+                    const inside = err.message.slice(parenOpen + 1, parenClose);
+                    const colon = inside.indexOf(':');
+                    if (colon > 0) {
+                        line = parseInt(inside.slice(0, colon), 10);
+                        column = parseInt(inside.slice(colon + 1), 10) + 1;
+                    }
+                }
             }
         }
         const filename = options.filename || '';
-        const cleanMessage = err.message.replace(/\s*\(\d+:\d+\)\s*$/, '');
-        const frame = line > 0 ? codeFrame(source, line, column, 5, 5) : '';
+        // Strip the trailing "(line:column)" acorn appends, without regex.
+        let cleanMessage = err.message;
+        const lastParen = cleanMessage.lastIndexOf('(');
+        if (lastParen >= 0) {
+            const closeParen = cleanMessage.indexOf(')', lastParen);
+            if (closeParen > lastParen) {
+                const inside = cleanMessage.slice(lastParen + 1, closeParen);
+                const colon = inside.indexOf(':');
+                if (colon > 0 &&
+                    inside.slice(0, colon).split('').every((ch) => ch >= '0' && ch <= '9') &&
+                    inside.slice(colon + 1).split('').every((ch) => ch >= '0' && ch <= '9')) {
+                    cleanMessage = cleanMessage.slice(0, lastParen).trimEnd();
+                }
+            }
+        }
+        // --- Convert acorn's raw JSX errors into descriptive Vesk messages ---
+        let message = cleanMessage;
+        let errLine = line;
+        let errColumn = column;
+        let code;
+        const extraHelp = [];
+        const frame = errLine > 0 ? codeFrame(source, errLine, errColumn, 5, 5) : '';
         const hint = filename ? ` in ${filename}` : '';
-        throw new VeskError(`${cleanMessage}${hint}`, {
+        // "Unterminated JSX contents" — acorn hit EOF inside a JSX block.
+        if (cleanMessage.includes('Unterminated JSX contents')) {
+            throw VeskError.jsxUnterminated({
+                file: filename,
+                line: errLine,
+                column: errColumn,
+                frame,
+            });
+        }
+        // "JSX attributes must only be assigned a non-empty expression" — `{}`.
+        if (cleanMessage.includes('JSX attributes must only be assigned a non-empty expression')) {
+            throw VeskError.jsxEmptyExpression({
+                file: filename,
+                line: errLine,
+                column: errColumn,
+                frame,
+            });
+        }
+        // "Expected corresponding JSX closing tag for <X>" — acorn points at the
+        // opening tag, but it could mean either a mismatched closing tag
+        // (<div></span>) or a genuinely unclosed tag (<div><span>...</div>).
+        const jsxClosePrefix = 'Expected corresponding JSX closing tag for <';
+        if (cleanMessage.startsWith(jsxClosePrefix)) {
+            const mismatched = findMismatchedJsxTag(source, errLine);
+            if (mismatched) {
+                throw VeskError.jsxMismatchedTag(mismatched.openingTag, mismatched.closingTag, {
+                    file: filename,
+                    line: mismatched.line,
+                    column: mismatched.column,
+                    frame: codeFrame(source, mismatched.line, mismatched.column, 5, 5),
+                });
+            }
+            const rest = cleanMessage.slice(jsxClosePrefix.length);
+            const gt = rest.indexOf('>');
+            const tagName = gt >= 0 ? rest.slice(0, gt) : rest;
+            throw VeskError.jsxUnclosedTag(tagName, {
+                file: filename,
+                line: errLine,
+                column: errColumn,
+                frame,
+                suggestedFix: `Insert </${tagName}> before the tag that closes the parent element.`,
+            });
+        }
+        // "Unexpected token" inside a component body often means a JSX tag was
+        // opened but never closed — acorn reports it late, at the closing `}`.
+        if (cleanMessage.includes('Unexpected token') && errLine > 0) {
+            const srcLine = (source.split('\n')[errLine - 1] ?? '').trim();
+            const isBlockCloser = srcLine.startsWith('}') || srcLine.startsWith(')');
+            if (isBlockCloser) {
+                const unclosed = findUnclosedJsxTag(source, errLine);
+                if (unclosed) {
+                    throw VeskError.jsxUnclosedTag(unclosed.tagName, {
+                        file: filename,
+                        line: unclosed.line,
+                        column: unclosed.column,
+                        frame: errLine > 0 ? codeFrame(source, unclosed.line, unclosed.column, 5, 5) : '',
+                        suggestedFix: `Insert </${unclosed.tagName}> before the tag that closes the parent element.`,
+                    });
+                }
+            }
+            // `{if (cond) { <jsx/> }}` — LLMs often wrap statements in braces in
+            // statement mode, but Vesk doesn't need them. Look for `{` immediately
+            // before the offending token (skipping whitespace) followed by a
+            // statement keyword (`if`, `for`, `while`, `switch`, `try`, `const`,
+            // `let`, `var`, `function`, `class`, `return`).
+            if (errColumn > 1) {
+                const lineText = source.split('\n')[errLine - 1] ?? '';
+                // Walk back from the error column to find the `{` that opened the
+                // block (or JSX expression container) that shouldn't be there.
+                let j = errColumn - 2; // 0-based index of char before error token
+                while (j >= 0 && (lineText[j] === ' ' || lineText[j] === '\t'))
+                    j--;
+                if (j >= 0 && lineText[j] === '{') {
+                    // Read the keyword after `{` (skipping whitespace)
+                    let k = errColumn - 1; // 0-based index of error token start
+                    while (k < lineText.length && (lineText[k] === ' ' || lineText[k] === '\t'))
+                        k++;
+                    let keyword = '';
+                    while (k < lineText.length && ((lineText[k] >= 'a' && lineText[k] <= 'z') || (lineText[k] >= 'A' && lineText[k] <= 'Z') || lineText[k] === '_' || lineText[k] === '$')) {
+                        keyword += lineText[k];
+                        k++;
+                    }
+                    const statementKeywords = new Set(['if', 'for', 'while', 'switch', 'try', 'const', 'let', 'var', 'function', 'class', 'return', 'do', 'with']);
+                    if (statementKeywords.has(keyword)) {
+                        const startLine = errLine;
+                        const startColumn = j + 1; // 1-based column of `{`
+                        throw VeskError.blockStatementInStatementMode({
+                            file: filename,
+                            line: startLine,
+                            column: startColumn,
+                            frame: codeFrame(source, startLine, startColumn, 5, 5),
+                        });
+                    }
+                }
+            }
+        }
+        // Targeted help for a bare template literal used as a JSX attribute value,
+        // e.g. <Link href=`/admin/learners/${id}`>. JSX attributes must be a quoted
+        // string or a `{...}` expression; a backtick on its own is not valid JSX.
+        if (errLine > 0 &&
+            cleanMessage.includes('JSX value should be either an expression or a quoted JSX text')) {
+            const srcLine = (source.split('\n')[errLine - 1] ?? '');
+            if (srcLine.includes('`')) {
+                extraHelp.push('JSX attribute values must be a quoted string (`href="..."`) or a `{...}` expression (`href={expr}`).', 'A bare backtick template literal is not valid JSX — wrap it in braces:', '  href={`/admin/learners/${id}`}');
+            }
+        }
+        throw new VeskError(`${message}${hint}`, {
             file: filename,
-            line,
-            column,
-            code: frame,
-            nextSteps: [
-                'Check the line indicated by the ^ marker for missing brackets, quotes, or JSX syntax.',
-                'If you wrote literal { or } inside JSX text, escape them as {\'{\'} and {\'}\'} or use &lbrace; &rbrace;.',
-                'Ensure all JSX tags are properly closed and component names start with an uppercase letter.',
-            ],
+            line: errLine,
+            column: errColumn,
+            frame,
+            code,
+            nextSteps: extraHelp.length ? extraHelp : [],
         });
     }
 }
+/**
+ * Scan the source (character by character, no regex) tracking JSX opening and
+ * closing tags up to `upToLine`. Returns the most recently opened tag that
+ * was never closed, or `null` if all tags are balanced. Used only to produce
+ * a better error message when acorn reports a generic "Unexpected token"
+ * for an unclosed JSX tag.
+ */
+function findUnclosedJsxTag(source, upToLine) {
+    const stack = [];
+    let i = 0;
+    let currentLine = 1;
+    const isIdentStart = (code) => (code >= 97 && code <= 122) || (code >= 65 && code <= 90) || code === 95; // a-z A-Z _
+    while (i < source.length) {
+        if (source[i] === '\n') {
+            currentLine++;
+            i++;
+            if (currentLine > upToLine)
+                break;
+            continue;
+        }
+        if (currentLine > upToLine)
+            break;
+        if (source[i] === '<') {
+            // Closing tag: </tagName>
+            if (i + 1 < source.length && source[i + 1] === '/') {
+                let j = i + 2;
+                while (j < source.length && source[j] !== '>' && source[j] !== '\n')
+                    j++;
+                const tagName = source.slice(i + 2, j);
+                // Only pop if it matches the most recently opened unclosed tag.
+                if (stack.length > 0 && stack[stack.length - 1].tagName === tagName) {
+                    stack.pop();
+                }
+                // Skip past the closing >.
+                while (j < source.length && source[j] !== '>')
+                    j++;
+                if (j < source.length)
+                    j++;
+                i = j;
+                continue;
+            }
+            // Opening tag: <tagName ...> (skip namespace prefixes like ns.)
+            let j = i + 1;
+            while (j < source.length &&
+                (source[j] === '.' || source[j] === ':' ||
+                    (source.charCodeAt(j) >= 97 && source.charCodeAt(j) <= 122) ||
+                    (source.charCodeAt(j) >= 65 && source.charCodeAt(j) <= 90) ||
+                    source.charCodeAt(j) === 95)) {
+                j++;
+            }
+            const tagName = source.slice(i + 1, j);
+            if (tagName.length > 0 && isIdentStart(tagName.charCodeAt(0))) {
+                // Check for self-closing: <tagName />
+                let k = j;
+                let selfClosing = false;
+                while (k < source.length && source[k] !== '>') {
+                    if (source[k] === '/' && k + 1 < source.length && source[k + 1] === '>') {
+                        selfClosing = true;
+                        break;
+                    }
+                    k++;
+                }
+                if (!selfClosing) {
+                    const loc = offsetToLineCol(source, i);
+                    stack.push({ tagName, line: loc.line, column: loc.column });
+                }
+            }
+            // Skip past the closing >.
+            while (j < source.length && source[j] !== '>')
+                j++;
+            if (j < source.length)
+                j++;
+            i = j;
+            continue;
+        }
+        i++;
+    }
+    // The most recently opened tag still on the stack is the unclosed one.
+    if (stack.length > 0) {
+        return stack[stack.length - 1];
+    }
+    return null;
+}
+/**
+ * Scan the source tracking JSX tags up to `upToLine`. Returns the first
+ * closing tag that does not match the most recently opened tag,
+ * e.g. `</span>` after `<div>`. Character scan only — no regex.
+ */
+function findMismatchedJsxTag(source, upToLine) {
+    const stack = [];
+    let i = 0;
+    let currentLine = 1;
+    const isIdentStart = (code) => (code >= 97 && code <= 122) || (code >= 65 && code <= 90) || code === 95;
+    while (i < source.length) {
+        if (source[i] === '\n') {
+            currentLine++;
+            i++;
+            if (currentLine > upToLine)
+                break;
+            continue;
+        }
+        if (currentLine > upToLine)
+            break;
+        if (source[i] === '<') {
+            // Closing tag: </tagName>
+            if (i + 1 < source.length && source[i + 1] === '/') {
+                let j = i + 2;
+                while (j < source.length && source[j] !== '>' && source[j] !== '\n')
+                    j++;
+                const closingTag = source.slice(i + 2, j);
+                while (j < source.length && source[j] !== '>')
+                    j++;
+                if (j < source.length)
+                    j++;
+                const loc = offsetToLineCol(source, i);
+                // Mismatch: a closing tag that doesn't match the most recent opening tag.
+                if (stack.length > 0 && stack[stack.length - 1] !== closingTag) {
+                    return { openingTag: stack[stack.length - 1], closingTag, line: loc.line, column: loc.column };
+                }
+                // Match: pop the stack.
+                if (stack.length > 0)
+                    stack.pop();
+                i = j;
+                continue;
+            }
+            // Opening tag: <tagName ...>
+            let j = i + 1;
+            while (j < source.length &&
+                (source[j] === '.' || source[j] === ':' ||
+                    (source.charCodeAt(j) >= 97 && source.charCodeAt(j) <= 122) ||
+                    (source.charCodeAt(j) >= 65 && source.charCodeAt(j) <= 90) ||
+                    source.charCodeAt(j) === 95)) {
+                j++;
+            }
+            const tagName = source.slice(i + 1, j);
+            if (tagName.length > 0 && isIdentStart(tagName.charCodeAt(0))) {
+                // Self-closing: <tagName />
+                let k = j;
+                let selfClosing = false;
+                while (k < source.length && source[k] !== '>') {
+                    if (source[k] === '/' && k + 1 < source.length && source[k + 1] === '>') {
+                        selfClosing = true;
+                        break;
+                    }
+                    k++;
+                }
+                if (!selfClosing)
+                    stack.push(tagName);
+            }
+            while (j < source.length && source[j] !== '>')
+                j++;
+            if (j < source.length)
+                j++;
+            i = j;
+            continue;
+        }
+        i++;
+    }
+    return null;
+}

package/dist/server-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-render.d.ts","sourceRoot":"","sources":["../src/server-render.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,EAAE,eAAe,EAAqB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAuCvJ,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,iBAAiB,CAMhG;AA6DD,wBAAgB,MAAM,CACpB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA0C1B;AAED,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiG9C;AAqED,KAAK,gBAAgB,GAAG,OAAO,aAAa,EAAE,UAAU,CAAC;AAEzD,UAAU,iBAAiB;IACzB,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,gBAAgB,EAAE,GAAG,SAAS,GAAG,IAAI,EAC9C,GAAG,CAAC,EAAE,OAAO,aAAa,EAAE,mBAAmB,GAC9C,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,EAAE,GAAG,SAAS,GAAG,IAAI,EAC9C,GAAG,CAAC,EAAE,OAAO,aAAa,EAAE,mBAAmB,GAC9C,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,iBAAiB,EAC1B,GAAG,CAAC,EAAE,OAAO,aAAa,EAAE,mBAAmB,GAC9C,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,GAAG,CACvB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAO,GACnI,OAAO,CAAC,SAAS,CAAC,CA6EpB;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EACpD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI,GACnC,MAAM,EAAE,CAuBV;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAoHjB;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,eAAoB,GAC5B,cAAc,CAAC,MAAM,CAAC,CAsJxB"}
+{"version":3,"file":"server-render.d.ts","sourceRoot":"","sources":["../src/server-render.ts"],"names":[],"mappings":"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"}

package/dist/server-render.js

@@ -463,23 +463,24 @@ export function buildDataScripts(ssrProps, ssrData, external) {
     return scripts;
 }
 export async function renderFullPage(source, componentName, props = {}, registry = new Map(), options = {}) {
-    return withSsrStore(async () => {
-        globalThis.__vsk_ssr = true;
-        // Reuse the request token when a page/layout render already started one (the
-        // generated adapter handler renders page -> layouts -> document within one
-        // process), otherwise start fresh. One request = one token = one data slot.
-        if (!globalThis.__vsk_ssr_token)
-            globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
-        const renderToken = globalThis.__vsk_ssr_token;
-        keepSsrSlot(renderToken);
-        pruneSsrDataSlots();
-        // Start this render's handoff store fresh: setSsrData mirrors into
-        // globalThis.__vsk_ssr_data (see resource.ts) because the AsyncLocalStorage
-        // sink snapshot can be empty when the write runs in a forked async context.
-        // Resetting here also gives the /about-after-/posts no-leak behavior the
-        // ALS isolation was introduced to fix.
-        globalThis.__vsk_ssr_data = {};
-        try {
+    // Adopt the ambient request store when one is open: renderPage runs in the
+    // enclosing withSsrStore scope and attributes setSsrData writes to that
+    // store's token, so renderFullPage must read the same slot to hand off SSR
+    // data. Only mint a fresh store when called stand-alone (no ambient scope),
+    // which keeps concurrent requests isolated through their distinct tokens.
+    const store = adoptSsrStore();
+    const renderToken = store.token;
+    keepSsrSlot(renderToken);
+    pruneSsrDataSlots();
+    globalThis.__vsk_ssr = true;
+    // Start this render's handoff store fresh: setSsrData mirrors into
+    // globalThis.__vsk_ssr_data (see resource.ts) because the AsyncLocalStorage
+    // sink snapshot can be empty when the write runs in a forked async context.
+    // Resetting here also gives the /about-after-/posts no-leak behavior.
+    globalThis.__vsk_ssr_data = {};
+    let result;
+    try {
+        result = await withSsrStoreOf(store, async () => {
             let ssrProps = { ...props };
             let serializedProps = null;
             const cached = options.cached || undefined;
@@ -500,18 +501,20 @@ export async function renderFullPage(source, componentName, props = {}, registry
             // Defensive settle: page/layout renders already awaited their own SSR
             // promises before cleanup; this covers any resource started here (loadFn).
             await settleSsrPromises(renderToken);
-            // Merge the ALS sink snapshot with the request's per-token data slot. The
-            // slot is the deterministic channel for writes that happened in a forked
-            // async context (native fetch) — the sink alone can miss them. The slot is
-            // request-scoped (deleted below), so a late write can never leak into a
-            // following request the way the flat global would.
+            // Merge the request's per-token data slot. The slot is the deterministic
+            // channel for writes that happened in a forked async context (native fetch
+            // .then() callbacks run outside the ALS scope) and is keyed per render
+            // token, so concurrent renders never mix data. The ALS sink (ssrSink) is
+            // NOT read here because withSsrStore reuses the ambient store when one is
+            // already open, so concurrent renderFullPage calls share a single sink and
+            // their writes would cross-contaminate. Every setSsrData write also lands
+            // in the slot, so the slot alone is a complete handoff source.
             const slot = globalThis[`__vsk_ssr_data_${renderToken}`] || {};
             const ssrData = {
-                ...ssrSink.snapshot(),
                 ...slot,
             };
             if (process.env.VESK_SSR_TRACE) {
-                console.error(`[render-trace] renderFullPage comp=${componentName} keys=${Object.keys(ssrData).join(',') || '∅'} slot=${Object.keys(slot).join(',') || '∅'} sink=${Object.keys(ssrSink.snapshot()).join(',') || '∅'}`);
+                console.error(`[render-trace] renderFullPage comp=${componentName} keys=${Object.keys(ssrData).join(',') || '∅'} slot=${Object.keys(slot).join(',') || '∅'}`);
             }
             let headHtml = rendered.head;
             if (options.pageHead) {
@@ -565,17 +568,15 @@ ${bodyHtml}
 ${dataScriptBlock}${clientScript}</body>
 </html>`;
             return applyHtmlPlugins(docHtml, options.plugins, { sourcePath: options.sourcePath, url: options.__vesk?.url || undefined });
-        }
-        finally {
-            delete globalThis.__vsk_ssr;
-            delete globalThis[`__vsk_ssr_data_${renderToken}`];
-            // The token lives in the AsyncLocalStorage store now (see ssr-store.ts);
-            // it goes away with the scope. Deleting the global would destroy the
-            // request-scoped accessor that generated render code reads.
-            dropSsrSlot(renderToken);
-            pruneSsrDataSlots();
-        }
-    });
+        });
+    }
+    finally {
+        delete globalThis.__vsk_ssr;
+        delete globalThis[`__vsk_ssr_data_${renderToken}`];
+        dropSsrSlot(renderToken);
+        pruneSsrDataSlots();
+    }
+    return result;
 }
 export function renderPageStream(source, componentName, props = {}, registry = new Map(), options = {}) {
     // One store for the whole stream. `next()` is driven by the consumer, so a

package/package.json

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