@arcote.tech/arc-react 0.1.5 → 0.1.7

package/dist/index.js

@@ -273,7 +273,7 @@ var sqliteWasmAdapterFactory = (db) => {
 
 // reactModel.tsx
 import { jsx as jsx5 } from "react/jsx-runtime";
-var reactModel = (arcContextPromise, options) => {
+var reactModel = (arcContext, options) => {
   const LiveModelContext = createContext4(null);
   const LocalModelContext = createContext4(null);
   let masterModel = null;
@@ -281,10 +281,8 @@ var reactModel = (arcContextPromise, options) => {
     function LiveModelProvider(props) {
       const [context, setContext] = useState3(null);
       useEffect2(() => {
-        arcContextPromise.then((arcContext) => {
-          setContext(arcContext);
-        });
-      }, [arcContextPromise]);
+        setContext(arcContext);
+      }, [arcContext]);
       useEffect2(() => {
         model?.setAuthToken(props.token);
       }, [props.token]);
@@ -347,6 +345,7 @@ var reactModel = (arcContextPromise, options) => {
       if (!model) {
         throw new Error("useQuery must be used within a ModelProvider");
       }
+      const [loading, setLoading] = useState3(true);
       const [result, setResult] = useState3(null);
       const [revalidationTrigger, setRevalidationTrigger] = useState3(0);
       const unsubscribeRef = useRef(null);
@@ -377,9 +376,10 @@ var reactModel = (arcContextPromise, options) => {
         if (unsubscribeRef.current) {
           unsubscribeRef.current();
         }
-        const defaultAuthContext = { userId: "react-user", roles: ["user"] };
+        const defaultAuthContext = { userId: "react-user" };
         const { unsubscribe, result: result2 } = model.subscribe(queryBuilderFn, (newResult) => {
           setResult(newResult);
+          setLoading(false);
         }, defaultAuthContext);
         unsubscribeRef.current = unsubscribe;
         return () => {
@@ -389,7 +389,7 @@ var reactModel = (arcContextPromise, options) => {
           }
         };
       }, [model, revalidationTrigger, ...dependencies]);
-      return [result];
+      return [result, loading];
     },
     function useRevalidate() {
       const model = useContext3(LocalModelContext) || useContext3(LiveModelContext);
@@ -411,7 +411,7 @@ var reactModel = (arcContextPromise, options) => {
       if (!model) {
         throw new Error("useCommands must be used within a ModelProvider");
       }
-      const defaultAuthContext = { userId: "react-user", roles: ["user"] };
+      const defaultAuthContext = { userId: "react-user" };
       return model.commands(defaultAuthContext);
     },
     async function query(queryBuilderFn, model) {
@@ -419,7 +419,7 @@ var reactModel = (arcContextPromise, options) => {
         model = masterModel;
       if (!model)
         throw new Error("Model not found");
-      const defaultAuthContext = { userId: "react-user", roles: ["user"] };
+      const defaultAuthContext = { userId: "react-user" };
       return model.query(queryBuilderFn, defaultAuthContext);
     },
     function useLocalModel() {
@@ -452,4 +452,4 @@ export {
   Form
 };
 
-//# debugId=8ECE7A0A6915EECC64756E2164756E21
+//# debugId=5CF15300E5CC460C64756E2164756E21

package/dist/reactModel.d.ts

@@ -1,6 +1,6 @@
 import { Model, type ArcContextAny, type IArcQueryBuilder, type ModelBase, type QueryBuilderFunctionResult, type QueryFactoryFunction, type UnaryFunction } from "@arcote.tech/arc";
-import type { ArcContextElementMethodReturnType, SQLiteDatabase } from "@arcote.tech/arc";
-export declare const reactModel: <C extends ArcContextAny>(arcContextPromise: Promise<C>, options: {
+import type { ArcContextElementMethodReturnType, objectUtil, SQLiteDatabase } from "@arcote.tech/arc";
+export declare const reactModel: <C extends ArcContextAny>(arcContext: C, options: {
     sqliteAdapter: SQLiteDatabase;
 } | {
     remoteUrl: string;
@@ -17,5 +17,5 @@ export declare const reactModel: <C extends ArcContextAny>(arcContextPromise: Pr
     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) => [ReturnType<Q["toQuery"]>["lastResult"]], () => (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) => 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.5",
+  "version": "0.1.7",
   "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.",