@arcote.tech/arc-react 0.7.15 → 0.7.16

package/dist/index.js

@@ -305,8 +305,7 @@ import {
   QueryWire,
   StreamingEventPublisher,
   StreamingQueryCache,
-  buildContextAccessor,
-  resolveQueryChange
+  buildContextAccessor
 } from "@arcote.tech/arc";
 import {
   createContext as createContext4,
@@ -449,8 +448,7 @@ Event payload:`, event.payload);
           }
         } else if (eventWire && queryWire) {
           streamingCache = new StreamingQueryCache;
-          streamingCache.registerViews(views);
-          eventPublisher = new StreamingEventPublisher(streamingCache, eventWire);
+          eventPublisher = new StreamingEventPublisher(eventWire);
           eventPublisher.registerViews(views);
           if (authAdapter.isAuthenticated()) {
             eventWire.connect();
@@ -516,7 +514,7 @@ Event payload:`, event.payload);
       authAdapter.setToken(token, name);
       if (cachedModel) {
         cachedModel.scope(name).setToken(token);
-        cachedModel.getAdapters().streamingCache?.invalidateScope(name);
+        cachedModel.getAdapters().streamingCache?.invalidateScope(name, eventWire);
       } else {
         eventWire?.setScopeToken(name, token);
         if (eventWire && token && eventWire.getState() === "disconnected") {
@@ -570,51 +568,30 @@ Event payload:`, event.payload);
           return;
         const unsubs = [];
         const element = model.context.get(desc.element);
-        const qCtx = element?.queryContext?.(adapters);
-        const method = qCtx?.[desc.method];
-        const reExecute = async () => {
-          if (!method)
-            return;
-          try {
-            const result = await method(...desc.args);
-            setData(result);
-            setLoading(false);
-          } catch (err) {
-            console.error(`[Arc] Query error:`, err);
-          }
-        };
         if (adapters.streamingCache) {
-          const store = adapters.streamingCache.getStore(desc.element, name);
-          let cachedResult;
-          unsubs.push(store.subscribe((events) => {
-            if (!events) {
-              cachedResult = undefined;
-              reExecute();
-              return;
-            }
-            if (cachedResult !== undefined) {
-              let current = cachedResult;
-              let changed = false;
-              for (const event of events) {
-                const newResult = resolveQueryChange(current, event, desc.args[0] ?? {});
-                if (newResult !== false) {
-                  current = newResult;
-                  changed = true;
-                }
-              }
-              if (!changed)
-                return;
-              cachedResult = current;
-              reExecute();
+          const sub = adapters.streamingCache.subscribe(desc, name, adapters.eventWire, () => {
+            const snap = sub.read();
+            setData(snap.result);
+            setLoading(snap.loading);
+          });
+          unsubs.push(sub.unsubscribe);
+          const initial = sub.read();
+          setData(initial.result);
+          setLoading(initial.loading);
+        } else {
+          const qCtx = element?.queryContext?.(adapters);
+          const method = qCtx?.[desc.method];
+          const reExecute = async () => {
+            if (!method)
               return;
+            try {
+              const result = await method(...desc.args);
+              setData(result);
+              setLoading(false);
+            } catch (err) {
+              console.error(`[Arc] Query error:`, err);
             }
-            reExecute();
-          }));
-          unsubs.push(adapters.streamingCache.subscribeView(desc.element, adapters.eventWire, name));
-          if (store.hasData()) {
-            reExecute();
-          }
-        } else {
+          };
           if (adapters.eventPublisher) {
             const aggregateName = element?.name;
             const eventTypes = element?.getElements?.()?.map((e) => aggregateName ? `${aggregateName}.${e.name}` : e.name) ?? [];
@@ -701,4 +678,4 @@ export {
   Form
 };
 
-//# debugId=88FD0E28C6E4167364756E2164756E21
+//# debugId=966C03CA44E269FA64756E2164756E21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arcote.tech/arc-react",
   "type": "module",
-  "version": "0.7.15",
+  "version": "0.7.16",
   "private": false,
   "author": "Przemysław Krasiński [arcote.tech]",
   "description": "React client for the Arc framework, providing utilities for querying data and executing commands, enhancing the development of reactive and efficient user interfaces.",
@@ -32,7 +32,7 @@
     "typescript": "^5.2.2"
   },
   "peerDependencies": {
-    "@arcote.tech/arc": "^0.7.15",
+    "@arcote.tech/arc": "^0.7.16",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0",
     "typescript": "^5.0.0"