@arcote.tech/arc-react 0.0.26 → 0.0.28

package/dist/index.js

@@ -67,8 +67,31 @@ class IDBReadTransaction {
   async findByIndex(store, index, data) {
     return new Promise((resolve) => {
       const idbIndex = this.transaction.objectStore(store).index(index);
-      const value = idbIndex.keyPath.map((key) => data[key]);
-      const keyRange = IDBKeyRange.only(value);
+      const keyPath = idbIndex.keyPath;
+      let keyRange;
+      const getKey = (obj) => {
+        const key = keyPath.map((key2) => obj[key2]);
+        if (key.some((value) => value === undefined))
+          return;
+        return key;
+      };
+      const simpleKey = getKey(data);
+      if (!simpleKey) {
+        const lower = "$gt" in data ? getKey(data.$gt) : getKey(data.$gte);
+        const upper = "$lt" in data ? getKey(data.$lt) : getKey(data.$lte);
+        const lowerOpen = "$gt" in data;
+        const upperOpen = "$lt" in data;
+        if (lower !== undefined && upper !== undefined) {
+          keyRange = IDBKeyRange.bound(lower, upper, lowerOpen, upperOpen);
+        } else if (lower !== undefined) {
+          keyRange = IDBKeyRange.lowerBound(lower, lowerOpen);
+        } else {
+          keyRange = IDBKeyRange.upperBound(upper, upperOpen);
+        }
+      } else {
+        keyRange = IDBKeyRange.only(simpleKey);
+      }
+      console.log(keyRange);
       const result = idbIndex.getAll(keyRange);
       result.onsuccess = (e) => {
         resolve(e.target.result);
@@ -157,31 +180,37 @@ var reactModel = (arcContext, databaseName) => {
   return [
     function LiveModelProvider(props) {
       const dataStorage = useMemo(() => {
+        if (typeof window === "undefined")
+          return null;
         const dbAdapterPromise = idbAdapterFactory(databaseName, arcContext.version)(arcContext);
-        const dataStorage2 = new MasterDataStorage(dbAdapterPromise, rtcClientFactory, arcContext);
+        const dataStorage2 = new MasterDataStorage(dbAdapterPromise, rtcClientFactory(props.token), arcContext);
         modelMasterDataStorage = dataStorage2;
         return dataStorage2;
       }, [arcContext, databaseName, arcContext.version]);
       const [syncProgress, setSyncProgress] = useState([]);
       const [syncDone, setSyncDone] = useState(false);
       useEffect(() => {
+        if (typeof window === "undefined" || !dataStorage)
+          return;
         const sync = async () => {
-          await dataStorage?.sync(({ store, size }) => {
+          await dataStorage.sync(({ store, size }) => {
             setSyncProgress((prev) => [...prev, { store, size }]);
           });
           setSyncDone(true);
         };
         sync();
-      }, []);
+      }, [dataStorage]);
+      if (!dataStorage || !syncDone)
+        return /* @__PURE__ */ jsx(props.syncView, {
+          progress: syncProgress
+        }, undefined, false, undefined, this);
       return /* @__PURE__ */ jsx(LiveModelContext.Provider, {
         value: {
           dataStorage,
           client: props.client,
           catchErrorCallback: props.catchErrorCallback
         },
-        children: syncDone ? props.children : /* @__PURE__ */ jsx(props.syncView, {
-          progress: syncProgress
-        }, undefined, false, undefined, this)
+        children: props.children
       }, undefined, false, undefined, this);
     },
     function LocalModelProvider({ children }) {
@@ -238,12 +267,14 @@ var reactModel = (arcContext, databaseName) => {
       }
       return arcContext.commandsClient(context.client, context.dataStorage, context.catchErrorCallback);
     },
-    async function query(queryBuilderFn) {
+    async function query(queryBuilderFn, datastorage) {
+      if (!datastorage)
+        datastorage = modelMasterDataStorage;
       const queryBuilder = arcContext.queryBuilder();
       const query = queryBuilderFn(queryBuilder).toQuery();
-      if (!modelMasterDataStorage)
+      if (!datastorage)
         throw new Error("dataStorage not found");
-      const result = await query.run(modelMasterDataStorage);
+      const result = await query.run(datastorage);
       return result;
     },
     function useLocalDataStorage() {
@@ -261,4 +292,4 @@ export {
   formResolver
 };
 
-//# debugId=BD5635FAE340904564756E2164756E21
+//# debugId=EB0E8168D4E98EF264756E2164756E21

package/dist/reactModel.d.ts

@@ -1,7 +1,8 @@
-import { ForkedDataStorage, type ArcContextAny, type CommandsClient, type QueryBuilderFunctionResult, type QueryFactoryFunction } from "@arcote.tech/arc";
+import { ForkedDataStorage, type ArcContextAny, type CommandsClient, type DataStorage, type QueryBuilderFunctionResult, type QueryFactoryFunction } from "@arcote.tech/arc";
 export declare const reactModel: <C extends ArcContextAny>(arcContext: C, databaseName: string) => readonly [(props: {
     children: React.ReactNode;
     client: string;
+    token: string;
     syncView: React.ComponentType<{
         progress: {
             store: string;
@@ -11,5 +12,5 @@ export declare const reactModel: <C extends ArcContextAny>(arcContext: C, databa
     catchErrorCallback: (error: any) => void;
 }) => import("react/jsx-dev-runtime").JSX.Element, ({ children }: {
     children: React.ReactNode;
-}) => import("react/jsx-dev-runtime").JSX.Element, <QueryBuilderFn extends QueryFactoryFunction<C>>(queryBuilderFn: QueryBuilderFn, dependencies?: any[]) => [QueryBuilderFunctionResult<QueryBuilderFn>, boolean], () => CommandsClient<C["commands"]>, <QueryBuilderFn extends QueryFactoryFunction<C>>(queryBuilderFn: QueryBuilderFn) => Promise<QueryBuilderFunctionResult<QueryBuilderFn>>, () => ForkedDataStorage | null];
+}) => import("react/jsx-dev-runtime").JSX.Element, <QueryBuilderFn extends QueryFactoryFunction<C>>(queryBuilderFn: QueryBuilderFn, dependencies?: any[]) => [QueryBuilderFunctionResult<QueryBuilderFn>, boolean], () => CommandsClient<C["commands"]>, <QueryBuilderFn extends QueryFactoryFunction<C>>(queryBuilderFn: QueryBuilderFn, datastorage?: DataStorage | null) => Promise<QueryBuilderFunctionResult<QueryBuilderFn>>, () => ForkedDataStorage | null];
 //# sourceMappingURL=reactModel.d.ts.map

package/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "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.",