sygnal 5.3.7 → 6.0.0

package/dist/vike/onRenderClient.mjs

@@ -1,5 +1,23 @@
 import { run } from 'sygnal';
 
+/**
+ * PLAN-4.5 G-275: marks an initial state that a wrapper built from its caller's values (an
+ * element's host props, Vike's pageContext.data or hydrated state, renderComponent's
+ * initialState option). The dev statics freeze (D152, checks/statics.ts) leaves a marked object
+ * and everything in it alone: the caller may still change those values. A non-enumerable symbol
+ * key: spreads, JSON and Object.keys don't see it.
+ */
+const OWNED = Symbol.for('sygnal.owned');
+const owned = (v) => {
+    // G-289: an object that refuses the key (a Proxy) is returned as is
+    try {
+        if (v && typeof v == 'object' && Object.isExtensible(v))
+            Object.defineProperty(v, OWNED, { value: 1 });
+    }
+    catch { }
+    return v;
+};
+
 /**
  * Vike client-side render hook for Sygnal.
  *
@@ -30,40 +48,55 @@ let currentPageData = {};
 let currentRouteParams = {};
 let currentUrlPathname = '';
 let pageNavCounter = 0;
+/**
+ * PLAN-4 G-207: the uid() path part of a shell component or the Page: wrapper_0 → 'w0',
+ * layout_1 → 'l1', page → 'p'. Given as the nested vnode's `id` prop, so the Page's uid is
+ * 'u-w0-l0-p' however the shell nests it; onRenderHtml renders each one with the same root
+ * (renderToString's `uid`), so server and client ids match. (Same helper in onRenderHtml.ts.)
+ */
+function uidPart(key) {
+    return key == 'page' ? 'p' : key[0] + key.slice(key.indexOf('_') + 1);
+}
+/**
+ * PLAN-4.6 R4 (04 §3.11): the core instantiates a component from the vnode's `data.c`, a
+ * component function, and reads its statics there (no options object). A shell component or a
+ * Page is wrapped once (a per-app / per-navigation function) with the statics the options
+ * gave the 5.x core: isolatedState, and the initial state.
+ */
+const shellFns = new WeakMap();
+function shellFn(comp, initialState, cache = true) {
+    let f = cache ? shellFns.get(comp) : undefined;
+    if (!f) {
+        f = Object.assign((p) => comp(p), comp, { isolatedState: true, initialState });
+        try {
+            Object.defineProperty(f, 'name', { value: comp.name, configurable: true });
+        }
+        catch (_) { }
+        if (cache)
+            shellFns.set(comp, f);
+    }
+    return f;
+}
+let pageFn, pageFnNav = -1;
 /**
  * Build a component vnode that matches what the JSX pragma produces.
  */
