@vesk/compiler 0.2.16 → 0.2.18

package/dist/client-codegen.d.ts

@@ -8,6 +8,14 @@ export interface TrackedInfo {
 export declare function semicolonizeStatement(code: string): string;
 export declare function transformTracked(irNode: Expression | RuntimeStatement | DynamicBinding, tracked: Map<string, TrackedInfo>): string;
 export declare function collectTrackedNames(body: IRNode[]): Map<string, TrackedInfo>;
+/**
+ * Tracked reads inside a track/derived declaration init are re-emitted as
+ * `get(…)` subscriptions so a `derived(() => … cell …)` (or
+ * `track(() => … cell …)`) recomputes when the cell changes, instead of
+ * reading the raw cell object as a key/property. The init is parsed with the
+ * normal vesk parser so TS generics and `.vsk` syntax survive.
+ */
+export declare function transformTrackedInit(init: string, tracked: Map<string, TrackedInfo>): string;
 declare function isStaticIR(body: IRNode[]): boolean;
 export declare function escapeHtml(str: string): string;
 export declare function compileClient(source: string, _componentName: string | null, options?: {

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,EAOjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAwCxD,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,CAwGlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAU5E;AA8kCD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AA2HD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAoED,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,CAAA;CAAO,GAAG,MAAM,CAOnN;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAqBxJ;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,EAOjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAwCxD,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,CAwGlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAU5E;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAY5F;AA0pCD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AA2HD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAoED,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,CAAA;CAAO,GAAG,MAAM,CAOnN;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAqBxJ;AAED,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/client-codegen.js

@@ -208,6 +208,29 @@ export function collectTrackedNames(body) {
     }
     return names;
 }
+/**
+ * Tracked reads inside a track/derived declaration init are re-emitted as
+ * `get(…)` subscriptions so a `derived(() => … cell …)` (or
+ * `track(() => … cell …)`) recomputes when the cell changes, instead of
+ * reading the raw cell object as a key/property. The init is parsed with the
+ * normal vesk parser so TS generics and `.vsk` syntax survive.
+ */
+export function transformTrackedInit(init, tracked) {
+    if (!init)
+        return init;
+    let expr = null;
+    try {
+        const prog = parse(`(${init})`);
+        expr = prog.body?.[0]?.type === 'ExpressionStatement' ? (prog.body[0].expression ?? null) : null;
+    }
+    catch {
+        // Unparseable init (defensive) — leave raw; the generated code is checked
+        // for syntax at build time and would be reported there.
+    }
+    if (!expr)
+        return init;
+    return transformTracked({ raw: init, ast: expr }, tracked);
+}
 const NON_BUBBLING_EVENTS = new Set([
     'focus', 'blur',
     'mouseenter', 'mouseleave',
@@ -229,6 +252,7 @@ class Ctx {
     effects = [];
     c = 0;
     importedNames = new Set();
+    linkNames = new Set();
     delegatedEvents = new Set();
     directEvents = new Set();
     hydrate = false;
@@ -281,7 +305,7 @@ function emitNode(ctx, node, tracked, effectsVar, parentVar, compPrefix = '__com
         return emitDynamicBinding(ctx, node, tracked, effectsVar);
     if (node instanceof TrackDecl) {
         const cellName = node.rawName || node.name;
-        const init = stripTrackGeneric(node.init);
+        const init = transformTrackedInit(stripTrackGeneric(node.init), tracked);
         ctx.push(`const ${cellName} = ${init};`);
         return null;
     }
@@ -621,6 +645,13 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
             ctx.push(`const ${frag} = (() => { const $f = document.createDocumentFragment();`);
             const savedWalker = ctx.walker;
             const savedEffects = ctx.effects;
+            // Link/NavLink hydrate branches WIPE their SSR anchor (a.replaceChildren())
+            // and remount the children fragment. Suppressed fully-static children would
+            // therefore be lost, so rebuild the whole subtree fresh instead of claiming.
+            const wipeMount = ctx.linkNames.has(node.componentName);
+            const savedHydrate = ctx.hydrate;
+            if (wipeMount)
+                ctx.hydrate = false;
             ctx.walker = walkerVar;
             ctx.effects = [];
             for (const child of node.children) {
@@ -632,6 +663,7 @@ function emitComponentCall(ctx, node, tracked, effectsVar, parentVar, compPrefix
                 ctx.push(effectsVar ? `${effectsVar}.push(${effectBlockToHandlerExpr(eff)});` : eff);
             ctx.effects = savedEffects;
             ctx.walker = savedWalker;
+            ctx.hydrate = savedHydrate;
             ctx.push(`return $f; })();`);
             propsEntries.push(`children: ${frag}`);
             ctx.push(`const ${v} = ${awaitKw}${access}({ ${propsEntries.join(', ')} }, __registry, ${walkerVar});`);
@@ -697,7 +729,7 @@ function emitTryCatch(ctx, node, tracked, effectsVar, parentVar) {
             ctx.push(indent(`const __cl = [];`));
         }
         for (const child of body) {
-            const childVar = emitNode(ctx, child, tracked, isCatch ? null : effArr, undefined, compPrefix);
+            const childVar = emitNode(ctx, child, tracked, isCatch ? null : effArr, hydMode ? undefined : '__p', compPrefix);
             if (childVar) {
                 if (hydMode)
                     ctx.push(indent(`__cl.push(${childVar});`));
@@ -817,7 +849,7 @@ function emitOpaque(ctx, node, tracked, effTarget, parentVar) {
     ctx.push(`if (${condExpr}) { ${asyncKw}${conRenderName}(); }` + (hasElse ? ` else { ${asyncKw}${altRenderName}(); }` : ''));
     const renderBranch = `if (__nv) { ${asyncKw}${conRenderName}(); }` + (hasElse ? ` else { ${asyncKw}${altRenderName}(); }` : '');
     const effectBody = `effect(${ctx.isAsyncScope ? 'async () => {' : '() => {'}
-      if (__first) { __first = false; return; }
+      if (__first) { __first = false; __iv = ${condExpr}; return; }
       const __nv = ${condExpr};
       if (__nv !== __iv) {
         for (const e of ${effectsVar}) destroy_block(e);
@@ -827,6 +859,11 @@ function emitOpaque(ctx, node, tracked, effTarget, parentVar) {
         __iv = __nv;
       }
     });`;
+    // 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).
+    if (!isReactiveExpression(node.condition, tracked))
+        return null;
     if (effTarget) {
         ctx.push(`${effTarget}.push((() => {
     let __iv = ${condExpr};
@@ -859,17 +896,19 @@ function emitWhileLoop(ctx, node, tracked, parentVar) {
     ctx.push(`const ${renderLoop} = ${ctx.isAsyncScope ? 'async () => {' : '() => {'}`);
     if (!hyd)
         ctx.push(indent(`const __p = ${anchor}.parentNode;`));
+    if (!hyd)
+        ctx.push(indent(`const __b = document.createDocumentFragment();`));
     if (hyd)
         ctx.push(indent(`const __cl = [];`));
     if (node.isDoWhile) {
         ctx.push(indent(`do {`));
         for (const n of node.bodyTemplate) {
-            const v = emitNode(ctx, n, tracked, effectsVar, hyd ? parentVar : undefined);
+            const v = emitNode(ctx, n, tracked, effectsVar, hyd ? parentVar : '__b');
             if (v) {
                 if (hyd)
                     ctx.push(indent(`__cl.push(${v});`));
                 else
-                    ctx.push(indent(`__p.insertBefore(${v}, ${endAnchor});`));
+                    ctx.push(indent(`__b.appendChild(${v});`));
             }
         }
         ctx.push(indent(`} while (${condExpr});`));
@@ -877,16 +916,18 @@ function emitWhileLoop(ctx, node, tracked, parentVar) {
     else {
         ctx.push(indent(`while (${condExpr}) {`));
         for (const n of node.bodyTemplate) {
-            const v = emitNode(ctx, n, tracked, effectsVar, hyd ? parentVar : undefined);
+            const v = emitNode(ctx, n, tracked, effectsVar, hyd ? parentVar : '__b');
             if (v) {
                 if (hyd)
                     ctx.push(indent(`__cl.push(${v});`));
                 else
-                    ctx.push(indent(`__p.insertBefore(${v}, ${endAnchor});`));
+                    ctx.push(indent(`__b.appendChild(${v});`));
             }
         }
         ctx.push(indent(`}`));
     }
+    if (!hyd)
+        ctx.push(indent(`__p.insertBefore(__b, ${endAnchor});`));
     if (hyd)
         ctx.push(indent(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
     ctx.push(`};`);
@@ -898,7 +939,7 @@ function emitWhileLoop(ctx, node, tracked, parentVar) {
   let __iv = (${condExpr});
   let __first = true;
   effect(${ctx.isAsyncScope ? 'async () => {' : '() => {'}
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __iv = (${condExpr}); return; }
     if (__busy) return;
     const __nv = (${condExpr});
     if (__nv !== __iv) {
@@ -929,40 +970,55 @@ function emitForLoop(ctx, node, tracked, parentVar) {
     ctx.push(`const ${renderLoop} = ${ctx.isAsyncScope ? 'async () => {' : '() => {'}`);
     if (!hyd)
         ctx.push(indent(`const __p = ${anchor}.parentNode;`));
+    if (!hyd)
+        ctx.push(indent(`const __b = document.createDocumentFragment();`));
     if (hyd)
         ctx.push(indent(`const __cl = [];`));
     if (node.kind === 'for-in') {
         const srcExpr = transformTracked(node.condition, tracked);
         ctx.push(indent(`for (${node.init} of (Array.isArray(${srcExpr}) ? ${srcExpr} : (${srcExpr} == null ? [] : Object.keys(${srcExpr})))) {`));
         for (const n of node.bodyTemplate) {
-            const v = emitNode(ctx, n, tracked, effectsVar, hyd ? parentVar : undefined);
+            const v = emitNode(ctx, n, tracked, effectsVar, hyd ? parentVar : '__b');
             if (v) {
                 if (hyd)
                     ctx.push(indent(`__cl.push(${v});`));
                 else
-                    ctx.push(indent(`__p.insertBefore(${v}, ${endAnchor});`));
+                    ctx.push(indent(`__b.appendChild(${v});`));
             }
         }
         ctx.push(indent(`}`));
     }
     else {
         const condExpr = transformTracked(node.condition, tracked);
-        if (node.init)
-            ctx.push(indent(`${node.init}`));
-        ctx.push(indent(`while (${condExpr}) {`));
+        // Emit a real `for` statement. A `let`/`const` declared in the init clause
+        // gets a fresh binding per iteration (per the spec), so closures created in
+        // the body — event handlers, effects, `createComment('if')` render fns —
+        // capture that iteration's value instead of the loop variable's final value.
+        // The old hoisted `let i = 0; while (…) { …; i++; }` shape made every
+        // closure alias-exit to the final counter (e.g. `onClick={() => index = i}`
+        // inside `for (let i = 0; i < n; i++)` always wrote n-last, and
+        // `aria-pressed={i === index}` compared against n-last for every button).
+        let initPart = (node.init || '').trim();
+        let updatePart = (node.update || '').trim();
+        if (initPart.endsWith(';'))
+            initPart = initPart.slice(0, -1).trim();
+        if (updatePart.endsWith(';'))
+            updatePart = updatePart.slice(0, -1).trim();
+        const head = initPart ? `${initPart}; ${condExpr}` : `; ${condExpr}`;
+        ctx.push(indent(`for (${head}; ${updatePart}) {`));
         for (const n of node.bodyTemplate) {
-            const v = emitNode(ctx, n, tracked, effectsVar, hyd ? parentVar : undefined);
+            const v = emitNode(ctx, n, tracked, effectsVar, hyd ? parentVar : '__b');
             if (v) {
                 if (hyd)
                     ctx.push(indent(`__cl.push(${v});`));
                 else
-                    ctx.push(indent(`__p.insertBefore(${v}, ${endAnchor});`));
+                    ctx.push(indent(`__b.appendChild(${v});`));
             }
         }
-        if (node.update)
-            ctx.push(indent(`${node.update}`));
         ctx.push(indent(`}`));
     }
+    if (!hyd)
+        ctx.push(indent(`__p.insertBefore(__b, ${endAnchor});`));
     if (hyd)
         ctx.push(indent(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
     ctx.push(`};`);
@@ -971,12 +1027,20 @@ function emitForLoop(ctx, node, tracked, parentVar) {
     ctx.push(`${ctx.isAsyncScope ? 'await ' : ''}${renderLoop}();`);
     if (node.kind === 'for-in') {
         const srcExpr = transformTracked(node.condition, tracked);
+        // A `for ... of x` loop is only reactive when its source references a
+        // tracked cell/prop. Emitting the re-render effect unconditionally would
+        // reference the loop-local item variable (e.g. `col`, `group`, `p`) at
+        // the top level, where it is out of scope — `ReferenceError` at hydrate
+        // for loops over static/member collections or statement-mode locals.
+        if (!isReactiveExpression(node.condition, tracked)) {
+            return null;
+        }
         ctx.effects.push(`{
   let __busy = false;
   let __iv = undefined;
   let __first = true;
   effect(${ctx.isAsyncScope ? 'async () => {' : '() => {'}
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __iv = (${srcExpr}); return; }
     if (__busy) return;
     const __nv = (${srcExpr});
     if (__nv !== __iv) {
@@ -1012,10 +1076,16 @@ function emitSwitchBlock(ctx, node, tracked, parentVar) {
     ctx.push(`const ${endAnchor} = document.createComment('switch-end');`);
     const renderSwitch = ctx.n();
     ctx.push(`const ${renderSwitch} = ${ctx.isAsyncScope ? 'async () => {' : '() => {'}`);
-    if (!hyd)
-        ctx.push(indent(`const __p = ${anchor}.parentNode;`));
-    if (hyd)
+    if (hyd) {
         ctx.push(indent(`const __cl = [];`));
+    }
+    else {
+        // Case bodies can contain block-level nodes (`if`/`map`/…). Route them into
+        // a whole-case fragment so their anchors stay inside the switch region
+        // instead of leaking to `$root` on fresh client renders.
+        ctx.push(indent(`const __p = ${anchor}.parentNode;`));
+        ctx.push(indent(`const __c = document.createDocumentFragment();`));
+    }
     ctx.push(indent(`switch (${discExpr}) {`));
     for (const c of node.cases) {
         if (c.test) {
@@ -1025,17 +1095,19 @@ function emitSwitchBlock(ctx, node, tracked, parentVar) {
             ctx.push(indent(`default:`));
         }
         for (const n of c.body) {
-            const v = emitNode(ctx, n, tracked, effectsVar, hyd ? parentVar : undefined);
+            const v = emitNode(ctx, n, tracked, effectsVar, hyd ? parentVar : '__c');
             if (v) {
                 if (hyd)
                     ctx.push(indent(`__cl.push(${v});`));
                 else
-                    ctx.push(indent(`__p.insertBefore(${v}, ${endAnchor});`));
+                    ctx.push(indent(`__c.appendChild(${v});`));
             }
         }
         ctx.push(indent(`break;`));
     }
     ctx.push(indent(`}`));
+    if (!hyd)
+        ctx.push(indent(`__p.insertBefore(__c, ${endAnchor});`));
     if (hyd)
         ctx.push(indent(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
     ctx.push(`};`);
@@ -1047,7 +1119,7 @@ function emitSwitchBlock(ctx, node, tracked, parentVar) {
   let __iv = (${discExpr});
   let __first = true;
   effect(${ctx.isAsyncScope ? 'async () => {' : '() => {'}
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __iv = (${discExpr}); return; }
     if (__busy) return;
     const __nv = (${discExpr});
     if (__nv !== __iv) {
@@ -1074,6 +1146,12 @@ function emitMap(ctx, node, tracked, parentVar) {
     const keyed = !!node.keyExpr;
     const hyd = ctx.hydrate && !keyed;
     const parent = parentVar || '$root';
+    // A re-render effect is only valid when the map iterates a tracked/reactive
+    // source. Iterating a static collection (module const, top-level array) or a
+    // loop/statement-local derived value (e.g. `col.links`, `pages`) renders once;
+    // emitting a top-level effect there would reference the loop/statement local
+    // (`col`, `pages`) which is out of scope — `ReferenceError` at hydrate.
+    const reactiveSource = isReactiveExpression(node.expression, tracked);
     ctx.push(`const ${anchor} = document.createComment('map');`);
     if (!hyd)
         ctx.push(`${parent}.appendChild(${anchor});`);
@@ -1085,16 +1163,29 @@ function emitMap(ctx, node, tracked, parentVar) {
     ctx.push(indent(`__r = __r || ${endAnchor};`));
     if (node.indexVariable)
         ctx.push(indent(`const ${node.indexVariable} = __i;`));
-    ctx.push(indent(`const __p = ${anchor}.parentNode;`));
+    if (hyd) {
+        ctx.push(indent(`const __p = ${anchor}.parentNode;`));
+    }
+    else {
+        // Block-level item nodes (`if`/`map`/`try`/…) self-append their anchors to
+        // whatever container they are told to. A fresh fragment per item keeps them
+        // inside the map region (before `__r`/`endAnchor`) instead of leaking to
+        // `$root`, which would render map content above the enclosing layout slot
+        // during every fresh client render (SPA navigation / renderMatch).
+        ctx.push(indent(`const __p = ${anchor}.parentNode;`));
+        ctx.push(indent(`const __it = document.createDocumentFragment();`));
+    }
     for (const n of node.bodyTemplate) {
-        const v = emitNode(ctx, n, tracked, '__e');
+        const v = emitNode(ctx, n, tracked, '__e', hyd ? undefined : '__it');
         if (v) {
             if (hyd)
                 ctx.push(indent(`if (__cl) __cl.push(${v}); else __p.insertBefore(${v}, __r);`));
             else
-                ctx.push(indent(`__p.insertBefore(${v}, __r);`));
+                ctx.push(indent(`__it.appendChild(${v});`));
         }
     }
+    if (!hyd)
+        ctx.push(indent(`__p.insertBefore(__it, __r);`));
     ctx.push(`};`);
     let emptyRenderName = null;
     if (node.alternateNodes.length > 0) {
@@ -1137,11 +1228,13 @@ function emitMap(ctx, node, tracked, parentVar) {
             const isEmptyVar = ctx.n();
             ctx.push(`let ${isEmptyVar} = !${hasItems}();`);
             ctx.push(`if (!${isEmptyVar}) { ${initList}(); } else { ${aw}${emptyRenderName}(); }`);
+            if (!reactiveSource)
+                return null;
             ctx.effects.push(`{
   let __first = true;
   effect(${effOpen}
     const __new = ${hasItems}();
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __new; return; }
     if (__new !== ${isEmptyVar}) {
       if (__new) ${reconciler}(${arrExpr});
       return;
@@ -1156,11 +1249,13 @@ function emitMap(ctx, node, tracked, parentVar) {
         }
         else {
             ctx.push(`${initList}();`);
+            if (!reactiveSource)
+                return null;
             ctx.effects.push(`{
   let __first = true;
   effect(() => {
     const __nv = ${arrExpr};
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __nv; ${reconciler}(${arrExpr}); return; }
     ${reconciler}(${arrExpr});
   });
 }`);
@@ -1194,11 +1289,13 @@ function emitMap(ctx, node, tracked, parentVar) {
             ctx.push(indent(`} else { ${aw}${emptyRenderName}(${collectVar ? collectVar : ''}); }`));
             if (collectVar)
                 ctx.push(`__place(${anchor}, ${endAnchor}, ${collectVar}, ${parent});`);
+            if (!reactiveSource)
+                return null;
             ctx.effects.push(`{
   let __first = true;
   effect(${effOpen}
     const __new = ${hasItems}();
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __new; return; }
     if (__new !== ${isEmptyVar}) {
       if (__new) {
         for (const e of ${effectsVar}) destroy_block(e);
@@ -1225,11 +1322,13 @@ ${renderAllItems('      ', null)}
             ctx.push(renderAllItems('', collectVar));
             if (collectVar)
                 ctx.push(`__place(${anchor}, ${endAnchor}, ${collectVar}, ${parent});`);
+            if (!reactiveSource)
+                return null;
             ctx.effects.push(`{
   let __first = true;
   effect(${effOpen}
     const __nv = ${arrExpr};
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __nv; return; }
     for (const e of ${effectsVar}) destroy_block(e);
     ${effectsVar}.length = 0;
     __cleanup(${anchor}, ${endAnchor});
@@ -1243,10 +1342,11 @@ ${renderAllItems('    ', null)}
 function computeAsyncComponents(comps) {
     return new Set(comps.filter((c) => c.isAsync).map((c) => c.name));
 }
-function generateComponent(comp, importedNames = new Set(), hydrate = false, asyncComps = new Set()) {
+function generateComponent(comp, importedNames = new Set(), hydrate = false, asyncComps = new Set(), linkNames = new Set()) {
     const tracked = collectTrackedNames(comp.body);
     const ctx = new Ctx();
     ctx.importedNames = importedNames;
+    ctx.linkNames = linkNames;
     ctx.hydrate = hydrate;
     ctx.asyncComps = asyncComps;
     ctx.isAsyncScope = comp.isAsync || asyncComps.has(comp.name);
@@ -1275,7 +1375,7 @@ function generateComponent(comp, importedNames = new Set(), hydrate = false, asy
         const v = emitNode(ctx, node, tracked, null);
         if (v) {
             if (ctx.hydrate) {
-                ctx.push(indent(`if (${v}.parentNode !== $root) $root.appendChild(${v});`));
+                ctx.push(indent(`if (${v}.parentNode !== $root) { if (!$root || ${v}.parentNode == null || !$root.contains(${v})) $root.appendChild(${v}); }`));
             }
             else {
                 ctx.push(indent(`$root.appendChild(${v});`));
@@ -1306,6 +1406,16 @@ function buildComponentMap(irRoot, hydrate = false) {
     const mapLines = [];
     mapLines.push(`const __components = {};`);
     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
+    // file-local binding names regardless of aliasing (`const Nav = NavLink`).
+    const linkNames = new Set();
+    for (const imp of irRoot.imports) {
+        for (const pair of importBindingPairs(imp)) {
+            if (pair.imported === 'Link' || pair.imported === 'NavLink')
+                linkNames.add(pair.local);
+        }
+    }
     // Top-level value bindings (`const MyIcon = Cpu`) live in module scope
     // alongside the component map, so a same-named JSX tag must invoke that
     // in-scope value directly — not a registry lookup. File-defined components
@@ -1319,7 +1429,7 @@ function buildComponentMap(irRoot, hydrate = false) {
             mapLines.push(`__components[${JSON.stringify(comp.name)}] = ${stub};`);
             continue;
         }
-        const code = generateComponent(comp, directNames, hydrate, asyncComps);
+        const code = generateComponent(comp, directNames, hydrate, asyncComps, linkNames);
         mapLines.push(`__components[${JSON.stringify(comp.name)}] = ${code};`);
     }
     mapLines.push(`function __cleanup(start, end) {`);

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,EAoBP,MAAM,uBAAuB,CAAC;AA0L/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;AAg0BD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAoO9E"}
+{"version":3,"file":"ir-generator.d.ts","sourceRoot":"","sources":["../src/ir-generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAoBP,MAAM,uBAAuB,CAAC;AA0L/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;AAg0BD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CA6P9E"}

package/dist/ir-generator.js

@@ -1277,6 +1277,7 @@ export function generateIR(ast, source, filename) {
         'createContext',
         'redirect', 'permanentRedirect', 'notFound', 'NotFoundError',
         'createResource', 'getAction', 'validateActionInput', 'issuesToFieldMap', 'isFormAction',
+        'Show', 'For', 'Switch', 'Match',
     ];
     const usedFunctions = new Set();
     const addUsedFrom = (code) => {
@@ -1297,6 +1298,36 @@ export function generateIR(ast, source, filename) {
             if (node instanceof RuntimeStatement && node.raw) {
                 addUsedFrom(node.raw);
             }
+            if (node instanceof TrackDecl && node.init) {
+                addUsedFrom(node.init);
+            }
+            if (node instanceof ForLoop) {
+                if (node.init)
+                    addUsedFrom(node.init);
+                if (node.update)
+                    addUsedFrom(node.update);
+                if (node.condition && node.condition.raw)
+                    addUsedFrom(node.condition.raw);
+                scanForAutoImport(node.bodyTemplate);
+            }
+            if (node instanceof WhileLoop) {
+                if (node.condition && node.condition.raw)
+                    addUsedFrom(node.condition.raw);
+                scanForAutoImport(node.bodyTemplate);
+            }
+            if (node instanceof SwitchBlock) {
+                if (node.discriminant && node.discriminant.raw)
+                    addUsedFrom(node.discriminant.raw);
+                for (const c of node.cases) {
+                    if (c.test && c.test.raw)
+                        addUsedFrom(c.test.raw);
+                    scanForAutoImport(c.body);
+                }
+            }
+            if (node instanceof TryCatch) {
+                scanForAutoImport(node.bodyTemplate);
+                scanForAutoImport(node.catchBody);
+            }
             if (node instanceof ComponentCall) {
                 if (autoImportable.includes(node.componentName)) {
                     usedFunctions.add(node.componentName);

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

@@ -1 +1 @@
-{"version":3,"file":"module-imports.d.ts","sourceRoot":"","sources":["../src/module-imports.ts"],"names":[],"mappings":"AAmGA;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAgC1F;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAQpE;AAED,0FAA0F;AAC1F,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,UAAU,EAAE,MAAM,EAAE,EACpB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,IAAI,CAuBN;AAiBD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAqD7E;AAqJD;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAyBlF;AAoJD,kFAAkF;AAClF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAiGxF"}
+{"version":3,"file":"module-imports.d.ts","sourceRoot":"","sources":["../src/module-imports.ts"],"names":[],"mappings":"AAmGA;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAgC1F;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAQpE;AAED,0FAA0F;AAC1F,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,UAAU,EAAE,MAAM,EAAE,EACpB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,IAAI,CAuBN;AAiBD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAiE7E;AA0WD;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA8BlF;AAoJD,kFAAkF;AAClF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAiGxF"}

package/dist/module-imports.js

@@ -238,13 +238,26 @@ export function loadSsrModule(absPath) {
             }
         }
         else {
-            exportsObj = {};
-            EVALUATING.set(absPath, exportsObj);
-            const ran = evaluateModuleFile(absPath, exportsObj);
-            // Runtime evaluation failure (already warned) — give Node's own loader
-            // a chance before giving up.
-            if (!ran)
-                exportsObj = null;
+            // Pure re-export barrels (`export { x as y } from`, `export * from`,
+            // `export * as ns from`) return a lazy Proxy: only the submodule backing
+            // a name the consumer actually touches gets evaluated. Without this, a
+            // several-thousand-export barrel (e.g. lucide's icon index) pays its full
+            // transitive closure on every cold load (tens of seconds dev, too slow to
+            // ship in prod).
+            const src = readSsrSource(absPath);
+            const body = (src?.ast?.body || []);
+            if (src && isPureReexportBarrel(body)) {
+                exportsObj = createLazyBarrelExports(buildBarrelSpec(body), dirname(absPath));
+            }
+            else {
+                exportsObj = {};
+                EVALUATING.set(absPath, exportsObj);
+                const ran = evaluateModuleFile(absPath, exportsObj, src);
+                // Runtime evaluation failure (already warned) — give Node's own loader
+                // a chance before giving up.
+                if (!ran)
+                    exportsObj = null;
+            }
         }
         if (exportsObj === null) {
             exportsObj = nativeRequireFallback(absPath);
@@ -287,19 +300,14 @@ function depsFresh(cachedVal) {
     }
     return true;
 }
-/**
- * Runs one module file. Returns `true` when the body executed, `false` when a
- * runtime failure was already warned about. Unsupported ESM constructs throw —
- * the only honest outcome is a loud, specific error, never silently undefined.
- */
-function evaluateModuleFile(absPath, exportsObj) {
+function readSsrSource(absPath) {
     let raw;
     try {
         raw = readFileSync(absPath, 'utf-8');
     }
     catch (err) {
         console.warn(`[vesk] SSR: failed to read ${absPath}: ${err?.message ?? String(err)}`);
-        return false;
+        return null;
     }
     let ast = null;
     try {
@@ -308,6 +316,233 @@ function evaluateModuleFile(absPath, exportsObj) {
     catch {
         ast = null;
     }
+    return { raw, ast };
+}
+/** True when every statement in a module body is a re-export (or a type-only /
+ *  directive statement). Such "pure barrels" carry no computation of their own,
+ *  so they can be served lazily instead of paying their full transitive closure. */
+function isPureReexportBarrel(body) {
+    for (const stmt of body) {
+        if (stmt.type === 'EmptyStatement')
+            continue;
+        if (stmt.type === 'ExpressionStatement') {
+            // A leading directive such as 'use strict' — no runtime effect here.
+            const expr = stmt.expression;
+            if (expr && expr.type === 'Literal' && typeof expr.value === 'string' && expr.value.length > 0)
+                continue;
+            return false;
+        }
+        if (stmt.type === 'ExportAllDeclaration') {
+            if (stmt.exportKind === 'type')
+                continue;
+            continue;
+        }
+        if (stmt.type === 'ExportNamedDeclaration') {
+            if (stmt.exportKind === 'type')
+                continue;
+            if (stmt.source)
+                continue; // `export { x } from 'm'` re-export
+            return false; // local declaration or local re-export — real code
+        }
+        if (stmt.type === 'ImportDeclaration' && stmt.importKind === 'type')
+            continue;
+        return false;
+    }
+    return true;
+}
+function buildBarrelSpec(body) {
+    const spec = { direct: new Map(), namespaces: new Map(), stars: [] };
+    for (const stmt of body) {
+        if (stmt.type === 'ExportNamedDeclaration') {
+            if (stmt.exportKind === 'type' || !stmt.source)
+                continue;
+            // The module source is a string literal — read its value directly instead
+            // of reprinting the node (esrap print per statement is the dominant cost
+            // in multi-thousand-export barrels).
+            const source = quotedSourceValue(stmt.source);
+            const specifiers = stmt.specifiers || [];
+            for (const ex of specifiers) {
+                if (ex.exportKind === 'type')
+                    continue;
+                const imported = exportKeyName(ex.local);
+                const exported = exportKeyName(ex.exported);
+                if (!exported || !imported)
+                    continue;
+                if (source !== null)
+                    spec.direct.set(exported, { source, imported });
+            }
+        }
+        else if (stmt.type === 'ExportAllDeclaration') {
+            if (stmt.exportKind === 'type')
+                continue;
+            const source = quotedSourceValue(stmt.source);
+            if (stmt.exported) {
+                const nsName = exportKeyName(stmt.exported);
+                if (source !== null && nsName)
+                    spec.namespaces.set(nsName, source);
+            }
+            else if (source !== null) {
+                spec.stars.push(source);
+            }
+        }
+    }
+    return spec;
+}
+/**
+ * Raw string value of an `... from <literal>` source node. Returns the unquoted
+ * specifier, or `null` when the node isn't a plain string literal (callers fall
+ * back — and caching the string is safer than reprinting per statement).
+ */
+/**
+ * Raw string value of an `... from <literal>` source node. String literals are
+ * read directly (esrap printing per statement is the dominant cost in
+ * multi-thousand-export barrels); any other node falls back to a reprinted,
+ * quote-stripped value so no export is ever dropped.
+ */
+function quotedSourceValue(node) {
+    const n = node;
+    if (n && (n.type === 'Literal' || n.type === 'StringLiteral') && typeof n.value === 'string') {
+        return n.value;
+    }
+    const printed = printNode(node);
+    return printed ? stripOuterQuotes(printed) : null;
+}
+/**
+ * A lazy exports object for a pure re-export barrel. Names resolve on access;
+ * the submodule backing them is loaded (and cached) only then. Barrels load
+ * with an empty dependency closure, so editing one re-exported module
+ * invalidates that module alone — never the whole barrel (a several-thousand
+ * file stat walk otherwise).
+ */
+function createLazyBarrelExports(spec, dir) {
+    // Resolved submodule TARGETS are cached, but their values are pulled through
+    // `loadSsrModule` on every access — that call is mtime-keyed per module, so
+    // editing a re-exported file invalidates exactly that module (and is cheap:
+    // one stat), while the barrel itself stays cached with no dependency walk.
+    const targets = new Map();
+    const starKeys = new Set();
+    let starsEnumerated = false;
+    const loadSource = (source) => {
+        let target = targets.get(source);
+        if (!target) {
+            target = resolveSsrModule(source, dir) ?? '';
+            if (!target)
+                return null;
+            targets.set(source, target);
+        }
+        const mod = loadSsrModule(target);
+        return mod && typeof mod === 'object' ? mod : null;
+    };
+    const hasPresent = (prop) => {
+        if (spec.direct.has(prop) || spec.namespaces.has(prop))
+            return true;
+        if (starsEnumerated && starKeys.has(prop))
+            return true;
+        if (prop === 'default')
+            return false; // `export *` never re-exports default
+        for (const source of spec.stars) {
+            const mod = loadSource(source);
+            if (mod && Object.prototype.hasOwnProperty.call(mod, prop))
+                return true;
+        }
+        return false;
+    };
+    const getNamed = (prop) => {
+        const direct = spec.direct.get(prop);
+        if (direct) {
+            const mod = loadSource(direct.source);
+            if (!mod)
+                return undefined;
+            return mod[direct.imported];
+        }
+        const nsSource = spec.namespaces.get(prop);
+        if (nsSource) {
+            return loadSource(nsSource) ?? undefined;
+        }
+        if (prop === 'default')
+            return undefined;
+        for (const source of spec.stars) {
+            const mod = loadSource(source);
+            if (mod && Object.prototype.hasOwnProperty.call(mod, prop)) {
+                return mod[prop];
+            }
+        }
+        return undefined;
+    };
+    return new Proxy(Object.create(null), {
+        get(_target, prop) {
+            if (typeof prop === 'symbol')
+                return undefined;
+            return getNamed(prop);
+        },
+        has(_target, prop) {
+            if (typeof prop === 'symbol')
+                return false;
+            return hasPresent(prop);
+        },
+        ownKeys() {
+            if (!starsEnumerated) {
+                for (const source of spec.stars) {
+                    const mod = loadSource(source);
+                    if (!mod)
+                        continue;
+                    for (const k of Reflect.ownKeys(mod)) {
+                        if (typeof k === 'string' && k !== 'default')
+                            starKeys.add(k);
+                    }
+                }
+                starsEnumerated = true;
+            }
+            return [...new Set([...spec.direct.keys(), ...spec.namespaces.keys(), ...starKeys])];
+        },
+        getOwnPropertyDescriptor(_target, prop) {
+            if (typeof prop === 'symbol')
+                return undefined;
+            if (!hasPresent(prop))
+                return undefined;
+            // Accessor descriptor so iteration doesn't force-load every submodule;
+            // values are pulled via the getter only when a consumer reads them.
+            return {
+                enumerable: true,
+                configurable: true,
+                get: () => getNamed(prop),
+            };
+        },
+    });
+}
+/**
+ * Runs one module file. Returns `true` when the body executed, `false` when a
+ * runtime failure was already warned about. Unsupported ESM constructs throw —
+ * the only honest outcome is a loud, specific error, never silently undefined.
+ * `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) {
+    let raw;
+    if (src) {
+        raw = src.raw;
+    }
+    else {
+        try {
+            raw = readFileSync(absPath, 'utf-8');
+        }
+        catch (err) {
+            console.warn(`[vesk] SSR: failed to read ${absPath}: ${err?.message ?? String(err)}`);
+            return false;
+        }
+    }
+    let ast;
+    if (src) {
+        ast = src.ast;
+    }
+    else {
+        try {
+            ast = parse(raw, { filename: absPath });
+        }
+        catch {
+            ast = null;
+        }
+    }
     if (!ast) {
         // Not parseable as ESM — run verbatim as CJS.
         try {
@@ -421,7 +656,13 @@ function createModuleRequire(fromDir) {
  */
 export function resolveSsrModule(specifier, fromDir) {
     let resolved = null;
-    if (specifier === '.' || specifier === '..' || isAbsolute(specifier)) {
+    if (specifier === '.' || specifier === '..') {
+        // Literal `.`/`..` are relative — anchor them to the importing file's
+        // directory like every other relative specifier (a bare resolve()
+        // against process.cwd() silently resolved the wrong directory).
+        resolved = probeFile(resolve(fromDir, specifier));
+    }
+    else if (isAbsolute(specifier)) {
         resolved = probeFile(resolve(specifier));
     }
     else if (specifier.startsWith('./') || specifier.startsWith('../')) {

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;AAMtC,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;AAYD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAAE,CA0KpG;AAED,wBAAgB,gBAAgB,IAAI,OAAO,KAAK,CAAC,MAAM,CAEtD;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CA8CzE"}
+{"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;AAMtC,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;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAAE,CA4LpG;AAED,wBAAgB,gBAAgB,IAAI,OAAO,KAAK,CAAC,MAAM,CAEtD;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CA8CzE"}

package/dist/parser.js

@@ -9,6 +9,20 @@ function isIdentChar(code) {
 function isWhitespaceChar(ch) {
     return ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r' || ch === '\f' || ch === '\v' || ch === '\u00a0' || ch === '\ufeff';
 }
+function offsetToLineCol(source, offset) {
+    let line = 1;
+    let column = 1;
+    for (let i = 0; i < offset && i < source.length; i++) {
+        if (source.charCodeAt(i) === 10) {
+            line++;
+            column = 1;
+        }
+        else {
+            column++;
+        }
+    }
+    return { line, column };
+}
 /**
  * Scans the source and blanks `; key <expr>` / `; index <ident>` clauses
  * found in `for (...)` headers, returning the rewritten code (same length
@@ -181,6 +195,21 @@ export function preprocessForClauses(source) {
                                 k++;
                             const expr = source.slice(k, end).trim();
                             if (expr) {
+                                if (expr[0] === ':') {
+                                    // `; key : <expr>` / `; key: <expr>` (colon form) is not valid
+                                    // Vesk: the clause is `; key <expr>`, and passing the colon
+                                    // through used to emit a broken reconciliation key.
+                                    const { line, column } = offsetToLineCol(source, start);
+                                    throw new VeskError(`Invalid \`; key\` clause — write the key expression after \`key\` without a colon: \`key ${expr.slice(1).trim()}\`.`, {
+                                        line,
+                                        column,
+                                        code: codeFrame(source, line, column),
+                                        nextSteps: [
+                                            'Use `; key <expr>` (no colon), e.g. `for (const item of items; key item.id)`.',
+                                            'For the iteration index use `; index <name>`, e.g. `for (const item of items; key item.id; index i)`.',
+                                        ],
+                                    });
+                                }
                                 keyRange = [k, start + clause.length];
                                 clauseCode = ' '.repeat(clause.length);
                             }

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

@@ -1 +1 @@
-{"version":3,"file":"server-jsgen.d.ts","sourceRoot":"","sources":["../src/server-jsgen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAOzE,OAAO,EAA4E,KAAK,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAW/I,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,OAAO,GAAE,OAAe,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CA8CjJ;AAyTD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAmD1F;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAkChG"}
+{"version":3,"file":"server-jsgen.d.ts","sourceRoot":"","sources":["../src/server-jsgen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAOzE,OAAO,EAAkG,KAAK,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAWrK,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,OAAO,GAAE,OAAe,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAmDjJ;AAiUD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAmD1F;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAkChG"}

package/dist/server-jsgen.js

@@ -1,5 +1,5 @@
 import { StaticNode, TextNode, DynamicBinding, OpaqueDynamicRegion, MapRegion, WhileLoop, SwitchBlock, TryCatch, ForLoop, TrackDecl, RuntimeStatement, ComponentRef, ComponentCall, ServerBlock, ClientBlock, HeadBlock, SlotNode, } from '@vesk/compiler/src/ir';
-import { isStaticIR, collectTrackedNames, transformTracked, semicolonizeStatement } from '@vesk/compiler/src/client-codegen';
+import { isStaticIR, collectTrackedNames, transformTracked, transformTrackedInit, semicolonizeStatement } from '@vesk/compiler/src/client-codegen';
 import { unwrapTrackCall, stripTrackGeneric, hasTopLevelComma, skipWhitespace, findBalancedEnd, startsWithIdentifier } from '@vesk/compiler/src/scan';
 import { escapeHtml, indent, exprJS, extractTopLevelNames, extractRuntimeNames, buildParamInit, __vskHydrate, __vskImportedNames, setVskImportedNames, setVskForceClaim, takeVskForceClaim, nextVskId, } from '@vesk/compiler/src/server-utils';
 import { localValueImportNames } from '@vesk/compiler/src/module-imports';
@@ -45,8 +45,13 @@ export function irNodeToJS(node, importedNames, isAsync = false, tracked) {
         return forLoopToJS(node, isAsync, tracked);
     if (node instanceof TrackDecl) {
         const cellName = node.rawName || node.name;
-        const unwrapped = unwrapTrackCall(node.init);
-        const inner = hasTopLevelComma(unwrapped) ? stripTrackGeneric(node.init) : unwrapped;
+        // Tracked reads inside a `track`/`derived` init are re-emitted as `get(…)`
+        // (matching client codegen) so a function init like
+        // `track(() => x * 2)` / `derived(() => props.tabs[x])` computes against the
+        // cell VALUES server-side instead of the raw cell objects.
+        const init = transformTrackedInit(node.init, tracked || new Map());
+        const unwrapped = unwrapTrackCall(init);
+        const inner = hasTopLevelComma(unwrapped) ? stripTrackGeneric(init) : unwrapped;
         const key = JSON.stringify(`${compKey(node)}:${node.name}`);
         return [
             `const ${cellName} = (() => {`,
@@ -316,16 +321,24 @@ function forLoopToJS(node, isAsync = false, tracked) {
         lines.push(`}`);
     }
     else {
-        if (node.init)
-            lines.push(`${node.init}`);
-        lines.push(`while (${exprJSX(node.condition, tracked)}) {`);
+        // Emit a real `for` statement (matching the client codegen): a `let`/`const`
+        // declared in the init clause gets a fresh binding per iteration, so closures
+        // created in the body capture that iteration's value rather than the loop
+        // variable's final value after the last pass.
+        let initPart = (node.init || '').trim();
+        let updatePart = (node.update || '').trim();
+        if (initPart.endsWith(';'))
+            initPart = initPart.slice(0, -1).trim();
+        if (updatePart.endsWith(';'))
+            updatePart = updatePart.slice(0, -1).trim();
+        const cond = exprJSX(node.condition, tracked);
+        const head = initPart ? `${initPart}; ${cond}` : `; ${cond}`;
+        lines.push(`for (${head}; ${updatePart}) {`);
         for (const n of node.bodyTemplate) {
             const code = irNodeToJS(n, null, isAsync, tracked);
             if (code)
                 lines.push(indent(code));
         }
-        if (node.update)
-            lines.push(indent(`${node.update}`));
         lines.push(`}`);
     }
     return lines.join('\n');

package/dist/vesk-plugin.d.ts.map

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

package/dist/vesk-plugin.js

@@ -463,16 +463,32 @@ export function VeskParserPlugin(config = {}) {
                 }
                 if (this.#componentDepth > 0 && code === 60 && this.#isBlockContext()) {
                     const next = this.input.charCodeAt(this.pos + 1);
-                    if (next === 47 || (next >= 65 && next <= 90) || (next >= 97 && next <= 122)) {
-                        const startsNewStatement = this.hasPrecedingLineBreak();
-                        const inType = this.inType;
-                        const forceJsx = () => {
-                            const savedExprAllowed = this.exprAllowed;
-                            this.exprAllowed = true;
-                            const result = super.readToken(code);
-                            this.exprAllowed = savedExprAllowed;
-                            return result;
-                        };
+                    const startsNewStatement = this.hasPrecedingLineBreak();
+                    const inType = this.inType;
+                    const forceJsx = () => {
+                        const savedExprAllowed = this.exprAllowed;
+                        this.exprAllowed = true;
+                        const result = super.readToken(code);
+                        this.exprAllowed = savedExprAllowed;
+                        return result;
+                    };
+                    const prev = this.type;
+                    const canEndExpr = prev === tt.name || prev === tt.num || prev === tt.string || prev === tt.regexp ||
+                        prev === tt.bracketR || prev === tt.backQuote || prev === tt.template ||
+                        prev === tt._this || prev === tt._super || prev === tt._true || prev === tt._false ||
+                        prev === tt._null || prev === tt.jsxTagEnd;
+                    // A bare `<>` fragment opening a statement (rather than a
+                    // relational/type token) is JSX. It is only safe to force when it
+                    // follows a line break — e.g. a semicolon-less declaration such as
+                    // `const &[x] = track(...)` in statement mode, where plain
+                    // tokenisation emits a `<`/`>` pair. No expression can end in `<>`,
+                    // so a line break alone is sufficient to disambiguate.
+                    const fragmentStart = !inType && next === 62 && startsNewStatement;
+                    if (next === 47 || fragmentStart || (next >= 65 && next <= 90) || (next >= 97 && next <= 122)) {
+                        if (fragmentStart) {
+                            this.#jsxStartsStatement = true;
+                            return forceJsx();
+                        }
                         if (inType) {
                             if (startsNewStatement) {
                                 if (looksLikeGenericArrowAt(this.input, this.pos) || looksLikeTypeAssertionAt(this.input, this.pos)) {
@@ -485,11 +501,6 @@ export function VeskParserPlugin(config = {}) {
                             }
                         }
                         else {
-                            const prev = this.type;
-                            const canEndExpr = prev === tt.name || prev === tt.num || prev === tt.string || prev === tt.regexp ||
-                                prev === tt.bracketR || prev === tt.backQuote || prev === tt.template ||
-                                prev === tt._this || prev === tt._super || prev === tt._true || prev === tt._false ||
-                                prev === tt._null || prev === tt.jsxTagEnd;
                             if (!canEndExpr || startsNewStatement) {
                                 if (looksLikeGenericArrowAt(this.input, this.pos) || looksLikeTypeAssertionAt(this.input, this.pos)) {
                                     this.#jsxStartsStatement = false;

package/package.json

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