@jay-framework/stack-client-runtime 0.12.0 → 0.14.0

package/dist/index.cjs

@@ -80,23 +80,56 @@ function mergeArraysByTrackBy$1(baseArray, overlayArray, trackByField, trackByMa
   });
 }
 const HEADLESS_INSTANCES = runtime.createJayContext();
-function makeSignals$1(obj) {
+function makeSignals$2(obj) {
   return Object.keys(obj).reduce((signals, key) => {
     signals[key] = component.createSignal(obj[key]);
     return signals;
   }, {});
 }
-function makeHeadlessInstanceComponent(preRender, interactiveConstructor, coordinateKey, pluginContexts = []) {
-  const wrappedConstructor = (props, refs, ...pluginResolvedContexts) => {
+function makeHeadlessInstanceComponent(preRender, componentDef, coordinateKey) {
+  const interactiveConstructor = componentDef.comp;
+  const resolvedContexts = componentDef.contexts ?? [];
+  const clientDefaults = componentDef.clientDefaults;
+  const wrappedConstructor = (signalProps, refs, ...pluginResolvedContexts) => {
     const instanceData = runtime.useContext(HEADLESS_INSTANCES);
-    const fastVS = instanceData?.viewStates?.[coordinateKey];
-    const cf = instanceData?.carryForwards?.[coordinateKey] || {};
-    const signalVS = fastVS ? makeSignals$1(fastVS) : void 0;
-    return interactiveConstructor(props, refs, signalVS, cf, ...pluginResolvedContexts);
+    const resolvedKey = typeof coordinateKey === "function" ? coordinateKey(runtime.currentConstructionContext()?.dataIds ?? []) : coordinateKey;
+    const suffixKey = resolvedKey.includes("/") && resolvedKey.includes(":") ? resolvedKey.split("/").find((s) => s.includes(":")) ?? resolvedKey : resolvedKey;
+    const fastVS = instanceData?.viewStates?.[resolvedKey] ?? instanceData?.viewStates?.[suffixKey];
+    const cf = instanceData?.carryForwards?.[resolvedKey] ?? instanceData?.carryForwards?.[suffixKey];
+    let resolvedFastVS;
+    let resolvedCf;
+    if (fastVS) {
+      resolvedFastVS = fastVS;
+      resolvedCf = cf || {};
+    } else if (clientDefaults) {
+      const rawProps = signalProps.props();
+      const defaults = clientDefaults(rawProps);
+      resolvedFastVS = defaults.viewState;
+      resolvedCf = defaults.carryForward ?? {};
+    } else {
+      console.warn(
+        `[Jay] Headless instance "${resolvedKey}" has no server data and no clientDefaults. Add .withClientDefaults() to the component definition to provide fallback values.`
+      );
+      resolvedFastVS = {};
+      resolvedCf = {};
+    }
+    const signalVS = makeSignals$2(resolvedFastVS);
+    const compCore = interactiveConstructor(
+      signalProps,
+      refs,
+      signalVS,
+      resolvedCf,
+      ...pluginResolvedContexts
+    );
+    const originalRender = compCore.render;
+    compCore.render = () => {
+      return { ...resolvedFastVS, ...originalRender() };
+    };
+    return compCore;
   };
-  return component.makeJayComponent(preRender, wrappedConstructor, ...pluginContexts);
+  return component.makeJayComponent(preRender, wrappedConstructor, ...resolvedContexts);
 }
-function makeSignals(obj) {
+function makeSignals$1(obj) {
   return Object.keys(obj).reduce((signals, key) => {
     signals[key] = component.createSignal(obj[key]);
     return signals;
@@ -112,21 +145,93 @@ function makeCompositeJayComponent(preRender, defaultViewState, fastCarryForward
   if (headlessInstanceCarryForwards)
     delete fastCarryForward.__headlessInstances;
   const comp = (props, refs, ...contexts) => {
-    if (headlessInstanceViewStates || headlessInstanceCarryForwards) {
-      const componentContext = runtime.useContext(component.COMPONENT_CONTEXT);
-      const instancesData = {
-        viewStates: headlessInstanceViewStates || {},
-        carryForwards: headlessInstanceCarryForwards || {}
-      };
-      componentContext.provideContexts.push([HEADLESS_INSTANCES, instancesData]);
-    }
+    const componentContext = runtime.useContext(component.COMPONENT_CONTEXT);
+    const instancesData = {
+      viewStates: headlessInstanceViewStates || {},
+      carryForwards: headlessInstanceCarryForwards || {}
+    };
+    componentContext.provideContexts.push([HEADLESS_INSTANCES, instancesData]);
+    const instances = interactiveParts.map(
+      (part) => {
+        const partRefs = part.key ? refs[part.key] : refs;
+        let partContexts;
+        if (hasFastRendering) {
+          const partViewState = part.key ? defaultViewState?.[part.key] : defaultViewState;
+          const partFastViewState = partViewState ? makeSignals$1(partViewState) : makeSignals$1({});
+          const partCarryForward = part.key ? fastCarryForward?.[part.key] : fastCarryForward;
+          partContexts = [
+            partFastViewState,
+            partCarryForward,
+            ...contexts.splice(0, part.contextMarkers.length)
+          ];
+        } else {
+          partContexts = [...contexts.splice(0, part.contextMarkers.length)];
+        }
+        return [part.key, part.comp(props, partRefs, ...partContexts)];
+      }
+    );
+    return {
+      render: () => {
+        let viewState = defaultViewState;
+        instances.forEach(([key, instance]) => {
+          const rendered = component.materializeViewState(instance.render());
+          if (key) {
+            viewState[key] = deepMergeViewStates$1(
+              defaultViewState[key],
+              rendered,
+              trackByMap,
+              key
+            );
+          } else {
+            viewState = deepMergeViewStates$1(
+              viewState,
+              rendered,
+              trackByMap
+            );
+          }
+        });
+        return viewState;
+      }
+    };
+  };
+  const contextMarkers = interactiveParts.reduce((cm, part) => {
+    return [...cm, ...part.contextMarkers];
+  }, []);
+  return component.makeJayComponent(
+    preRender,
+    comp,
+    ...contextMarkers
+  );
+}
+function makeSignals(obj) {
+  return Object.keys(obj).reduce((signals, key) => {
+    signals[key] = component.createSignal(obj[key]);
+    return signals;
+  }, {});
+}
+function hydrateCompositeJayComponent(hydratePreRender, defaultViewState, fastCarryForward, parts, trackByMap = {}, rootElement) {
+  const interactiveParts = parts.filter((part) => part.comp !== void 0);
+  const hasFastRendering = defaultViewState !== null && defaultViewState !== void 0;
+  const headlessInstanceViewStates = defaultViewState?.__headlessInstances;
+  const headlessInstanceCarryForwards = fastCarryForward?.__headlessInstances;
+  if (headlessInstanceViewStates)
+    delete defaultViewState.__headlessInstances;
+  if (headlessInstanceCarryForwards)
+    delete fastCarryForward.__headlessInstances;
+  const comp = (props, refs, ...contexts) => {
+    const componentContext = runtime.useContext(component.COMPONENT_CONTEXT);
+    const instancesData = {
+      viewStates: headlessInstanceViewStates || {},
+      carryForwards: headlessInstanceCarryForwards || {}
+    };
+    componentContext.provideContexts.push([HEADLESS_INSTANCES, instancesData]);
     const instances = interactiveParts.map(
       (part) => {
         const partRefs = part.key ? refs[part.key] : refs;
         let partContexts;
         if (hasFastRendering) {
           const partViewState = part.key ? defaultViewState?.[part.key] : defaultViewState;
-          const partFastViewState = partViewState ? makeSignals(partViewState) : void 0;
+          const partFastViewState = partViewState ? makeSignals(partViewState) : makeSignals({});
           const partCarryForward = part.key ? fastCarryForward?.[part.key] : fastCarryForward;
           partContexts = [
             partFastViewState,
@@ -166,6 +271,7 @@ function makeCompositeJayComponent(preRender, defaultViewState, fastCarryForward
   const contextMarkers = interactiveParts.reduce((cm, part) => {
     return [...cm, ...part.contextMarkers];
   }, []);
+  const preRender = (options) => hydratePreRender(rootElement, options);
   return component.makeJayComponent(
     preRender,
     comp,
@@ -357,14 +463,13 @@ function collectInteractionsRecursive(refs, interactions) {
       continue;
     if (refImpl.elements && refImpl.elements instanceof Set) {
       for (const elem of refImpl.elements) {
-        if (elem.element) {
+        if (elem.element && !isDisabled(elem.element)) {
           interactions.push({
             refName,
             coordinate: elem.coordinate || [refName],
             element: elem.element,
-            elementType: getElementType(elem.element),
             supportedEvents: getSupportedEvents(elem.element),
-            itemContext: elem.viewState
+            description: elem.description
           });
         }
       }
@@ -383,8 +488,12 @@ function isNestedRefsObject(obj) {
     return false;
   return true;
 }
-function getElementType(element) {
-  return element.constructor.name;
+function isDisabled(element) {
+  if ("disabled" in element && element.disabled) {
+    return true;
+  }
+  const fieldset = element.closest?.("fieldset:disabled");
+  return !!fieldset;
 }
 function getSupportedEvents(element) {
   const base = ["click", "focus", "blur"];
@@ -408,11 +517,45 @@ function getSupportedEvents(element) {
   }
   return base;
 }
+function groupInteractions(raw) {
+  const byRef = /* @__PURE__ */ new Map();
+  for (const item of raw) {
+    let group = byRef.get(item.refName);
+    if (!group) {
+      group = [];
+      byRef.set(item.refName, group);
+    }
+    group.push(item);
+  }
+  return Array.from(byRef.entries()).map(([refName, items]) => ({
+    refName,
+    description: items[0].description,
+    items: items.map(toInstance)
+  }));
+}
+function toInstance(raw) {
+  return {
+    coordinate: raw.coordinate,
+    element: raw.element,
+    events: relevantEvents(raw)
+  };
+}
+function relevantEvents(raw) {
+  const el = raw.element;
+  if (el instanceof HTMLButtonElement || el instanceof HTMLAnchorElement) {
+    return ["click"];
+  }
+  if (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement || el instanceof HTMLSelectElement) {
+    return raw.supportedEvents.filter((e) => e === "input" || e === "change");
+  }
+  return raw.supportedEvents;
+}
 const VIEW_STATE_CHANGE = "viewStateChange";
 class AutomationAgent {
   constructor(component2, options) {
     __publicField2(this, "stateListeners", /* @__PURE__ */ new Set());
-    __publicField2(this, "cachedInteractions", null);
+    __publicField2(this, "cachedRaw", null);
+    __publicField2(this, "cachedGrouped", null);
     __publicField2(this, "viewStateHandler", null);
     __publicField2(this, "mergedViewState");
     __publicField2(this, "initialSlowViewState");
@@ -431,7 +574,8 @@ class AutomationAgent {
   }
   subscribeToUpdates() {
     this.viewStateHandler = () => {
-      this.cachedInteractions = null;
+      this.cachedRaw = null;
+      this.cachedGrouped = null;
       if (this.initialSlowViewState && this.trackByMap) {
         this.mergedViewState = deepMergeViewStates(
           this.initialSlowViewState,
@@ -449,33 +593,43 @@ class AutomationAgent {
     const state = this.getPageState();
     this.stateListeners.forEach((callback) => callback(state));
   }
-  getPageState() {
-    if (!this.cachedInteractions) {
-      this.cachedInteractions = collectInteractions(this.component.element?.refs);
+  getGrouped() {
+    if (!this.cachedGrouped) {
+      if (!this.cachedRaw) {
+        this.cachedRaw = collectInteractions(this.component.element?.refs);
+      }
+      this.cachedGrouped = groupInteractions(this.cachedRaw);
     }
+    return this.cachedGrouped;
+  }
+  getPageState() {
     return {
       // Use merged state if available (slow+fast), otherwise component's viewState
       viewState: this.mergedViewState || this.component.viewState,
-      interactions: this.cachedInteractions,
+      interactions: this.getGrouped(),
       customEvents: this.getCustomEvents()
     };
   }
   triggerEvent(eventType, coordinate, eventData) {
-    const interaction = this.getInteraction(coordinate);
-    if (!interaction) {
+    const instance = this.getInteraction(coordinate);
+    if (!instance) {
       throw new Error(`No element found at coordinate: ${coordinate.join("/")}`);
     }
     const event = new Event(eventType, { bubbles: true });
     if (eventData) {
       Object.assign(event, eventData);
     }
-    interaction.element.dispatchEvent(event);
+    instance.element.dispatchEvent(event);
   }
   getInteraction(coordinate) {
-    const state = this.getPageState();
-    return state.interactions.find(
-      (i) => i.coordinate.length === coordinate.length && i.coordinate.every((c, idx) => c === coordinate[idx])
-    );
+    for (const group of this.getGrouped()) {
+      for (const instance of group.items) {
+        if (instance.coordinate.length === coordinate.length && instance.coordinate.every((c, idx) => c === coordinate[idx])) {
+          return instance;
+        }
+      }
+    }
+    return void 0;
   }
   onStateChange(callback) {
     this.stateListeners.add(callback);
@@ -508,7 +662,8 @@ class AutomationAgent {
       this.viewStateHandler = null;
     }
     this.stateListeners.clear();
-    this.cachedInteractions = null;
+    this.cachedRaw = null;
+    this.cachedGrouped = null;
   }
 }
 function wrapWithAutomation(component2, options) {
@@ -520,6 +675,7 @@ exports.AUTOMATION_CONTEXT = AUTOMATION_CONTEXT;
 exports.ActionError = ActionError;
 exports.HEADLESS_INSTANCES = HEADLESS_INSTANCES;
 exports.createActionCaller = createActionCaller;
+exports.hydrateCompositeJayComponent = hydrateCompositeJayComponent;
 exports.makeCompositeJayComponent = makeCompositeJayComponent;
 exports.makeHeadlessInstanceComponent = makeHeadlessInstanceComponent;
 exports.setActionCallerOptions = setActionCallerOptions;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as _jay_framework_component from '@jay-framework/component';
-import { ComponentConstructor, ContextMarkers, JayComponentCore } from '@jay-framework/component';
-import { JayElement, PreRenderElement, ContextMarker } from '@jay-framework/runtime';
+import { ComponentConstructor, ContextMarkers, JayComponentCore, ConcreteJayComponent } from '@jay-framework/component';
+import { JayElement, PreRenderElement, RenderElementOptions, RenderElement, ContextMarker } from '@jay-framework/runtime';
 import { TrackByMap } from '@jay-framework/view-state-merge';
 export { AUTOMATION_CONTEXT, AutomationAPI, AutomationWrappedComponent, Coordinate, Interaction, PageState, wrapWithAutomation } from '@jay-framework/runtime-automation';
 
@@ -17,6 +17,15 @@ interface CompositePart {
 
 declare function makeCompositeJayComponent<PropsT extends object, ViewState extends object, Refs extends object, JayElementT extends JayElement<ViewState, Refs>, CompCore extends JayComponentCore<PropsT, ViewState>>(preRender: PreRenderElement<ViewState, Refs, JayElementT>, defaultViewState: ViewState, fastCarryForward: object, parts: Array<CompositePart>, trackByMap?: TrackByMap): (props: PropsT) => _jay_framework_component.ConcreteJayComponent<PropsT, ViewState, Refs, CompCore, JayElementT>;
 
+/**
+ * Hydrate variant of makeCompositeJayComponent.
+ *
+ * Instead of creating new DOM, this adopts the server-rendered DOM by using
+ * the hydrate target's function signature: (rootElement, options?) => [Refs, RenderElement].
+ * The rootElement is the SSR-rendered DOM already present in the page.
+ */
+declare function hydrateCompositeJayComponent<PropsT extends object, ViewState extends object, Refs extends object, JayElementT extends JayElement<ViewState, Refs>, CompCore extends JayComponentCore<PropsT, ViewState>>(hydratePreRender: (rootElement: Element, options?: RenderElementOptions) => [Refs, RenderElement<ViewState, Refs, JayElementT>], defaultViewState: ViewState, fastCarryForward: object, parts: Array<CompositePart>, trackByMap: TrackByMap, rootElement: Element): (props: PropsT) => _jay_framework_component.ConcreteJayComponent<PropsT, ViewState, Refs, CompCore, JayElementT>;
+
 /**
  * Client-side context and helpers for headless component instances.
  *
@@ -53,10 +62,25 @@ declare const HEADLESS_INSTANCES: ContextMarker<HeadlessInstancesData>;
  *
  * @param preRender - The inline template's render function
  * @param interactiveConstructor - The plugin's interactive constructor
- * @param coordinateKey - The coordinate key for this instance (e.g., "product-card:0")
+ * @param coordinateKey - Static coordinate key (e.g., "product-card:0") or a
+ *   factory function for forEach instances that receives the current dataIds
+ *   (accumulated trackBy values from ancestor forEach loops) and returns the key.
  * @param pluginContexts - Additional context markers from the plugin (if any)
  */
-declare function makeHeadlessInstanceComponent<PropsT extends object, ViewState extends object, Refs extends object, JayElementT extends JayElement<ViewState, Refs>, CompCore extends JayComponentCore<PropsT, ViewState>>(preRender: PreRenderElement<ViewState, Refs, JayElementT>, interactiveConstructor: ComponentConstructor<PropsT, Refs, ViewState, any, CompCore>, coordinateKey: string, pluginContexts?: ContextMarkers<any>): any;
+/**
+ * Component definition shape expected by makeHeadlessInstanceComponent.
+ * `clientDefaults` receives raw props (not signal-wrapped) since it's called
+ * before the component construction context is set up.
+ */
+interface HeadlessComponentDef {
+    comp: ComponentConstructor<any, any, any, any, any>;
+    contexts?: ContextMarkers<any>;
+    clientDefaults?: (props: any) => {
+        viewState: any;
+        carryForward?: any;
+    };
+}
+declare function makeHeadlessInstanceComponent<PropsT extends object, ViewState extends object, Refs extends object, JayElementT extends JayElement<ViewState, Refs>, CompCore extends JayComponentCore<PropsT, ViewState>>(preRender: PreRenderElement<ViewState, Refs, JayElementT>, componentDef: HeadlessComponentDef, coordinateKey: string | ((dataIds: string[]) => string)): (props: PropsT) => ConcreteJayComponent<PropsT, ViewState, Refs, CompCore, JayElementT>;
 
 /**
  * Client-side action caller for Jay Stack.
@@ -123,4 +147,4 @@ declare function setActionCallerOptions(options: ActionCallerOptions): void;
  */
 declare function createActionCaller<Input, Output>(actionName: string, method?: HttpMethod): (input: Input) => Promise<Output>;
 
-export { type ActionCallerOptions, ActionError, type CompositePart, HEADLESS_INSTANCES, type HeadlessInstancesData, type HttpMethod, createActionCaller, makeCompositeJayComponent, makeHeadlessInstanceComponent, setActionCallerOptions };
+export { type ActionCallerOptions, ActionError, type CompositePart, HEADLESS_INSTANCES, type HeadlessComponentDef, type HeadlessInstancesData, type HttpMethod, createActionCaller, hydrateCompositeJayComponent, makeCompositeJayComponent, makeHeadlessInstanceComponent, setActionCallerOptions };

package/dist/index.js

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 import { makeJayComponent, createSignal, COMPONENT_CONTEXT, materializeViewState } from "@jay-framework/component";
-import { createJayContext, useContext } from "@jay-framework/runtime";
+import { createJayContext, useContext, currentConstructionContext } from "@jay-framework/runtime";
 function deepMergeViewStates$1(base, overlay, trackByMap, path = "") {
   if (!base && !overlay)
     return {};
@@ -78,23 +78,56 @@ function mergeArraysByTrackBy$1(baseArray, overlayArray, trackByField, trackByMa
   });
 }
 const HEADLESS_INSTANCES = createJayContext();
-function makeSignals$1(obj) {
+function makeSignals$2(obj) {
   return Object.keys(obj).reduce((signals, key) => {
     signals[key] = createSignal(obj[key]);
     return signals;
   }, {});
 }
-function makeHeadlessInstanceComponent(preRender, interactiveConstructor, coordinateKey, pluginContexts = []) {
-  const wrappedConstructor = (props, refs, ...pluginResolvedContexts) => {
+function makeHeadlessInstanceComponent(preRender, componentDef, coordinateKey) {
+  const interactiveConstructor = componentDef.comp;
+  const resolvedContexts = componentDef.contexts ?? [];
+  const clientDefaults = componentDef.clientDefaults;
+  const wrappedConstructor = (signalProps, refs, ...pluginResolvedContexts) => {
     const instanceData = useContext(HEADLESS_INSTANCES);
-    const fastVS = instanceData?.viewStates?.[coordinateKey];
-    const cf = instanceData?.carryForwards?.[coordinateKey] || {};
-    const signalVS = fastVS ? makeSignals$1(fastVS) : void 0;
-    return interactiveConstructor(props, refs, signalVS, cf, ...pluginResolvedContexts);
+    const resolvedKey = typeof coordinateKey === "function" ? coordinateKey(currentConstructionContext()?.dataIds ?? []) : coordinateKey;
+    const suffixKey = resolvedKey.includes("/") && resolvedKey.includes(":") ? resolvedKey.split("/").find((s) => s.includes(":")) ?? resolvedKey : resolvedKey;
+    const fastVS = instanceData?.viewStates?.[resolvedKey] ?? instanceData?.viewStates?.[suffixKey];
+    const cf = instanceData?.carryForwards?.[resolvedKey] ?? instanceData?.carryForwards?.[suffixKey];
+    let resolvedFastVS;
+    let resolvedCf;
+    if (fastVS) {
+      resolvedFastVS = fastVS;
+      resolvedCf = cf || {};
+    } else if (clientDefaults) {
+      const rawProps = signalProps.props();
+      const defaults = clientDefaults(rawProps);
+      resolvedFastVS = defaults.viewState;
+      resolvedCf = defaults.carryForward ?? {};
+    } else {
+      console.warn(
+        `[Jay] Headless instance "${resolvedKey}" has no server data and no clientDefaults. Add .withClientDefaults() to the component definition to provide fallback values.`
+      );
+      resolvedFastVS = {};
+      resolvedCf = {};
+    }
+    const signalVS = makeSignals$2(resolvedFastVS);
+    const compCore = interactiveConstructor(
+      signalProps,
+      refs,
+      signalVS,
+      resolvedCf,
+      ...pluginResolvedContexts
+    );
+    const originalRender = compCore.render;
+    compCore.render = () => {
+      return { ...resolvedFastVS, ...originalRender() };
+    };
+    return compCore;
   };
-  return makeJayComponent(preRender, wrappedConstructor, ...pluginContexts);
+  return makeJayComponent(preRender, wrappedConstructor, ...resolvedContexts);
 }
-function makeSignals(obj) {
+function makeSignals$1(obj) {
   return Object.keys(obj).reduce((signals, key) => {
     signals[key] = createSignal(obj[key]);
     return signals;
@@ -110,21 +143,93 @@ function makeCompositeJayComponent(preRender, defaultViewState, fastCarryForward
   if (headlessInstanceCarryForwards)
     delete fastCarryForward.__headlessInstances;
   const comp = (props, refs, ...contexts) => {
-    if (headlessInstanceViewStates || headlessInstanceCarryForwards) {
-      const componentContext = useContext(COMPONENT_CONTEXT);
-      const instancesData = {
-        viewStates: headlessInstanceViewStates || {},
-        carryForwards: headlessInstanceCarryForwards || {}
-      };
-      componentContext.provideContexts.push([HEADLESS_INSTANCES, instancesData]);
-    }
+    const componentContext = useContext(COMPONENT_CONTEXT);
+    const instancesData = {
+      viewStates: headlessInstanceViewStates || {},
+      carryForwards: headlessInstanceCarryForwards || {}
+    };
+    componentContext.provideContexts.push([HEADLESS_INSTANCES, instancesData]);
+    const instances = interactiveParts.map(
+      (part) => {
+        const partRefs = part.key ? refs[part.key] : refs;
+        let partContexts;
+        if (hasFastRendering) {
+          const partViewState = part.key ? defaultViewState?.[part.key] : defaultViewState;
+          const partFastViewState = partViewState ? makeSignals$1(partViewState) : makeSignals$1({});
+          const partCarryForward = part.key ? fastCarryForward?.[part.key] : fastCarryForward;
+          partContexts = [
+            partFastViewState,
+            partCarryForward,
+            ...contexts.splice(0, part.contextMarkers.length)
+          ];
+        } else {
+          partContexts = [...contexts.splice(0, part.contextMarkers.length)];
+        }
+        return [part.key, part.comp(props, partRefs, ...partContexts)];
+      }
+    );
+    return {
+      render: () => {
+        let viewState = defaultViewState;
+        instances.forEach(([key, instance]) => {
+          const rendered = materializeViewState(instance.render());
+          if (key) {
+            viewState[key] = deepMergeViewStates$1(
+              defaultViewState[key],
+              rendered,
+              trackByMap,
+              key
+            );
+          } else {
+            viewState = deepMergeViewStates$1(
+              viewState,
+              rendered,
+              trackByMap
+            );
+          }
+        });
+        return viewState;
+      }
+    };
+  };
+  const contextMarkers = interactiveParts.reduce((cm, part) => {
+    return [...cm, ...part.contextMarkers];
+  }, []);
+  return makeJayComponent(
+    preRender,
+    comp,
+    ...contextMarkers
+  );
+}
+function makeSignals(obj) {
+  return Object.keys(obj).reduce((signals, key) => {
+    signals[key] = createSignal(obj[key]);
+    return signals;
+  }, {});
+}
+function hydrateCompositeJayComponent(hydratePreRender, defaultViewState, fastCarryForward, parts, trackByMap = {}, rootElement) {
+  const interactiveParts = parts.filter((part) => part.comp !== void 0);
+  const hasFastRendering = defaultViewState !== null && defaultViewState !== void 0;
+  const headlessInstanceViewStates = defaultViewState?.__headlessInstances;
+  const headlessInstanceCarryForwards = fastCarryForward?.__headlessInstances;
+  if (headlessInstanceViewStates)
+    delete defaultViewState.__headlessInstances;
+  if (headlessInstanceCarryForwards)
+    delete fastCarryForward.__headlessInstances;
+  const comp = (props, refs, ...contexts) => {
+    const componentContext = useContext(COMPONENT_CONTEXT);
+    const instancesData = {
+      viewStates: headlessInstanceViewStates || {},
+      carryForwards: headlessInstanceCarryForwards || {}
+    };
+    componentContext.provideContexts.push([HEADLESS_INSTANCES, instancesData]);
     const instances = interactiveParts.map(
       (part) => {
         const partRefs = part.key ? refs[part.key] : refs;
         let partContexts;
         if (hasFastRendering) {
           const partViewState = part.key ? defaultViewState?.[part.key] : defaultViewState;
-          const partFastViewState = partViewState ? makeSignals(partViewState) : void 0;
+          const partFastViewState = partViewState ? makeSignals(partViewState) : makeSignals({});
           const partCarryForward = part.key ? fastCarryForward?.[part.key] : fastCarryForward;
           partContexts = [
             partFastViewState,
@@ -164,6 +269,7 @@ function makeCompositeJayComponent(preRender, defaultViewState, fastCarryForward
   const contextMarkers = interactiveParts.reduce((cm, part) => {
     return [...cm, ...part.contextMarkers];
   }, []);
+  const preRender = (options) => hydratePreRender(rootElement, options);
   return makeJayComponent(
     preRender,
     comp,
@@ -355,14 +461,13 @@ function collectInteractionsRecursive(refs, interactions) {
       continue;
     if (refImpl.elements && refImpl.elements instanceof Set) {
       for (const elem of refImpl.elements) {
-        if (elem.element) {
+        if (elem.element && !isDisabled(elem.element)) {
           interactions.push({
             refName,
             coordinate: elem.coordinate || [refName],
             element: elem.element,
-            elementType: getElementType(elem.element),
             supportedEvents: getSupportedEvents(elem.element),
-            itemContext: elem.viewState
+            description: elem.description
           });
         }
       }
@@ -381,8 +486,12 @@ function isNestedRefsObject(obj) {
     return false;
   return true;
 }
-function getElementType(element) {
-  return element.constructor.name;
+function isDisabled(element) {
+  if ("disabled" in element && element.disabled) {
+    return true;
+  }
+  const fieldset = element.closest?.("fieldset:disabled");
+  return !!fieldset;
 }
 function getSupportedEvents(element) {
   const base = ["click", "focus", "blur"];
@@ -406,11 +515,45 @@ function getSupportedEvents(element) {
   }
   return base;
 }
+function groupInteractions(raw) {
+  const byRef = /* @__PURE__ */ new Map();
+  for (const item of raw) {
+    let group = byRef.get(item.refName);
+    if (!group) {
+      group = [];
+      byRef.set(item.refName, group);
+    }
+    group.push(item);
+  }
+  return Array.from(byRef.entries()).map(([refName, items]) => ({
+    refName,
+    description: items[0].description,
+    items: items.map(toInstance)
+  }));
+}
+function toInstance(raw) {
+  return {
+    coordinate: raw.coordinate,
+    element: raw.element,
+    events: relevantEvents(raw)
+  };
+}
+function relevantEvents(raw) {
+  const el = raw.element;
+  if (el instanceof HTMLButtonElement || el instanceof HTMLAnchorElement) {
+    return ["click"];
+  }
+  if (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement || el instanceof HTMLSelectElement) {
+    return raw.supportedEvents.filter((e) => e === "input" || e === "change");
+  }
+  return raw.supportedEvents;
+}
 const VIEW_STATE_CHANGE = "viewStateChange";
 class AutomationAgent {
   constructor(component, options) {
     __publicField2(this, "stateListeners", /* @__PURE__ */ new Set());
-    __publicField2(this, "cachedInteractions", null);
+    __publicField2(this, "cachedRaw", null);
+    __publicField2(this, "cachedGrouped", null);
     __publicField2(this, "viewStateHandler", null);
     __publicField2(this, "mergedViewState");
     __publicField2(this, "initialSlowViewState");
@@ -429,7 +572,8 @@ class AutomationAgent {
   }
   subscribeToUpdates() {
     this.viewStateHandler = () => {
-      this.cachedInteractions = null;
+      this.cachedRaw = null;
+      this.cachedGrouped = null;
       if (this.initialSlowViewState && this.trackByMap) {
         this.mergedViewState = deepMergeViewStates(
           this.initialSlowViewState,
@@ -447,33 +591,43 @@ class AutomationAgent {
     const state = this.getPageState();
     this.stateListeners.forEach((callback) => callback(state));
   }
-  getPageState() {
-    if (!this.cachedInteractions) {
-      this.cachedInteractions = collectInteractions(this.component.element?.refs);
+  getGrouped() {
+    if (!this.cachedGrouped) {
+      if (!this.cachedRaw) {
+        this.cachedRaw = collectInteractions(this.component.element?.refs);
+      }
+      this.cachedGrouped = groupInteractions(this.cachedRaw);
     }
+    return this.cachedGrouped;
+  }
+  getPageState() {
     return {
       // Use merged state if available (slow+fast), otherwise component's viewState
       viewState: this.mergedViewState || this.component.viewState,
-      interactions: this.cachedInteractions,
+      interactions: this.getGrouped(),
       customEvents: this.getCustomEvents()
     };
   }
   triggerEvent(eventType, coordinate, eventData) {
-    const interaction = this.getInteraction(coordinate);
-    if (!interaction) {
+    const instance = this.getInteraction(coordinate);
+    if (!instance) {
       throw new Error(`No element found at coordinate: ${coordinate.join("/")}`);
     }
     const event = new Event(eventType, { bubbles: true });
     if (eventData) {
       Object.assign(event, eventData);
     }
-    interaction.element.dispatchEvent(event);
+    instance.element.dispatchEvent(event);
   }
   getInteraction(coordinate) {
-    const state = this.getPageState();
-    return state.interactions.find(
-      (i) => i.coordinate.length === coordinate.length && i.coordinate.every((c, idx) => c === coordinate[idx])
-    );
+    for (const group of this.getGrouped()) {
+      for (const instance of group.items) {
+        if (instance.coordinate.length === coordinate.length && instance.coordinate.every((c, idx) => c === coordinate[idx])) {
+          return instance;
+        }
+      }
+    }
+    return void 0;
   }
   onStateChange(callback) {
     this.stateListeners.add(callback);
@@ -506,7 +660,8 @@ class AutomationAgent {
       this.viewStateHandler = null;
     }
     this.stateListeners.clear();
-    this.cachedInteractions = null;
+    this.cachedRaw = null;
+    this.cachedGrouped = null;
   }
 }
 function wrapWithAutomation(component, options) {
@@ -519,6 +674,7 @@ export {
   ActionError,
   HEADLESS_INSTANCES,
   createActionCaller,
+  hydrateCompositeJayComponent,
   makeCompositeJayComponent,
   makeHeadlessInstanceComponent,
   setActionCallerOptions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/stack-client-runtime",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "type": "module",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -27,15 +27,15 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/component": "^0.12.0",
-    "@jay-framework/fullstack-component": "^0.12.0",
-    "@jay-framework/runtime": "^0.12.0",
-    "@jay-framework/runtime-automation": "^0.12.0",
-    "@jay-framework/view-state-merge": "^0.12.0"
+    "@jay-framework/component": "^0.14.0",
+    "@jay-framework/fullstack-component": "^0.14.0",
+    "@jay-framework/runtime": "^0.14.0",
+    "@jay-framework/runtime-automation": "^0.14.0",
+    "@jay-framework/view-state-merge": "^0.14.0"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.12.0",
-    "@jay-framework/jay-cli": "^0.12.0",
+    "@jay-framework/dev-environment": "^0.14.0",
+    "@jay-framework/jay-cli": "^0.14.0",
     "@types/express": "^5.0.2",
     "@types/node": "^22.15.21",
     "nodemon": "^3.0.3",