@based/react 4.4.0 → 4.5.1

package/dist/Ctx.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="react" />
 import { BasedClient } from '@based/client';
 export declare const Ctx: import("react").Context<BasedClient>;
+//# sourceMappingURL=Ctx.d.ts.map

package/dist/Ctx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Ctx.d.ts","sourceRoot":"","sources":["../src/Ctx.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,eAAO,MAAM,GAAG,sCAAmC,CAAA"}

package/dist/Provider.d.ts

@@ -4,3 +4,4 @@ export declare const Provider: FC<{
     client: BasedClient;
     children: ReactNode;
 }>;
+//# sourceMappingURL=Provider.d.ts.map

package/dist/Provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../src/Provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAG3C,eAAO,MAAM,QAAQ,EAAE,EAAE,CAAC;IACxB,MAAM,EAAE,WAAW,CAAA;IACnB,QAAQ,EAAE,SAAS,CAAA;CACpB,CAEA,CAAA"}

package/dist/index.d.ts

@@ -6,3 +6,4 @@ export * from './useConnected';
 export * from './useLoading';
 export * from './useQuery';
 export * from './useWindow';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA"}

package/dist/useAuthState.d.ts

@@ -1,2 +1,3 @@
 import { AuthState } from '@based/client';
 export declare const useAuthState: () => AuthState;
+//# sourceMappingURL=useAuthState.d.ts.map

package/dist/useAuthState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useAuthState.d.ts","sourceRoot":"","sources":["../src/useAuthState.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,SAAS,EAAE,MAAM,eAAe,CAAA;AAGtD,eAAO,MAAM,YAAY,QAAO,SAgB/B,CAAA"}

package/dist/useClient.d.ts

@@ -1,2 +1,3 @@
 import { BasedClient } from '@based/client';
 export declare const useClient: () => BasedClient;
+//# sourceMappingURL=useClient.d.ts.map

package/dist/useClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useClient.d.ts","sourceRoot":"","sources":["../src/useClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAG3C,eAAO,MAAM,SAAS,QAAO,WAE5B,CAAA"}

package/dist/useConnected.d.ts

@@ -1,3 +1,4 @@
 export declare const useConnected: () => {
     connected: boolean;
 };
+//# sourceMappingURL=useConnected.d.ts.map

package/dist/useConnected.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useConnected.d.ts","sourceRoot":"","sources":["../src/useConnected.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY;;CAsBxB,CAAA"}

package/dist/useLoading.d.ts

@@ -1,3 +1,4 @@
 export declare const useLoadingListeners: Set<Function>;
 export declare const hooksLoading: Set<number>;
 export declare const useLoading: () => boolean;
+//# sourceMappingURL=useLoading.d.ts.map

package/dist/useLoading.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useLoading.d.ts","sourceRoot":"","sources":["../src/useLoading.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,QAAQ,CAAa,CAAA;AAC3D,eAAO,MAAM,YAAY,EAAE,GAAG,CAAC,MAAM,CAAa,CAAA;AAClD,eAAO,MAAM,UAAU,eAStB,CAAA"}

package/dist/useQuery.d.ts

