@choksheak/react-utils 0.2.3 → 0.2.4

package/sharedQuery.mjs

@@ -1,7 +1,7 @@
 // src/sharedQuery.ts
 import { MS_PER_DAY as MS_PER_DAY2 } from "@choksheak/ts-utils/timeConstants";
 import getByteSize from "object-sizeof";
-import { useCallback, useEffect, useMemo, useRef } from "react";
+import { useCallback, useEffect, useMemo as useMemo2, useRef } from "react";
 
 // src/sharedState.ts
 import { MS_PER_DAY } from "@choksheak/ts-utils/timeConstants";
@@ -266,18 +266,39 @@ function stringifyDeterministicForKeys(params) {
   });
 }
 
+// src/utils/useDeepMemo.ts
+import isEqual from "lodash/isEqual";
+import { useMemo, useState } from "react";
+function useDeepMemo(value) {
+  const [state, setState] = useState(value);
+  return useMemo(() => {
+    if (state === value || isEqual(state, value)) {
+      return state;
+    }
+    setState(value);
+    return value;
+  }, [state, value]);
+}
+
 // src/sharedQuery.ts
 var SharedQueryDefaults = {
+  // Refetch on every page load.
   staleMs: 0,
+  // Keep in cache for a long time.
   expiryMs: 30 * MS_PER_DAY2,
+  // Always refetch automatically if the data is stale.
+  refetchOnStale: true,
+  // No default persistence configured.
   persistTo: void 0,
+  // 100 is not too large, but please tweak accordingly.
   maxSize: 100,
-  // 100 is not too large, but please tweak accordingly
-  maxBytes: 1e5
-  // 100kb before GC
+  // 100kb limit before discarding old records.
+  maxBytes: 1e5,
+  // Default to log to console.
+  log: (...args) => console.log("[sharedQuery]", ...args)
 };
 var SharedQuery = class {
-  inflightPromises = /* @__PURE__ */ new Map();
+  inflightQueries = /* @__PURE__ */ new Map();
   queryState;
   queryName;
   queryFn;
@@ -286,22 +307,27 @@ var SharedQuery = class {
   refetchOnStale;
   maxSize;
   maxBytes;
+  log;
   constructor(options) {
     this.queryName = options.queryName;
     this.queryFn = options.queryFn;
-    this.expiryMs = options?.expiryMs !== void 0 ? options?.expiryMs : SharedQueryDefaults.expiryMs;
-    this.staleMs = options?.staleMs !== void 0 ? options?.staleMs : SharedQueryDefaults.staleMs;
-    this.refetchOnStale = Boolean(options?.refetchOnStale);
-    const persistTo = options.persistTo ?? SharedQueryDefaults.persistTo;
-    if (persistTo === "localStorage") {
-      options.localStorageKey = options.queryName;
-    } else if (persistTo === "indexedDb") {
-      options.indexedDbKey = options.queryName;
+    this.staleMs = options?.staleMs ?? SharedQueryDefaults.staleMs;
+    this.expiryMs = options?.expiryMs ?? SharedQueryDefaults.expiryMs;
+    this.refetchOnStale = options?.refetchOnStale ?? SharedQueryDefaults.refetchOnStale;
+    if (!options.localStorageKey && !options.indexedDbKey) {
+      const persistTo = options.persistTo ?? SharedQueryDefaults.persistTo;
+      if (persistTo === "localStorage") {
+        options.localStorageKey = options.queryName;
+      } else if (persistTo === "indexedDb") {
+        options.indexedDbKey = options.queryName;
+      }
     }
     this.maxSize = options?.maxSize ?? SharedQueryDefaults.maxSize;
     this.maxBytes = options?.maxBytes ?? SharedQueryDefaults.maxBytes;
+    this.log = options?.log ?? SharedQueryDefaults.log;
     this.queryState = sharedState(
       {},
+      // defaultValue
       {
         ...options,
         // Fallback to use expiryMs for the storeExpiryMs.
@@ -309,9 +335,24 @@ var SharedQuery = class {
       }
     );
   }
+  /** Returns a key to identify requests based on the given args. */
   getQueryKey(args) {
     return this.queryName + ":" + stringifyDeterministicForKeys(args);
   }
+  /**
+   * Get the AbortController to abort the inflight query (if any).
+   *
+   * Note that once you get the controller, you can also get the signal easily
+   * using `controller.signal`. So if you need both the controller and the
+   * signal, just use this function.
+   */
+  getAbortController(queryKey) {
+    return this.inflightQueries.get(queryKey)?.abortController ?? null;
+  }
+  /** Get the AbortSignal to check for query abortions. */
+  getAbortSignal(queryKey) {
+    return this.getAbortController(queryKey)?.signal ?? null;
+  }
   isStale(dataUpdatedMs) {
     if (this.staleMs === 0) return true;
     const ageMs = Date.now() - dataUpdatedMs;
@@ -327,42 +368,41 @@ var SharedQuery = class {
     const cached = this.queryState.getSnapshot()?.[queryKey];
     if (cached?.data && !this.isExpired(cached.dataUpdatedMs ?? 0)) {
       if (!this.isStale(cached.dataUpdatedMs ?? 0)) {
-        console.log(
-          `Return fresh data ${queryKey} from cache without fetching`
-        );
+        this.log(`Return fresh data ${queryKey} from cache without fetching`);
         return cached.data;
       }
       if (this.refetchOnStale) {
-        console.log(`refetchOnStale for ${queryKey}`);
+        this.log(`refetchOnStale for ${queryKey}`);
         void this.dedupedFetch(queryKey, ...args);
       }
-      console.log(`Returning stale data for ${queryKey}`);
+      this.log(`Returning stale data for ${queryKey}`);
       return cached.data;
     }
     return await this.dedupedFetch(queryKey, ...args);
   }
   dedupedFetch(queryKey, ...args) {
-    const inflightPromise = this.inflightPromises.get(queryKey);
-    if (inflightPromise) {
-      console.log(`Deduplicating inflight fetch for ${queryKey}`);
-      return inflightPromise;
+    const inflightQuery = this.inflightQueries.get(queryKey);
+    if (inflightQuery) {
+      this.log(`Deduplicating inflight fetch for ${queryKey}`);
+      return inflightQuery.promise;
     }
     const promise = this.startFetching(queryKey, args);
-    this.inflightPromises.set(queryKey, promise);
+    const abortController = new AbortController();
+    this.inflightQueries.set(queryKey, { promise, abortController });
     return promise;
   }
   async startFetching(queryKey, args) {
-    console.log(`Start fetching ${queryKey}`);
+    this.log(`Start fetching ${queryKey}`);
     try {
       const data = await this.queryFn(...args);
-      console.log(`Successfully fetched ${queryKey}`);
+      this.log(`Successfully fetched ${queryKey}`);
       this.setData(queryKey, data, Date.now());
       return data;
     } catch (e) {
-      console.error(`Failed to fetch ${queryKey}: ${e}`);
+      this.log(`Failed to fetch ${queryKey}: ${e}`);
       throw e;
     } finally {
-      this.inflightPromises.delete(queryKey);
+      this.inflightQueries.delete(queryKey);
     }
   }
   /** Set the data directly if the user obtained it from somewhere else. */
@@ -382,18 +422,26 @@ var SharedQuery = class {
     return await this.dedupedFetch(key, ...args);
   }
   /** Delete the cached data for one set of arguments. */
-  deleteData(args) {
-    const queryKey = this.getQueryKey(args);
+  deleteData(queryKey) {
     const record = this.queryState.getSnapshot();
     const clone = { ...record };
     delete clone[queryKey];
     this.queryState.setValue(clone);
-    this.inflightPromises.delete(queryKey);
+    const inflight = this.inflightQueries.get(queryKey);
+    if (inflight) {
+      this.inflightQueries.delete(queryKey);
+      inflight.abortController.abort("Deleted");
+    }
   }
   /** Delete all currently cached data & all inflight promises. */
   clear() {
     this.queryState.delete();
-    this.inflightPromises.clear();
+    for (const { abortController } of Array.from(
+      this.inflightQueries.values()
+    )) {
+      abortController.abort("Cleared");
+    }
+    this.inflightQueries.clear();
   }
   /**
    * Discard the oldest entries if the size exceeds the limit. The last
@@ -414,7 +462,7 @@ var SharedQuery = class {
     if (this.maxSize) {
       const numToCut = oldSize - this.maxSize;
       if (numToCut > 0) {
-        console.log(
+        this.log(
           `enforceSizeLimit for ${this.queryName} needed due to size ${oldSize} > ${this.maxSize}`
         );
         newState = { ...newState };
@@ -433,7 +481,7 @@ var SharedQuery = class {
       const currentByteSize = needUpdate ? getByteSize(newState) : oldByteSize;
       let bytesToCut = currentByteSize - this.maxBytes;
       if (bytesToCut > 0) {
-        console.log(
+        this.log(
           `enforceSizeLimit for ${this.queryName} needed due to byte size ${currentByteSize.toLocaleString()} > ${this.maxBytes.toLocaleString()}`
         );
         if (!needUpdate) {
@@ -458,12 +506,12 @@ var SharedQuery = class {
     }
     if (needUpdate) {
       this.queryState.setValue(newState);
-      console.log(
+      this.log(
         `Trimmed data for ${this.queryName}: size=(${oldSize} -> ${Object.keys(newState).length}) (limit=${this.maxSize}), byteSize=(${oldByteSize.toLocaleString()} -> ${getByteSize(newState).toLocaleString()}) (limit=${this.maxBytes.toLocaleString()})`
       );
       return;
     }
-    console.log(
+    this.log(
       `No need to trim data for ${this.queryName}: size=${oldSize} (limit=${this.maxSize}), byteSize=${oldByteSize.toLocaleString()} (limit=${this.maxBytes.toLocaleString()})`
     );
   }
@@ -481,77 +529,89 @@ var DEFAULT_QUERY_STATE_ENTRY = {
   loading: true
 };
 function useSharedQuery(query, args = []) {
+  const stableArgs = useDeepMemo(args);
   const [queryState, setQueryState] = useSharedState(query.queryState);
   const isMounted = useRef(true);
-  const queryKey = query.getQueryKey(args);
-  const execute = useCallback(async () => {
-    console.log(`Begin executing shared query ${queryKey}`);
-    setQueryState((prev) => {
-      const clone = { ...prev };
-      clone[queryKey] = {
-        ...clone[queryKey] ?? {},
-        lastUpdatedMs: Date.now(),
-        loading: true
-      };
-      return clone;
-    });
-    try {
-      const data = await query.getCachedOrFetch(...args);
-      if (isMounted.current) {
-        setQueryState((prev) => {
-          const clone = { ...prev };
-          const now = Date.now();
-          clone[queryKey] = {
-            // Don't keep old error.
-            lastUpdatedMs: now,
-            loading: false,
-            data,
-            dataUpdatedMs: now
-          };
-          return clone;
-        });
-      }
-    } catch (e) {
-      const error = e instanceof Error ? e : new Error(`An unknown error occurred during fetch: ${e}`);
-      if (isMounted.current) {
-        setQueryState((prev) => {
-          const clone = { ...prev };
-          const now = Date.now();
-          clone[queryKey] = {
-            // Keep old data.
-            ...clone[queryKey] ?? {},
-            lastUpdatedMs: now,
-            loading: false,
-            error,
-            errorUpdatedMs: now
-          };
-          return clone;
-        });
+  const queryKey = useMemo2(
+    () => query.getQueryKey(stableArgs),
+    [query, stableArgs]
+  );
+  const queryStateValue = queryState[queryKey];
+  const execute = useCallback(
+    async (forceRefresh) => {
+      query.log(`Begin executing shared query ${queryKey}`);
+      setQueryState((prev) => {
+        const clone = { ...prev };
+        clone[queryKey] = {
+          ...clone[queryKey] ?? {},
+          lastUpdatedMs: Date.now(),
+          loading: true
+        };
+        return clone;
+      });
+      try {
+        const data = await (forceRefresh ? query.updateFromSource(...stableArgs) : query.getCachedOrFetch(...stableArgs));
+        if (isMounted.current) {
+          setQueryState((prev) => {
+            const clone = { ...prev };
+            const now = Date.now();
+            clone[queryKey] = {
+              // Don't keep old error.
+              lastUpdatedMs: now,
+              loading: false,
+              data,
+              dataUpdatedMs: now
+            };
+            return clone;
+          });
+        }
+      } catch (e) {
+        if (isMounted.current) {
+          setQueryState((prev) => {
+            const clone = { ...prev };
+            const now = Date.now();
+            clone[queryKey] = {
+              // Keep old data.
+              ...clone[queryKey] ?? {},
+              lastUpdatedMs: now,
+              loading: false,
+              error: e,
+              errorUpdatedMs: now
+            };
+            return clone;
+          });
+        }
       }
-    }
-  }, [queryKey]);
+    },
+    [query, queryKey, setQueryState, stableArgs]
+  );
   useEffect(() => {
     isMounted.current = true;
-    void execute();
+    void execute(false);
     return () => {
       isMounted.current = false;
     };
   }, [execute]);
-  return useMemo(() => {
-    const state = queryState[queryKey] ?? DEFAULT_QUERY_STATE_ENTRY;
+  return useMemo2(() => {
+    const state = queryStateValue ?? DEFAULT_QUERY_STATE_ENTRY;
     return {
       ...state,
+      abortCurrentQuery: (reason) => {
+        const controller = query.getAbortController(queryKey);
+        controller?.abort(reason);
+        return Boolean(controller);
+      },
       refetch: () => {
-        return query.updateFromSource(...args);
+        void execute(true);
       },
       setData: (data, dataUpdatedMs) => {
         query.setData(queryKey, data, dataUpdatedMs ?? Date.now());
       },
       deleteData: () => {
-        query.deleteData(args);
+        query.deleteData(queryKey);
       }
     };
-  }, [query, queryKey, queryState]);
+  }, [execute, query, queryKey, queryStateValue]);
 }
 export {
   SharedQuery,