@zenithbuild/runtime 0.7.11 → 0.7.12

package/dist/expressions.js

@@ -1,5 +1,6 @@
 import { throwZenithRuntimeError, DOCS_LINKS } from './diagnostics.js';
 import { _fragment } from './markup.js';
+import { readSsrPayload } from './payload.js';
 export const UNRESOLVED_LITERAL = Symbol('unresolved_literal');
 const OWN = Object.prototype.hasOwnProperty;
 export const STRICT_MEMBER_CHAIN_LITERAL_RE = /^(?:true|false|null|undefined|[A-Za-z_$][A-Za-z0-9_$]*(\.[A-Za-z_$][A-Za-z0-9_$]*)*)$/;
@@ -56,12 +57,13 @@ export function _evaluateExpression(binding, stateValues, stateKeys, signalMap,
     if (primitiveValue !== UNRESOLVED_LITERAL) {
         return primitiveValue;
     }
-    const canonicalRootValue = _rcr(trimmedLiteral, params, ssrData, runtimeProps);
+    const hydrationSsrData = _resolveHydrationSsrData(binding, ssrData);
+    const canonicalRootValue = _rcr(trimmedLiteral, params, hydrationSsrData, runtimeProps);
     if (canonicalRootValue !== UNRESOLVED_LITERAL) {
         return canonicalRootValue;
     }
     const source = _resolveBindingSource(binding, markerBinding, eventBinding);
-    const strictMemberValue = _resolveStrictMemberChainLiteral(trimmedLiteral, stateValues, stateKeys, params, ssrData, mode, runtimeProps, binding.marker_index, source);
+    const strictMemberValue = _resolveStrictMemberChainLiteral(trimmedLiteral, stateValues, stateKeys, params, hydrationSsrData, mode, runtimeProps, binding.marker_index, source);
     if (strictMemberValue !== UNRESOLVED_LITERAL) {
         return strictMemberValue;
     }
@@ -236,6 +238,22 @@ function _rcb(binding, componentBindings) {
     }
     return instanceBindings[binding.component_binding];
 }
+function _resolveHydrationSsrData(binding, ssrData) {
+    const payload = readSsrPayload(ssrData);
+    const scopedDataKey = typeof binding?.scoped_data_key === 'string' && binding.scoped_data_key.length > 0
+        ? binding.scoped_data_key
+        : null;
+    if (!scopedDataKey) {
+        return payload.route;
+    }
+    if (!OWN.call(payload.scoped, scopedDataKey) || !_isObjectRecord(payload.scoped[scopedDataKey])) {
+        throw new Error(`[Zenith:ScopedServerData] Missing scoped hydration payload for ${scopedDataKey}`);
+    }
+    return payload.scoped[scopedDataKey];
+}
+function _isObjectRecord(value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+}
 function _rcr(literal, params, ssrData, props) {
     if (literal === 'data' || literal === 'ssr')
         return ssrData;

package/dist/payload.d.ts

@@ -13,6 +13,10 @@ export function _validatePayload(payload: any): {
     props: any;
     exprFns: any;
 };
+export function readSsrPayload(raw: any): {
+    route: any;
+    scoped: any;
+};
 export function _resolveComponentProps(propTable: any, signalMap: any): any;
 export function _deepFreezePayload(obj: any): void;
 export function _isHydrationRefObject(obj: any): boolean;

package/dist/payload.js

@@ -139,6 +139,13 @@ export function _validatePayload(payload) {
         exprFns: _f(exprFns)
     };
 }
+export function readSsrPayload(raw) {
+    const root = _ir(raw) ? raw : {};
+    return {
+        route: root,
+        scoped: _ir(root.scoped) ? root.scoped : {}
+    };
+}
 function _assertValidSourceSpan(source, contextLabel) {
     if (source === undefined || source === null) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenithbuild/runtime",
-  "version": "0.7.11",
+  "version": "0.7.12",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {