@vesk/vesk-cli 0.2.47 → 0.2.49

package/dist/cli.js

@@ -2400,13 +2400,13 @@ function normText(el) {
 }
 function collectElements(rootEl) {
   const out = [];
-  (function walk7(n) {
+  (function walk8(n) {
     const kids = n.childNodes;
     for (let i = 0; i < kids.length; i++) {
       const c = kids[i];
       if (c.nodeType === 1) {
         out.push(c);
-        walk7(c);
+        walk8(c);
       }
     }
   })(rootEl);
@@ -3917,12 +3917,29 @@ function handleScroll(pathname, isReplace, scrollBehavior) {
     requestAnimationFrame(() => window.scrollTo({ top: 0, behavior }));
   }
 }
+function decodeHeadText(value) {
+  if (value.indexOf("&") === -1) return value;
+  return value.replace(/&(#x[0-9a-fA-F]+|#\d+|[a-zA-Z][a-zA-Z0-9]*);/g, (match, body) => {
+    if (body.charCodeAt(0) === 35) {
+      const hex = body.charCodeAt(1) === 120 || body.charCodeAt(1) === 88;
+      const num = parseInt(hex ? body.slice(2) : body.slice(1), hex ? 16 : 10);
+      if (!Number.isFinite(num) || num < 0 || num > 1114111) return match;
+      try {
+        return String.fromCodePoint(num);
+      } catch {
+        return match;
+      }
+    }
+    const named = HEAD_ENTITIES[body.toLowerCase()];
+    return named === void 0 ? match : named;
+  });
+}
 function applyHeadAttrs(el, raw2) {
   for (const attrMatch of raw2.matchAll(/([a-zA-Z0-9\-:]+)\s*=\s*("([^"]*)"|'([^']*)')/g)) {
     const name = attrMatch[1];
     const value = attrMatch[3] ?? attrMatch[4] ?? "";
     if (name.toLowerCase() === "charset") continue;
-    el.setAttribute(name, value);
+    el.setAttribute(name, decodeHeadText(value));
   }
 }
 function applyHead(headHtml) {
@@ -3936,7 +3953,7 @@ function applyHead(headHtml) {
   const titleMatch = headHtml.match(/<title[^>]*>([\s\S]*?)<\/title>/i);
   if (titleMatch) {
     const t = document.createElement("title");
-    t.textContent = titleMatch[1];
+    t.textContent = decodeHeadText(titleMatch[1]);
     t.setAttribute(HEAD_MARKER, "");
     head.appendChild(t);
   }
@@ -3965,7 +3982,7 @@ function applyHead(headHtml) {
   }
   for (const m of headHtml.matchAll(/<style\b([^>]*)>([\s\S]*?)<\/style>/gi)) {
     const style = document.createElement("style");
-    style.textContent = m[2];
+    style.textContent = decodeHeadText(m[2]);
     style.setAttribute(HEAD_MARKER, "");
     head.appendChild(style);
   }
@@ -4245,7 +4262,7 @@ function useRouter() {
     }
   };
 }
-var Redirect, NotFoundError, RouterCtx, _currentRouter, _outletId, __isHydrating, _state, _scrollPositions, _isPopStateNavigation, HEAD_MARKER;
+var Redirect, NotFoundError, RouterCtx, _currentRouter, _outletId, __isHydrating, _state, _scrollPositions, _isPopStateNavigation, HEAD_MARKER, HEAD_ENTITIES;
 var init_router_components = __esm({
   "../runtime/src/router-components.ts"() {
     "use strict";
@@ -4281,6 +4298,14 @@ var init_router_components = __esm({
     _scrollPositions = /* @__PURE__ */ new Map();
     _isPopStateNavigation = false;
     HEAD_MARKER = "data-vesk-head";
+    HEAD_ENTITIES = {
+      amp: "&",
+      lt: "<",
+      gt: ">",
+      quot: '"',
+      apos: "'",
+      nbsp: "\xA0"
+    };
   }
 });
 
@@ -28740,273 +28765,6 @@ var init_esbuild_fallback = __esm({
   }
 });
 
-// ../compiler/src/server-head.ts
-function isHtmlNameChar(ch) {
-  const code = ch.charCodeAt(0);
-  return code >= 48 && code <= 57 || code >= 65 && code <= 90 || code >= 97 && code <= 122 || ch === "-";
-}
-function isAttrBoundaryChar(ch) {
-  return isWhitespaceChar(ch) || ch === "=" || ch === "/" || ch === ">";
-}
-function isValueBoundaryChar(ch) {
-  return isWhitespaceChar(ch) || ch === "/" || ch === ">";
-}
-function evaluateLocals(comp, props) {
-  const locals2 = {};
-  for (const node of comp.body) {
-    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;
-            const initSrc = node.source.slice(decl.init.start, decl.init.end);
-            try {
-              const fn = new Function("props", "return (" + initSrc + ")");
-              locals2[name] = fn(props);
-            } catch {
-            }
-          }
-        }
-      }
-    }
-  }
-  return locals2;
-}
-function headElementKey(node, props, locals2) {
-  if (!(node instanceof StaticNode)) return null;
-  const tag = node.tag;
-  if (tag === "title") return "title";
-  if (tag === "base") return "base";
-  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 {
-        attrMap.set(child.target, String(tryEvalExpr(child.expression.raw, props, locals2)));
-      } catch {
-      }
-    }
-  }
-  if (tag === "meta") {
-    if (attrMap.has("name")) return `meta[name=${attrMap.get("name")}]`;
-    if (attrMap.has("property")) return `meta[property=${attrMap.get("property")}]`;
-    if (attrMap.has("charset")) return "meta[charset]";
-    if (attrMap.has("http-equiv")) return `meta[http-equiv=${attrMap.get("http-equiv")}]`;
-    return null;
-  }
-  if (tag === "link") {
-    if (attrMap.has("href")) return `link[href=${attrMap.get("href")}]`;
-    if (attrMap.has("id")) return `link[id=${attrMap.get("id")}]`;
-    return null;
-  }
-  if (tag === "script") {
-    if (attrMap.has("src")) return `script[src=${attrMap.get("src")}]`;
-    return null;
-  }
-  if (tag === "style") return null;
-  return null;
-}
-function headIsReconcilable(tag, attrMap) {
-  if (!HEAD_RECONCILE_TAGS.has(tag)) return false;
-  if (tag === "meta" && attrMap.has("charset")) return false;
-  return true;
-}
-function irNodeToHeadHtml(node, props, locals2 = {}, 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, locals2);
-          attrMap.set(child.target, String(val));
-        } catch {
-        }
-      }
-    }
-    const marker = reconcileable && headIsReconcilable(node.tag, attrMap) ? ` ${HEAD_RECONCILE_MARKER}` : "";
-    const attrs = [...attrMap.entries()].map(([k, v]) => ` ${k}="${escapeHtml(v)}"`).join("");
-    if (node.selfClosing) 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, locals2, false)).join("");
-    return `<${node.tag}${attrs}${marker}>${inner}</${node.tag}>`;
-  }
-  if (node instanceof TextNode) return node.value;
-  if (node instanceof DynamicBinding) {
-    try {
-      const val = tryEvalExpr(node.expression.raw, props, locals2);
-      return escapeHtml(String(val));
-    } catch {
-      return "";
-    }
-  }
-  return "";
-}
-function renderHeadHtml(comp, props = {}) {
-  const locals2 = evaluateLocals(comp, props);
-  const seen = /* @__PURE__ */ 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, locals2);
-        if (key !== null && seen.has(key)) continue;
-        if (key !== null) seen.add(key);
-        parts.push(irNodeToHeadHtml(child, props, locals2, true));
-      }
-    }
-  }
-  return parts.join("\n");
-}
-function scanHeadTag(html, lt) {
-  let i = lt + 1;
-  if (html[i] === "/") i++;
-  const nameStart = i;
-  while (i < html.length && isHtmlNameChar(html[i])) i++;
-  const tag = html.slice(nameStart, i).toLowerCase();
-  if (!tag) return null;
-  const attrs = /* @__PURE__ */ new Map();
-  let selfClosing = false;
-  while (i < html.length) {
-    while (i < html.length && isWhitespaceChar(html[i])) i++;
-    if (html[i] === ">") {
-      i++;
-      break;
-    }
-    if (html[i] === "/" && html[i + 1] === ">") {
-      selfClosing = true;
-      i += 2;
-      break;
-    }
-    if (i >= html.length || html[i] === ">" || html[i] === "/") continue;
-    const aStart = i;
-    while (i < html.length && !isAttrBoundaryChar(html[i])) i++;
-    const aName = html.slice(aStart, i).toLowerCase();
-    while (i < html.length && isWhitespaceChar(html[i])) i++;
-    let value = "";
-    if (html[i] === "=") {
-      i++;
-      while (i < html.length && isWhitespaceChar(html[i])) i++;
-      const q = html[i];
-      if (q === '"' || q === "'") {
-        i++;
-        const vStart = i;
-        while (i < html.length && html[i] !== q) i++;
-        value = html.slice(vStart, i);
-        if (i < html.length) i++;
-      } else {
-        const vStart = i;
-        while (i < html.length && !isValueBoundaryChar(html[i])) i++;
-        value = html.slice(vStart, i);
-      }
-    }
-    if (aName) attrs.set(aName, value);
-  }
-  let raw2 = html.slice(lt, i);
-  const nonVoidTags = /* @__PURE__ */ new Set(["title", "script", "style", "noscript"]);
-  if (!selfClosing && nonVoidTags.has(tag)) {
-    const closeTag = html.indexOf("</" + tag, i);
-    if (closeTag !== -1) {
-      const end = html.indexOf(">", closeTag);
-      if (end !== -1) {
-        raw2 = html.slice(lt, end + 1);
-        i = end + 1;
-      }
-    }
-  }
-  return { raw: raw2, tag, attrs, selfClosing, end: i };
-}
-function parseHeadTags(html) {
-  const entries = [];
-  let i = 0;
-  while (i < html.length) {
-    const lt = html.indexOf("<", i);
-    if (lt === -1) break;
-    if (html.startsWith("<!--", lt)) {
-      const close = html.indexOf("-->", lt + 4);
-      i = close === -1 ? html.length : close + 3;
-      continue;
-    }
-    const entry = scanHeadTag(html, lt);
-    if (!entry) break;
-    entries.push(entry);
-    i = entry.end;
-  }
-  return entries;
-}
-function mergeHeadHtml(pageHead, layoutHead) {
-  const extractKey = (entry) => {
-    if (entry.tag === "title") return "title";
-    if (entry.tag === "base") {
-      const h = entry.attrs.get("href");
-      return h !== void 0 ? `base[href=${h}]` : "base";
-    }
-    if (entry.tag === "meta") {
-      const n = entry.attrs.get("name");
-      if (n !== void 0) return `meta[name=${n}]`;
-      const p = entry.attrs.get("property");
-      if (p !== void 0) return `meta[property=${p}]`;
-      if (entry.attrs.has("charset")) return "meta[charset]";
-      return null;
-    }
-    if (entry.tag === "link") {
-      const h = entry.attrs.get("href");
-      if (h !== void 0) return `link[href=${h}]`;
-      return null;
-    }
-    if (entry.tag === "script") {
-      const s = entry.attrs.get("src");
-      if (s !== void 0) return `script[src=${s}]`;
-      return null;
-    }
-    return null;
-  };
-  const layoutEntries = parseHeadTags(layoutHead);
-  const pageEntries = parseHeadTags(pageHead);
-  const merged = /* @__PURE__ */ new Map();
-  for (const tag of layoutEntries) {
-    const key = extractKey(tag);
-    if (key) merged.set(key, { html: tag.raw, source: "layout" });
-  }
-  const conflicts = [];
-  for (const tag of pageEntries) {
-    const key = extractKey(tag);
-    if (key) {
-      if (merged.has(key) && merged.get(key).source === "page") {
-        conflicts.push({ key, message: `Sibling conflict for <head> key "${key}":
-  ${merged.get(key).html}
-  ${tag.raw}` });
-      }
-      merged.set(key, { html: tag.raw, source: "page" });
-    }
-  }
-  const order = ["title", "base", "meta", "link", "script", "style"];
-  const sorted = [...merged.values()].sort((a, b) => {
-    const ak = [...merged.entries()].find((e) => e[1] === a)?.[0] || "";
-    const bk = [...merged.entries()].find((e) => e[1] === b)?.[0] || "";
-    const ai = order.findIndex((o) => ak.startsWith(o));
-    const bi = order.findIndex((o) => bk.startsWith(o));
-    return (ai === -1 ? 999 : ai) - (bi === -1 ? 999 : bi);
-  });
-  const unkeyed = [];
-  for (const e of [...layoutEntries, ...pageEntries]) {
-    if (extractKey(e) === null && !unkeyed.includes(e.raw)) unkeyed.push(e.raw);
-  }
-  return {
-    html: [...sorted.map((e) => e.html), ...unkeyed].join("\n"),
-    conflicts
-  };
-}
-var HEAD_RECONCILE_MARKER, HEAD_RECONCILE_TAGS;
-var init_server_head = __esm({
-  "../compiler/src/server-head.ts"() {
-    "use strict";
-    init_ir();
-    init_server_utils();
-    init_scan();
-    HEAD_RECONCILE_MARKER = "data-vesk-head";
-    HEAD_RECONCILE_TAGS = /* @__PURE__ */ new Set(["title", "meta", "link", "base", "style"]);
-  }
-});
-
 // ../compiler/src/actions.ts
 import { walk as walk3 } from "zimmerframe";
 import { print as print4 } from "esrap";
