sygnal 6.6.0 → 7.1.0

package/dist/astro/server.cjs.js

@@ -3063,7 +3063,7 @@ function withUses(def, state) {
  * state reads from the cache ('success' with the cached data), else 'loading' ('idle' for a
  * falsy request), as the client's first paint does with the same (hydrated) cache
  */
-function withResources(def, state) {
+function withResources(def, state, ctx) {
     state = withUses(def, state);
     const res = def && def.resources;
     if (!res || !state || typeof state !== 'object' || Array.isArray(state))
@@ -3074,7 +3074,7 @@ function withResources(def, state) {
             continue;
         let q;
         try {
-            q = typeof res[n] === 'function' ? res[n](state) : res[n];
+            q = typeof res[n] === 'function' ? res[n](state, ctx) : res[n];
         }
         catch (_) { }
         const E = q && ssrCache ? ssrCache.get(ssrCache.key(q, 1)) : undefined;
@@ -3121,15 +3121,33 @@ function viewFailed(def, err, name) {
     }
     return vnode;
 }
-function collectHead(def, state) {
+function collectHead(def, state, ctx) {
     const h = def && def.head;
     if (!heads || !h)
         return;
     try {
-        heads.push(typeof h === 'function' ? h(state) : h);
+        heads.push(typeof h === 'function' ? h(state, ctx) : h);
     }
     catch (_) { }
 }
+/**
+ * PLAN-13 F-1: the context a component sees (its parent's, plus its own entries computed on
+ * `state`). The statics get it as on the client; for `resources` it is computed on the state
+ * before the resources are filled in (a context entry can't read the component's own resource)
+ */
+function contextOf(def, state, parent) {
+    const own = def.context || {}, out = { ...parent };
+    for (const key of Object.keys(own)) {
+        const f = own[key];
+        if (typeof f === 'function' && state != null) {
+            try {
+                out[key] = f(state);
+            }
+            catch (_) { }
+        }
+    }
+    return out;
+}
 /**
  * Render a Sygnal component to an HTML string.
  *
@@ -3170,20 +3188,10 @@ function renderRoot(componentDef, options) {
     const uid = (options.uid || 'u').replace(/[^\w-]+/g, '_');
     const ownState = state !== undefined ? state : componentDef.initialState;
     // 5-5: the view sees its resources; the hydration script keeps the state as it was given
-    const resolvedState = withResources(componentDef, ownState);
-    collectHead(componentDef, resolvedState);
+    const resolvedState = withResources(componentDef, ownState, contextOf(componentDef, ownState, context));
     // Build context: merge parent context with component's own context definitions
-    const componentContext = componentDef.context || {};
-    const mergedContext = { ...context };
-    for (const key of Object.keys(componentContext)) {
-        const contextFn = componentContext[key];
-        if (typeof contextFn === 'function' && resolvedState != null) {
-            try {
-                mergedContext[key] = contextFn(resolvedState);
-            }
-            catch (_) { }
-        }
-    }
+    const mergedContext = contextOf(componentDef, resolvedState, context);
+    collectHead(componentDef, resolvedState, mergedContext);
     // Call the view function
     let vnode;
     try {
@@ -3394,19 +3402,9 @@ function renderSubComponent(vnode, context, parentState, uid) {
         // State passed directly
         childState = stateProp;
     }
-    childState = withResources(componentDef, childState);
+    childState = withResources(componentDef, childState, contextOf(componentDef, childState, context));
     // Build child context
-    const childContext = { ...context };
-    const componentContext = componentDef.context || {};
-    for (const key of Object.keys(componentContext)) {
-        const contextFn = componentContext[key];
-        if (typeof contextFn === 'function' && childState != null) {
-            try {
-                childContext[key] = contextFn(childState);
-            }
-            catch (_) { }
-        }
-    }
+    const childContext = contextOf(componentDef, childState, context);
     // Extract slots from children
     const slots = {};
     const defaultSlotChildren = [];
@@ -3428,7 +3426,7 @@ function renderSubComponent(vnode, context, parentState, uid) {
             slots.default = [];
         slots.default.push(...defaultSlotChildren);
     }
-    collectHead(componentDef, childState);
+    collectHead(componentDef, childState, childContext);
     // Call the view function
     let result;
     try {
@@ -3645,19 +3643,10 @@ function renderSwitchable(vnode, context, parentState, uid) {
  * Internal helper: render a component def to a VNode (not HTML string).
  */
 function renderToStringInternal(componentDef, state, context, uid) {
-    const resolvedState = withResources(componentDef, state !== undefined ? state : componentDef.initialState);
-    const componentContext = componentDef.context || {};
-    const mergedContext = { ...context };
-    for (const key of Object.keys(componentContext)) {
-        const contextFn = componentContext[key];
-        if (typeof contextFn === 'function' && resolvedState != null) {
-            try {
-                mergedContext[key] = contextFn(resolvedState);
-            }
-            catch (_) { }
-        }
-    }
-    collectHead(componentDef, resolvedState);
+    const own = state !== undefined ? state : componentDef.initialState;
+    const resolvedState = withResources(componentDef, own, contextOf(componentDef, own, context));
+    const mergedContext = contextOf(componentDef, resolvedState, context);
+    collectHead(componentDef, resolvedState, mergedContext);
     let vnode;
     try {
         vnode = componentDef({