@vesk/compiler 0.2.22 → 0.2.24

package/dist/server-jsgen.js

@@ -3,6 +3,30 @@ import { isStaticIR, collectTrackedNames, transformTracked, transformTrackedInit
 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';
+// Hydrate-mode component-boundary wrapper. Each server-rendered component call
+// is preceded by a `<!--vsk-->` marker and a single container element: the
+// hydration walker adopts that element as the component root
+// (`walker.nextElement()`) and scopes interior claims via
+// `subWalker(rootEl).contains(...)`, so fragment components with multiple root
+// siblings need one shared container here.
+//
+// The container MUST NOT be a layout box. The client renderer has no such box
+// — component nodes are appended straight into the parent — so a block wrapper
+// that collapses to the component's own height confines every child that
+// depends on the parent layout: `position: sticky`, `h-full`/`min-h-screen`,
+// inset/percent offsets, flex/grid stretch. `display: contents` keeps the DOM
+// node for claiming while suppressing its box, making SSR layout identical to
+// the client's for every property, not just sticky.
+//
+// The wrapper tag must be `<span>`, not `<div>`. The HTML parser implicitly
+// closes an open `<p>` on a flow-content start tag like `<div>`, so a `<div>`
+// wrapper inside a `<p>` (a component called inside a paragraph, e.g. a `Link`
+// in an eyebrow row) is hoisted out of the paragraph, stranding its `<!--vsk-->`
+// marker in the now-empty `<p>` → `nextElementSibling` is null → the hydration
+// claim misses and every later claim tag-shifts, wiping the SSR content. `<span>`
+// is phrasing content (legal inside `<p>`) and never triggers an implicit close,
+// while `display: contents` keeps it box-less everywhere a `<div>` would be.
+const HYDRATE_COMPONENT_WRAPPER = '<!--vsk--><span style="display:contents">';
 export function irNodeToJS(node, importedNames, isAsync = false, tracked) {
     importedNames = importedNames || __vskImportedNames;
     if (node instanceof StaticNode)
@@ -185,18 +209,27 @@ function opaqueRegionToJS(node, isAsync = false, tracked) {
     const lines = [];
     const cond = exprJSX(node.condition, tracked);
     lines.push(`if (${cond}) {`);
+    // Static branch content still needs server claim markers: the client
+    // re-branches an if/else-if region on every tracked change (OpaqueDynamicRegion
+    // claimStatic codegen), so opposed to plain component bodies it must be able
+    // to adopt the SSR nodes in place — not leave them orphaned next to the
+    // region's anchors. Mirrors mapRegionToJS' alternate handling below.
+    setVskForceClaim(true);
     for (const n of node.consequentNodes) {
         const code = irNodeToJS(n, null, isAsync, tracked);
         if (code)
             lines.push(indent(code));
     }
+    setVskForceClaim(false);
     if (node.alternateNodes.length > 0) {
         lines.push(`} else {`);
+        setVskForceClaim(true);
         for (const n of node.alternateNodes) {
             const code = irNodeToJS(n, null, isAsync, tracked);
             if (code)
                 lines.push(indent(code));
         }
+        setVskForceClaim(false);
     }
     lines.push(`}`);
     return lines.join('\n');
@@ -205,6 +238,12 @@ function mapRegionToJS(node, isAsync = false, tracked) {
     const lines = [];
     const arr = exprJSX(node.expression, tracked);
     const item = node.itemVariable;
+    // In hydration SSR, stamp each keyed item root with `data-vsk-key` so the
+    // client can claim items by key instead of rebuilding them. The binding is
+    // injected into a shadow copy of the item root at codegen time — it flows
+    // through the existing dynamic-attribute machinery (which also forces a
+    // claim marker on otherwise-static roots).
+    const bodyForItem = __vskHydrate && node.keyExpr ? keyedItemTemplate(node) : node.bodyTemplate;
     const hasAlternate = node.alternateNodes.length > 0;
     const arrVar = hasAlternate ? `__a${nextVskId()}` : null;
     if (hasAlternate) {
@@ -224,7 +263,7 @@ function mapRegionToJS(node, isAsync = false, tracked) {
         lines.push('let __i = 0;');
         lines.push(`for (const ${item} of ${loopArr}) {`);
         lines.push(indent(`const ${node.indexVariable} = __i;`));
-        for (const n of node.bodyTemplate) {
+        for (const n of bodyForItem) {
             const code = irNodeToJS(n, null, isAsync, tracked);
             if (code)
                 lines.push(indent(code));
@@ -234,7 +273,7 @@ function mapRegionToJS(node, isAsync = false, tracked) {
     }
     else {
         lines.push(`for (const ${item} of ${loopArr}) {`);
-        for (const n of node.bodyTemplate) {
+        for (const n of bodyForItem) {
             const code = irNodeToJS(n, null, isAsync, tracked);
             if (code)
                 lines.push(indent(code));
@@ -246,6 +285,27 @@ function mapRegionToJS(node, isAsync = false, tracked) {
     }
     return lines.join('\n');
 }
+/**
+ * Returns a per-item body where the item root element (the first top-level
+ * StaticNode) carries an injected `data-vsk-key` dynamic attribute matching
+ * the map's `keyExpr`. Only the common case — an element as the item root —
+ * is supported; other root shapes (conditionals/components) render without a
+ * key and degrade to fresh rendering, exactly as before.
+ */
+function keyedItemTemplate(node) {
+    if (!node.keyExpr)
+        return node.bodyTemplate;
+    const template = node.bodyTemplate;
+    const idx = template.findIndex((n) => n instanceof StaticNode);
+    if (idx === -1)
+        return template;
+    const root = template[idx];
+    const copy = new StaticNode(root.tag, root.attributes, [...root.children, new DynamicBinding(node.keyExpr, 'attribute', 'data-vsk-key')], root.keyExpr);
+    copy.selfClosing = root.selfClosing;
+    const out = template.slice();
+    out[idx] = copy;
+    return out;
+}
 function whileLoopToJS(node, isAsync = false, tracked) {
     const lines = [];
     if (node.isDoWhile) {
@@ -388,7 +448,9 @@ function componentCallToJS(node, importedNames, isAsync = false, tracked) {
     lines.push(`const ${calleeVar} = ${callee};`);
     const callExpr = `${awaitKw}${calleeVar}(${propsObj}, __registry, (${calleeVar}.__veskScope || __vesk))`;
     if (__vskHydrate) {
-        lines.push(`__out.push('<!--vsk--><div>' + (${callExpr} || '') + '</div>');`);
+        // Wrapper purpose documented at HYDRATE_COMPONENT_WRAPPER; it must never
+        // become a layout box (see the constant's comment for why).
+        lines.push(`__out.push(${JSON.stringify(HYDRATE_COMPONENT_WRAPPER)} + (${callExpr} || '') + '</span>');`);
     }
     else {
         lines.push(`__out.push(${callExpr} || '');`);
@@ -446,8 +508,12 @@ export function generateFunctionBody(comp, importedNames) {
     __currentCompName = '';
     return lines.join('\n');
 }
-export function buildComponentMap(irRoot, useSharedScope) {
-    const map = new Map();
+/**
+ * Builds the compiled body source for every component in an IR root. Used by
+ * both `buildComponentMap` (live functions) and `precompile.ts` (AOT SSR plans
+ * that reconstruct the same functions at function-bundle load time).
+ */
+export function buildComponentEntries(irRoot) {
     const runtimeNames = extractRuntimeNames(irRoot.imports);
     const localValueNames = localValueImportNames(irRoot.imports);
     const topNames = extractTopLevelNames(irRoot.topLevelCode);
@@ -463,6 +529,7 @@ export function buildComponentMap(irRoot, useSharedScope) {
     const allNames = [...new Set([...runtimeNames, ...topNames, ...extraNames, ...localValueNames])];
     const scopeDecl = allNames.length > 0 ? `const { ${allNames.join(', ')} } = __vesk;\n` : '';
     setVskImportedNames(importedNames);
+    const entries = [];
     for (const comp of irRoot.components) {
         const bodyCode = generateFunctionBody(comp, importedNames);
         const paramInit = buildParamInit(comp.paramNames);
@@ -470,15 +537,22 @@ export function buildComponentMap(irRoot, useSharedScope) {
             ? `console.error('[SSR-CALL]', ${JSON.stringify(comp.name)}, props ? JSON.stringify(props) : String(props));\n`
             : '';
         const code = `${scopeDecl}${paramInit}${diag}\n${bodyCode}`;
+        entries.push({ name: comp.name, source: code, isAsync: comp.isAsync || comp.ssrAwait });
+    }
+    setVskImportedNames(null);
+    return entries;
+}
+export function buildComponentMap(irRoot, useSharedScope) {
+    const map = new Map();
+    for (const entry of buildComponentEntries(irRoot)) {
         let fn;
-        if (comp.isAsync || comp.ssrAwait) {
-            fn = new Function('props', '__registry', '__vesk', `return (async () => {\n${code}\n})()`);
+        if (entry.isAsync) {
+            fn = new Function('props', '__registry', '__vesk', `return (async () => {\n${entry.source}\n})()`);
         }
         else {
-            fn = new Function('props', '__registry', '__vesk', code);
+            fn = new Function('props', '__registry', '__vesk', entry.source);
         }
-        map.set(comp.name, fn);
+        map.set(entry.name, fn);
     }
-    setVskImportedNames(null);
     return map;
 }

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":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,EAAE,eAAe,EAAqB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AA6BvJ,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,iBAAiB,CAEhG;AA6CD,wBAAgB,MAAM,CACpB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAmC1B;AAED,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAqF9C;AAyCD,KAAK,gBAAgB,GAAG,OAAO,aAAa,EAAE,UAAU,CAAC;AAEzD,UAAU,iBAAiB;IACzB,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,gBAAgB,EAAE,GAAG,SAAS,GAAG,IAAI,EAC9C,GAAG,CAAC,EAAE,OAAO,aAAa,EAAE,mBAAmB,GAC9C,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,EAAE,GAAG,SAAS,GAAG,IAAI,EAC9C,GAAG,CAAC,EAAE,OAAO,aAAa,EAAE,mBAAmB,GAC9C,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,iBAAiB,EAC1B,GAAG,CAAC,EAAE,OAAO,aAAa,EAAE,mBAAmB,GAC9C,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,GAAG,CACvB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAO,GACnI,OAAO,CAAC,SAAS,CAAC,CA6EpB;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EACpD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI,GACnC,MAAM,EAAE,CAuBV;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CA6GjB;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAa,EAC3C,OAAO,GAAE,eAAoB,GAC5B,cAAc,CAAC,MAAM,CAAC,CA0HxB"}

package/dist/server-render.js

@@ -83,7 +83,8 @@ export function render(source, componentName, props = {}, registry = new Map(),
     const targetComp = compiled.ir.components.find((c) => c.name === componentName);
     const isAsyncComp = !!(targetComp && (targetComp.isAsync || targetComp.ssrAwait));
     globalThis.__vsk_ssr = true;
-    globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
+    if (!globalThis.__vsk_ssr_token)
+        globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
     const renderToken = globalThis.__vsk_ssr_token;
     if (isAsyncComp) {
         return withSsrStore(() => (async () => {
@@ -93,6 +94,7 @@ export function render(source, componentName, props = {}, registry = new Map(),
             }
             finally {
                 delete globalThis.__vsk_ssr;
+                await settleSsrPromises(renderToken);
                 clearSsrCells(renderToken);
             }
             return bodyHtml;
@@ -130,8 +132,14 @@ export function renderPage(source, componentName, props = {}, registry = new Map
     const targetComp = ir.components.find((c) => c.name === componentName);
     const doRender = (ssrProps) => {
         globalThis.__vsk_ssr = true;
-        globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
+        // Reuse an in-flight render token: the generated adapter handler renders
+        // page -> layouts -> document sequentially within one request, and all of
+        // them must share a single data slot so the final renderFullPage merge can
+        // serialize the whole handoff. Only create when no render began yet.
+        if (!globalThis.__vsk_ssr_token)
+            globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
         const renderToken = globalThis.__vsk_ssr_token;
+        pruneSsrDataSlots();
         if (targetComp && (targetComp.isAsync || targetComp.ssrAwait)) {
             return withSsrStore(() => (async () => {
                 let bodyHtml;
@@ -140,6 +148,11 @@ export function renderPage(source, componentName, props = {}, registry = new Map
                 }
                 finally {
                     delete globalThis.__vsk_ssr;
+                    // Settle before cleanup: the fetch resolution callbacks write the
+                    // SSR data (flat + per-token slot), and without this the promises
+                    // were deleted by clearSsrCells before they ever resolved — the
+                    // handoff came back empty and hydration claimed stale SSR nodes.
+                    await settleSsrPromises(renderToken);
                     clearSsrCells(renderToken);
                 }
                 return {
@@ -155,9 +168,19 @@ export function renderPage(source, componentName, props = {}, registry = new Map
         }
         finally {
             delete globalThis.__vsk_ssr;
-            clearSsrCells(renderToken);
         }
         const headHtml = targetComp ? renderHeadHtml(targetComp, ssrProps) : '';
+        const pending = globalThis[`__vsk_ssr_promises_${renderToken}`];
+        if (pending && pending.length > 0) {
+            // A sync component still started server resources (useFetch): settle them
+            // before returning so the handoff serializes real data, not loading state.
+            return withSsrStore(() => (async () => {
+                await settleSsrPromises(renderToken);
+                clearSsrCells(renderToken);
+                return { body: bodyHtml, head: headHtml, props: ssrProps };
+            })());
+        }
+        clearSsrCells(renderToken);
         return { body: bodyHtml, head: headHtml, props: ssrProps };
     };
     if (ir.loadFn) {
@@ -182,7 +205,6 @@ function clearSsrCells(token) {
         return;
     delete globalThis[`__vsk_ssr_promises_${token}`];
     delete globalThis[`__vsk_ssr_failures_${token}`];
-    delete globalThis.__vsk_ssr_token;
     const cells = globalThis.__vsk_ssr_cells;
     if (!cells || !(cells instanceof Map))
         return;
@@ -191,6 +213,35 @@ function clearSsrCells(token) {
             cells.delete(k);
     }
 }
+/**
+ * Await every server resource promise registered under a render token. The
+ * fetch callbacks call setSsrData (flat + per-token slot) once they resolve,
+ * so a render MUST settle before cleanup or its handoff serializes nothing.
+ */
+async function settleSsrPromises(token) {
+    if (!token)
+        return;
+    const pending = globalThis[`__vsk_ssr_promises_${token}`];
+    if (!pending || pending.length === 0)
+        return;
+    await Promise.allSettled(pending);
+}
+/**
+ * Bound the per-token SSR data slots against abandonment (dev-partial
+ * renderPage / render() that never runs renderFullPage). Slots are keyed by
+ * Math.random tokens, so deleted-slot accounting by token can't be cleaned by
+ * an owning render; cap the map instead. RenderFullPage/RenderPageStream delete
+ * their own slot + token in every path, so this only guards the untracked ones.
+ */
+function pruneSsrDataSlots() {
+    const g = globalThis;
+    const keys = Object.keys(g).filter((k) => typeof k === 'string' && k.startsWith('__vsk_ssr_data_'));
+    if (keys.length <= 40)
+        return;
+    keys.sort().slice(0, keys.length - 40).forEach((k) => {
+        delete g[k];
+    });
+}
 /**
  * Run the active plugins' `onHead` hooks (config order) against an assembled
  * `<head>` string. A hook returns the new head, or `null` to keep the input.
@@ -279,11 +330,17 @@ export async function ssg(source, componentName, customProps, options = {}) {
     const cssUrls = options.cssUrls || (options.cssUrl ? [options.cssUrl] : []);
     const cssLink = cssUrls.map(u => `\t<link rel="stylesheet" href="${u}" />\n`).join('');
     const renderCtx = { sourcePath: options.sourcePath };
-    let finalHead = ['\t<meta charset="utf-8" />', '\t<meta name="viewport" content="width=device-width, initial-scale=1" />'].join('\n');
+    const baseHeadParts = [];
+    const lowerHead = (headHtml || '').toLowerCase();
+    if (!lowerHead.includes('charset'))
+        baseHeadParts.push('\t<meta charset="utf-8" />');
+    if (!lowerHead.includes('viewport'))
+        baseHeadParts.push('\t<meta name="viewport" content="width=device-width, initial-scale=1" />');
+    let finalHead = baseHeadParts.join('\n');
     if (cssLink)
-        finalHead += '\n' + cssLink.trimEnd();
+        finalHead += (finalHead ? '\n' : '') + cssLink.trimEnd();
     if (headHtml)
-        finalHead += '\n' + headHtml.split('\n').map((l) => '\t' + l).join('\n');
+        finalHead += (finalHead ? '\n' : '') + headHtml.split('\n').map((l) => '\t' + l).join('\n');
     finalHead = await applyHeadInjects(finalHead, { plugins: options.plugins, headExtra: options.headExtra }, renderCtx);
     const html = `<!DOCTYPE html>
 <html>
@@ -336,6 +393,19 @@ export function buildDataScripts(ssrProps, ssrData, external) {
 export async function renderFullPage(source, componentName, props = {}, registry = new Map(), options = {}) {
     return withSsrStore(async () => {
         globalThis.__vsk_ssr = true;
+        // Reuse the request token when a page/layout render already started one (the
+        // generated adapter handler renders page -> layouts -> document within one
+        // process), otherwise start fresh. One request = one token = one data slot.
+        if (!globalThis.__vsk_ssr_token)
+            globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
+        const renderToken = globalThis.__vsk_ssr_token;
+        pruneSsrDataSlots();
+        // Start this render's handoff store fresh: setSsrData mirrors into
+        // globalThis.__vsk_ssr_data (see resource.ts) because the AsyncLocalStorage
+        // sink snapshot can be empty when the write runs in a forked async context.
+        // Resetting here also gives the /about-after-/posts no-leak behavior the
+        // ALS isolation was introduced to fix.
+        globalThis.__vsk_ssr_data = {};
         try {
             let ssrProps = { ...props };
             let serializedProps = null;
@@ -354,7 +424,22 @@ export async function renderFullPage(source, componentName, props = {}, registry
                 serializedProps = JSON.stringify(ssrProps);
             }
             const rendered = await renderPage(source, componentName, ssrProps, registry, { ...options, __vesk: options.__vesk });
-            const ssrData = { ...ssrSink.snapshot() };
+            // Defensive settle: page/layout renders already awaited their own SSR
+            // promises before cleanup; this covers any resource started here (loadFn).
+            await settleSsrPromises(renderToken);
+            // Merge the ALS sink snapshot with the request's per-token data slot. The
+            // slot is the deterministic channel for writes that happened in a forked
+            // async context (native fetch) — the sink alone can miss them. The slot is
+            // request-scoped (deleted below), so a late write can never leak into a
+            // following request the way the flat global would.
+            const slot = globalThis[`__vsk_ssr_data_${renderToken}`] || {};
+            const ssrData = {
+                ...ssrSink.snapshot(),
+                ...slot,
+            };
+            if (process.env.VESK_SSR_TRACE) {
+                console.error(`[render-trace] renderFullPage comp=${componentName} keys=${Object.keys(ssrData).join(',') || '∅'} slot=${Object.keys(slot).join(',') || '∅'} sink=${Object.keys(ssrSink.snapshot()).join(',') || '∅'}`);
+            }
             let headHtml = rendered.head;
             if (options.pageHead) {
                 const merged = mergeHeadHtml(options.pageHead, rendered.head);
@@ -373,7 +458,12 @@ export async function renderFullPage(source, componentName, props = {}, registry
                 : '';
             const dataScripts = buildDataScripts(ssrProps, ssrData, options.externalDataScript);
             const dataScriptBlock = dataScripts.length > 0 ? '\n' + dataScripts.join('\n') + '\n' : '';
-            const headLines = ['\t<meta charset="utf-8" />', '\t<meta name="viewport" content="width=device-width, initial-scale=1" />'];
+            const lowerHeadFull = (headHtml || '').toLowerCase();
+            const headLines = [];
+            if (!lowerHeadFull.includes('charset'))
+                headLines.push('\t<meta charset="utf-8" />');
+            if (!lowerHeadFull.includes('viewport'))
+                headLines.push('\t<meta name="viewport" content="width=device-width, initial-scale=1" />');
             if (cssLink)
                 headLines.push(cssLink.trimEnd());
             if (headHtml)
@@ -402,6 +492,9 @@ ${dataScriptBlock}${clientScript}</body>
         }
         finally {
             delete globalThis.__vsk_ssr;
+            delete globalThis[`__vsk_ssr_data_${renderToken}`];
+            delete globalThis.__vsk_ssr_token;
+            pruneSsrDataSlots();
         }
     });
 }
@@ -436,7 +529,7 @@ export function renderPageStream(source, componentName, props = {}, registry = n
         const targetComp = ir.components.find((c) => c.name === componentName);
         const cssUrls = options.cssUrls || (options.cssUrl ? [options.cssUrl] : []);
         const cssLink = cssUrls.map(u => `\t<link rel="stylesheet" href="${u}" />\n`).join('');
-        const headParts = ['\t<meta charset="utf-8" />', '\t<meta name="viewport" content="width=device-width, initial-scale=1" />'];
+        const headParts = [];
         if (cssLink)
             headParts.push(cssLink.trimEnd());
         if (options.security) {
@@ -448,6 +541,7 @@ export function renderPageStream(source, componentName, props = {}, registry = n
             if (sec.autoEscape !== false)
                 headParts.push('\t<!-- vesk: auto-escape enabled -->');
         }
+        let streamHeadHtml = null;
         if (targetComp) {
             let headHtml = renderHeadHtml(targetComp, ssrProps);
             if (options.pageHead) {
@@ -459,26 +553,50 @@ export function renderPageStream(source, componentName, props = {}, registry = n
                     }
                 }
             }
-            if (headHtml)
+            if (headHtml) {
+                streamHeadHtml = headHtml;
                 headParts.push('\t' + headHtml.split('\n').join('\n\t'));
+            }
         }
+        const lowerStreamHead = (streamHeadHtml || '').toLowerCase();
+        const baseStream = [];
+        if (!lowerStreamHead.includes('charset'))
+            baseStream.push('\t<meta charset="utf-8" />');
+        if (!lowerStreamHead.includes('viewport'))
+            baseStream.push('\t<meta name="viewport" content="width=device-width, initial-scale=1" />');
+        headParts.unshift(...baseStream);
         yield '<!DOCTYPE html>\n<html>\n<head>\n';
         const finalHead = await applyHeadInjects(headParts.join('\n'), { plugins: options.plugins, headExtra: options.headExtra }, { sourcePath: options.sourcePath, url: options.__vesk?.url || undefined });
         yield finalHead + '\n';
         yield '</head>\n<body>\n<div id="root">\n';
         globalThis.__vsk_ssr = true;
-        globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
+        // Fresh handoff store per render; see renderFullPage note.
+        globalThis.__vsk_ssr_data = {};
+        if (!globalThis.__vsk_ssr_token)
+            globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
         const renderToken = globalThis.__vsk_ssr_token;
+        pruneSsrDataSlots();
         let bodyHtml;
         try {
             bodyHtml = await Promise.resolve(renderFn(ssrProps, fullRegistry, scopedVesk(renderFn, __vesk)));
         }
         finally {
             delete globalThis.__vsk_ssr;
+            await settleSsrPromises(renderToken);
             clearSsrCells(renderToken);
         }
         yield bodyHtml;
-        const ssrData = { ...ssrSink.snapshot() };
+        const slot = globalThis[`__vsk_ssr_data_${renderToken}`] || {};
+        const ssrData = {
+            ...ssrSink.snapshot(),
+            ...slot,
+        };
+        if (process.env.VESK_SSR_TRACE) {
+            console.error(`[render-trace] renderPageStream comp=${componentName} keys=${Object.keys(ssrData).join(',') || '∅'} slot=${Object.keys(slot).join(',') || '∅'} sink=${Object.keys(ssrSink.snapshot()).join(',') || '∅'}`);
+        }
+        delete globalThis[`__vsk_ssr_data_${renderToken}`];
+        delete globalThis.__vsk_ssr_token;
+        pruneSsrDataSlots();
         const dataScripts = buildDataScripts(ssrProps, ssrData, options.externalDataScript);
         const dataScriptBlock = dataScripts.length > 0 ? '\n' + dataScripts.join('\n') : '';
         // Mirror renderFullPage: a full document must carry the client bundle or

package/package.json

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