-function componentVNode(comp, stateField, children, compInitialState) {
+function componentVNode(comp, key, stateField, children, compInitialState) {
     const name = comp.componentName || comp.name || 'FUNCTION_COMPONENT';
     return {
         sel: name,
         data: {
+            c: shellFn(comp, owned(comp.initialState)),
             props: {
                 state: stateField,
-                sygnalOptions: {
-                    name,
-                    view: comp,
-                    model: comp.model,
-                    intent: comp.intent,
-                    hmrActions: comp.hmrActions,
-                    context: comp.context,
-                    peers: comp.peers,
-                    components: comp.components,
-                    initialState: compInitialState,
-                    isolatedState: true,
-                    calculated: comp.calculated,
-                    storeCalculatedInState: comp.storeCalculatedInState,
-                    DOMSourceName: comp.DOMSourceName,
-                    stateSourceName: comp.stateSourceName,
-                    onError: comp.onError,
-                    debug: comp.debug,
-                },
+                // G-207: the uid() base, as onRenderHtml gives this shell component (see uidPart)
+                id: uidPart(key),
             },
         },
         children,
         text: undefined,
         elm: undefined,
-        key: '__vike_' + stateField + '__',
+        key: '__vike_' + key + '__',
     };
 }
 /**
@@ -71,33 +104,22 @@ function componentVNode(comp, stateField, children, compInitialState) {
  * Reads from mutable `currentPage` / `currentPageName` so the wrapper
  * view picks up the new Page component on navigation without being recreated.
  */
-function pageChildVNode(pageState) {
-    // Include pageNavCounter in sel so instantiateSubComponents detects a
-    // component swap even when both pages have the same function name (e.g. 'Page').
+function pageChildVNode(pageState, stateField = 'page') {
+    // a new function per navigation, so the Page is made again even when both pages are the same
+    // function (e.g. 'Page'); the nav counter in `sel` keeps the vnodes apart
     const sel = currentPageName + '__nav' + pageNavCounter;
+    if (pageFnNav !== pageNavCounter) {
+        pageFnNav = pageNavCounter;
+        pageFn = shellFn(currentPage, undefined, false);
+    }
     return {
         sel,
         data: {
+            c: pageFn,
             props: {
-                state: 'page',
-                sygnalOptions: {
-                    name: sel,
-                    view: currentPage,
-                    model: currentPage.model,
-                    intent: currentPage.intent,
-                    hmrActions: currentPage.hmrActions,
-                    context: currentPage.context,
-                    peers: currentPage.peers,
-                    components: currentPage.components,
-                    initialState: pageState,
-                    isolatedState: true,
-                    calculated: currentPage.calculated,
-                    storeCalculatedInState: currentPage.storeCalculatedInState,
-                    DOMSourceName: currentPage.DOMSourceName,
-                    stateSourceName: currentPage.stateSourceName,
-                    onError: currentPage.onError,
-                    debug: currentPage.debug,
-                },
+                state: stateField,
+                // G-207: the Page's uid() base, as onRenderHtml gives it (the same across navigations)
+                id: uidPart('page'),
             },
         },
         children: [],
@@ -119,24 +141,47 @@ function pageChildVNode(pageState) {
 function createLayoutWrapper(wrappers, layouts, Page) {
     currentPage = Page;
     currentPageName = Page.componentName || Page.name || 'VikePageComponent';
-    // Combined shell = wrappers (outermost) + layouts (innermost around Page)
-    // State keys: wrapper_0, wrapper_1, ..., layout_0, layout_1, ...
-    // Page state lives under the innermost shell component's slice.
-    const shell = [
-        ...wrappers.map((w, i) => ({ comp: w, key: 'wrapper_' + i })),
-        ...layouts.map((l, i) => ({ comp: l, key: 'layout_' + i })),
-    ];
+    // Combined shell = wrappers (outermost) + layouts (innermost around Page).
+    // D50: the root state holds every slice as a sibling, as in 5.4.0 but with the Page at the
+    // root too: { wrapper_0, ..., layout_0, ..., page }. A component's `state` prop selects from
+    // its parent component's state, and the shell components are nested in each other, so each
+    // one (and the Page) gets a { get, set } lens onto its own ROOT slice: an outer component's
+    // reducer replacing its state can't wipe the inner slices (R2-2), and no view sees another
+    // component's slice.
+    const keys = shellKeys(wrappers, layouts);
+    const shell = [...wrappers, ...layouts].map((comp, i) => ({ comp, key: keys[i] }));
+    // The latest root state. Only the outermost lens gets the root itself; the nested lenses get
+    // their parent shell component's state. In both directions the outermost lens runs first and
+    // synchronously (state: root -> outer get -> inner get; a reducer: outer get, inner get, inner
+    // set, outer set), so the nested lenses read and write through `root`.
+    let root = {};
+    const rootLens = (key, outermost, fresh) => ({
+        get: (state) => {
+            if (outermost)
+                root = state || {};
+            const slice = root[key];
+            // a shell slice is a new object on every root state, so the components nested in the
+            // shell component see every change (their state stream drops repeated objects)
+            return fresh && slice && typeof slice === 'object' && !Array.isArray(slice) ? { ...slice } : slice;
+        },
+        set: (state, slice) => {
+            root = { ...root, [key]: slice };
+            // a nested lens returns a changed parent state, so the parent's lens writes `root` back
+            return outermost ? root : { ...state };
+        },
+    });
+    const lenses = keys.map((key, i) => rootLens(key, i === 0, true));
+    const pageLens = rootLens('page', false, false);
     function LayoutWrapperView({ state }) {
         if (shell.length === 0) {
             // No wrappers or layouts — render Page directly
             return pageChildVNode(state.page);
         }
         const lastIdx = shell.length - 1;
-        const innermostState = state[shell[lastIdx].key] || {};
-        let inner = componentVNode(shell[lastIdx].comp, shell[lastIdx].key, [pageChildVNode(innermostState.page)], innermostState);
+        let inner = componentVNode(shell[lastIdx].comp, shell[lastIdx].key, lenses[lastIdx], [pageChildVNode(state.page, pageLens)], state[shell[lastIdx].key]);
         // Wrap with outer shell components
         for (let i = lastIdx - 1; i >= 0; i--) {
-            inner = componentVNode(shell[i].comp, shell[i].key, [inner], state[shell[i].key]);
+            inner = componentVNode(shell[i].comp, shell[i].key, lenses[i], [inner], state[shell[i].key]);
         }
         // Wrap in a plain div so the view returns a regular DOM vnode.
         // Sub-component vnodes at the root position are not processed correctly
@@ -151,17 +196,18 @@ function createLayoutWrapper(wrappers, layouts, Page) {
         };
     }
     LayoutWrapperView.componentName = 'VikeLayoutWrapper';
-    // Build the wrapper's initial state with a slice for each shell component.
-    // Page state is nested under the innermost shell component's slice.
-    const wrapperInitialState = {};
-    shell.forEach(({ comp, key }, i) => {
-        const sliceState = { ...(comp.initialState || {}) };
-        if (i === shell.length - 1) {
-            sliceState.page = Page.initialState || {};
-        }
-        wrapperInitialState[key] = sliceState;
-    });
-    LayoutWrapperView.initialState = wrapperInitialState;
+    // run() names the root by `name` first
+    try {
+        Object.defineProperty(LayoutWrapperView, 'name', { value: 'VikeLayoutWrapper', configurable: true });
+    }
+    catch (_) { }
+    // The wrapper's initial state: a sibling slice for each shell component and the Page.
+    // Must match onRenderHtml's serialized state.
+    const initialState = {};
+    shell.forEach(({ comp, key }) => { initialState[key] = { ...(comp.initialState || {}) }; });
+    initialState.page = Page.initialState || {};
+    // G-275: owned (built from the hydrated state and pageContext.data: never frozen in dev)
+    LayoutWrapperView.initialState = root = owned(initialState);
     // Context uses mutable references so navigation updates are picked up.
     // Wrapper and Layout contexts are merged once; page-level context
     // (pageData, routeParams, urlPathname) reads from mutable variables
@@ -181,6 +227,13 @@ function createLayoutWrapper(wrappers, layouts, Page) {
     };
     return LayoutWrapperView;
 }
+/** State keys of the shell components, outermost first: wrapper_0, ..., layout_0, ... */
+function shellKeys(wrappers, layouts) {
+    return [
+        ...wrappers.map((_, i) => 'wrapper_' + i),
+        ...layouts.map((_, i) => 'layout_' + i),
+    ];
+}
 /**
  * Normalize a cumulative config value into an array of functions.
  */
@@ -195,34 +248,39 @@ function onRenderClient(pageContext) {
     const wrappers = toComponentArray(config.Wrapper);
     const layouts = toComponentArray(config.Layout);
     const hasShell = wrappers.length > 0 || layouts.length > 0;
-    // The shell is wrappers (outermost) + layouts. The innermost component
-    // holds the Page state as a nested sub-component.
-    const shell = [
-        ...wrappers.map((_, i) => 'wrapper_' + i),
-        ...layouts.map((_, i) => 'layout_' + i),
-    ];
-    const innermostKey = shell.length > 0 ? shell[shell.length - 1] : null;
+    // The shell is wrappers (outermost) + layouts; their state slices and the Page's are
+    // siblings at the root (D50).
+    const shell = shellKeys(wrappers, layouts);
+    // PLAN-3 5-5 (H-7): seed the caches of the fetch drivers (makeFetchDriver({ cache: queryCache() })
+    // exposes it as driver.cache) before the page renders, so its resources start at 'success'
+    if (pageContext.queryCache) {
+        for (const d of Object.values(config.drivers || {}))
+            d?.cache?.hydrate?.(pageContext.queryCache);
+    }
     // Update mutable context references (used by the wrapper's context functions)
     currentPageData = data;
     currentRouteParams = pageContext.routeParams || {};
-    currentUrlPathname = pageContext.urlPathname || '';
+    // urlPathname is built in on the client with Client Routing (G-046: it is
+    // not in passToClient); fall back to the location with Server Routing.
+    currentUrlPathname = pageContext.urlPathname
+        || (typeof window !== 'undefined' && window.location ? window.location.pathname : '');
     // --- Shell path: hot-swap Page, keep Layout/Wrapper alive ---
     if (hasShell) {
         if (currentApp) {
             // Client-side navigation: swap the Page without disposing the shell.
+            // PLAN-3 5-4b: a router given Vike's navigate() (makeRouter({ routes, navigate })) re-reads
+            // the route on this event; sent before the swap, so the new Page declares after it
+            if (typeof window !== 'undefined')
+                window.dispatchEvent?.(new Event('sygnal:navigate'));
             currentPage = Page;
             currentPageName = Page.componentName || Page.name || 'VikePageComponent';
             pageNavCounter++;
             const newPageState = { ...(Page.initialState || {}), ...data };
-            if (currentApp.sinks?.STATE?.shamefullySendNext) {
-                currentApp.sinks.STATE.shamefullySendNext((state) => {
-                    const shellState = state[innermostKey] || {};
-                    return {
-                        ...state,
-                        [innermostKey]: { ...shellState, page: newPageState },
-                    };
-                });
-            }
+            // replace the page slice, keeping every shell slice (G-106, D50)
+            const swapPage = (state) => ({ ...state, page: newPageState });
+            // (PLAN-4.6 core: through the runtime API, 04 §3.11)
+            const rt = currentApp.__runtime;
+            rt?.setState('root', swapPage);
         }
         else {
             // First load: read hydrated state or build from initialState
@@ -234,25 +292,28 @@ function onRenderClient(pageContext) {
             else {
                 initialState = null;
             }
-            if (initialState && innermostKey && initialState[innermostKey] !== undefined) {
-                // Hydrated combined state — distribute slices to each shell component
+            if (initialState && initialState[shell[shell.length - 1]] !== undefined) {
+                // Hydrated shell state: sibling slices (D50), or the 5.4.0 shape with the Page state
+                // under the innermost shell slice (R2-9) — distribute the slices to each component
                 const allShellComps = [...wrappers, ...layouts];
+                let pageState = initialState.page;
                 shell.forEach((key, i) => {
-                    if (initialState[key] !== undefined) {
-                        if (i === shell.length - 1) {
-                            const { page: pageState, ...compState } = initialState[key];
-                            allShellComps[i].initialState = compState;
-                            Page.initialState = pageState || { ...(Page.initialState || {}), ...data };
-                        }
-                        else {
-                            allShellComps[i].initialState = initialState[key];
-                        }
+                    let slice = initialState[key];
+                    if (slice === undefined)
+                        return;
+                    if (i === shell.length - 1 && slice && 'page' in slice) {
+                        const { page, ...rest } = slice;
+                        if (pageState === undefined)
+                            pageState = page;
+                        slice = rest;
                     }
+                    allShellComps[i].initialState = owned(slice);
                 });
+                Page.initialState = owned(pageState || { ...(Page.initialState || {}), ...data });
             }
             else {
                 // SPA mode or client-side first navigation
-                Page.initialState = { ...(Page.initialState || {}), ...data };
+                Page.initialState = owned({ ...(Page.initialState || {}), ...data });
             }
             // Inject page-level context into Page (for SSR renderToString compat)
             Page.context = {
@@ -263,7 +324,9 @@ function onRenderClient(pageContext) {
             };
             const Component = createLayoutWrapper(wrappers, layouts, Page);
             try {
-                currentApp = run(Component, config.drivers || {}, { mountPoint: '#page-view' });
+                // 3-B2: `__vike` marks the shell's components (Page, Layouts, Wrappers: sub-components of
+                // the shell root) for the dev entry, whose SYG224 then says persist() isn't supported there
+                currentApp = run(Component, { ...config.drivers, __vike: () => 1 }, { mountPoint: '#page-view', onError: config.sygnalOnError });
             }
             catch (err) {
                 console.error('[sygnal/vike] Client render error:', err);
@@ -284,14 +347,17 @@ function onRenderClient(pageContext) {
             currentApp = null;
         }
         let initialState;
+        // 3-B2: the server's state is here when the page hydrates its HTML
+        let serverState = false;
         if (typeof window !== 'undefined' && window.__VIKE_SYGNAL_STATE__ !== undefined) {
             initialState = window.__VIKE_SYGNAL_STATE__;
             delete window.__VIKE_SYGNAL_STATE__;
+            serverState = true;
         }
         else {
             initialState = { ...(Page.initialState || {}), ...data };
         }
-        Page.initialState = initialState;
+        Page.initialState = owned(initialState);
         Page.context = {
             ...Page.context,
             pageData: () => currentPageData,
@@ -299,7 +365,11 @@ function onRenderClient(pageContext) {
             urlPathname: () => currentUrlPathname,
         };
         try {
-            currentApp = run(Page, config.drivers || {}, { mountPoint: '#page-view' });
+            // 3-B2: the Page is the root, so its persist() restores after the first render when this
+            // is a hydration (`__hydrate`), keeping that render equal to the server's HTML. A client-side
+            // navigation isn't one, though the previous page's markup is still in #page-view
+            const hydrating = pageContext.isHydration ?? serverState;
+            currentApp = run(Page, { ...config.drivers, __hydrate: () => hydrating }, { mountPoint: '#page-view', onError: config.sygnalOnError });
         }
         catch (err) {
             console.error('[sygnal/vike] Client render error:', err);
@@ -319,3 +389,4 @@ function onRenderClient(pageContext) {
 }
 
 export { onRenderClient };
+//# sourceMappingURL=onRenderClient.mjs.map

package/dist/vike/onRenderClient.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"onRenderClient.mjs","sources":["../../src/extra/owned.ts","../../src/vike/onRenderClient.ts"],"sourcesContent":["/**\n * PLAN-4.5 G-275: marks an initial state that a wrapper built from its caller's values (an\n * element's host props, Vike's pageContext.data or hydrated state, renderComponent's\n * initialState option). The dev statics freeze (D152, checks/statics.ts) leaves a marked object\n * and everything in it alone: the caller may still change those values. A non-enumerable symbol\n * key: spreads, JSON and Object.keys don't see it.\n */\nexport const OWNED = Symbol.for('sygnal.owned')\n\nexport const owned = <T>(v: T): T => {\n  // G-289: an object that refuses the key (a Proxy) is returned as is\n  try { if (v && typeof v == 'object' && Object.isExtensible(v)) Object.defineProperty(v, OWNED, {value: 1}) } catch {}\n  return v\n}\n\n/**\n * G-289: owned() of a shallow copy of a plain object or array (the caller's own object stays\n * unmarked: it may be a component's static, which the freeze must still cover, or sealed, which\n * can't be marked); anything else as owned()\n */\nexport const ownedCopy = <T>(v: T): T => {\n  const p = v && typeof v == 'object' ? Object.getPrototypeOf(v) : 0\n  return owned(Array.isArray(v) ? [...v] as any : p == Object.prototype || p === null ? {...v} : v)\n}\n","/**\n * Vike client-side render hook for Sygnal.\n *\n * On first page load (hydration): reads server-serialized state and\n * boots the Sygnal app via run().\n *\n * On client-side navigation with a Layout/Wrapper: the Layout and Wrapper\n * stay mounted and only the Page sub-component is hot-swapped. Layout and\n * Wrapper state persists across navigations. Without either, the app is\n * disposed and recreated.\n *\n * Nesting order: Wrapper > Layout > Page\n * - Wrappers are outermost (context providers, state management)\n * - Layouts are inside wrappers (visual structure, navigation chrome)\n * - Page is innermost (route-specific content, swapped on navigation)\n */\n\n// Import from the package entry so rollup externalizes it\n// @ts-ignore — resolved at runtime via package exports\nimport { run } from 'sygnal'\nimport { owned } from '../extra/owned'\n\ndeclare global {\n  interface Window {\n    __VIKE_SYGNAL_STATE__?: any\n  }\n}\n\ninterface PageContext {\n  Page: any\n  data?: any\n  routeParams?: Record<string, string>\n  urlPathname?: string\n  isHydration?: boolean\n  /** PLAN-3 5-5 (H-7): the queryCache() snapshot a loader seeded (see onRenderHtml) */\n  queryCache?: any\n  config: {\n    Layout?: any | any[]\n    Wrapper?: any | any[]\n    title?: string\n    ssr?: boolean\n    drivers?: Record<string, (sink: any) => any>\n    // PLAN-4 GS-11: the app-level error hook (not Vike's own onError)\n    sygnalOnError?: (error: any, info: any) => void\n  }\n}\n\n/** Track the running Sygnal app for disposal on navigation */\nlet currentApp: { sources: any; sinks: any; dispose: () => void } | null = null\n\n/**\n * Mutable references read by the wrapper's view function.\n * Updated on navigation to swap the Page without disposing the Layout.\n */\nlet currentPage: any = null\nlet currentPageName: string = ''\nlet currentPageData: any = {}\nlet currentRouteParams: any = {}\nlet currentUrlPathname: string = ''\nlet pageNavCounter: number = 0\n\n/**\n * PLAN-4 G-207: the uid() path part of a shell component or the Page: wrapper_0 → 'w0',\n * layout_1 → 'l1', page → 'p'. Given as the nested vnode's `id` prop, so the Page's uid is\n * 'u-w0-l0-p' however the shell nests it; onRenderHtml renders each one with the same root\n * (renderToString's `uid`), so server and client ids match. (Same helper in onRenderHtml.ts.)\n */\nfunction uidPart(key: string): string {\n  return key == 'page' ? 'p' : key[0] + key.slice(key.indexOf('_') + 1)\n}\n\n/**\n * PLAN-4.6 R4 (04 §3.11): the core instantiates a component from the vnode's `data.c`, a\n * component function, and reads its statics there (no options object). A shell component or a\n * Page is wrapped once (a per-app / per-navigation function) with the statics the options\n * gave the 5.x core: isolatedState, and the initial state.\n */\nconst shellFns = new WeakMap<any, any>()\nfunction shellFn(comp: any, initialState: any, cache = true): any {\n  let f = cache ? shellFns.get(comp) : undefined\n  if (!f) {\n    f = Object.assign((p: any) => comp(p), comp, { isolatedState: true, initialState })\n    try { Object.defineProperty(f, 'name', { value: comp.name, configurable: true }) } catch (_) {}\n    if (cache) shellFns.set(comp, f)\n  }\n  return f\n}\nlet pageFn: any, pageFnNav = -1\n\n/**\n * Build a component vnode that matches what the JSX pragma produces.\n */\nfunction componentVNode(comp: any, key: string, stateField: any, children: any[], compInitialState?: any): any {\n  const name = comp.componentName || comp.name || 'FUNCTION_COMPONENT'\n  return {\n    sel: name,\n    data: {\n      c: shellFn(comp, owned(comp.initialState)),\n      props: {\n        state: stateField,\n        // G-207: the uid() base, as onRenderHtml gives this shell component (see uidPart)\n        id: uidPart(key),\n      },\n    },\n    children,\n    text: undefined,\n    elm: undefined,\n    key: '__vike_' + key + '__',\n  }\n}\n\n/**\n * Build a vnode for the current Page as a child of the Layout.\n * Reads from mutable `currentPage` / `currentPageName` so the wrapper\n * view picks up the new Page component on navigation without being recreated.\n */\nfunction pageChildVNode(pageState: any, stateField: any = 'page'): any {\n  // a new function per navigation, so the Page is made again even when both pages are the same\n  // function (e.g. 'Page'); the nav counter in `sel` keeps the vnodes apart\n  const sel = currentPageName + '__nav' + pageNavCounter\n  if (pageFnNav !== pageNavCounter) { pageFnNav = pageNavCounter; pageFn = shellFn(currentPage, undefined, false) }\n  return {\n    sel,\n    data: {\n      c: pageFn,\n      props: {\n        state: stateField,\n        // G-207: the Page's uid() base, as onRenderHtml gives it (the same across navigations)\n        id: uidPart('page'),\n      },\n    },\n    children: [],\n    text: undefined,\n    elm: undefined,\n    key: '__vike_page__',\n  }\n}\n\n/**\n * Create a synthetic wrapper component that nests Page inside Layout(s)\n * inside Wrapper(s).\n *\n * Nesting order: Wrapper(s) > Layout(s) > Page\n *\n * The wrapper's view reads `currentPage` from the mutable closure, so\n * on client-side navigation only the Page sub-component changes while\n * the Layout and Wrapper stay mounted with their state preserved.\n */\nfunction createLayoutWrapper(wrappers: any[], layouts: any[], Page: any): any {\n  currentPage = Page\n  currentPageName = Page.componentName || Page.name || 'VikePageComponent'\n\n  // Combined shell = wrappers (outermost) + layouts (innermost around Page).\n  // D50: the root state holds every slice as a sibling, as in 5.4.0 but with the Page at the\n  // root too: { wrapper_0, ..., layout_0, ..., page }. A component's `state` prop selects from\n  // its parent component's state, and the shell components are nested in each other, so each\n  // one (and the Page) gets a { get, set } lens onto its own ROOT slice: an outer component's\n  // reducer replacing its state can't wipe the inner slices (R2-2), and no view sees another\n  // component's slice.\n  const keys = shellKeys(wrappers, layouts)\n  const shell = [...wrappers, ...layouts].map((comp: any, i: number) => ({ comp, key: keys[i] }))\n\n  // The latest root state. Only the outermost lens gets the root itself; the nested lenses get\n  // their parent shell component's state. In both directions the outermost lens runs first and\n  // synchronously (state: root -> outer get -> inner get; a reducer: outer get, inner get, inner\n  // set, outer set), so the nested lenses read and write through `root`.\n  let root: any = {}\n  const rootLens = (key: string, outermost: boolean, fresh: boolean) => ({\n    get: (state: any) => {\n      if (outermost) root = state || {}\n      const slice = root[key]\n      // a shell slice is a new object on every root state, so the components nested in the\n      // shell component see every change (their state stream drops repeated objects)\n      return fresh && slice && typeof slice === 'object' && !Array.isArray(slice) ? { ...slice } : slice\n    },\n    set: (state: any, slice: any) => {\n      root = { ...root, [key]: slice }\n      // a nested lens returns a changed parent state, so the parent's lens writes `root` back\n      return outermost ? root : { ...state }\n    },\n  })\n  const lenses = keys.map((key, i) => rootLens(key, i === 0, true))\n  const pageLens = rootLens('page', false, false)\n\n  function LayoutWrapperView({ state }: any) {\n    if (shell.length === 0) {\n      // No wrappers or layouts — render Page directly\n      return pageChildVNode(state.page)\n    }\n\n    const lastIdx = shell.length - 1\n    let inner: any = componentVNode(\n      shell[lastIdx].comp,\n      shell[lastIdx].key,\n      lenses[lastIdx],\n      [pageChildVNode(state.page, pageLens)],\n      state[shell[lastIdx].key]\n    )\n\n    // Wrap with outer shell components\n    for (let i = lastIdx - 1; i >= 0; i--) {\n      inner = componentVNode(shell[i].comp, shell[i].key, lenses[i], [inner], state[shell[i].key])\n    }\n\n    // Wrap in a plain div so the view returns a regular DOM vnode.\n    // Sub-component vnodes at the root position are not processed correctly\n    // by the rendering pipeline — they must be children of a DOM element.\n    return {\n      sel: 'div',\n      data: { attrs: { id: 'vike-shell' } },\n      children: [inner],\n      text: undefined,\n      elm: undefined,\n      key: '__vike_shell__',\n    }\n  }\n\n  LayoutWrapperView.componentName = 'VikeLayoutWrapper'\n  // run() names the root by `name` first\n  try { Object.defineProperty(LayoutWrapperView, 'name', { value: 'VikeLayoutWrapper', configurable: true }) } catch (_) {}\n\n  // The wrapper's initial state: a sibling slice for each shell component and the Page.\n  // Must match onRenderHtml's serialized state.\n  const initialState: any = {}\n  shell.forEach(({ comp, key }: any) => { initialState[key] = { ...(comp.initialState || {}) } })\n  initialState.page = Page.initialState || {}\n  // G-275: owned (built from the hydrated state and pageContext.data: never frozen in dev)\n  LayoutWrapperView.initialState = root = owned(initialState)\n\n  // Context uses mutable references so navigation updates are picked up.\n  // Wrapper and Layout contexts are merged once; page-level context\n  // (pageData, routeParams, urlPathname) reads from mutable variables\n  // updated on each navigation.\n  const shellContext: any = {}\n  shell.forEach(({ comp }: any) => {\n    if (comp.context) {\n      Object.assign(shellContext, comp.context)\n    }\n  })\n\n  LayoutWrapperView.context = {\n    ...shellContext,\n    ...(Page.context || {}),\n    pageData: () => currentPageData,\n    routeParams: () => currentRouteParams,\n    urlPathname: () => currentUrlPathname,\n  }\n\n  return LayoutWrapperView\n}\n\n/** State keys of the shell components, outermost first: wrapper_0, ..., layout_0, ... */\nfunction shellKeys(wrappers: any[], layouts: any[]): string[] {\n  return [\n    ...wrappers.map((_: any, i: number) => 'wrapper_' + i),\n    ...layouts.map((_: any, i: number) => 'layout_' + i),\n  ]\n}\n\n/**\n * Normalize a cumulative config value into an array of functions.\n */\nfunction toComponentArray(val: any): any[] {\n  if (!val) return []\n  return (Array.isArray(val) ? val : [val]).filter((c: any) => typeof c === 'function')\n}\n\nexport function onRenderClient(pageContext: PageContext) {\n  const { Page, config } = pageContext\n  const data = pageContext.data || {}\n\n  const wrappers = toComponentArray(config.Wrapper)\n  const layouts = toComponentArray(config.Layout)\n  const hasShell = wrappers.length > 0 || layouts.length > 0\n\n  // The shell is wrappers (outermost) + layouts; their state slices and the Page's are\n  // siblings at the root (D50).\n  const shell = shellKeys(wrappers, layouts)\n\n  // PLAN-3 5-5 (H-7): seed the caches of the fetch drivers (makeFetchDriver({ cache: queryCache() })\n  // exposes it as driver.cache) before the page renders, so its resources start at 'success'\n  if (pageContext.queryCache) {\n    for (const d of Object.values(config.drivers || {})) (d as any)?.cache?.hydrate?.(pageContext.queryCache)\n  }\n\n  // Update mutable context references (used by the wrapper's context functions)\n  currentPageData = data\n  currentRouteParams = pageContext.routeParams || {}\n  // urlPathname is built in on the client with Client Routing (G-046: it is\n  // not in passToClient); fall back to the location with Server Routing.\n  currentUrlPathname = pageContext.urlPathname\n    || (typeof window !== 'undefined' && window.location ? window.location.pathname : '')\n\n  // --- Shell path: hot-swap Page, keep Layout/Wrapper alive ---\n  if (hasShell) {\n    if (currentApp) {\n      // Client-side navigation: swap the Page without disposing the shell.\n      // PLAN-3 5-4b: a router given Vike's navigate() (makeRouter({ routes, navigate })) re-reads\n      // the route on this event; sent before the swap, so the new Page declares after it\n      if (typeof window !== 'undefined') window.dispatchEvent?.(new Event('sygnal:navigate'))\n      currentPage = Page\n      currentPageName = Page.componentName || Page.name || 'VikePageComponent'\n      pageNavCounter++\n\n      const newPageState = { ...(Page.initialState || {}), ...data }\n      // replace the page slice, keeping every shell slice (G-106, D50)\n      const swapPage = (state: any) => ({ ...state, page: newPageState })\n      // (PLAN-4.6 core: through the runtime API, 04 §3.11)\n      const rt = (currentApp as any).__runtime\n      rt?.setState('root', swapPage)\n    } else {\n      // First load: read hydrated state or build from initialState\n      let initialState: any\n      if (typeof window !== 'undefined' && window.__VIKE_SYGNAL_STATE__ !== undefined) {\n        initialState = window.__VIKE_SYGNAL_STATE__\n        delete window.__VIKE_SYGNAL_STATE__\n      } else {\n        initialState = null\n      }\n\n      if (initialState && initialState[shell[shell.length - 1]] !== undefined) {\n        // Hydrated shell state: sibling slices (D50), or the 5.4.0 shape with the Page state\n        // under the innermost shell slice (R2-9) — distribute the slices to each component\n        const allShellComps = [...wrappers, ...layouts]\n        let pageState = initialState.page\n        shell.forEach((key: string, i: number) => {\n          let slice = initialState[key]\n          if (slice === undefined) return\n          if (i === shell.length - 1 && slice && 'page' in slice) {\n            const { page, ...rest } = slice\n            if (pageState === undefined) pageState = page\n            slice = rest\n          }\n          allShellComps[i].initialState = owned(slice)\n        })\n        Page.initialState = owned(pageState || { ...(Page.initialState || {}), ...data })\n      } else {\n        // SPA mode or client-side first navigation\n        Page.initialState = owned({ ...(Page.initialState || {}), ...data })\n      }\n\n      // Inject page-level context into Page (for SSR renderToString compat)\n      Page.context = {\n        ...Page.context,\n        pageData: () => currentPageData,\n        routeParams: () => currentRouteParams,\n        urlPathname: () => currentUrlPathname,\n      }\n\n      const Component = createLayoutWrapper(wrappers, layouts, Page)\n\n      try {\n        // 3-B2: `__vike` marks the shell's components (Page, Layouts, Wrappers: sub-components of\n        // the shell root) for the dev entry, whose SYG224 then says persist() isn't supported there\n        currentApp = run(Component, { ...config.drivers, __vike: () => 1 }, { mountPoint: '#page-view', onError: config.sygnalOnError }) as any\n      } catch (err: any) {\n        console.error('[sygnal/vike] Client render error:', err)\n        const container = document.getElementById('page-view')\n        if (container) {\n          container.innerHTML = `<div data-sygnal-error style=\"padding:2rem;color:#e74c3c;font-family:monospace\">\n            <h2>Render Error</h2>\n            <pre>${String(err.message || err)}</pre>\n          </div>`\n        }\n      }\n    }\n\n  // --- No shell path: dispose and recreate ---\n  } else {\n    if (currentApp) {\n      currentApp.dispose()\n      currentApp = null\n    }\n\n    let initialState: any\n    // 3-B2: the server's state is here when the page hydrates its HTML\n    let serverState = false\n    if (typeof window !== 'undefined' && window.__VIKE_SYGNAL_STATE__ !== undefined) {\n      initialState = window.__VIKE_SYGNAL_STATE__\n      delete window.__VIKE_SYGNAL_STATE__\n      serverState = true\n    } else {\n      initialState = { ...(Page.initialState || {}), ...data }\n    }\n\n    Page.initialState = owned(initialState)\n    Page.context = {\n      ...Page.context,\n      pageData: () => currentPageData,\n      routeParams: () => currentRouteParams,\n      urlPathname: () => currentUrlPathname,\n    }\n\n    try {\n      // 3-B2: the Page is the root, so its persist() restores after the first render when this\n      // is a hydration (`__hydrate`), keeping that render equal to the server's HTML. A client-side\n      // navigation isn't one, though the previous page's markup is still in #page-view\n      const hydrating = pageContext.isHydration ?? serverState\n      currentApp = run(Page, { ...config.drivers, __hydrate: () => hydrating }, { mountPoint: '#page-view', onError: config.sygnalOnError }) as any\n    } catch (err: any) {\n      console.error('[sygnal/vike] Client render error:', err)\n      const container = document.getElementById('page-view')\n      if (container) {\n        container.innerHTML = `<div data-sygnal-error style=\"padding:2rem;color:#e74c3c;font-family:monospace\">\n          <h2>Render Error</h2>\n          <pre>${String(err.message || err)}</pre>\n        </div>`\n      }\n    }\n  }\n\n  // Update document title on client navigation\n  if (config.title) {\n    document.title = config.title\n  }\n}\n"],"names":[],"mappings":";;AAAA;;;;;;AAMG;AACI,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;AAExC,MAAM,KAAK,GAAG,CAAI,CAAI,KAAO;;AAElC,IAAA,IAAI;AAAE,QAAA,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,QAAQ,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;AAAE,YAAA,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,EAAC,KAAK,EAAE,CAAC,EAAC,CAAC,CAAA;KAAE;IAAC,MAAM,GAAE;AACrH,IAAA,OAAO,CAAC,CAAA;AACV,CAAC;;ACbD;;;;;;;;;;;;;;;AAeG;AAEH;AACA;AA6BA;AACA,IAAI,UAAU,GAA6D,IAAI,CAAA;AAE/E;;;AAGG;AACH,IAAI,WAAW,GAAQ,IAAI,CAAA;AAC3B,IAAI,eAAe,GAAW,EAAE,CAAA;AAChC,IAAI,eAAe,GAAQ,EAAE,CAAA;AAC7B,IAAI,kBAAkB,GAAQ,EAAE,CAAA;AAChC,IAAI,kBAAkB,GAAW,EAAE,CAAA;AACnC,IAAI,cAAc,GAAW,CAAC,CAAA;AAE9B;;;;;AAKG;AACH,SAAS,OAAO,CAAC,GAAW,EAAA;AAC1B,IAAA,OAAO,GAAG,IAAI,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;AACvE,CAAC;AAED;;;;;AAKG;AACH,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAY,CAAA;AACxC,SAAS,OAAO,CAAC,IAAS,EAAE,YAAiB,EAAE,KAAK,GAAG,IAAI,EAAA;AACzD,IAAA,IAAI,CAAC,GAAG,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,SAAS,CAAA;IAC9C,IAAI,CAAC,CAAC,EAAE;QACN,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;AACnF,QAAA,IAAI;AAAE,YAAA,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAA;SAAE;AAAC,QAAA,OAAO,CAAC,EAAE,GAAE;AAC/F,QAAA,IAAI,KAAK;AAAE,YAAA,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;KACjC;AACD,IAAA,OAAO,CAAC,CAAA;AACV,CAAC;AACD,IAAI,MAAW,EAAE,SAAS,GAAG,CAAC,CAAC,CAAA;AAE/B;;AAEG;AACH,SAAS,cAAc,CAAC,IAAS,EAAE,GAAW,EAAE,UAAe,EAAE,QAAe,EAAE,gBAAsB,EAAA;IACtG,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,IAAI,oBAAoB,CAAA;IACpE,OAAO;AACL,QAAA,GAAG,EAAE,IAAI;AACT,QAAA,IAAI,EAAE;YACJ,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAC1C,YAAA,KAAK,EAAE;AACL,gBAAA,KAAK,EAAE,UAAU;;AAEjB,gBAAA,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC;AACjB,aAAA;AACF,SAAA;QACD,QAAQ;AACR,QAAA,IAAI,EAAE,SAAS;AACf,QAAA,GAAG,EAAE,SAAS;AACd,QAAA,GAAG,EAAE,SAAS,GAAG,GAAG,GAAG,IAAI;KAC5B,CAAA;AACH,CAAC;AAED;;;;AAIG;AACH,SAAS,cAAc,CAAC,SAAc,EAAE,aAAkB,MAAM,EAAA;;;AAG9D,IAAA,MAAM,GAAG,GAAG,eAAe,GAAG,OAAO,GAAG,cAAc,CAAA;AACtD,IAAA,IAAI,SAAS,KAAK,cAAc,EAAE;QAAE,SAAS,GAAG,cAAc,CAAC;QAAC,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;KAAE;IACjH,OAAO;QACL,GAAG;AACH,QAAA,IAAI,EAAE;AACJ,YAAA,CAAC,EAAE,MAAM;AACT,YAAA,KAAK,EAAE;AACL,gBAAA,KAAK,EAAE,UAAU;;AAEjB,gBAAA,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC;AACpB,aAAA;AACF,SAAA;AACD,QAAA,QAAQ,EAAE,EAAE;AACZ,QAAA,IAAI,EAAE,SAAS;AACf,QAAA,GAAG,EAAE,SAAS;AACd,QAAA,GAAG,EAAE,eAAe;KACrB,CAAA;AACH,CAAC;AAED;;;;;;;;;AASG;AACH,SAAS,mBAAmB,CAAC,QAAe,EAAE,OAAc,EAAE,IAAS,EAAA;IACrE,WAAW,GAAG,IAAI,CAAA;IAClB,eAAe,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,IAAI,mBAAmB,CAAA;;;;;;;;IASxE,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;AACzC,IAAA,MAAM,KAAK,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,CAAS,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;;;;;IAM/F,IAAI,IAAI,GAAQ,EAAE,CAAA;IAClB,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,SAAkB,EAAE,KAAc,MAAM;AACrE,QAAA,GAAG,EAAE,CAAC,KAAU,KAAI;AAClB,YAAA,IAAI,SAAS;AAAE,gBAAA,IAAI,GAAG,KAAK,IAAI,EAAE,CAAA;AACjC,YAAA,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;;;YAGvB,OAAO,KAAK,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAA;SACnG;AACD,QAAA,GAAG,EAAE,CAAC,KAAU,EAAE,KAAU,KAAI;YAC9B,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,GAAG,GAAG,KAAK,EAAE,CAAA;;AAEhC,YAAA,OAAO,SAAS,GAAG,IAAI,GAAG,EAAE,GAAG,KAAK,EAAE,CAAA;SACvC;AACF,KAAA,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;IACjE,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;AAE/C,IAAA,SAAS,iBAAiB,CAAC,EAAE,KAAK,EAAO,EAAA;AACvC,QAAA,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;;AAEtB,YAAA,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;SAClC;AAED,QAAA,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAA;QAChC,IAAI,KAAK,GAAQ,cAAc,CAC7B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EACnB,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,EAClB,MAAM,CAAC,OAAO,CAAC,EACf,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EACtC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAC1B,CAAA;;AAGD,QAAA,KAAK,IAAI,CAAC,GAAG,OAAO,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;AACrC,YAAA,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;SAC7F;;;;QAKD,OAAO;AACL,YAAA,GAAG,EAAE,KAAK;YACV,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE;YACrC,QAAQ,EAAE,CAAC,KAAK,CAAC;AACjB,YAAA,IAAI,EAAE,SAAS;AACf,YAAA,GAAG,EAAE,SAAS;AACd,YAAA,GAAG,EAAE,gBAAgB;SACtB,CAAA;KACF;AAED,IAAA,iBAAiB,CAAC,aAAa,GAAG,mBAAmB,CAAA;;AAErD,IAAA,IAAI;AAAE,QAAA,MAAM,CAAC,cAAc,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAA;KAAE;AAAC,IAAA,OAAO,CAAC,EAAE,GAAE;;;IAIzH,MAAM,YAAY,GAAQ,EAAE,CAAA;AAC5B,IAAA,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAO,KAAI,EAAG,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,CAAA,EAAE,CAAC,CAAA;IAC/F,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAA;;IAE3C,iBAAiB,CAAC,YAAY,GAAG,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,CAAA;;;;;IAM3D,MAAM,YAAY,GAAQ,EAAE,CAAA;IAC5B,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAO,KAAI;AAC9B,QAAA,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;SAC1C;AACH,KAAC,CAAC,CAAA;IAEF,iBAAiB,CAAC,OAAO,GAAG;AAC1B,QAAA,GAAG,YAAY;AACf,QAAA,IAAI,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;AACvB,QAAA,QAAQ,EAAE,MAAM,eAAe;AAC/B,QAAA,WAAW,EAAE,MAAM,kBAAkB;AACrC,QAAA,WAAW,EAAE,MAAM,kBAAkB;KACtC,CAAA;AAED,IAAA,OAAO,iBAAiB,CAAA;AAC1B,CAAC;AAED;AACA,SAAS,SAAS,CAAC,QAAe,EAAE,OAAc,EAAA;IAChD,OAAO;AACL,QAAA,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,CAAS,KAAK,UAAU,GAAG,CAAC,CAAC;AACtD,QAAA,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,CAAS,KAAK,SAAS,GAAG,CAAC,CAAC;KACrD,CAAA;AACH,CAAC;AAED;;AAEG;AACH,SAAS,gBAAgB,CAAC,GAAQ,EAAA;AAChC,IAAA,IAAI,CAAC,GAAG;AAAE,QAAA,OAAO,EAAE,CAAA;AACnB,IAAA,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC,CAAM,KAAK,OAAO,CAAC,KAAK,UAAU,CAAC,CAAA;AACvF,CAAC;AAEK,SAAU,cAAc,CAAC,WAAwB,EAAA;AACrD,IAAA,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,WAAW,CAAA;AACpC,IAAA,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,IAAI,EAAE,CAAA;IAEnC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACjD,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AAC/C,IAAA,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;;;IAI1D,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;;;AAI1C,IAAA,IAAI,WAAW,CAAC,UAAU,EAAE;AAC1B,QAAA,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;YAAG,CAAS,EAAE,KAAK,EAAE,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,CAAA;KAC1G;;IAGD,eAAe,GAAG,IAAI,CAAA;AACtB,IAAA,kBAAkB,GAAG,WAAW,CAAC,WAAW,IAAI,EAAE,CAAA;;;IAGlD,kBAAkB,GAAG,WAAW,CAAC,WAAW;YACtC,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAA;;IAGvF,IAAI,QAAQ,EAAE;QACZ,IAAI,UAAU,EAAE;;;;YAId,IAAI,OAAO,MAAM,KAAK,WAAW;gBAAE,MAAM,CAAC,aAAa,GAAG,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAA;YACvF,WAAW,GAAG,IAAI,CAAA;YAClB,eAAe,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,IAAI,mBAAmB,CAAA;AACxE,YAAA,cAAc,EAAE,CAAA;AAEhB,YAAA,MAAM,YAAY,GAAG,EAAE,IAAI,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAA;;AAE9D,YAAA,MAAM,QAAQ,GAAG,CAAC,KAAU,MAAM,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;;AAEnE,YAAA,MAAM,EAAE,GAAI,UAAkB,CAAC,SAAS,CAAA;AACxC,YAAA,EAAE,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;SAC/B;aAAM;;AAEL,YAAA,IAAI,YAAiB,CAAA;YACrB,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,qBAAqB,KAAK,SAAS,EAAE;AAC/E,gBAAA,YAAY,GAAG,MAAM,CAAC,qBAAqB,CAAA;gBAC3C,OAAO,MAAM,CAAC,qBAAqB,CAAA;aACpC;iBAAM;gBACL,YAAY,GAAG,IAAI,CAAA;aACpB;AAED,YAAA,IAAI,YAAY,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;;;gBAGvE,MAAM,aAAa,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAA;AAC/C,gBAAA,IAAI,SAAS,GAAG,YAAY,CAAC,IAAI,CAAA;gBACjC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,CAAS,KAAI;AACvC,oBAAA,IAAI,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;oBAC7B,IAAI,KAAK,KAAK,SAAS;wBAAE,OAAM;AAC/B,oBAAA,IAAI,CAAC,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,IAAI,MAAM,IAAI,KAAK,EAAE;wBACtD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAA;wBAC/B,IAAI,SAAS,KAAK,SAAS;4BAAE,SAAS,GAAG,IAAI,CAAA;wBAC7C,KAAK,GAAG,IAAI,CAAA;qBACb;oBACD,aAAa,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;AAC9C,iBAAC,CAAC,CAAA;gBACF,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,IAAI,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAA;aAClF;iBAAM;;AAEL,gBAAA,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,EAAE,IAAI,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAA;aACrE;;YAGD,IAAI,CAAC,OAAO,GAAG;gBACb,GAAG,IAAI,CAAC,OAAO;AACf,gBAAA,QAAQ,EAAE,MAAM,eAAe;AAC/B,gBAAA,WAAW,EAAE,MAAM,kBAAkB;AACrC,gBAAA,WAAW,EAAE,MAAM,kBAAkB;aACtC,CAAA;YAED,MAAM,SAAS,GAAG,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;AAE9D,YAAA,IAAI;;;AAGF,gBAAA,UAAU,GAAG,GAAG,CAAC,SAAS,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,aAAa,EAAE,CAAQ,CAAA;aACxI;YAAC,OAAO,GAAQ,EAAE;AACjB,gBAAA,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAA;gBACxD,MAAM,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;gBACtD,IAAI,SAAS,EAAE;oBACb,SAAS,CAAC,SAAS,GAAG,CAAA;;AAEb,iBAAA,EAAA,MAAM,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,CAAA;iBAC5B,CAAA;iBACR;aACF;SACF;;KAGF;SAAM;QACL,IAAI,UAAU,EAAE;YACd,UAAU,CAAC,OAAO,EAAE,CAAA;YACpB,UAAU,GAAG,IAAI,CAAA;SAClB;AAED,QAAA,IAAI,YAAiB,CAAA;;QAErB,IAAI,WAAW,GAAG,KAAK,CAAA;QACvB,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,qBAAqB,KAAK,SAAS,EAAE;AAC/E,YAAA,YAAY,GAAG,MAAM,CAAC,qBAAqB,CAAA;YAC3C,OAAO,MAAM,CAAC,qBAAqB,CAAA;YACnC,WAAW,GAAG,IAAI,CAAA;SACnB;aAAM;AACL,YAAA,YAAY,GAAG,EAAE,IAAI,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAA;SACzD;AAED,QAAA,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,CAAA;QACvC,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,CAAC,OAAO;AACf,YAAA,QAAQ,EAAE,MAAM,eAAe;AAC/B,YAAA,WAAW,EAAE,MAAM,kBAAkB;AACrC,YAAA,WAAW,EAAE,MAAM,kBAAkB;SACtC,CAAA;AAED,QAAA,IAAI;;;;AAIF,YAAA,MAAM,SAAS,GAAG,WAAW,CAAC,WAAW,IAAI,WAAW,CAAA;AACxD,YAAA,UAAU,GAAG,GAAG,CAAC,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,EAAE,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,aAAa,EAAE,CAAQ,CAAA;SAC9I;QAAC,OAAO,GAAQ,EAAE;AACjB,YAAA,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAA;YACxD,MAAM,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;YACtD,IAAI,SAAS,EAAE;gBACb,SAAS,CAAC,SAAS,GAAG,CAAA;;AAEb,eAAA,EAAA,MAAM,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,CAAA;eAC5B,CAAA;aACR;SACF;KACF;;AAGD,IAAA,IAAI,MAAM,CAAC,KAAK,EAAE;AAChB,QAAA,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;KAC9B;AACH;;;;"}

package/dist/vike/onRenderHtml.cjs.js

@@ -28,6 +28,15 @@ function esc(str) {
         .replace(/>/g, '>')
         .replace(/"/g, '"');
 }
+/**
+ * PLAN-4 G-207: the uid() path part of a shell component or the Page (wrapper_0 → 'w0',
+ * layout_1 → 'l1', page → 'p'), as onRenderClient gives each nested vnode in its `id` prop. Each
+ * one renders here as its own root, so its root is 'u' plus the parts of the shell around it and
+ * its own: the same uids as the client's nested instances.
+ */
+function uidPart(key) {
+    return key == 'page' ? 'p' : key[0] + key.slice(key.indexOf('_') + 1);
+}
 function onRenderHtml(pageContext) {
     const { Page, config } = pageContext;
     const data = pageContext.data || {};
@@ -84,6 +93,8 @@ function onRenderHtml(pageContext) {
         routeParams: () => pageContext.routeParams || {},
         urlPathname: () => pageContext.urlPathname || '',
     };
+    // PLAN-3 5-5 (H-7): the seeded cache the components' resources render from
+    const cache = pageContext.queryCache ? sygnal.queryCache({ initial: pageContext.queryCache }) : undefined;
     // Determine if Wrapper(s) and/or Layout(s) are present — this affects hydration state shape
     const wrapperArray = config.Wrapper
         ? (Array.isArray(config.Wrapper) ? config.Wrapper : [config.Wrapper])
@@ -94,14 +105,31 @@ function onRenderHtml(pageContext) {
             .filter((L) => typeof L === 'function')
         : [];
     const hasShell = wrapperArray.length > 0 || layoutArray.length > 0;
+    // Combined shell: wrappers (outermost) + layouts (innermost around Page)
+    // Must match the order used in onRenderClient's createLayoutWrapper.
+    const shell = [
+        ...wrapperArray.map((w, i) => ({ comp: w, key: 'wrapper_' + i })),
+        ...layoutArray.map((l, i) => ({ comp: l, key: 'layout_' + i })),
+    ];
+    // G-207: with a shell, the client nests each shell component and the Page in the one outside it
+    // with an `id` prop (onRenderClient), so their uid roots are 'u-w0', 'u-w0-l0', 'u-w0-l0-p'
+    const uidRoot = (i) => ['u', ...shell.slice(0, i + 1).map(s => uidPart(s.key))].join('-');
+    const pageUid = hasShell ? uidRoot(shell.length - 1) + '-' + uidPart('page') : undefined;
     // Render the page component to HTML, with error boundary.
     // When layouts are present, the hydration state is serialized separately
     // as the wrapper's combined state (with page + layout slices).
+    // PLAN-3 (HEAD driver): the `head` statics of the rendered components (shell first, so the page's win)
+    const pageHeads = [], shellHeads = [];
     let pageHtml;
     try {
         pageHtml = sygnal.renderToString(Page, {
             state: initialState,
+            onError: config.sygnalOnError,
+            // G-207: the client's uid base and `id` prop for the nested Page
+            ...(hasShell && { uid: pageUid, props: { id: uidPart('page') } }),
             hydrateState: hasShell ? false : '__VIKE_SYGNAL_STATE__',
+            head: pageHeads,
+            cache,
         });
     }
     catch (err) {
@@ -131,26 +159,34 @@ function onRenderHtml(pageContext) {
     // If Layout(s) and/or Wrapper(s) are defined, render them wrapping the page content.
     // HTML is rendered INSIDE #page-view so the structure matches the client-side
     // wrapper component. Nesting order: Wrapper > Layout > Page.
-    // Each shell component receives page content via a placeholder in its children slot.
+    // Each shell component receives the page content as a placeholder. G-464: a placeholder element
+    // as its `children` (`<main>{children}</main>`, as on the client), and, for a Layout written
+    // for the server only, the `innerHTML` prop.
     let pageViewContent = pageHtml;
     if (hasShell) {
-        // Combined shell: wrappers (outermost) + layouts (innermost around Page)
-        // Must match the order used in onRenderClient's createLayoutWrapper.
-        const shell = [
-            ...wrapperArray.map((w, i) => ({ comp: w, key: 'wrapper_' + i })),
-            ...layoutArray.map((l, i) => ({ comp: l, key: 'layout_' + i })),
-        ];
+        // G-491: with attributes too (a shell whose root, or fragment's first element, is the slot
+        // carries the SSR root stamp: data-sygnal-ssr="")
+        const SLOT = /<sygnal-page-slot(?:\s[^>]*)?><\/sygnal-page-slot>/;
+        const PLACEHOLDER = '<!--SYGNAL_PAGE_SLOT-->';
         // Wrap from innermost to outermost (reverse order)
         for (let i = shell.length - 1; i >= 0; i--) {
-            const { comp } = shell[i];
-            const PLACEHOLDER = '<!--SYGNAL_PAGE_SLOT-->';
+            const { comp, key } = shell[i];
+            const slot = { sel: 'sygnal-page-slot', data: {}, children: [], text: undefined, elm: undefined, key: undefined };
             const compHtml = sygnal.renderToString(comp, {
                 state: comp.initialState || {},
-                props: { innerHTML: PLACEHOLDER },
+                // G-207: the uid root and `id` prop the client's nested instance has
+                uid: uidRoot(i),
+                props: { innerHTML: PLACEHOLDER, id: uidPart(key), children: [slot] },
+                head: shellHeads,
+                cache,
+                onError: config.sygnalOnError,
             });
-            const splitIdx = compHtml.indexOf(PLACEHOLDER);
+            const m = SLOT.exec(compHtml);
+            let splitIdx = m ? m.index : -1, len = m ? m[0].length : 0;
+            if (splitIdx === -1)
+                splitIdx = compHtml.indexOf(PLACEHOLDER), len = PLACEHOLDER.length;
             if (splitIdx !== -1) {
-                pageViewContent = compHtml.substring(0, splitIdx) + pageViewContent + compHtml.substring(splitIdx + PLACEHOLDER.length);
+                pageViewContent = compHtml.substring(0, splitIdx) + pageViewContent + compHtml.substring(splitIdx + len);
             }
             else {
                 // Fallback: component didn't use children/innerHTML, wrap content after it
@@ -159,17 +195,12 @@ function onRenderHtml(pageContext) {
         }
         // Wrap in a shell div matching the client-side wrapper's root element
         pageViewContent = `<div id="vike-shell">${pageViewContent}</div>`;
-        // Serialize the wrapper's combined state for hydration.
-        // Must match the state shape from createLayoutWrapper:
-        //   { wrapper_0: {...}, layout_0: { ...layoutState, page: pageState } }
+        // Serialize the wrapper's combined state for hydration. Must match the state shape
+        // from createLayoutWrapper (D50: sibling slices at the root):
+        //   { wrapper_0: { ...wrapperState }, layout_0: { ...layoutState }, page: pageState }
         const wrapperState = {};
-        shell.forEach(({ comp, key }, i) => {
-            const compState = { ...(comp.initialState || {}) };
-            if (i === shell.length - 1) {
-                compState.page = initialState;
-            }
-            wrapperState[key] = compState;
-        });
+        shell.forEach(({ comp, key }) => { wrapperState[key] = { ...(comp.initialState || {}) }; });
+        wrapperState.page = initialState;
         pageViewContent += `<script>window.__VIKE_SYGNAL_STATE__=${JSON.stringify(wrapperState)}</script>`;
     }
     // Render Head component for <head> tags
@@ -186,8 +217,12 @@ function onRenderHtml(pageContext) {
     const description = config.description || '';
     const favicon = config.favicon || '';
     const lang = config.lang || 'en';
-    const titleTag = title ? `<title>${esc(title)}</title>` : '';
-    const descTag = description
+    const heads = [...shellHeads, ...pageHeads].filter(Boolean);
+    // with `head` statics, config.title / description are the defaults they override
+    const titleTag = heads.length
+        ? sygnal.renderHead([{ title: title || undefined, meta: { description: description || undefined } }, ...heads])
+        : title ? `<title>${esc(title)}</title>` : '';
+    const descTag = description && !heads.length
         ? `<meta name="description" content="${esc(description)}">`
         : '';
     const faviconTag = favicon
@@ -215,3 +250,4 @@ function onRenderHtml(pageContext) {
 }
 
 exports.onRenderHtml = onRenderHtml;
+//# sourceMappingURL=onRenderHtml.cjs.js.map