@jay-framework/runtime 0.11.0 → 0.13.0

package/dist/index.d.ts

@@ -69,20 +69,22 @@ type JayEventHandlerWrapper<EventType, ViewState, Returns> = (orig: JayEventHand
 interface ContextMarker<ContextType> {
 }
 declare const _jayContractBrand: unique symbol;
-type JayContract<ViewState extends object, Refs extends object, SlowViewState extends object = never, FastViewState extends object = never, InteractiveViewState extends object = never> = {
+type JayContract<ViewState extends object, Refs extends object, SlowViewState extends object = never, FastViewState extends object = never, InteractiveViewState extends object = never, Props extends object = {}> = {
     readonly [_jayContractBrand]: {
         viewState: ViewState;
         refs: Refs;
         slowViewState: SlowViewState;
         fastViewState: FastViewState;
         interactiveViewState: InteractiveViewState;
+        props: Props;
     };
 };
-type ExtractViewState<A> = A extends JayContract<infer ViewState, any, any, any, any> ? ViewState : never;
-type ExtractRefs<A> = A extends JayContract<any, infer Refs, any, any, any> ? Refs : never;
-type ExtractSlowViewState<A> = A extends JayContract<any, any, infer SlowViewState, any, any> ? SlowViewState : never;
-type ExtractFastViewState<A> = A extends JayContract<any, any, any, infer FastViewState, any> ? FastViewState : never;
-type ExtractInteractiveViewState<A> = A extends JayContract<any, any, any, any, infer InteractiveViewState> ? InteractiveViewState : never;
+type ExtractViewState<A> = A extends JayContract<infer ViewState, any, any, any, any, any> ? ViewState : never;
+type ExtractRefs<A> = A extends JayContract<any, infer Refs, any, any, any, any> ? Refs : never;
+type ExtractSlowViewState<A> = A extends JayContract<any, any, infer SlowViewState, any, any, any> ? SlowViewState : never;
+type ExtractFastViewState<A> = A extends JayContract<any, any, any, infer FastViewState, any, any> ? FastViewState : never;
+type ExtractInteractiveViewState<A> = A extends JayContract<any, any, any, any, infer InteractiveViewState, any> ? InteractiveViewState : never;
+type ExtractProps<A> = A extends JayContract<any, any, any, any, any, infer Props> ? Props : never;
 declare enum LogType {
     ASYNC_ERROR = 0,
     CONTEXT_NOT_FOUND = 1
@@ -484,12 +486,12 @@ declare function forEach<T, Item>(getItems: (T: any) => Array<Item>, elemCreator
  * specific array item, so child bindings like {price} work correctly
  * (they resolve to item.price, not viewState.price).
  *
- * @param arrayName - The property name of the array in the parent ViewState
+ * @param getItems - Function to get the array from the parent ViewState (handles nested paths)
  * @param index - The jayIndex value (position in the pre-rendered array)
  * @param trackByValue - The jayTrackBy value (identity for reconciliation)
  * @param elementCreator - Function that creates the pre-rendered element (called within item context)
  */
-declare function slowForEachItem<ParentVS, ItemVS>(arrayName: keyof ParentVS, index: number, trackByValue: string, elementCreator: () => BaseJayElement<ItemVS>): BaseJayElement<ParentVS>;
+declare function slowForEachItem<ParentVS, ItemVS>(getItems: (parentData: ParentVS) => ItemVS[], index: number, trackByValue: string, elementCreator: () => BaseJayElement<ItemVS>): BaseJayElement<ParentVS>;
 interface ForEach<ViewState, Item> {
     getItems: (T: any) => Array<Item>;
     elemCreator: (Item: any, String: any) => BaseJayElement<Item>;
@@ -567,10 +569,12 @@ declare class ConstructContext<ViewState> {
     private readonly coordinateBase;
     constructor(data: ViewState, forStaticElements?: boolean, coordinateBase?: Coordinate);
     get currData(): ViewState;
+    /** The accumulated coordinate base (trackBy values from ancestor forEach loops) */
+    get dataIds(): Coordinate;
     coordinate: (refName: string) => Coordinate;
     forItem<ChildViewState>(childViewState: ChildViewState, id: string): ConstructContext<ChildViewState>;
     forAsync<ChildViewState>(childViewState: ChildViewState): ConstructContext<ChildViewState>;
     static withRootContext<ViewState, Refs>(viewState: ViewState, refManager: ReferencesManager, elementConstructor: () => BaseJayElement<ViewState>): JayElement<ViewState, Refs>;
 }
 
-export { type Attribute, type Attributes, type BaseJayElement, BaseReferencesManager, type ComponentCollectionProxy, ComponentCollectionRefImpl, type ComponentProxy, ComponentRefImpl, ComponentRefsImpl, type Conditional, ConstructContext, type ContextMarker, type Coordinate, type DynamicAttributeOrProperty, EVENT_TRAP, type ElementFrom, type EventEmitter, type EventTypeFrom, type ExtractFastViewState, type ExtractInteractiveViewState, type ExtractRefs, type ExtractSlowViewState, type ExtractViewState, type ForEach, GetTrapProxy, type GlobalJayEvents, type HTMLElementCollectionProxy, type HTMLElementCollectionProxyTarget, type HTMLElementProxy, type HTMLElementProxyTarget, type HTMLNativeExec, type HeadLink, type JayComponent, type JayComponentConstructor, type JayContract, type JayElement, type JayEvent, type JayEventHandler, type JayEventHandlerWrapper, type JayLog, type JayNativeEventBuilder, type JayNativeFunction, LogType, type ManagedRefConstructor, ManagedRefType, type ManagedRefs, type MapEventEmitterViewState, type MountFunc, type OnlyEventEmitters, type PreRenderElement, type PrivateRef, type PrivateRefConstructor, PrivateRefs, type PropsFrom, ReferencesManager, type RenderElement, type RenderElementOptions, type TextElement, VIEW_STATE_CHANGE_EVENT, type ViewStateFrom, type When, WhenRole, type WithData, booleanAttribute, childComp, clearGlobalContextRegistry, conditional, createJayContext, currentConstructionContext, defaultEventWrapper, dynamicAttribute, dynamicElement, dynamicElementNS, dynamicProperty, dynamicText, element, findContext, forEach, injectHeadLinks, isCondition, isForEach, isWhen, isWithData, jayLog, mathMLDynamicElement, mathMLElement, mkUpdateCollection, noop, noopMount, noopUpdate, normalizeMount, normalizeUpdates, pending, registerGlobalContext, rejected, resolved, restoreContext, saveContext, slowForEachItem, svgDynamicElement, svgElement, type updateFunc, useContext, useGlobalContext, withContext, withData };
+export { type Attribute, type Attributes, type BaseJayElement, BaseReferencesManager, type ComponentCollectionProxy, ComponentCollectionRefImpl, type ComponentProxy, ComponentRefImpl, ComponentRefsImpl, type Conditional, ConstructContext, type ContextMarker, type Coordinate, type DynamicAttributeOrProperty, EVENT_TRAP, type ElementFrom, type EventEmitter, type EventTypeFrom, type ExtractFastViewState, type ExtractInteractiveViewState, type ExtractProps, type ExtractRefs, type ExtractSlowViewState, type ExtractViewState, type ForEach, GetTrapProxy, type GlobalJayEvents, type HTMLElementCollectionProxy, type HTMLElementCollectionProxyTarget, type HTMLElementProxy, type HTMLElementProxyTarget, type HTMLNativeExec, type HeadLink, type JayComponent, type JayComponentConstructor, type JayContract, type JayElement, type JayEvent, type JayEventHandler, type JayEventHandlerWrapper, type JayLog, type JayNativeEventBuilder, type JayNativeFunction, LogType, type ManagedRefConstructor, ManagedRefType, type ManagedRefs, type MapEventEmitterViewState, type MountFunc, type OnlyEventEmitters, type PreRenderElement, type PrivateRef, type PrivateRefConstructor, PrivateRefs, type PropsFrom, ReferencesManager, type RenderElement, type RenderElementOptions, type TextElement, VIEW_STATE_CHANGE_EVENT, type ViewStateFrom, type When, WhenRole, type WithData, booleanAttribute, childComp, clearGlobalContextRegistry, conditional, createJayContext, currentConstructionContext, defaultEventWrapper, dynamicAttribute, dynamicElement, dynamicElementNS, dynamicProperty, dynamicText, element, findContext, forEach, injectHeadLinks, isCondition, isForEach, isWhen, isWithData, jayLog, mathMLDynamicElement, mathMLElement, mkUpdateCollection, noop, noopMount, noopUpdate, normalizeMount, normalizeUpdates, pending, registerGlobalContext, rejected, resolved, restoreContext, saveContext, slowForEachItem, svgDynamicElement, svgElement, type updateFunc, useContext, useGlobalContext, withContext, withData };

package/dist/index.js

@@ -179,6 +179,10 @@ class ConstructContext {
   get currData() {
     return this.data;
   }
+  /** The accumulated coordinate base (trackBy values from ancestor forEach loops) */
+  get dataIds() {
+    return this.coordinateBase;
+  }
   forItem(childViewState, id) {
     return new ConstructContext(childViewState, false, [...this.coordinateBase, id]);
   }
@@ -368,17 +372,17 @@ function mkWhenPendingCondition(when2, group) {
 function forEach(getItems, elemCreator, matchBy) {
   return { getItems, elemCreator, trackBy: matchBy };
 }
-function slowForEachItem(arrayName, index, trackByValue, elementCreator) {
+function slowForEachItem(getItems, index, trackByValue, elementCreator) {
   const parentContext = currentConstructionContext();
   const savedContext = saveContext();
   const parentData = parentContext.currData;
-  const array = parentData[arrayName];
+  const array = getItems(parentData);
   const initialItem = array?.[index];
   const childContext = parentContext.forItem(initialItem, trackByValue);
   const element2 = withContext(CONSTRUCTION_CONTEXT_MARKER, childContext, elementCreator);
   const originalUpdate = element2.update;
   const update = (newParentData) => {
-    const newArray = newParentData[arrayName];
+    const newArray = getItems(newParentData);
     const newItem = newArray?.[index];
     const updateChildContext = parentContext.forItem(newItem, trackByValue);
     restoreContext(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/runtime",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "type": "module",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -23,11 +23,11 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/list-compare": "^0.11.0",
-    "@jay-framework/reactive": "^0.11.0"
+    "@jay-framework/list-compare": "^0.13.0",
+    "@jay-framework/reactive": "^0.13.0"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.11.0",
+    "@jay-framework/dev-environment": "^0.13.0",
     "@testing-library/jest-dom": "^6.2.0",
     "@types/jsdom": "^21.1.6",
     "@types/node": "^20.11.5",