@vesk/compiler 0.2.47 → 0.2.48

package/dist/server-head.d.ts

@@ -1,5 +1,18 @@
 import type { ComponentIR } from '@vesk/compiler/src/ir';
-export declare function renderHeadHtml(comp: ComponentIR, props?: Record<string, unknown>): string;
+/**
+ * Serialize one component's `<Head>` block.
+ *
+ * `scope` is the component's `__vesk` bindings (imports, runtime names, the
+ * sub-components its body destructures). The head is assembled by re-walking
+ * the IR and re-evaluating the expressions rather than by capturing the real
+ * render, so the re-evaluation needs the same bindings the component had —
+ * without them every expression that touched an import threw and was swallowed,
+ * and the served document shipped an empty `<title>`/`<meta>` while the page
+ * body rendered fine (and the client corrected it on hydration, which is why
+ * this only ever showed up in view-source, in crawlers, and after an SPA nav
+ * re-applied the server head).
+ */
+export declare function renderHeadHtml(comp: ComponentIR, props?: Record<string, unknown>, scope?: Record<string, unknown>): string;
 export declare function mergeHeadHtml(pageHead: string, layoutHead: string): {
     html: string;
     conflicts: Array<{

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

@@ -1 +1 @@
-{"version":3,"file":"server-head.d.ts","sourceRoot":"","sources":["../src/server-head.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAyHzD,wBAAgB,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,MAAM,CAe7F;AAoFD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAkExI"}
+{"version":3,"file":"server-head.d.ts","sourceRoot":"","sources":["../src/server-head.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAgVzD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,WAAW,EACjB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAClC,MAAM,CAkBR;AAoFD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAkExI"}

package/dist/server-head.js

@@ -1,6 +1,9 @@
-import { StaticNode, TextNode, DynamicBinding, HeadBlock, RuntimeStatement } from '@vesk/compiler/src/ir';
+import { StaticNode, TextNode, DynamicBinding, HeadBlock, RuntimeStatement, TrackDecl } from '@vesk/compiler/src/ir';
 import { tryEvalExpr, escapeHtml } from '@vesk/compiler/src/server-utils';
 import { isWhitespaceChar } from '@vesk/compiler/src/scan';
+import { parse } from '@vesk/compiler/src/parser';
+import { collectTrackedNames, transformTracked, transformTrackedInit } from '@vesk/compiler/src/client-codegen';
+import { walk } from 'zimmerframe';
 function isHtmlNameChar(ch) {
     const code = ch.charCodeAt(0);
     return ((code >= 48 && code <= 57) || (code >= 65 && code <= 90) || (code >= 97 && code <= 122) || ch === '-');
@@ -11,22 +14,206 @@ function isAttrBoundaryChar(ch) {
 function isValueBoundaryChar(ch) {
     return isWhitespaceChar(ch) || ch === '/' || ch === '>';
 }
-function evaluateLocals(comp, props) {
+function headCell(value) {
+    const cell = {
+        __vskHeadValue: value,
+        toString() { return String(cell.__vskHeadValue); },
+        // Present so `+count` / `String(count)` on the cell itself still yields the
+        // value; the return type is widened because `valueOf` must return `this`.
+        valueOf() { return cell; },
+    };
+    return cell;
+}
+const headRuntimeShims = () => ({
+    track: (init) => headCell(init),
+    derived: (fn) => headCell(typeof fn === 'function' ? fn() : fn),
+    get: (cell) => cell && typeof cell === 'object' && '__vskHeadValue' in cell
+        ? cell.__vskHeadValue
+        : cell,
+    peek: (cell) => cell && typeof cell === 'object' && '__vskHeadValue' in cell
+        ? cell.__vskHeadValue
+        : cell,
+    untrack: (fn) => (typeof fn === 'function' ? fn() : fn),
+});
+function headEvalScope(ctx) {
+    // The shims come LAST: they must win over the component's real `track`/`get`
+    // from `__vesk`, which would otherwise allocate real cells.
+    return { ...ctx.scope, ...ctx.locals, ...headRuntimeShims() };
+}
+function evalHeadExpression(expression, ctx) {
+    // `{count}` must resolve to the VALUE, not the cell: rewrite tracked reads the
+    // same way the client codegen does, then evaluate with the shims bound.
+    const code = transformTracked(expression, ctx.tracked);
+    return tryEvalExpr(code, ctx.props, headEvalScope(ctx));
+}
+/**
+ * Evaluate `raw` with `props` plus every name in `scope` bound to its value.
+ *
+ * The head pass re-evaluates a component's top-level declarations outside the
+ * component's own call frame, so it has to rebuild that frame. Passing the
+ * component's `__vesk` bindings as named parameters is what makes imports
+ * visible: a docs page's `const doc = getDoc(props.params.slug)` needs
+ * `getDoc`, which lives in `__vesk` (the generated body destructures it from
+ * there), and without it the head silently degraded to empty strings.
+ */
+function evalWithScope(raw, props, scope) {
+    const names = Object.keys(scope);
+    const fn = new Function('props', ...names, 'return (' + raw + ')');
+    return fn(props, ...names.map((n) => scope[n]));
+}
+/** Identifier reads of an ESTree expression (not property keys, not `obj.prop`). */
+function identifiersOf(ast, into) {
+    if (!ast || typeof ast !== 'object')
+        return;
+    walk(ast, null, {
+        Identifier(n, context) {
+            const parent = context.path.at(-1);
+            if (parent) {
+                if (parent.type === 'MemberExpression' && !parent.computed && parent.property === n)
+                    return context.next();
+                if (parent.type === 'Property' && parent.key === n)
+                    return context.next();
+            }
+            into.add(n.name);
+            return context.next();
+        },
+    });
+}
+/** Every interpolated/attribute expression inside a `<Head>` subtree. */
+function collectHeadExprs(node, out) {
+    if (node instanceof StaticNode) {
+        for (const child of node.children) {
+            if (child instanceof DynamicBinding)
+                out.push(child.expression);
+            else
+                collectHeadExprs(child, out);
+        }
+    }
+}
+/** Top-level declarations of a component: tracked cells and `const` locals. */
+function declaredNames(comp) {
+    const out = new Map();
+    for (const node of comp.body) {
+        if (node instanceof TrackDecl) {
+            const cellName = node.rawName || node.name;
+            let initAst = null;
+            try {
+                initAst = parse(node.init);
+            }
+            catch { /* unparsable init: no deps to follow */ }
+            const entry = { kind: 'track', initSrc: node.init, initAst, names: [cellName] };
+            out.set(cellName, entry);
+            if (node.name !== cellName) {
+                out.set(node.name, entry);
+                entry.names.push(node.name);
+            }
+        }
+        else if (node instanceof RuntimeStatement && node.ast) {
+            const stmt = node.ast;
+            if (stmt.type !== 'VariableDeclaration')
+                continue;
+            for (const decl of stmt.declarations) {
+                if (decl.id.type !== 'Identifier' || !decl.init || !node.source)
+                    continue;
+                out.set(decl.id.name, {
+                    kind: 'const',
+                    initSrc: node.source.slice(decl.init.start, decl.init.end),
+                    initAst: decl.init,
+                    names: [decl.id.name],
+                });
+            }
+        }
+    }
+    return out;
+}
+/**
+ * The transitive closure of top-level names the `<Head>` block reads.
+ *
+ * THE head pass must evaluate only what the head uses. Evaluating every
+ * top-level declaration (which is what it used to do) means re-running the
+ * component's SIDE EFFECTS in the rebuilt frame: a page whose body does
+ * `const data = useFetch('/api/fail')` fetched twice per render, because the
+ * head pass called `useFetch` a second time now that the runtime names are in
+ * scope. Imports and tracked reads are still resolved — just the declarations
+ * the head actually needs, plus the ones those depend on.
+ */
+function headNeededNames(comp) {
+    const wanted = new Set();
+    for (const node of comp.body) {
+        if (!(node instanceof HeadBlock))
+            continue;
+        const exprs = [];
+        for (const child of node.children)
+            collectHeadExprs(child, exprs);
+        for (const e of exprs)
+            identifiersOf(e.ast, wanted);
+    }
+    const declared = declaredNames(comp);
+    const needed = new Set();
+    const queue = [...wanted].filter((n) => declared.has(n));
+    while (queue.length > 0) {
+        const name = queue.shift();
+        if (needed.has(name))
+            continue;
+        needed.add(name);
+        const entry = declared.get(name);
+        if (!entry)
+            continue;
+        const deps = new Set();
+        identifiersOf(entry.initAst, deps);
+        for (const d of deps) {
+            // A tracked init reads other cells through the runtime, so follow the
+            // tracked names the init mentions.
+            if (declared.has(d) && !needed.has(d))
+                queue.push(d);
+        }
+    }
+    return needed;
+}
+function evaluateLocals(comp, props, scope = {}, tracked = new Map(), needed = null) {
     const locals = {};
+    const wanted = (name) => needed === null || needed.has(name);
     for (const node of comp.body) {
+        if (node instanceof TrackDecl) {
+            // `const [count, setCount] = track(0)`: bind every name the declaration
+            // introduces to a head cell, so a later local or head expression that
+            // reads it sees the current value through the shims.
+            const cellName = node.rawName || node.name;
+            if (!wanted(cellName) && !wanted(node.name))
+                continue;
+            const init = transformTrackedInit(node.init, tracked);
+            let value;
+            try {
+                value = evalWithScope(init, props, { ...scope, ...locals, ...headRuntimeShims() });
+            }
+            catch {
+                value = undefined;
+            }
+            const cell = headCell(value);
+            if (node.name !== cellName)
+                locals[node.name] = cell;
+            locals[cellName] = cell;
+            continue;
+        }
         if (node instanceof RuntimeStatement && node.ast) {
             const stmt = node.ast;
             if (stmt.type === 'VariableDeclaration') {
                 for (const decl of stmt.declarations) {
                     if (decl.id.type === 'Identifier' && decl.init && node.source) {
                         const name = decl.id.name;
+                        if (!wanted(name))
+                            continue;
                         const initSrc = node.source.slice(decl.init.start, decl.init.end);
                         try {
-                            const fn = new Function('props', 'return (' + initSrc + ')');
-                            locals[name] = fn(props);
+                            locals[name] = evalWithScope(initSrc, props, {
+                                ...scope,
+                                ...locals,
+                                ...headRuntimeShims(),
+                            });
                         }
                         catch {
-                            // expression can't be evaluated — skip
+                            // expression can't be evaluated — skip (its dependents degrade
+                            // to empty, exactly as they did before the scope was passed)
                         }
                     }
                 }
@@ -35,7 +222,7 @@ function evaluateLocals(comp, props) {
     }
     return locals;
 }
-function headElementKey(node, props, locals) {
+function headElementKey(node, ctx) {
     if (!(node instanceof StaticNode))
         return null;
     const tag = node.tag;
@@ -47,7 +234,7 @@ function headElementKey(node, props, locals) {
     for (const child of node.children) {
         if (child instanceof DynamicBinding && child.kind === 'attribute' && child.target && child.target !== 'ref') {
             try {
-                attrMap.set(child.target, String(tryEvalExpr(child.expression.raw, props, locals)));
+                attrMap.set(child.target, String(evalHeadExpression(child.expression, ctx)));
             }
             catch { /* skip */ }
         }
@@ -88,14 +275,13 @@ function headIsReconcilable(tag, attrMap) {
         return false;
     return true;
 }
-function irNodeToHeadHtml(node, props, locals = {}, reconcileable = false) {
+function irNodeToHeadHtml(node, ctx, reconcileable = false) {
     if (node instanceof StaticNode) {
         const attrMap = new Map(node.attributes.map((a) => [a.name, a.value]));
         for (const child of node.children) {
             if (child instanceof DynamicBinding && child.kind === 'attribute' && child.target && child.target !== 'ref') {
                 try {
-                    const val = tryEvalExpr(child.expression.raw, props, locals);
-                    attrMap.set(child.target, String(val));
+                    attrMap.set(child.target, String(evalHeadExpression(child.expression, ctx)));
                 }
                 catch { /* skip */ }
             }
@@ -108,7 +294,7 @@ function irNodeToHeadHtml(node, props, locals = {}, reconcileable = false) {
             return `<${node.tag}${attrs}${marker} />`;
         const inner = node.children
             .filter((c) => !(c instanceof DynamicBinding && c.kind === 'attribute' && c.target !== 'ref'))
-            .map((c) => irNodeToHeadHtml(c, props, locals, false))
+            .map((c) => irNodeToHeadHtml(c, ctx, false))
             .join('');
         return `<${node.tag}${attrs}${marker}>${inner}</${node.tag}>`;
     }
@@ -116,8 +302,7 @@ function irNodeToHeadHtml(node, props, locals = {}, reconcileable = false) {
         return node.value;
     if (node instanceof DynamicBinding) {
         try {
-            const val = tryEvalExpr(node.expression.raw, props, locals);
-            return escapeHtml(String(val));
+            return escapeHtml(String(evalHeadExpression(node.expression, ctx)));
         }
         catch {
             return '';
@@ -125,19 +310,35 @@ function irNodeToHeadHtml(node, props, locals = {}, reconcileable = false) {
     }
     return '';
 }
-export function renderHeadHtml(comp, props = {}) {
-    const locals = evaluateLocals(comp, props);
+/**
+ * Serialize one component's `<Head>` block.
+ *
+ * `scope` is the component's `__vesk` bindings (imports, runtime names, the
+ * sub-components its body destructures). The head is assembled by re-walking
+ * the IR and re-evaluating the expressions rather than by capturing the real
+ * render, so the re-evaluation needs the same bindings the component had —
+ * without them every expression that touched an import threw and was swallowed,
+ * and the served document shipped an empty `<title>`/`<meta>` while the page
+ * body rendered fine (and the client corrected it on hydration, which is why
+ * this only ever showed up in view-source, in crawlers, and after an SPA nav
+ * re-applied the server head).
+ */
+export function renderHeadHtml(comp, props = {}, scope = {}) {
+    const tracked = collectTrackedNames(comp.body);
+    const needed = headNeededNames(comp);
+    const locals = evaluateLocals(comp, props, scope, tracked, needed);
+    const ctx = { props, locals, tracked, scope };
     const seen = new Set();
     const parts = [];
     for (const node of comp.body) {
         if (node instanceof HeadBlock) {
             for (const child of node.children) {
-                const key = headElementKey(child, props, locals);
+                const key = headElementKey(child, ctx);
                 if (key !== null && seen.has(key))
                     continue;
                 if (key !== null)
                     seen.add(key);
-                parts.push(irNodeToHeadHtml(child, props, locals, true));
+                parts.push(irNodeToHeadHtml(child, ctx, true));
             }
         }
     }

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

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

package/dist/server-render.js

@@ -187,7 +187,9 @@ export function renderPage(source, componentName, props = {}, registry = new Map
                 }
                 return {
                     body: bodyHtml,
-                    head: renderHeadHtml(targetComp, ssrProps),
+                    // The component's own scope, so head expressions that read an import
+                    // resolve (see renderHeadHtml).
+                    head: renderHeadHtml(targetComp, ssrProps, scopedVesk(renderFn, __vesk)),
                     props: ssrProps
                 };
             })();
@@ -199,7 +201,7 @@ export function renderPage(source, componentName, props = {}, registry = new Map
         finally {
             delete globalThis.__vsk_ssr;
         }
-        const headHtml = targetComp ? renderHeadHtml(targetComp, ssrProps) : '';
+        const headHtml = targetComp ? renderHeadHtml(targetComp, ssrProps, scopedVesk(renderFn, __vesk)) : '';
         const pending = globalThis[`__vsk_ssr_promises_${renderToken}`];
         if (pending && pending.length > 0) {
             // A sync component still started server resources (useFetch): settle them
@@ -616,7 +618,7 @@ export function renderPageStream(source, componentName, props = {}, registry = n
         }
         let streamHeadHtml = null;
         if (targetComp) {
-            let headHtml = renderHeadHtml(targetComp, ssrProps);
+            let headHtml = renderHeadHtml(targetComp, ssrProps, scopedVesk(renderFn, __vesk));
             if (options.pageHead) {
                 const merged = mergeHeadHtml(options.pageHead, headHtml);
                 headHtml = merged.html;

package/package.json

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