@@ -31322,6 +31080,409 @@ var init_client_codegen = __esm({
   }
 });
 
+// ../compiler/src/server-head.ts
+import { walk as walk5 } from "zimmerframe";
+function isHtmlNameChar(ch) {
+  const code = ch.charCodeAt(0);
+  return code >= 48 && code <= 57 || code >= 65 && code <= 90 || code >= 97 && code <= 122 || ch === "-";
+}
+function isAttrBoundaryChar(ch) {
+  return isWhitespaceChar(ch) || ch === "=" || ch === "/" || ch === ">";
+}
+function isValueBoundaryChar(ch) {
+  return isWhitespaceChar(ch) || ch === "/" || ch === ">";
+}
+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;
+}
+function headEvalScope(ctx2) {
+  return { ...ctx2.scope, ...ctx2.locals, ...headRuntimeShims() };
+}
+function evalHeadExpression(expression, ctx2) {
+  const code = transformTracked(expression, ctx2.tracked);
+  return tryEvalExpr(code, ctx2.props, headEvalScope(ctx2));
+}
+function evalWithScope(raw2, props, scope2) {
+  const names = Object.keys(scope2);
+  const fn = new Function("props", ...names, "return (" + raw2 + ")");
+  return fn(props, ...names.map((n) => scope2[n]));
+}
+function identifiersOf(ast, into) {
+  if (!ast || typeof ast !== "object") return;
+  walk5(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();
+    }
+  });
+}
+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);
+    }
+  }
+}
+function declaredNames(comp) {
+  const out = /* @__PURE__ */ new Map();
+  for (const node of comp.body) {
+    if (node instanceof TrackDecl) {
+      const cellName = node.rawName || node.name;
+      let initAst = null;
+      try {
+        initAst = parse4(node.init);
+      } catch {
+      }
+      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;
+}
+function headNeededNames(comp) {
+  const wanted = /* @__PURE__ */ 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 = /* @__PURE__ */ 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 = /* @__PURE__ */ new Set();
+    identifiersOf(entry.initAst, deps);
+    for (const d of deps) {
+      if (declared.has(d) && !needed.has(d)) queue.push(d);
+    }
+  }
+  return needed;
+}
+function evaluateLocals(comp, props, scope2 = {}, tracked2 = /* @__PURE__ */ new Map(), needed = null) {
+  const locals2 = {};
+  const wanted = (name) => needed === null || needed.has(name);
+  for (const node of comp.body) {
+    if (node instanceof TrackDecl) {
+      const cellName = node.rawName || node.name;
+      if (!wanted(cellName) && !wanted(node.name)) continue;
+      const init = transformTrackedInit(node.init, tracked2);
+      let value;
+      try {
+        value = evalWithScope(init, props, { ...scope2, ...locals2, ...headRuntimeShims() });
+      } catch {
+        value = void 0;
+      }
+      const cell = headCell(value);
+      if (node.name !== cellName) locals2[node.name] = cell;
+      locals2[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 {
+              locals2[name] = evalWithScope(initSrc, props, {
+                ...scope2,
+                ...locals2,
+                ...headRuntimeShims()
+              });
+            } catch {
+            }
+          }
+        }
+      }
+    }
+  }
+  return locals2;
+}
+function headElementKey(node, ctx2) {
+  if (!(node instanceof StaticNode)) return null;
+  const tag = node.tag;
+  if (tag === "title") return "title";
+  if (tag === "base") return "base";
+  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 {
+        attrMap.set(child.target, String(evalHeadExpression(child.expression, ctx2)));
+      } catch {
+      }
+    }
+  }
+  if (tag === "meta") {
+    if (attrMap.has("name")) return `meta[name=${attrMap.get("name")}]`;
+    if (attrMap.has("property")) return `meta[property=${attrMap.get("property")}]`;
+    if (attrMap.has("charset")) return "meta[charset]";
+    if (attrMap.has("http-equiv")) return `meta[http-equiv=${attrMap.get("http-equiv")}]`;
+    return null;
+  }
+  if (tag === "link") {
+    if (attrMap.has("href")) return `link[href=${attrMap.get("href")}]`;
+    if (attrMap.has("id")) return `link[id=${attrMap.get("id")}]`;
+    return null;
+  }
+  if (tag === "script") {
+    if (attrMap.has("src")) return `script[src=${attrMap.get("src")}]`;
+    return null;
+  }
+  if (tag === "style") return null;
+  return null;
+}
+function headIsReconcilable(tag, attrMap) {
+  if (!HEAD_RECONCILE_TAGS.has(tag)) return false;
+  if (tag === "meta" && attrMap.has("charset")) return false;
+  return true;
+}
+function irNodeToHeadHtml(node, ctx2, 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 {
+          attrMap.set(child.target, String(evalHeadExpression(child.expression, ctx2)));
+        } catch {
+        }
+      }
+    }
+    const marker = reconcileable && headIsReconcilable(node.tag, attrMap) ? ` ${HEAD_RECONCILE_MARKER}` : "";
+    const attrs = [...attrMap.entries()].map(([k, v]) => ` ${k}="${escapeHtml(v)}"`).join("");
+    if (node.selfClosing) return `<${node.tag}${attrs}${marker} />`;
+    const inner = node.children.filter((c) => !(c instanceof DynamicBinding && c.kind === "attribute" && c.target !== "ref")).map((c) => irNodeToHeadHtml(c, ctx2, false)).join("");
+    return `<${node.tag}${attrs}${marker}>${inner}</${node.tag}>`;
+  }
+  if (node instanceof TextNode) return node.value;
+  if (node instanceof DynamicBinding) {
+    try {
+      return escapeHtml(String(evalHeadExpression(node.expression, ctx2)));
+    } catch {
+      return "";
+    }
+  }
+  return "";
+}
+function renderHeadHtml(comp, props = {}, scope2 = {}) {
+  const tracked2 = collectTrackedNames(comp.body);
+  const needed = headNeededNames(comp);
+  const locals2 = evaluateLocals(comp, props, scope2, tracked2, needed);
+  const ctx2 = { props, locals: locals2, tracked: tracked2, scope: scope2 };
+  const seen = /* @__PURE__ */ new Set();
+  const parts = [];
+  for (const node of comp.body) {
+    if (node instanceof HeadBlock) {
+      for (const child of node.children) {
+        const key = headElementKey(child, ctx2);
+        if (key !== null && seen.has(key)) continue;
+        if (key !== null) seen.add(key);
+        parts.push(irNodeToHeadHtml(child, ctx2, true));
+      }
+    }
+  }
+  return parts.join("\n");
+}
+function scanHeadTag(html, lt) {
+  let i = lt + 1;
+  if (html[i] === "/") i++;
+  const nameStart = i;
+  while (i < html.length && isHtmlNameChar(html[i])) i++;
+  const tag = html.slice(nameStart, i).toLowerCase();
+  if (!tag) return null;
+  const attrs = /* @__PURE__ */ new Map();
+  let selfClosing = false;
+  while (i < html.length) {
+    while (i < html.length && isWhitespaceChar(html[i])) i++;
+    if (html[i] === ">") {
+      i++;
+      break;
+    }
+    if (html[i] === "/" && html[i + 1] === ">") {
+      selfClosing = true;
+      i += 2;
+      break;
+    }
+    if (i >= html.length || html[i] === ">" || html[i] === "/") continue;
+    const aStart = i;
+    while (i < html.length && !isAttrBoundaryChar(html[i])) i++;
+    const aName = html.slice(aStart, i).toLowerCase();
+    while (i < html.length && isWhitespaceChar(html[i])) i++;
+    let value = "";
+    if (html[i] === "=") {
+      i++;
+      while (i < html.length && isWhitespaceChar(html[i])) i++;
+      const q = html[i];
+      if (q === '"' || q === "'") {
+        i++;
+        const vStart = i;
+        while (i < html.length && html[i] !== q) i++;
+        value = html.slice(vStart, i);
+        if (i < html.length) i++;
+      } else {
+        const vStart = i;
+        while (i < html.length && !isValueBoundaryChar(html[i])) i++;
+        value = html.slice(vStart, i);
+      }
+    }
+    if (aName) attrs.set(aName, value);
+  }
+  let raw2 = html.slice(lt, i);
+  const nonVoidTags = /* @__PURE__ */ new Set(["title", "script", "style", "noscript"]);
+  if (!selfClosing && nonVoidTags.has(tag)) {
+    const closeTag = html.indexOf("</" + tag, i);
+    if (closeTag !== -1) {
+      const end = html.indexOf(">", closeTag);
+      if (end !== -1) {
+        raw2 = html.slice(lt, end + 1);
+        i = end + 1;
+      }
+    }
+  }
+  return { raw: raw2, tag, attrs, selfClosing, end: i };
+}
+function parseHeadTags(html) {
+  const entries = [];
+  let i = 0;
+  while (i < html.length) {
+    const lt = html.indexOf("<", i);
+    if (lt === -1) break;
+    if (html.startsWith("<!--", lt)) {
+      const close = html.indexOf("-->", lt + 4);
+      i = close === -1 ? html.length : close + 3;
+      continue;
+    }
+    const entry = scanHeadTag(html, lt);
+    if (!entry) break;
+    entries.push(entry);
+    i = entry.end;
+  }
+  return entries;
+}
+function mergeHeadHtml(pageHead, layoutHead) {
+  const extractKey = (entry) => {
+    if (entry.tag === "title") return "title";
+    if (entry.tag === "base") {
+      const h = entry.attrs.get("href");
+      return h !== void 0 ? `base[href=${h}]` : "base";
+    }
+    if (entry.tag === "meta") {
+      const n = entry.attrs.get("name");
+      if (n !== void 0) return `meta[name=${n}]`;
+      const p = entry.attrs.get("property");
+      if (p !== void 0) return `meta[property=${p}]`;
+      if (entry.attrs.has("charset")) return "meta[charset]";
+      return null;
+    }
+    if (entry.tag === "link") {
+      const h = entry.attrs.get("href");
+      if (h !== void 0) return `link[href=${h}]`;
+      return null;
+    }
+    if (entry.tag === "script") {
+      const s = entry.attrs.get("src");
+      if (s !== void 0) return `script[src=${s}]`;
+      return null;
+    }
+    return null;
+  };
+  const layoutEntries = parseHeadTags(layoutHead);
+  const pageEntries = parseHeadTags(pageHead);
+  const merged = /* @__PURE__ */ new Map();
+  for (const tag of layoutEntries) {
+    const key = extractKey(tag);
+    if (key) merged.set(key, { html: tag.raw, source: "layout" });
+  }
+  const conflicts = [];
+  for (const tag of pageEntries) {
+    const key = extractKey(tag);
+    if (key) {
+      if (merged.has(key) && merged.get(key).source === "page") {
+        conflicts.push({ key, message: `Sibling conflict for <head> key "${key}":
+  ${merged.get(key).html}
+  ${tag.raw}` });
+      }
+      merged.set(key, { html: tag.raw, source: "page" });
+    }
+  }
+  const order = ["title", "base", "meta", "link", "script", "style"];
+  const sorted = [...merged.values()].sort((a, b) => {
+    const ak = [...merged.entries()].find((e) => e[1] === a)?.[0] || "";
+    const bk = [...merged.entries()].find((e) => e[1] === b)?.[0] || "";
+    const ai = order.findIndex((o) => ak.startsWith(o));
+    const bi = order.findIndex((o) => bk.startsWith(o));
+    return (ai === -1 ? 999 : ai) - (bi === -1 ? 999 : bi);
+  });
+  const unkeyed = [];
+  for (const e of [...layoutEntries, ...pageEntries]) {
+    if (extractKey(e) === null && !unkeyed.includes(e.raw)) unkeyed.push(e.raw);
+  }
+  return {
+    html: [...sorted.map((e) => e.html), ...unkeyed].join("\n"),
+    conflicts
+  };
+}
+var headRuntimeShims, HEAD_RECONCILE_MARKER, HEAD_RECONCILE_TAGS;
+var init_server_head = __esm({
+  "../compiler/src/server-head.ts"() {
+    "use strict";
+    init_ir();
+    init_server_utils();
+    init_scan();
+    init_parser();
+    init_client_codegen();
+    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
+    });
+    HEAD_RECONCILE_MARKER = "data-vesk-head";
+    HEAD_RECONCILE_TAGS = /* @__PURE__ */ new Set(["title", "meta", "link", "base", "style"]);
+  }
+});
+
 // ../compiler/src/server-jsgen.ts
 function sanitizeMarkerName(name) {
   return String(name).split("--").join("-").split("<").join("").split(">").join("");
@@ -32097,7 +32258,9 @@ function renderPage(source, componentName, props = {}, registry = /* @__PURE__ *
         }
         return {
           body: bodyHtml2,
-          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
         };
       })();
@@ -32108,7 +32271,7 @@ function renderPage(source, componentName, props = {}, registry = /* @__PURE__ *
     } 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) {
       return (async () => {
@@ -32423,7 +32586,7 @@ function renderPageStream(source, componentName, props = {}, registry = /* @__PU
     }
     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;
@@ -33538,7 +33701,7 @@ async function generateSsgRoutes(routeTree, appDir, outDir, plugins, headExtra,
       return null;
     }
   }
-  async function walk7(nodes) {
+  async function walk8(nodes) {
     for (const node of nodes) {
       if (node.page) {
         const pagePath = resolve15(appDir, node.sourceDir, "page.vsk");
@@ -33581,10 +33744,10 @@ async function generateSsgRoutes(routeTree, appDir, outDir, plugins, headExtra,
           }
         }
       }
-      await walk7(node.children || []);
+      await walk8(node.children || []);
     }
   }
-  await walk7(routeTree);
+  await walk8(routeTree);
   return results;
 }
 function generateSitemap(_routeTree, ssrRoutes, prerenderedRoutes, { siteUrl = "http://localhost:3000" } = {}) {
@@ -33600,15 +33763,15 @@ function generateSitemap(_routeTree, ssrRoutes, prerenderedRoutes, { siteUrl = "
   for (const r of prerenderedRoutes) {
     addUrl(r.path, "0.80", "weekly");
   }
-  function walk7(nodes) {
+  function walk8(nodes) {
     for (const node of nodes) {
       if (node.page && !node.fullPath.includes(":")) {
         addUrl(node.fullPath, "0.64", "daily");
       }
-      walk7(node.children || []);
+      walk8(node.children || []);
     }
   }
-  walk7(ssrRoutes);
+  walk8(ssrRoutes);
   let xml = '<?xml version="1.0" encoding="UTF-8"?>\n';
   xml += '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n';
   for (const u of urls) {
@@ -33735,7 +33898,7 @@ async function processImage(srcPath, outDir, baseName) {
 }
 function collectImageRefs(appDir) {
   const refs = [];
-  function walk7(dir) {
+  function walk8(dir) {
     let entries;
     try {
       entries = readdirSync4(dir);
@@ -33748,7 +33911,7 @@ function collectImageRefs(appDir) {
       if (st.isDirectory()) {
         if (entry.startsWith("."))
           continue;
-        walk7(full);
+        walk8(full);
       } else if (entry === "page.vsk") {
         const src2 = readFileSync18(full, "utf-8");
         const imgRegex = /<Image\s+src=["']([^"']+)["']/g;
@@ -33759,7 +33922,7 @@ function collectImageRefs(appDir) {
       }
     }
   }
-  walk7(appDir);
+  walk8(appDir);
   return refs;
 }
 async function optimizeImages(appDir, outDir) {
@@ -34391,18 +34554,18 @@ function writePrerenderedStatic(prerenderedRoutes, platformStaticDir) {
 function listStaticDir(dir) {
   const out = [];
   if (!existsSync21(dir)) return out;
-  function walk7(d, prefix) {
+  function walk8(d, prefix) {
     for (const entry of readdirSync6(d)) {
       const full = join14(d, entry);
       const rel = prefix ? `${prefix}/${entry}` : entry;
       if (statSync11(full).isDirectory()) {
-        walk7(full, rel);
+        walk8(full, rel);
       } else {
         out.push({ rel, buffer: readFileSync20(full) });
       }
     }
   }
-  walk7(dir, "");
+  walk8(dir, "");
   return out;
 }
 function mimeFor(path) {
@@ -39069,7 +39232,7 @@ import * as ts8 from "typescript";
 function walkProjectFiles(projectRoot) {
   const code = [];
   const js = [];
-  const walk7 = (dir) => {
+  const walk8 = (dir) => {
     let entries = [];
     try {
       entries = readdirSync14(dir);
@@ -39087,7 +39250,7 @@ function walkProjectFiles(projectRoot) {
       if (st.isDirectory()) {
         if (SKIP_DIRS.has(e))
           continue;
-        walk7(p);
+        walk8(p);
       } else if (e.endsWith(".vsk")) {
         code.push(p);
       } else if (e.endsWith(".ts") || e.endsWith(".tsx")) {
@@ -39101,7 +39264,7 @@ function walkProjectFiles(projectRoot) {
       }
     }
   };
-  walk7(projectRoot);
+  walk8(projectRoot);
   return { code, js };
 }
 function isUnder(dir, file) {
@@ -40906,13 +41069,13 @@ function hydrateInvoke(planExpr) {
 function buildParamExtraction(node, urlParts) {
   const parts = [];
   let partIdx = Math.max(0, urlParts.length - 1);
-  function walk7(n) {
+  function walk8(n) {
     if (n.fullPath === "/") {
-      for (const child of n.children || []) walk7(child);
+      for (const child of n.children || []) walk8(child);
       return;
     }
     if (n.isGroup) {
-      for (const child of n.children || []) walk7(child);
+      for (const child of n.children || []) walk8(child);
       return;
     }
     if (partIdx >= urlParts.length) return;
@@ -40926,15 +41089,15 @@ function buildParamExtraction(node, urlParts) {
       const paramName = n.path.startsWith(":") ? n.path.slice(1) : "param";
       parts.push(`${JSON.stringify(paramName)}: urlParts[${partIdx}]`);
       partIdx++;
-      for (const child of n.children || []) walk7(child);
+      for (const child of n.children || []) walk8(child);
       return;
     }
     if (n.path === urlParts[partIdx]) {
       partIdx++;
-      for (const child of n.children || []) walk7(child);
+      for (const child of n.children || []) walk8(child);
     }
   }
-  walk7(node);
+  walk8(node);
   return parts;
 }
 function generateSsrFunction(routeNode, appDir, outDir, componentMap, options) {
@@ -43629,7 +43792,7 @@ async function build2(appDir, options) {
   await bundleRuntime(appDir, outDir);
   const ssrRoutes = [];
   const actionMap = {};
-  function walk7(nodes, ancestorLayouts = []) {
+  function walk8(nodes, ancestorLayouts = []) {
     for (const node of nodes) {
       const isStandalone = node.standalone === true;
       let childAncestorLayouts = isStandalone ? [] : ancestorLayouts;
@@ -43673,10 +43836,10 @@ async function build2(appDir, options) {
         ssrRoutes.push(node);
         console.error(`vesk build: ssr  \u2192 server/functions/${name}.js  (${node.fullPath})${mwCode ? " [mw]" : ""}`);
       }
-      walk7(node.children || [], childAncestorLayouts);
+      walk8(node.children || [], childAncestorLayouts);
     }
   }
-  walk7(routeTree);
+  walk8(routeTree);
   markPhase("server runtime + ssr functions");
   const apiRoutes = [];
   function walkApi(nodes) {
@@ -43823,7 +43986,7 @@ import { WebSocketServer as WebSocketServer2 } from "ws";
 
 // ../compiler/dist/strip-ts.js
 init_parser();
-import { walk as walk5 } from "zimmerframe";
+import { walk as walk6 } from "zimmerframe";
 import { print as print6 } from "esrap";
 import ts6 from "esrap/languages/ts";
 var TS_NODE_TYPES2 = /* @__PURE__ */ new Set([
@@ -43865,7 +44028,7 @@ function isTypeOnlySpecifier2(node) {
 }
 function hasTsSyntax2(ast) {
   let found = false;
-  walk5(ast, null, {
+  walk6(ast, null, {
     _(node, context) {
       if (TS_NODE_TYPES2.has(node.type)) {
         found = true;
@@ -43903,7 +44066,7 @@ function isTypeOnlyStatement2(node) {
   return TYPE_ONLY_STATEMENTS2.has(node.type);
 }
 function stripTsTypes2(ast) {
-  return walk5(ast, null, {
+  return walk6(ast, null, {
     TSAsExpression(node, context) {
       return context.visit(node.expression);
     },
@@ -44159,7 +44322,7 @@ init_tokens();
 init_vsk_imports();
 init_md_inline();
 init_strip_ts();
-import { walk as walk6 } from "zimmerframe";
+import { walk as walk7 } from "zimmerframe";
 import { print as print7 } from "esrap";
 import ts7 from "esrap/languages/ts";
 import tsx2 from "esrap/languages/tsx";
@@ -44275,7 +44438,7 @@ function transformTracked2(irNode, tracked2) {
     return printAst2(stripTsTypes(ast));
   }
   const stripped = stripTsTypes(ast);
-  const transformed = walk6(stripped, tracked2, {
+  const transformed = walk7(stripped, tracked2, {
     AssignmentExpression(node, context) {
       if (node.left.type === "Identifier") {
         const info = context.state.get(node.left.name);
@@ -44388,7 +44551,7 @@ function collectTrackedDeps2(value, tracked2) {
     return [];
   const found = [];
   const seen = /* @__PURE__ */ new Set();
-  walk6(ast, tracked2, {
+  walk7(ast, tracked2, {
     Identifier(node, context) {
       const parent = context.path.at(-1);
       if (parent) {
@@ -44940,7 +45103,7 @@ function isReactiveExpression2(node, tracked2) {
   if (!ast)
     return false;
   let reactive = false;
-  walk6(ast, tracked2, {
+  walk7(ast, tracked2, {
     Identifier(n, context) {
       if (reactive)
         return;
@@ -45630,7 +45793,7 @@ function emitForLoop2(ctx2, node, tracked2, parentVar, skipK = 0, regionBudget)
       const seen = /* @__PURE__ */ new Set();
       const condAst = node.condition?.ast;
       if (condAst) {
-        walk6(condAst, tracked2, {
+        walk7(condAst, tracked2, {
           Identifier(n, context) {
             const parent2 = context.path.at(-1);
             if (parent2) {
@@ -46308,7 +46471,7 @@ function astHasBinding2(ast, names) {
   if (!ast)
     return false;
   let found = false;
-  walk6(ast, null, {
+  walk7(ast, null, {
     Identifier(node, context) {
       if (names.has(node.name))
         found = true;
@@ -46562,7 +46725,7 @@ function scanComponents(componentsDir) {
   const map = /* @__PURE__ */ new Map();
   if (!existsSync23(componentsDir))
     return map;
-  function walk7(dir, prefix) {
+  function walk8(dir, prefix) {
     let entries;
     try {
       entries = readdirSync7(dir);
@@ -46579,7 +46742,7 @@ function scanComponents(componentsDir) {
       }
       if (stat.isDirectory()) {
         if (!entry.startsWith("_")) {
-          walk7(full, prefix ? prefix + capitalize(entry) : capitalize(entry));
+          walk8(full, prefix ? prefix + capitalize(entry) : capitalize(entry));
         }
       } else if (entry.endsWith(".vsk")) {
         const name = prefix ? prefix + capitalize(entry.slice(0, -4)) : entry.slice(0, -4);
@@ -46589,7 +46752,7 @@ function scanComponents(componentsDir) {
       }
     }
   }
-  walk7(componentsDir, "");
+  walk8(componentsDir, "");
   return map;
 }
 function scanDirectory(rootDir, dir, parentPath, options) {
@@ -46741,7 +46904,7 @@ function extractComponentName(dir, type, rootDir) {
 }
 function collectSources(tree) {
   const map = /* @__PURE__ */ new Map();
-  function walk7(nodes) {
+  function walk8(nodes) {
     for (const node of nodes) {
       if (node.page)
         map.set(node.page, join15(node.sourceDir, "page.vsk"));
@@ -46757,10 +46920,10 @@ function collectSources(tree) {
         map.set(node.offline, join15(node.sourceDir, "offline.vsk"));
       if (node.network)
         map.set(node.network, join15(node.sourceDir, "network.vsk"));
-      walk7(node.children);
+      walk8(node.children);
     }
   }
-  walk7(tree);
+  walk8(tree);
   return map;
 }
 function matchUrl(tree, pathname) {
@@ -47255,16 +47418,16 @@ function parseCookies2(str3) {
 function collectMiddlewareChain(routeTree, url, appDir) {
   const parts = url.split("/").filter(Boolean);
   const chain = [];
-  function walk7(nodes, depth) {
+  function walk8(nodes, depth) {
     for (const node of nodes) {
       if (node.isGroup) {
-        if (walk7(node.children, depth))
+        if (walk8(node.children, depth))
           return true;
         continue;
       }
       if (node.fullPath === "/") {
         collectForNode(node);
-        return walk7(node.children, depth);
+        return walk8(node.children, depth);
       }
       if (depth >= parts.length) {
         if (node.page) {
@@ -47302,16 +47465,16 @@ function collectMiddlewareChain(routeTree, url, appDir) {
   function tryCollectAndRecurse(node, depth) {
     collectForNode(node);
     if (node.children.length > 0) {
-      return walk7(node.children, depth + 1);
+      return walk8(node.children, depth + 1);
     }
     return !!node.page;
   }
   const root3 = routeTree.find((n) => n.fullPath === "/");
   if (root3) {
     collectForNode(root3);
-    walk7(root3.children, 0);
+    walk8(root3.children, 0);
   } else {
-    walk7(routeTree, 0);
+    walk8(routeTree, 0);
   }
   return chain;
 }
@@ -50622,7 +50785,7 @@ function hasIdentifierAst(source, name) {
   if (!ast)
     return source.includes(name);
   let found = false;
-  function walk7(node) {
+  function walk8(node) {
     if (!node || typeof node !== "object" || found)
       return;
     if (node.type === "Identifier" && node.name === name) {
@@ -50633,12 +50796,12 @@ function hasIdentifierAst(source, name) {
       const v = node[k];
       if (Array.isArray(v))
         for (const el of v)
-          walk7(el);
+          walk8(el);
       else if (v && typeof v.type === "string")
-        walk7(v);
+        walk8(v);
     }
   }
-  walk7(ast);
+  walk8(ast);
   return found;
 }
 async function addPluginToConfig2(projectDir, pkg) {
@@ -54473,14 +54636,14 @@ function chainForPath(routeTree, pathname) {
 }
 function pageSourcesFor(appDirPath, routeTree) {
   const out = [];
-  function walk7(nodes) {
+  function walk8(nodes) {
     for (const node of nodes) {
       if (node.page) out.push(resolve37(appDirPath, node.sourceDir, "page.vsk"));
       if (node.layout) out.push(resolve37(appDirPath, node.sourceDir, "layout.vsk"));
-      walk7(node.children);
+      walk8(node.children);
     }
   }
-  walk7(routeTree);
+  walk8(routeTree);
   return out;
 }
 function walkVskFiles(dir, out, seen) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.47",
+  "version": "0.2.49",
   "type": "module",
   "description": "Vesk — compiler-first framework for the post-VDOM web. vesk dev, vesk build.",
   "bin": {
@@ -8,10 +8,10 @@
   },
   "main": "./dist/cli.js",
   "dependencies": {
-    "@vesk/adapter": "^0.2.47",
-    "@vesk/compiler": "^0.2.47",
-    "@vesk/plugin-tailwind": "^0.2.47",
-    "@vesk/runtime": "^0.2.47",
+    "@vesk/adapter": "^0.2.49",
+    "@vesk/compiler": "^0.2.49",
+    "@vesk/plugin-tailwind": "^0.2.49",
+    "@vesk/runtime": "^0.2.49",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",