@statorjs/stator 1.4.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statorjs/stator",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Server-canonical web framework: business logic in composable state machines, UI as a thin renderer binding machine outputs to DOM positions. Ships TypeScript source (Vite/tsx-native by design).",
   "license": "MIT",
   "type": "module",
@@ -88,7 +88,7 @@
     "pino-pretty": "^13.1.3",
     "vite": "^6.0.0",
     "vitest": "^2.1.0",
-    "@statorjs/stator": "1.4.0"
+    "@statorjs/stator": "1.4.1"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",

package/src/template/directives/list-attr.ts

@@ -21,6 +21,15 @@ import { type DirectiveInvocation, defineDirective, invoke } from './core.ts'
 
 type ConditionalEntry<TValue> = TValue | ReadResult<TValue>
 
+/** Resolve the machine instance a spec read evaluates against. During a
+ *  fan-out recompute this returns the CURRENT proxy — the ReadResult's captured
+ *  `.instance` was frozen at first render, and `rehydrate()` has since replaced
+ *  the connection's actor (FINDINGS #3, one composition boundary further out:
+ *  the spec object outlives the render that built it). Null runtime (initial
+ *  render, request-scoped recompute) falls back to the captured instance,
+ *  which is current there by construction. */
+type InstanceResolver = (r: ReadResult<unknown>) => unknown
+
 /** Recursive shape accepted by class:list. */
 export type ClassListSpec =
   | string
@@ -41,8 +50,8 @@ export type StyleListSpec =
   | Record<string, ConditionalEntry<string | number | null | undefined>>
   | StyleListSpec[]
 
-function evalRead<T>(value: ConditionalEntry<T>): T {
-  return isReadResult(value) ? (value.selector(value.instance) as T) : value
+function evalRead<T>(value: ConditionalEntry<T>, resolve: InstanceResolver): T {
+  return isReadResult(value) ? (value.selector(resolve(value)) as T) : value
 }
 
 /** Backstop for hand-written templates (the compiler rejects this at build
@@ -78,42 +87,42 @@ function collectMachines(spec: unknown, out: Set<string>): void {
   }
 }
 
-function composeClass(spec: ClassListSpec): string {
+function composeClass(spec: ClassListSpec, resolve: InstanceResolver): string {
   const parts: string[] = []
-  walkClass(spec, parts)
+  walkClass(spec, parts, resolve)
   return parts.join(' ')
 }
 
-function walkClass(spec: ClassListSpec, out: string[]): void {
+function walkClass(spec: ClassListSpec, out: string[], resolve: InstanceResolver): void {
   if (spec == null || spec === false) return
   if (typeof spec === 'string') {
     if (spec.length > 0) out.push(spec)
     return
   }
   if (isReadResult(spec)) {
-    const v = spec.selector(spec.instance)
+    const v = spec.selector(resolve(spec))
     if (typeof v === 'string' && v.length > 0) out.push(v)
     return
   }
   if (Array.isArray(spec)) {
-    for (const item of spec) walkClass(item, out)
+    for (const item of spec) walkClass(item, out, resolve)
     return
   }
   if (typeof spec === 'object') {
     for (const [name, cond] of Object.entries(spec)) {
-      const truthy = evalRead(cond)
+      const truthy = evalRead(cond, resolve)
       if (truthy) out.push(name)
     }
   }
 }
 
-function composeStyle(spec: StyleListSpec): string {
+function composeStyle(spec: StyleListSpec, resolve: InstanceResolver): string {
   const decls: string[] = []
-  walkStyle(spec, decls)
+  walkStyle(spec, decls, resolve)
   return decls.join('; ')
 }
 
-function walkStyle(spec: StyleListSpec, out: string[]): void {
+function walkStyle(spec: StyleListSpec, out: string[], resolve: InstanceResolver): void {
   if (spec == null || spec === false) return
   if (typeof spec === 'string') {
     const trimmed = spec.trim()
@@ -121,19 +130,19 @@ function walkStyle(spec: StyleListSpec, out: string[]): void {
     return
   }
   if (isReadResult(spec)) {
-    const v = spec.selector(spec.instance)
+    const v = spec.selector(resolve(spec))
     if (typeof v === 'string' && v.trim().length > 0) {
       out.push(v.trim().replace(/;\s*$/, ''))
     }
     return
   }
   if (Array.isArray(spec)) {
-    for (const item of spec) walkStyle(item, out)
+    for (const item of spec) walkStyle(item, out, resolve)
     return
   }
   if (typeof spec === 'object') {
     for (const [prop, raw] of Object.entries(spec)) {
-      const value = evalRead(raw)
+      const value = evalRead(raw, resolve)
       if (value == null || value === '') continue
       // A single property's value must not carry `;` — a `read()`-sourced value
       // like `red; position: fixed; …` would otherwise inject extra
@@ -156,26 +165,32 @@ function cssValue(v: string): string {
 /**
  * Register one attr-binding per unique machine the spec depends on. Each
  * binding's selector ignores its arg and recomputes the entire attribute
- * by re-walking the spec — every ReadResult inside re-evaluates its
- * `.selector(.instance)`, returning fresh state.
+ * by re-walking the spec — every ReadResult inside re-evaluates its selector
+ * against the RESOLVED instance (current proxy under a fan-out recompute,
+ * the captured one otherwise), returning fresh state.
  */
 function bindListAttr<TSpec>(
   state: RenderState,
   spec: TSpec,
   attrName: string,
   elementId: string,
-  compose: (spec: TSpec) => string,
+  compose: (spec: TSpec, resolve: InstanceResolver) => string,
 ): string {
   const machines = new Set<string>()
   collectMachines(spec, machines)
 
-  const initial = compose(spec)
+  // Resolution is per-evaluation, through the render state the binding was
+  // registered under — recompute sets `currentRuntime` for the fan-out pass.
+  const resolve: InstanceResolver = (r) =>
+    state.currentRuntime?.proxyFor(r.machineName) ?? r.instance
+
+  const initial = compose(spec, resolve)
   for (const machineName of machines) {
     const slotId = allocSlotId(state)
     registerBinding(state, {
       slotId,
       machineName,
-      selector: () => compose(spec),
+      selector: () => compose(spec, resolve),
       lastValue: initial,
       kind: 'attr',
       attrName,