@@ -1,9 +1,18 @@
-import { BasedError } from '@based/client';
-export declare const useQuery: <T = any>(name?: string, payload?: any, opts?: {
+import { BasedError, QueryMap } from '@based/client';
+export declare const useQueries: <T = any>(name?: string, payloads?: any[], opts?: {
     persistent: boolean;
 }) => {
     loading: boolean;
     data?: T;
     error?: BasedError;
+    checksum?: string;
+}[];
+export declare const useQuery: <N extends string | number>(name: N, payload?: QueryMap[N]["payload"], opts?: {
+    persistent: boolean;
+}) => {
+    loading: boolean;
+    data?: QueryMap[N]["result"];
+    error?: BasedError;
     checksum?: number;
 };
+//# sourceMappingURL=useQuery.d.ts.map

package/dist/useQuery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useQuery.d.ts","sourceRoot":"","sources":["../src/useQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAIjE,eAAO,MAAM,UAAU,mBACd,MAAM,aACF,GAAG,EAAE,SACT;IACL,UAAU,EAAE,OAAO,CAAA;CACpB;aAEQ,OAAO;;YAER,UAAU;eACP,MAAM;GA4DlB,CAAA;AAED,eAAO,MAAM,QAAQ,gFAGZ;IACL,UAAU,EAAE,OAAO,CAAA;CACpB;aAEQ,OAAO;;YAER,UAAU;eACP,MAAM;CAsElB,CAAA"}

package/dist/useQuery.js

@@ -1,12 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useQuery = void 0;
+exports.useQuery = exports.useQueries = void 0;
 const react_1 = require("react");
 const Ctx_1 = require("./Ctx");
 const useLoading_1 = require("./useLoading");
+const useQueries = (name, payloads, opts) => {
+    // TODO add error handling
+    const client = (0, react_1.useContext)(Ctx_1.Ctx);
+    let key = '';
+    let sum = '';
+    if (client && name) {
+        const queries = Array(payloads.length);
+        const result = payloads.map((payload, i) => {
+            // @ts-ignore
+            const q = client.query(name, payload, opts);
+            const { id, cache } = q;
+            queries[i] = q;
+            key += id;
+            if (cache) {
+                sum += cache.checksum;
+                return { loading: false, data: cache.value, checksum: cache.checksum };
+            }
+            return { loading: true };
+        });
+        const [, update] = (0, react_1.useState)(sum);
+        (0, react_1.useEffect)(() => {
+            let raf;
+            const listener = () => {
+                if (!raf) {
+                    raf = requestAnimationFrame(() => {
+                        raf = null;
+                        update(queries.reduce((sum, { cache }) => {
+                            return cache ? sum + cache.checksum : sum;
+                        }, ''));
+                    });
+                }
+            };
+            const unsubs = queries.map((q) => {
+                return q.subscribe(listener);
+            });
+            return () => {
+                unsubs.forEach((unsubscribe) => unsubscribe());
+                if (raf) {
+                    cancelAnimationFrame(raf);
+                }
+            };
+        }, [key]);
+        return result;
+    }
+    (0, react_1.useState)(sum);
+    (0, react_1.useEffect)(() => { }, [key]);
+    return Array(payloads.length).fill({ loading: true });
+};
+exports.useQueries = useQueries;
 const useQuery = (name, payload, opts) => {
     const client = (0, react_1.useContext)(Ctx_1.Ctx);
     if (client && name) {
+        // @ts-ignore
         const q = client.query(name, payload, opts);
         const { id, cache } = q;
         const [checksumOrError, update] = (0, react_1.useState)(cache?.checksum);

package/dist/useQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../src/useQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../src/useQuery.ts"],"names":[],"mappings":"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"}

package/dist/useWindow.d.ts

@@ -13,3 +13,4 @@ export declare const useWindow: (name: string, getPayload: ({ offset, limit }: {
     persistent?: boolean;
 }, dependencies?: any) => UseWindowState;
 export {};
+//# sourceMappingURL=useWindow.d.ts.map

package/dist/useWindow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useWindow.d.ts","sourceRoot":"","sources":["../src/useWindow.ts"],"names":[],"mappings":"AAKA,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,GAAG,EAAE,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,SAAS,SACd,MAAM;;;MACuB,GAAG,QAChC;IACJ,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,iBACc,GAAG,KACjB,cAiIF,CAAA"}

package/dist/useWindow.js

@@ -18,6 +18,7 @@ const useWindow = (name, getPayload, opts, dependencies) => {
         // complete reset
         const resetHash = (0, hash_1.hash)(dependencies);
         if (currResetHash.current !== resetHash) {
+            currResetHash.current = resetHash;
             currModifyHash.current = null;
             cache.current = null;
         }
@@ -86,19 +87,20 @@ const useWindow = (name, getPayload, opts, dependencies) => {
             return cache.current;
         }
         let l = queries.current.length;
+        cache.current.items = [];
         cache.current.loading = false;
         cache.current.checksum = checksum;
         while (l--) {
-            const q = queries.current[l];
-            const m = size * l + size;
             let i = size * l;
+            const q = queries.current[l];
+            const m = i + size;
             if (q) {
                 if (q.cache) {
                     let data = q.cache.value;
+                    for (const i of path) {
+                        data = data?.[i];
+                    }
                     if (data) {
-                        for (const i of path) {
-                            data = data[i];
-                        }
                         for (let j = 0; i < m; i++) {
                             const item = data[j++];
                             if (!item)
@@ -111,12 +113,12 @@ const useWindow = (name, getPayload, opts, dependencies) => {
                     cache.current.loading = true;
                 }
             }
-            // fill up empty items with null
-            for (; i < m; i++) {
-                if (!(i in cache.current.items)) {
-                    cache.current.items[i] = null;
-                }
-            }
+            // // fill up empty items with null
+            // for (; i < m; i++) {
+            //   if (!(i in cache.current.items)) {
+            //     cache.current.items[i] = null
+            //   }
+            // }
         }
     }
     return cache.current;

package/dist/useWindow.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWindow.js","sourceRoot":"","sources":["../src/useWindow.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useWindow.js","sourceRoot":"","sources":["../src/useWindow.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/react",
-  "version": "4.4.0",
+  "version": "4.5.1",
   "license": "MIT",
   "main": "dist/index.js",
   "scripts": {
@@ -17,10 +17,11 @@
     "ts-node": "10.9.1",
     "typescript": "^4.3.5",
     "react-dom": "^18.2.0",
-    "@saulx/aristotle": "^4.7.1"
+    "@saulx/aristotle": "^4.7.1",
+    "@based/client": "^4.8.9"
   },
   "peerDependencies": {
-    "@based/client": "^4.6.1",
+    "@based/client": "^4.8.9",
     "react": "16||17||18"
   }
 }

package/src/useQuery.ts

@@ -1,11 +1,11 @@
 import { useContext, useState, useEffect } from 'react'
-import { BasedClient, BasedError } from '@based/client'
+import { BasedClient, BasedError, QueryMap } from '@based/client'
 import { Ctx } from './Ctx'
 import { hooksLoading, useLoadingListeners } from './useLoading'
 
-export const useQuery = <T = any>(
+export const useQueries = <T = any>(
   name?: string,
-  payload?: any,
+  payloads?: any[],
   opts?: {
     persistent: boolean
   }
@@ -13,11 +13,84 @@ export const useQuery = <T = any>(
   loading: boolean
   data?: T
   error?: BasedError
+  checksum?: string
+}[] => {
+  // TODO add error handling
+  const client: BasedClient = useContext(Ctx)
+  let key = ''
+  let sum = ''
+
+  if (client && name) {
+    const queries = Array(payloads.length)
+    const result = payloads.map((payload, i) => {
+      // @ts-ignore
+      const q = client.query(name, payload, opts)
+      const { id, cache } = q
+      queries[i] = q
+      key += id
+
+      if (cache) {
+        sum += cache.checksum
+        return { loading: false, data: cache.value, checksum: cache.checksum }
+      }
+
+      return { loading: true }
+    })
+
+    const [, update] = useState(sum)
+
+    useEffect(() => {
+      let raf
+      const listener = () => {
+        if (!raf) {
+          raf = requestAnimationFrame(() => {
+            raf = null
+            update(
+              queries.reduce((sum, { cache }) => {
+                return cache ? sum + cache.checksum : sum
+              }, '')
+            )
+          })
+        }
+      }
+
+      const unsubs = queries.map((q) => {
+        return q.subscribe(listener)
+      })
+
+      return () => {
+        unsubs.forEach((unsubscribe) => unsubscribe())
+        if (raf) {
+          cancelAnimationFrame(raf)
+        }
+      }
+    }, [key])
+
+    return result
+  }
+
+  useState(sum)
+  useEffect(() => {}, [key])
+
+  return Array(payloads.length).fill({ loading: true })
+}
+
+export const useQuery = <N extends keyof QueryMap>(
+  name: N,
+  payload?: QueryMap[N]['payload'],
+  opts?: {
+    persistent: boolean
+  }
+): {
+  loading: boolean
+  data?: QueryMap[N]['result']
+  error?: BasedError
   checksum?: number
 } => {
   const client: BasedClient = useContext(Ctx)
 
   if (client && name) {
+    // @ts-ignore
     const q = client.query(name, payload, opts)
     const { id, cache } = q
     const [checksumOrError, update] = useState<number | BasedError>(

package/src/useWindow.ts

@@ -34,6 +34,7 @@ export const useWindow = (
     // complete reset
     const resetHash = hash(dependencies)
     if (currResetHash.current !== resetHash) {
+      currResetHash.current = resetHash
       currModifyHash.current = null
       cache.current = null
     }
@@ -110,21 +111,22 @@ export const useWindow = (
     }
 
     let l = queries.current.length
+    cache.current.items = []
     cache.current.loading = false
     cache.current.checksum = checksum
 
     while (l--) {
-      const q = queries.current[l]
-      const m = size * l + size
       let i = size * l
+      const q = queries.current[l]
+      const m = i + size
 
       if (q) {
         if (q.cache) {
           let data = q.cache.value
+          for (const i of path) {
+            data = data?.[i]
+          }
           if (data) {
-            for (const i of path) {
-              data = data[i]
-            }
             for (let j = 0; i < m; i++) {
               const item = data[j++]
               if (!item) break
@@ -136,12 +138,12 @@ export const useWindow = (
         }
       }
 
-      // fill up empty items with null
-      for (; i < m; i++) {
-        if (!(i in cache.current.items)) {
-          cache.current.items[i] = null
-        }
-      }
+      // // fill up empty items with null
+      // for (; i < m; i++) {
+      //   if (!(i in cache.current.items)) {
+      //     cache.current.items[i] = null
+      //   }
+      // }
     }
   }