@arcote.tech/arc-react 0.1.7 → 0.1.9

package/dist/index.js

@@ -349,6 +349,8 @@ var reactModel = (arcContext, options) => {
       const [result, setResult] = useState3(null);
       const [revalidationTrigger, setRevalidationTrigger] = useState3(0);
       const unsubscribeRef = useRef(null);
+      const queryPromiseRef = useRef(null);
+      const resolvePromiseRef = useRef(null);
       useEffect2(() => {
         if (cacheKey) {
           if (!model.__cacheRegistry) {
@@ -357,8 +359,13 @@ var reactModel = (arcContext, options) => {
           if (!model.__cacheRegistry.has(cacheKey)) {
             model.__cacheRegistry.set(cacheKey, new Set);
           }
-          const revalidateFn = () => {
+          const revalidateFn = async () => {
+            const promise = new Promise((resolve) => {
+              resolvePromiseRef.current = resolve;
+            });
+            queryPromiseRef.current = promise;
             setRevalidationTrigger((prev) => prev + 1);
+            return promise;
           };
           model.__cacheRegistry.get(cacheKey).add(revalidateFn);
           return () => {
@@ -380,6 +387,10 @@ var reactModel = (arcContext, options) => {
         const { unsubscribe, result: result2 } = model.subscribe(queryBuilderFn, (newResult) => {
           setResult(newResult);
           setLoading(false);
+          if (resolvePromiseRef.current) {
+            resolvePromiseRef.current();
+            resolvePromiseRef.current = null;
+          }
         }, defaultAuthContext);
         unsubscribeRef.current = unsubscribe;
         return () => {
@@ -396,13 +407,17 @@ var reactModel = (arcContext, options) => {
       if (!model) {
         throw new Error("useRevalidate must be used within a ModelProvider");
       }
-      return useCallback4((cacheKey) => {
+      return useCallback4(async (cacheKey) => {
         const registry = model.__cacheRegistry;
         if (registry && registry.has(cacheKey)) {
           const revalidators = registry.get(cacheKey);
-          revalidators?.forEach((revalidateFn) => {
-            revalidateFn();
-          });
+          if (revalidators) {
+            const promises = [];
+            revalidators.forEach((revalidateFn) => {
+              promises.push(revalidateFn());
+            });
+            await Promise.all(promises);
+          }
         }
       }, [model]);
     },
@@ -452,4 +467,4 @@ export {
   Form
 };
 
-//# debugId=5CF15300E5CC460C64756E2164756E21
+//# debugId=64B909B4D47850D764756E2164756E21

package/dist/reactModel.d.ts

@@ -17,5 +17,5 @@ export declare const reactModel: <C extends ArcContextAny>(arcContext: C, option
     catchErrorCallback: (error: any) => void;
 }) => import("react/jsx-dev-runtime").JSX.Element | null, ({ children }: {
     children: React.ReactNode;
-}) => import("react/jsx-dev-runtime").JSX.Element, <Q extends IArcQueryBuilder>(queryBuilderFn: UnaryFunction<ReturnType<C["queryBuilder"]>, Q>, dependencies?: any[], cacheKey?: string) => [objectUtil.simplify<ReturnType<Q["toQuery"]>["lastResult"]>, false] | [undefined, true], () => (cacheKey: string) => void, () => ArcContextElementMethodReturnType<C["elements"], "commandClient">, <QueryBuilderFn extends QueryFactoryFunction<C>>(queryBuilderFn: QueryBuilderFn, model?: ModelBase<C> | null) => Promise<QueryBuilderFunctionResult<QueryBuilderFn>>, () => Model<C> | null, (token: string) => ModelBase<C>];
+}) => import("react/jsx-dev-runtime").JSX.Element, <Q extends IArcQueryBuilder>(queryBuilderFn: UnaryFunction<ReturnType<C["queryBuilder"]>, Q>, dependencies?: any[], cacheKey?: string) => [objectUtil.simplify<ReturnType<Q["toQuery"]>["lastResult"]>, false] | [undefined, true], () => (cacheKey: string) => Promise<void>, () => ArcContextElementMethodReturnType<C["elements"], "commandClient">, <QueryBuilderFn extends QueryFactoryFunction<C>>(queryBuilderFn: QueryBuilderFn, model?: ModelBase<C> | null) => Promise<QueryBuilderFunctionResult<QueryBuilderFn>>, () => Model<C> | null, (token: string) => ModelBase<C>];
 //# sourceMappingURL=reactModel.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arcote.tech/arc-react",
   "type": "module",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "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.",
@@ -23,7 +23,6 @@
     "dev": "nodemon --ignore dist -e ts,tsx --exec 'bun run build'"
   },
   "dependencies": {
-    "@arcote.tech/arc": "latest",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
@@ -37,6 +36,7 @@
     "typescript": "^5.2.2"
   },
   "peerDependencies": {
+    "@arcote.tech/arc": "latest",
     "typescript": "^5.0.0"
   },
   "files": [