@almadar/ui 4.15.6 → 4.16.0

package/dist/avl/index.cjs

@@ -52070,10 +52070,6 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           ...payload !== void 0 ? { payload } : {},
           timestamp: Date.now()
         };
-        const pdata = payload?.data;
-        if (Array.isArray(pdata) && binding.linkedEntity) {
-          snap.data[binding.linkedEntity] = pdata;
-        }
         const listensEntry = (binding.trait.listens ?? []).find(
           (l) => l.event === normalizedEvent || l.triggers === normalizedEvent
         );
@@ -52167,9 +52163,53 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
             notify: clientHandlers.notify
           };
         }
+        const writeFetchResultToSnap = (fetchedEntityType, fetchResult) => {
+          if (!fetchResult) return;
+          const snapNow = traitSnapshotDataRef.current.get(traitName);
+          if (!snapNow) return;
+          const rows = Array.isArray(fetchResult.rows) ? fetchResult.rows : [fetchResult.rows];
+          snapNow.data[fetchedEntityType] = rows;
+        };
+        const baseFetch = handlers.fetch;
+        const baseRef = handlers.ref;
+        const baseDeref = handlers.deref;
+        handlers = {
+          ...handlers,
+          ...baseFetch ? {
+            fetch: async (entityType, options2) => {
+              const r2 = await baseFetch(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {},
+          ...baseRef ? {
+            ref: async (entityType, options2) => {
+              const r2 = await baseRef(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {},
+          ...baseDeref ? {
+            deref: async (entityType, options2) => {
+              const r2 = await baseDeref(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {}
+        };
         const entityFromPayload = payload ?? {};
+        const reducerSnap = traitSnapshotDataRef.current.get(traitName);
+        const persistedRows = linkedEntity ? reducerSnap?.data[linkedEntity] : void 0;
+        let entityForBinding = entityFromPayload;
+        if (persistedRows && persistedRows.length > 0) {
+          const hybrid = Object.assign(
+            [...persistedRows],
+            persistedRows[0]
+          );
+          entityForBinding = hybrid;
+        }
         const bindingCtx = {
-          entity: entityFromPayload,
+          entity: entityForBinding,
           payload: payload || {},
           state: result.previousState
         };

package/dist/avl/index.js

@@ -52024,10 +52024,6 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           ...payload !== void 0 ? { payload } : {},
           timestamp: Date.now()
         };
-        const pdata = payload?.data;
-        if (Array.isArray(pdata) && binding.linkedEntity) {
-          snap.data[binding.linkedEntity] = pdata;
-        }
         const listensEntry = (binding.trait.listens ?? []).find(
           (l) => l.event === normalizedEvent || l.triggers === normalizedEvent
         );
@@ -52121,9 +52117,53 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
             notify: clientHandlers.notify
           };
         }
+        const writeFetchResultToSnap = (fetchedEntityType, fetchResult) => {
+          if (!fetchResult) return;
+          const snapNow = traitSnapshotDataRef.current.get(traitName);
+          if (!snapNow) return;
+          const rows = Array.isArray(fetchResult.rows) ? fetchResult.rows : [fetchResult.rows];
+          snapNow.data[fetchedEntityType] = rows;
+        };
+        const baseFetch = handlers.fetch;
+        const baseRef = handlers.ref;
+        const baseDeref = handlers.deref;
+        handlers = {
+          ...handlers,
+          ...baseFetch ? {
+            fetch: async (entityType, options2) => {
+              const r2 = await baseFetch(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {},
+          ...baseRef ? {
+            ref: async (entityType, options2) => {
+              const r2 = await baseRef(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {},
+          ...baseDeref ? {
+            deref: async (entityType, options2) => {
+              const r2 = await baseDeref(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {}
+        };
         const entityFromPayload = payload ?? {};
+        const reducerSnap = traitSnapshotDataRef.current.get(traitName);
+        const persistedRows = linkedEntity ? reducerSnap?.data[linkedEntity] : void 0;
+        let entityForBinding = entityFromPayload;
+        if (persistedRows && persistedRows.length > 0) {
+          const hybrid = Object.assign(
+            [...persistedRows],
+            persistedRows[0]
+          );
+          entityForBinding = hybrid;
+        }
         const bindingCtx = {
-          entity: entityFromPayload,
+          entity: entityForBinding,
           payload: payload || {},
           state: result.previousState
         };

package/dist/runtime/index.cjs

@@ -38597,10 +38597,6 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           ...payload !== void 0 ? { payload } : {},
           timestamp: Date.now()
         };
-        const pdata = payload?.data;
-        if (Array.isArray(pdata) && binding.linkedEntity) {
-          snap.data[binding.linkedEntity] = pdata;
-        }
         const listensEntry = (binding.trait.listens ?? []).find(
           (l) => l.event === normalizedEvent || l.triggers === normalizedEvent
         );
@@ -38694,9 +38690,53 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
             notify: clientHandlers.notify
           };
         }
+        const writeFetchResultToSnap = (fetchedEntityType, fetchResult) => {
+          if (!fetchResult) return;
+          const snapNow = traitSnapshotDataRef.current.get(traitName);
+          if (!snapNow) return;
+          const rows = Array.isArray(fetchResult.rows) ? fetchResult.rows : [fetchResult.rows];
+          snapNow.data[fetchedEntityType] = rows;
+        };
+        const baseFetch = handlers.fetch;
+        const baseRef = handlers.ref;
+        const baseDeref = handlers.deref;
+        handlers = {
+          ...handlers,
+          ...baseFetch ? {
+            fetch: async (entityType, options2) => {
+              const r = await baseFetch(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {},
+          ...baseRef ? {
+            ref: async (entityType, options2) => {
+              const r = await baseRef(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {},
+          ...baseDeref ? {
+            deref: async (entityType, options2) => {
+              const r = await baseDeref(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {}
+        };
         const entityFromPayload = payload ?? {};
+        const reducerSnap = traitSnapshotDataRef.current.get(traitName);
+        const persistedRows = linkedEntity ? reducerSnap?.data[linkedEntity] : void 0;
+        let entityForBinding = entityFromPayload;
+        if (persistedRows && persistedRows.length > 0) {
+          const hybrid = Object.assign(
+            [...persistedRows],
+            persistedRows[0]
+          );
+          entityForBinding = hybrid;
+        }
         const bindingCtx = {
-          entity: entityFromPayload,
+          entity: entityForBinding,
           payload: payload || {},
           state: result.previousState
         };

package/dist/runtime/index.js

@@ -38552,10 +38552,6 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           ...payload !== void 0 ? { payload } : {},
           timestamp: Date.now()
         };
-        const pdata = payload?.data;
-        if (Array.isArray(pdata) && binding.linkedEntity) {
-          snap.data[binding.linkedEntity] = pdata;
-        }
         const listensEntry = (binding.trait.listens ?? []).find(
           (l) => l.event === normalizedEvent || l.triggers === normalizedEvent
         );
@@ -38649,9 +38645,53 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
             notify: clientHandlers.notify
           };
         }
+        const writeFetchResultToSnap = (fetchedEntityType, fetchResult) => {
+          if (!fetchResult) return;
+          const snapNow = traitSnapshotDataRef.current.get(traitName);
+          if (!snapNow) return;
+          const rows = Array.isArray(fetchResult.rows) ? fetchResult.rows : [fetchResult.rows];
+          snapNow.data[fetchedEntityType] = rows;
+        };
+        const baseFetch = handlers.fetch;
+        const baseRef = handlers.ref;
+        const baseDeref = handlers.deref;
+        handlers = {
+          ...handlers,
+          ...baseFetch ? {
+            fetch: async (entityType, options2) => {
+              const r = await baseFetch(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {},
+          ...baseRef ? {
+            ref: async (entityType, options2) => {
+              const r = await baseRef(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {},
+          ...baseDeref ? {
+            deref: async (entityType, options2) => {
+              const r = await baseDeref(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {}
+        };
         const entityFromPayload = payload ?? {};
+        const reducerSnap = traitSnapshotDataRef.current.get(traitName);
+        const persistedRows = linkedEntity ? reducerSnap?.data[linkedEntity] : void 0;
+        let entityForBinding = entityFromPayload;
+        if (persistedRows && persistedRows.length > 0) {
+          const hybrid = Object.assign(
+            [...persistedRows],
+            persistedRows[0]
+          );
+          entityForBinding = hybrid;
+        }
         const bindingCtx = {
-          entity: entityFromPayload,
+          entity: entityForBinding,
           payload: payload || {},
           state: result.previousState
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "4.15.6",
+  "version": "4.16.0",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "main": "./dist/components/index.js",
@@ -118,10 +118,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@almadar/core": "^7.5.1",
+    "@almadar/core": "^7.7.1",
     "@almadar/evaluator": ">=2.9.2",
     "@almadar/patterns": ">=2.17.1",
-    "@almadar/runtime": "^5.8.4",
+    "@almadar/runtime": "^5.11.1",
     "@almadar/std": ">=6.4.1",
     "@almadar/syntax": ">=1.3.1",
     "@xyflow/react": "12.10.1",