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

package/dist/index.cjs

@@ -89,8 +89,9 @@ function makeSignals$1(obj) {
 function makeHeadlessInstanceComponent(preRender, interactiveConstructor, coordinateKey, pluginContexts = []) {
   const wrappedConstructor = (props, refs, ...pluginResolvedContexts) => {
     const instanceData = runtime.useContext(HEADLESS_INSTANCES);
-    const fastVS = instanceData?.viewStates?.[coordinateKey];
-    const cf = instanceData?.carryForwards?.[coordinateKey] || {};
+    const resolvedKey = typeof coordinateKey === "function" ? coordinateKey(runtime.currentConstructionContext()?.dataIds ?? []) : coordinateKey;
+    const fastVS = instanceData?.viewStates?.[resolvedKey];
+    const cf = instanceData?.carryForwards?.[resolvedKey] || {};
     const signalVS = fastVS ? makeSignals$1(fastVS) : void 0;
     return interactiveConstructor(props, refs, signalVS, cf, ...pluginResolvedContexts);
   };
@@ -357,14 +358,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 +383,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 +412,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 +469,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 +488,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 +557,8 @@ class AutomationAgent {
       this.viewStateHandler = null;
     }
     this.stateListeners.clear();
-    this.cachedInteractions = null;
+    this.cachedRaw = null;
+    this.cachedGrouped = null;
   }
 }
 function wrapWithAutomation(component2, options) {

package/dist/index.d.ts

@@ -53,10 +53,12 @@ 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;
+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 | ((dataIds: string[]) => string), pluginContexts?: ContextMarkers<any>): any;
 
 /**
  * Client-side action caller for Jay Stack.

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 {};
@@ -87,8 +87,9 @@ function makeSignals$1(obj) {
 function makeHeadlessInstanceComponent(preRender, interactiveConstructor, coordinateKey, pluginContexts = []) {
   const wrappedConstructor = (props, refs, ...pluginResolvedContexts) => {
     const instanceData = useContext(HEADLESS_INSTANCES);
-    const fastVS = instanceData?.viewStates?.[coordinateKey];
-    const cf = instanceData?.carryForwards?.[coordinateKey] || {};
+    const resolvedKey = typeof coordinateKey === "function" ? coordinateKey(currentConstructionContext()?.dataIds ?? []) : coordinateKey;
+    const fastVS = instanceData?.viewStates?.[resolvedKey];
+    const cf = instanceData?.carryForwards?.[resolvedKey] || {};
     const signalVS = fastVS ? makeSignals$1(fastVS) : void 0;
     return interactiveConstructor(props, refs, signalVS, cf, ...pluginResolvedContexts);
   };
@@ -355,14 +356,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 +381,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 +410,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 +467,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 +486,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 +555,8 @@ class AutomationAgent {
       this.viewStateHandler = null;
     }
     this.stateListeners.clear();
-    this.cachedInteractions = null;
+    this.cachedRaw = null;
+    this.cachedGrouped = null;
   }
 }
 function wrapWithAutomation(component, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/stack-client-runtime",
-  "version": "0.12.0",
+  "version": "0.13.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.13.0",
+    "@jay-framework/fullstack-component": "^0.13.0",
+    "@jay-framework/runtime": "^0.13.0",
+    "@jay-framework/runtime-automation": "^0.13.0",
+    "@jay-framework/view-state-merge": "^0.13.0"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.12.0",
-    "@jay-framework/jay-cli": "^0.12.0",
+    "@jay-framework/dev-environment": "^0.13.0",
+    "@jay-framework/jay-cli": "^0.13.0",
     "@types/express": "^5.0.2",
     "@types/node": "^22.15.21",
     "nodemon": "^3.0.3",