@choksheak/react-utils 0.4.9 → 0.5.1

package/{chunk-2VVAT5AA.cjs → chunk-5WECMKSV.cjs}

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
-var _chunkKXFV42DPcjs = require('./chunk-KXFV42DP.cjs');
+var _chunkYMQDZV47cjs = require('./chunk-YMQDZV47.cjs');
 
 
 var _chunkCYTO5EZEcjs = require('./chunk-CYTO5EZE.cjs');
@@ -11,14 +11,7 @@ var _chunkWXLUEDBOcjs = require('./chunk-WXLUEDBO.cjs');
 
 // src/sharedQuery.ts
 var _http = require('@choksheak/ts-utils/http');
-var _nonNil = require('@choksheak/ts-utils/nonNil');
 var _objectsizeof = require('object-sizeof'); var _objectsizeof2 = _interopRequireDefault(_objectsizeof);
-
-
-
-
-
-
 var _react = require('react');
 var _xxhashjs = require('xxhashjs'); var _xxhashjs2 = _interopRequireDefault(_xxhashjs);
 var hasWindow = typeof window !== "undefined";
@@ -27,8 +20,6 @@ var SharedQueryConfig = {
   staleMs: 0,
   /** Keep in cache for a long time. */
   expiryMs: 30 * 864e5,
-  /** 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. */
@@ -114,7 +105,6 @@ function sharedQuery2(options) {
   const refetchFn = options.refetchFn;
   const staleMs = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _2 => _2.staleMs]), () => ( SharedQueryConfig.staleMs));
   const expiryMs = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _3 => _3.expiryMs]), () => ( SharedQueryConfig.expiryMs));
-  const refetchOnStale = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _4 => _4.refetchOnStale]), () => ( SharedQueryConfig.refetchOnStale));
   const store = options.store;
   if (store) {
     if ("persistTo" in store && store.isValid) {
@@ -150,16 +140,37 @@ function sharedQuery2(options) {
       };
     }
   }
-  const maxSize = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _5 => _5.maxSize]), () => ( SharedQueryConfig.maxSize));
-  const maxBytes = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _6 => _6.maxBytes]), () => ( SharedQueryConfig.maxBytes));
-  const keepLastNonEmptyData = Boolean(_optionalChain([options, 'optionalAccess', _7 => _7.keepLastNonEmptyData]));
-  const log = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _8 => _8.log]), () => ( SharedQueryConfig.log));
+  const maxSize = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _4 => _4.maxSize]), () => ( SharedQueryConfig.maxSize));
+  const maxBytes = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _5 => _5.maxBytes]), () => ( SharedQueryConfig.maxBytes));
+  const keepLastNonEmptyData = Boolean(_optionalChain([options, 'optionalAccess', _6 => _6.keepLastNonEmptyData]));
+  const log = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _7 => _7.log]), () => ( SharedQueryConfig.log));
   options.name = queryName;
-  const queryState = _chunkKXFV42DPcjs.sharedState.call(void 0, 
+  const queryState = _chunkYMQDZV47cjs.sharedState.call(void 0, 
     {},
     // defaultValue
     options
   );
+  function getQueryKey(args) {
+    let s = _chunkCYTO5EZEcjs.stringifyDeterministicForKeys.call(void 0, args);
+    if (s.length > 30) {
+      s = _xxhashjs2.default.h32(s, 39406).toString(16).slice(2);
+    }
+    return queryName + ":" + s;
+  }
+  function getAbortControllerByKey(queryKey) {
+    return _nullishCoalesce(_optionalChain([inflightQueries, 'access', _8 => _8.get, 'call', _9 => _9(queryKey), 'optionalAccess', _10 => _10.abortController]), () => ( null));
+  }
+  function getAbortController(args) {
+    const queryKey = getQueryKey(args);
+    return getAbortControllerByKey(queryKey);
+  }
+  function getAbortSignal(args) {
+    const queryKey = getQueryKey(args);
+    return getAbortSignalByKey(queryKey);
+  }
+  function getAbortSignalByKey(queryKey) {
+    return _nullishCoalesce(_optionalChain([getAbortControllerByKey, 'call', _11 => _11(queryKey), 'optionalAccess', _12 => _12.signal]), () => ( null));
+  }
   function isStale(dataUpdatedMs) {
     if (staleMs === 0) return true;
     const ageMs = Date.now() - dataUpdatedMs;
@@ -196,7 +207,7 @@ function sharedQuery2(options) {
     const deleteKeyIfNotMounted = (key, expired) => {
       if (mountedKeys.has(key)) {
         log(`Cannot clean up ${key} as it is mounted`);
-        return;
+        return false;
       }
       const byteSize = _objectsizeof2.default.call(void 0, key) + _objectsizeof2.default.call(void 0, newState[key]);
       log(
@@ -206,23 +217,31 @@ function sharedQuery2(options) {
       bytesToCut -= byteSize;
       delete newState[key];
       needUpdate = true;
+      return true;
     };
-    let entriesByTimeAscending = Object.entries(newState).sort(
-      (entry1, entry2) => entry1[1].lastUpdatedMs - entry2[1].lastUpdatedMs
+    const entriesByLastUpdatedMsAsc = Object.fromEntries(
+      Object.entries(newState).sort(
+        (entry1, entry2) => entry1[1].lastUpdatedMs - entry2[1].lastUpdatedMs
+      )
     );
-    for (const [key] of entriesByTimeAscending) {
-      if (!isExpired(newState[key].lastUpdatedMs)) {
+    for (const key of Object.keys(entriesByLastUpdatedMsAsc)) {
+      const state = newState[key];
+      if (!_optionalChain([state, 'optionalAccess', _13 => _13.lastUpdatedMs]) || _optionalChain([state, 'optionalAccess', _14 => _14.loading])) {
+        continue;
+      }
+      if (_optionalChain([state, 'optionalAccess', _15 => _15.lastUpdatedMs]) && !isExpired(state.lastUpdatedMs)) {
         break;
       }
-      deleteKeyIfNotMounted(key, true);
+      if (deleteKeyIfNotMounted(key, true)) {
+        delete entriesByLastUpdatedMsAsc[key];
+      }
     }
     if (numToCut > 0 || bytesToCut > 0) {
-      if (needUpdate) {
-        entriesByTimeAscending = Object.entries(newState).sort(
-          (entry1, entry2) => entry1[1].lastUpdatedMs - entry2[1].lastUpdatedMs
-        );
-      }
-      for (const [key] of entriesByTimeAscending) {
+      for (const key of Object.keys(entriesByLastUpdatedMsAsc)) {
+        const state = newState[key];
+        if (!_optionalChain([state, 'optionalAccess', _16 => _16.lastUpdatedMs]) || _optionalChain([state, 'optionalAccess', _17 => _17.loading])) {
+          continue;
+        }
         deleteKeyIfNotMounted(key, false);
         if (numToCut <= 0 && bytesToCut <= 0) {
           break;
@@ -240,15 +259,120 @@ function sharedQuery2(options) {
       `Trimmed data for ${queryName}: size=[${oldSize} -> ${Object.keys(newState).length}] (limit=${maxSize}), byteSize=[${oldByteSize.toLocaleString()} -> ${_objectsizeof2.default.call(void 0, newState).toLocaleString()}] (limit=${maxBytes.toLocaleString()})`
     );
   }
+  function getQueryValue(queryKey) {
+    return _optionalChain([queryState, 'access', _18 => _18.getSnapshot, 'call', _19 => _19(), 'optionalAccess', _20 => _20[queryKey]]);
+  }
+  function setQueryValue(queryKey, next) {
+    queryState.setValue((prev) => {
+      const value = typeof next === "function" ? next(_nullishCoalesce(prev[queryKey], () => ( DEFAULT_QUERY_STATE_ENTRY))) : next;
+      return { ...prev, [queryKey]: value };
+    });
+    enforceSizeLimit();
+  }
+  function getData(queryKey) {
+    const stateValue = getQueryValue(queryKey);
+    if (_optionalChain([stateValue, 'optionalAccess', _21 => _21.dataUpdatedMs])) {
+      if (isExpired(stateValue.dataUpdatedMs)) {
+        deleteData(queryKey);
+        return void 0;
+      }
+    }
+    return _optionalChain([stateValue, 'optionalAccess', _22 => _22.data]);
+  }
   function setData(queryKey, data, dataUpdatedMs = Date.now()) {
-    const entry = {
+    setQueryValue(queryKey, {
       lastUpdatedMs: Date.now(),
       loading: false,
       data,
       dataUpdatedMs
-    };
-    queryState.setValue((prev) => ({ ...prev, [queryKey]: entry }));
-    enforceSizeLimit();
+    });
+  }
+  function deleteData(queryKey) {
+    const record = queryState.getSnapshot();
+    const clone = { ...record };
+    delete clone[queryKey];
+    queryState.setValue(clone);
+    const inflight = inflightQueries.get(queryKey);
+    if (inflight) {
+      inflightQueries.delete(queryKey);
+      inflight.abortController.abort("Deleted");
+    }
+  }
+  async function wrapLoading(queryKey, fetchData) {
+    setQueryValue(queryKey, DEFAULT_QUERY_STATE_ENTRY);
+    try {
+      const data = await fetchData();
+      if (_optionalChain([getQueryValue, 'call', _23 => _23(queryKey), 'optionalAccess', _24 => _24.loading])) {
+        const now = Date.now();
+        setQueryValue(queryKey, {
+          data,
+          loading: false,
+          lastUpdatedMs: now,
+          dataUpdatedMs: now
+        });
+      }
+      return data;
+    } catch (e) {
+      if (_optionalChain([getQueryValue, 'call', _25 => _25(queryKey), 'optionalAccess', _26 => _26.loading])) {
+        const now = Date.now();
+        setQueryValue(queryKey, {
+          loading: false,
+          lastUpdatedMs: now,
+          error: e,
+          errorUpdatedMs: now
+        });
+      }
+      throw e;
+    }
+  }
+  async function waitForStateInit(queryKey) {
+    const startMs = Date.now();
+    await queryState.readyPromise;
+    const waitedMs = Date.now() - startMs;
+    if (waitedMs) {
+      log(`${queryKey}: Waited for ${waitedMs}ms before data is ready`);
+    }
+  }
+  async function getCachedOrFetch(queryKey, ...args) {
+    await waitForStateInit(queryKey);
+    const cached = getQueryValue(queryKey);
+    if (_optionalChain([cached, 'optionalAccess', _27 => _27.data]) !== void 0 && cached.dataUpdatedMs && !isExpired(cached.dataUpdatedMs)) {
+      if (!isStale(cached.dataUpdatedMs)) {
+        log(`Return fresh data ${queryKey} from cache without fetching`);
+        return cached.data;
+      }
+      void dedupedFetch(queryKey, "query", ...args);
+      log(`Returning stale data for ${queryKey}`);
+      return cached.data;
+    }
+    return await dedupedFetch(queryKey, "query", ...args);
+  }
+  async function getCachedStateOrFetch(queryKey, ...args) {
+    await waitForStateInit(queryKey);
+    const cached = getQueryValue(queryKey);
+    if (_optionalChain([cached, 'optionalAccess', _28 => _28.data]) !== void 0 && cached.dataUpdatedMs && !isExpired(cached.dataUpdatedMs)) {
+      if (!isStale(cached.dataUpdatedMs)) {
+        log(`Return fresh data ${queryKey} from cache without fetching`);
+        return cached;
+      }
+      void dedupedFetch(queryKey, "query", ...args);
+      log(`Returning stale data for ${queryKey}`);
+      return cached;
+    }
+    if (_optionalChain([cached, 'optionalAccess', _29 => _29.error]) !== void 0 && cached.errorUpdatedMs && !isExpired(cached.errorUpdatedMs)) {
+      if (!isStale(cached.errorUpdatedMs)) {
+        log(`Return fresh error ${queryKey} from cache without fetching`);
+        return cached;
+      }
+      void dedupedFetch(queryKey, "query", ...args);
+      log(`Returning stale error for ${queryKey}`);
+      return cached;
+    }
+    try {
+      await dedupedFetch(queryKey, "query", ...args);
+    } catch (e2) {
+    }
+    return _nullishCoalesce(getQueryValue(queryKey), () => ( DEFAULT_QUERY_STATE_ENTRY));
   }
   async function startFetching(queryKey, queryType, args) {
     log(`Start fetching ${queryKey}, queryType=${queryType}`);
@@ -272,197 +396,69 @@ function sharedQuery2(options) {
       );
       return inflightQuery.promise;
     }
-    const promise = startFetching(queryKey, queryType, args);
-    const abortController = new AbortController();
-    inflightQueries.set(queryKey, { promise, abortController });
-    return promise;
+    return wrapLoading(queryKey, () => {
+      const promise = startFetching(queryKey, queryType, args);
+      const abortController = new AbortController();
+      inflightQueries.set(queryKey, { promise, abortController });
+      return promise;
+    });
+  }
+  async function fetch(queryKey, ...args) {
+    return await dedupedFetch(queryKey, "query", ...args);
+  }
+  async function refetch(queryKey, ...args) {
+    return await dedupedFetch(queryKey, "refetch", ...args);
+  }
+  function clear() {
+    queryState.delete();
+    for (const { abortController } of Array.from(inflightQueries.values())) {
+      abortController.abort("Cleared");
+    }
+    inflightQueries.clear();
+  }
+  function mount(queryKey) {
+    mountedKeys.set(queryKey, (_nullishCoalesce(mountedKeys.get(queryKey), () => ( 0))) + 1);
   }
-  const obj = {
+  function unmount(queryKey) {
+    const count = mountedKeys.get(queryKey);
+    if (count === 1) {
+      mountedKeys.delete(queryKey);
+    } else {
+      mountedKeys.set(queryKey, (_nullishCoalesce(count, () => ( 0))) - 1);
+    }
+  }
+  return {
     queryName,
     queryFn,
     refetchFn,
     expiryMs,
     staleMs,
-    refetchOnStale,
     maxSize,
     maxBytes,
     keepLastNonEmptyData,
     log,
     queryState,
-    /** Returns a key to identify requests based on the given args. */
-    getQueryKey(args) {
-      let s = _chunkCYTO5EZEcjs.stringifyDeterministicForKeys.call(void 0, args);
-      if (s.length > 30) {
-        s = _xxhashjs2.default.h32(s, 39406).toString(16).slice(2);
-      }
-      return queryName + ":" + s;
-    },
-    /**
-     * 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(args) {
-      const queryKey = obj.getQueryKey(args);
-      return obj.getAbortControllerByKey(queryKey);
-    },
-    getAbortControllerByKey(queryKey) {
-      return _nullishCoalesce(_optionalChain([inflightQueries, 'access', _9 => _9.get, 'call', _10 => _10(queryKey), 'optionalAccess', _11 => _11.abortController]), () => ( null));
-    },
-    /**
-     * Get the AbortSignal to check for query abortions.
-     *
-     * Example using fetch:
-     * ```
-     *   const getUserQuery = sharedQuery({
-     *     queryName: "getUser",
-     *     queryFn: (userId: string) => {
-     *       // Get the signal for this current execution.
-     *       const signal = getUserQuery.getAbortSignal([userId]);
-     *
-     *       // Pass the signal to fetch so that it can be aborted.
-     *       const response = await fetch(`/users/${userId}`, { signal });
-     *
-     *       // Check for errors.
-     *       if (!response.ok) {
-     *         throw new Error(response.statusText);
-     *       }
-     *
-     *       // Return the data.
-     *       return await response.json();
-     *     },
-     *   });
-     * ```
-     *
-     * Example using `http.ts`:
-     * ```
-     *   const getUserQuery = sharedQuery({
-     *     queryName: "getUser",
-     *     queryFn: (userId: string) => {
-     *       // Get the signal for this current execution.
-     *       const signal = getUserQuery.getAbortSignal([userId]);
-     *
-     *       // Pass the signal to fetch so that it can be aborted.
-     *       const response = await http.get(`/users/${userId}`, { signal });
-     *       return await response.json();
-     *     },
-     *   });
-     * ```
-     */
-    getAbortSignal(args) {
-      const queryKey = obj.getQueryKey(args);
-      return obj.getAbortSignalByKey(queryKey);
-    },
-    getAbortSignalByKey(queryKey) {
-      return _nullishCoalesce(_optionalChain([obj, 'access', _12 => _12.getAbortControllerByKey, 'call', _13 => _13(queryKey), 'optionalAccess', _14 => _14.signal]), () => ( null));
-    },
-    /** For cached data, we need to return the correct timestamps as well. */
-    async getCachedOrFetch(...args) {
-      const startMs = Date.now();
-      await queryState.readyPromise;
-      const waitedMs = Date.now() - startMs;
-      const queryKey = obj.getQueryKey(args);
-      const cached = _optionalChain([queryState, 'access', _15 => _15.getSnapshot, 'call', _16 => _16(), 'optionalAccess', _17 => _17[queryKey]]);
-      if (waitedMs) {
-        log(`${queryKey}: Waited for ${waitedMs}ms before data is ready`);
-      }
-      if (_optionalChain([cached, 'optionalAccess', _18 => _18.data]) && !isExpired(_nullishCoalesce(cached.dataUpdatedMs, () => ( 0)))) {
-        if (!isStale(_nullishCoalesce(cached.dataUpdatedMs, () => ( 0)))) {
-          log(`Return fresh data ${queryKey} from cache without fetching`);
-          return cached;
-        }
-        if (refetchOnStale) {
-          log(`refetchOnStale for ${queryKey}`);
-          void dedupedFetch(queryKey, "query", ...args);
-        }
-        log(`Returning stale data for ${queryKey}`);
-        return cached;
-      }
-      const data = await dedupedFetch(queryKey, "query", ...args);
-      const now = Date.now();
-      return {
-        // Don't keep old error.
-        lastUpdatedMs: now,
-        loading: false,
-        data,
-        dataUpdatedMs: now
-      };
-    },
-    /** Get the entire stored entry for a query key. */
-    getQueryValue(queryKey) {
-      return _optionalChain([queryState, 'access', _19 => _19.getSnapshot, 'call', _20 => _20(), 'optionalAccess', _21 => _21[queryKey]]);
-    },
-    /** Get the current stored data for a query key. */
-    getData(queryKey) {
-      const stateValue = _optionalChain([queryState, 'access', _22 => _22.getSnapshot, 'call', _23 => _23(), 'optionalAccess', _24 => _24[queryKey]]);
-      if (_optionalChain([stateValue, 'optionalAccess', _25 => _25.lastUpdatedMs])) {
-        if (isExpired(stateValue.lastUpdatedMs)) {
-          obj.deleteData(queryKey);
-          return void 0;
-        }
-      }
-      return _optionalChain([stateValue, 'optionalAccess', _26 => _26.data]);
-    },
-    /** Set the data directly if the user obtained it from somewhere else. */
+    getQueryKey,
+    getAbortController,
+    getAbortControllerByKey,
+    getAbortSignal,
+    getAbortSignalByKey,
+    isStale,
+    isExpired,
+    enforceSizeLimit,
+    getQueryValue,
+    setQueryValue,
+    getData,
     setData,
-    /**
-     * Do a new fetch even when the data is already cached, but don't fetch if
-     * another fetch is already inflight.
-     */
-    async updateFromSource(...args) {
-      const key = obj.getQueryKey(args);
-      return await dedupedFetch(key, "query", ...args);
-    },
-    /**
-     * Perform an explicit refetch. If `options.refetchFn` was not specified,
-     * then this would be identical to calling `obj.updateFromSource()`.
-     */
-    async refetch(...args) {
-      const key = obj.getQueryKey(args);
-      return await dedupedFetch(key, "refetch", ...args);
-    },
-    /** Delete the cached data for one set of arguments. */
-    deleteData(queryKey) {
-      const record = queryState.getSnapshot();
-      const clone = { ...record };
-      delete clone[queryKey];
-      queryState.setValue(clone);
-      const inflight = inflightQueries.get(queryKey);
-      if (inflight) {
-        inflightQueries.delete(queryKey);
-        inflight.abortController.abort("Deleted");
-      }
-    },
-    /** Delete all currently cached data & all inflight promises. */
-    clear() {
-      queryState.delete();
-      for (const { abortController } of Array.from(inflightQueries.values())) {
-        abortController.abort("Cleared");
-      }
-      inflightQueries.clear();
-    },
-    /** Keep track of mounted keys. */
-    mount(queryKey) {
-      mountedKeys.set(queryKey, (_nullishCoalesce(mountedKeys.get(queryKey), () => ( 0))) + 1);
-    },
-    /** Clean up mounted keys. */
-    unmount(queryKey) {
-      const count = mountedKeys.get(queryKey);
-      if (count === 1) {
-        mountedKeys.delete(queryKey);
-      } else {
-        mountedKeys.set(queryKey, (_nullishCoalesce(count, () => ( 0))) - 1);
-      }
-    },
-    /**
-     * Discard the oldest entries if the size exceeds the limit. The last
-     * remaining record cannot be deleted no matter what the limit is.
-     */
-    enforceSizeLimit
+    deleteData,
+    getCachedOrFetch,
+    getCachedStateOrFetch,
+    fetch,
+    refetch,
+    clear,
+    mount,
+    unmount
   };
-  return obj;
 }
 function sharedQuery(options) {
   return sharedQuery1(options);
@@ -473,83 +469,33 @@ var DEFAULT_QUERY_STATE_ENTRY = {
 };
 function useSharedQuery(query, ...args) {
   const stableArgs = _chunkWXLUEDBOcjs.useDeepMemo.call(void 0, args);
-  const [queryState, setQueryState] = _chunkKXFV42DPcjs.useSharedState.call(void 0, query.queryState);
+  const [queryState] = _chunkYMQDZV47cjs.useSharedState.call(void 0, query.queryState);
   const isMounted = _react.useRef.call(void 0, true);
+  const initQueryKeyDone = _react.useRef.call(void 0, "");
   const queryKey = _react.useMemo.call(void 0, 
     () => query.getQueryKey(stableArgs),
     [query, stableArgs]
   );
   const queryStateValue = _nullishCoalesce(queryState[queryKey], () => ( DEFAULT_QUERY_STATE_ENTRY));
-  const setQueryStateValue = _react.useCallback.call(void 0, 
-    (next) => {
-      setQueryState((prev) => {
-        const clone = { ...prev };
-        clone[queryKey] = typeof next === "function" ? next(_nullishCoalesce(clone[queryKey], () => ( DEFAULT_QUERY_STATE_ENTRY))) : next;
-        return clone;
-      });
-    },
-    [queryKey, setQueryState]
-  );
   const [lastNonEmptyData, setLastNonEmptyData] = _react.useState.call(void 0, );
   _react.useEffect.call(void 0, () => {
     if (query.keepLastNonEmptyData && queryStateValue.data !== void 0) {
       setLastNonEmptyData(queryStateValue.data);
     }
   }, [query.keepLastNonEmptyData, queryStateValue.data]);
-  const executeQuery = _react.useCallback.call(void 0, 
-    async (isRefetch) => {
-      query.log(
-        `Begin executing shared query ${queryKey}, isRefetch=${isRefetch}`
-      );
-      if (!isMounted.current) return;
-      setQueryStateValue((prev) => ({
-        // Keep old data and error.
-        ...prev,
-        lastUpdatedMs: Date.now(),
-        loading: true
-      }));
-      try {
-        let state;
-        if (isRefetch) {
-          const data = await query.refetch(...stableArgs);
-          const now = Date.now();
-          state = {
-            // Don't keep old error.
-            lastUpdatedMs: now,
-            loading: false,
-            data,
-            dataUpdatedMs: now
-          };
-        } else {
-          state = await query.getCachedOrFetch(...stableArgs);
-        }
-        if (!isMounted.current) return;
-        setQueryStateValue({ ...state, loading: false });
-        return state.data;
-      } catch (e) {
-        if (!isMounted.current) return;
-        const now = Date.now();
-        setQueryStateValue((prev) => ({
-          // Keep old data.
-          ...prev,
-          lastUpdatedMs: now,
-          loading: false,
-          error: e,
-          errorUpdatedMs: now
-        }));
-      }
-    },
-    [query, queryKey, setQueryStateValue, stableArgs]
-  );
   _react.useEffect.call(void 0, () => {
     isMounted.current = true;
     query.mount(queryKey);
-    void executeQuery(false);
     return () => {
       isMounted.current = false;
       query.unmount(queryKey);
     };
-  }, [executeQuery, query, queryKey]);
+  }, [query, queryKey]);
+  _react.useEffect.call(void 0, () => {
+    if (initQueryKeyDone.current === queryKey) return;
+    initQueryKeyDone.current = queryKey;
+    void query.getCachedStateOrFetch(queryKey, ...stableArgs);
+  }, [query, queryKey, stableArgs]);
   return _react.useMemo.call(void 0, () => {
     return {
       ...queryStateValue,
@@ -561,18 +507,17 @@ function useSharedQuery(query, ...args) {
       // abort the running queryFn.
       abortCurrentQuery: (reason) => {
         const controller = query.getAbortControllerByKey(queryKey);
-        _optionalChain([controller, 'optionalAccess', _27 => _27.abort, 'call', _28 => _28(reason)]);
+        _optionalChain([controller, 'optionalAccess', _30 => _30.abort, 'call', _31 => _31(reason)]);
         return Boolean(controller);
       },
       getCachedOrFetch: async () => {
-        const data = await query.getCachedOrFetch(...stableArgs);
-        return _nonNil.nonNil.call(void 0, 
-          data.data,
-          typeof data.error === "string" ? data.error : JSON.stringify(data.error)
-        );
+        return await query.getCachedOrFetch(queryKey, ...stableArgs);
+      },
+      getCachedStateOrFetch: async () => {
+        return await query.getCachedStateOrFetch(queryKey, ...stableArgs);
       },
       refetch: () => {
-        return executeQuery(true);
+        return query.refetch(queryKey, ...stableArgs);
       },
       setData: (data, dataUpdatedMs) => {
         query.setData(queryKey, data, dataUpdatedMs);
@@ -581,14 +526,7 @@ function useSharedQuery(query, ...args) {
         query.deleteData(queryKey);
       }
     };
-  }, [
-    executeQuery,
-    lastNonEmptyData,
-    query,
-    queryKey,
-    queryStateValue,
-    stableArgs
-  ]);
+  }, [lastNonEmptyData, query, queryKey, queryStateValue, stableArgs]);
 }
 
 

package/chunk-AX6NADU2.min.cjs

@@ -0,0 +1,2 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }var _chunk2WE3FDDWmincjs = require('./chunk-2WE3FDDW.min.cjs');var _chunkKGN4HQPPmincjs = require('./chunk-KGN4HQPP.min.cjs');var _chunkJOHZV3FDmincjs = require('./chunk-JOHZV3FD.min.cjs');var _http = require('@choksheak/ts-utils/http');var _objectsizeof = require('object-sizeof'); var _objectsizeof2 = _interopRequireDefault(_objectsizeof);var _react = require('react');var _xxhashjs = require('xxhashjs'); var _xxhashjs2 = _interopRequireDefault(_xxhashjs);var H=typeof window<"u",A= exports.a ={staleMs:0,expiryMs:30*864e5,persistTo:void 0,maxSize:100,maxBytes:1e5,log:(...r)=>{H&&console.log("[sharedQuery]",...r)}};function At(r){Object.assign(A,r)}var ft=new Map;function gt(){if(H){let r=window.globalThis;return r.reactUtilsQueryRegistry??=new Map}return ft}function Tt(r){let m=gt(),s=r.queryName||r.url,c=m.get(s);if(c)return c;let l=pt(r);return m.set(s,l),l}function pt(r){let m=r.url||"",s=r.queryName||m;if(!s)throw new Error("Either queryName or url must be specified.");let c=new Map,l=new Map,D;if(r.queryFn)D=r.queryFn;else if(m){let t=_http.http.use(_http.retries.call(void 0, ));D=async(...a)=>{let e="",n=_optionalChain([a, 'optionalAccess', _2 => _2[0]]);if(n){if(typeof n=="string")e=n;else if(typeof n=="object"){let d=[];for(let[C,M]of Object.entries(n))if(M!==void 0)if(Array.isArray(M))for(let x of M)x!==void 0&&d.push([C,String(x)]);else d.push([C,String(M)]);e=new URLSearchParams(d).toString()}e&&(m.includes("?")?e="&"+e:e="?"+e)}return await(await t.get(m+e)).json()}}else throw new Error("Either queryFn or url must be specified");let o=r.refetchFn,f=_nullishCoalesce(_optionalChain([r, 'optionalAccess', _3 => _3.staleMs]), () => (A.staleMs)),S=_nullishCoalesce(_optionalChain([r, 'optionalAccess', _4 => _4.expiryMs]), () => (A.expiryMs)),b=r.store;if(b){if("persistTo"in b&&b.isValid){let t=b.isValid;r={...r,store:{...b,isValid:a=>{if(!a||typeof a!="object")return!1;for(let e of Object.values(a))if(!e||typeof e!="object"||!("data"in e)||!("dataUpdatedMs"in e)||!("lastUpdatedMs"in e)||typeof e.dataUpdatedMs!="number"||typeof e.lastUpdatedMs!="number"||!t(e.data))return!1;return!0}}}}}else{let t=_nullishCoalesce(r.persistTo, () => (A.persistTo));t&&(r={...r,store:{persistTo:t,key:s,expiryMs:S}})}let T=_nullishCoalesce(_optionalChain([r, 'optionalAccess', _5 => _5.maxSize]), () => (A.maxSize)),g=_nullishCoalesce(_optionalChain([r, 'optionalAccess', _6 => _6.maxBytes]), () => (A.maxBytes)),G=!!_optionalChain([r, 'optionalAccess', _7 => _7.keepLastNonEmptyData]),i=_nullishCoalesce(_optionalChain([r, 'optionalAccess', _8 => _8.log]), () => (A.log));r.name=s;let h=_chunk2WE3FDDWmincjs.c.call(void 0, {},r);function P(t){let a=_chunkKGN4HQPPmincjs.a.call(void 0, t);return a.length>30&&(a=_xxhashjs2.default.h32(a,39406).toString(16).slice(2)),s+":"+a}function R(t){return _nullishCoalesce(_optionalChain([c, 'access', _9 => _9.get, 'call', _10 => _10(t), 'optionalAccess', _11 => _11.abortController]), () => (null))}function J(t){let a=P(t);return R(a)}function Z(t){let a=P(t);return v(a)}function v(t){return _nullishCoalesce(_optionalChain([R, 'call', _12 => _12(t), 'optionalAccess', _13 => _13.signal]), () => (null))}function F(t){return f===0?!0:Date.now()-t>f}function U(t){return S===0?!1:Date.now()-t>S}function L(){if(!T&&!g)return;let t=h.getSnapshot(),a=Object.keys(t).length;if(a<=1)return;let e=_objectsizeof2.default.call(void 0, t),n=T?a-T:0,y=g?e-g:0;if(n<=0&&y<=0){i(`No need to trim data for ${s}: size=${a} (limit=${T}), byteSize=${e.toLocaleString()} (limit=${g.toLocaleString()})`);return}i(`Need to trim ${s}: numToCut=${n}, bytesToCut=${y}`);let d={...t},C=!1,M=(u,p)=>{if(l.has(u))return i(`Cannot clean up ${u} as it is mounted`),!1;let j=_objectsizeof2.default.call(void 0, u)+_objectsizeof2.default.call(void 0, d[u]);return i(`Cleaning up unmounted${p?", expired":""} ${u} (byteSize=${j.toLocaleString()})`),n--,y-=j,delete d[u],C=!0,!0},x=Object.fromEntries(Object.entries(d).sort((u,p)=>u[1].lastUpdatedMs-p[1].lastUpdatedMs));for(let u of Object.keys(x)){let p=d[u];if(!(!_optionalChain([p, 'optionalAccess', _14 => _14.lastUpdatedMs])||_optionalChain([p, 'optionalAccess', _15 => _15.loading]))){if(_optionalChain([p, 'optionalAccess', _16 => _16.lastUpdatedMs])&&!U(p.lastUpdatedMs))break;M(u,!0)&&delete x[u]}}if(n>0||y>0)for(let u of Object.keys(x)){let p=d[u];if(!(!_optionalChain([p, 'optionalAccess', _17 => _17.lastUpdatedMs])||_optionalChain([p, 'optionalAccess', _18 => _18.loading]))&&(M(u,!1),n<=0&&y<=0))break}if(!C){i(`No trimmable entries found for ${s}: size=${a} (limit=${T}), byteSize=${e.toLocaleString()} (limit=${g.toLocaleString()})`);return}h.setValue(d),i(`Trimmed data for ${s}: size=[${a} -> ${Object.keys(d).length}] (limit=${T}), byteSize=[${e.toLocaleString()} -> ${_objectsizeof2.default.call(void 0, d).toLocaleString()}] (limit=${g.toLocaleString()})`)}function w(t){return _optionalChain([h, 'access', _19 => _19.getSnapshot, 'call', _20 => _20(), 'optionalAccess', _21 => _21[t]])}function $(t,a){h.setValue(e=>{let n=typeof a=="function"?a(_nullishCoalesce(e[t], () => (O))):a;return{...e,[t]:n}}),L()}function K(t){let a=w(t);if(_optionalChain([a, 'optionalAccess', _22 => _22.dataUpdatedMs])&&U(a.dataUpdatedMs)){N(t);return}return _optionalChain([a, 'optionalAccess', _23 => _23.data])}function E(t,a,e=Date.now()){$(t,{lastUpdatedMs:Date.now(),loading:!1,data:a,dataUpdatedMs:e})}function N(t){let e={...h.getSnapshot()};delete e[t],h.setValue(e);let n=c.get(t);n&&(c.delete(t),n.abortController.abort("Deleted"))}async function q(t,a){$(t,O);try{let e=await a();if(_optionalChain([w, 'call', _24 => _24(t), 'optionalAccess', _25 => _25.loading])){let n=Date.now();$(t,{data:e,loading:!1,lastUpdatedMs:n,dataUpdatedMs:n})}return e}catch(e){if(_optionalChain([w, 'call', _26 => _26(t), 'optionalAccess', _27 => _27.loading])){let n=Date.now();$(t,{loading:!1,lastUpdatedMs:n,error:e,errorUpdatedMs:n})}throw e}}async function z(t){let a=Date.now();await h.readyPromise;let e=Date.now()-a;e&&i(`${t}: Waited for ${e}ms before data is ready`)}async function tt(t,...a){await z(t);let e=w(t);return _optionalChain([e, 'optionalAccess', _28 => _28.data])!==void 0&&e.dataUpdatedMs&&!U(e.dataUpdatedMs)?F(e.dataUpdatedMs)?(Q(t,"query",...a),i(`Returning stale data for ${t}`),e.data):(i(`Return fresh data ${t} from cache without fetching`),e.data):await Q(t,"query",...a)}async function et(t,...a){await z(t);let e=w(t);if(_optionalChain([e, 'optionalAccess', _29 => _29.data])!==void 0&&e.dataUpdatedMs&&!U(e.dataUpdatedMs))return F(e.dataUpdatedMs)?(Q(t,"query",...a),i(`Returning stale data for ${t}`),e):(i(`Return fresh data ${t} from cache without fetching`),e);if(_optionalChain([e, 'optionalAccess', _30 => _30.error])!==void 0&&e.errorUpdatedMs&&!U(e.errorUpdatedMs))return F(e.errorUpdatedMs)?(Q(t,"query",...a),i(`Returning stale error for ${t}`),e):(i(`Return fresh error ${t} from cache without fetching`),e);try{await Q(t,"query",...a)}catch (e2){}return _nullishCoalesce(w(t), () => (O))}async function at(t,a,e){i(`Start fetching ${t}, queryType=${a}`);try{let n=await(a==="refetch"&&o?o(...e):D(...e));return i(`Successfully fetched ${t}`),E(t,n,Date.now()),n}catch(n){throw i(`Failed to fetch ${t} for queryType=${a}: ${n}`),n}finally{c.delete(t)}}function Q(t,a,...e){let n=c.get(t);return n?(i(`Deduplicating inflight fetch for ${t}, queryType=${a}`),n.promise):q(t,()=>{let y=at(t,a,e),d=new AbortController;return c.set(t,{promise:y,abortController:d}),y})}async function rt(t,...a){return await Q(t,"query",...a)}async function nt(t,...a){return await Q(t,"refetch",...a)}function st(){h.delete();for(let{abortController:t}of Array.from(c.values()))t.abort("Cleared");c.clear()}function ot(t){l.set(t,(_nullishCoalesce(l.get(t), () => (0)))+1)}function it(t){let a=l.get(t);a===1?l.delete(t):l.set(t,(_nullishCoalesce(a, () => (0)))-1)}return{queryName:s,queryFn:D,refetchFn:o,expiryMs:S,staleMs:f,maxSize:T,maxBytes:g,keepLastNonEmptyData:G,log:i,queryState:h,getQueryKey:P,getAbortController:J,getAbortControllerByKey:R,getAbortSignal:Z,getAbortSignalByKey:v,isStale:F,isExpired:U,enforceSizeLimit:L,getQueryValue:w,setQueryValue:$,getData:K,setData:E,deleteData:N,getCachedOrFetch:tt,getCachedStateOrFetch:et,fetch:rt,refetch:nt,clear:st,mount:ot,unmount:it}}function Ut(r){return Tt(r)}var O={lastUpdatedMs:0,loading:!0};function xt(r,...m){let s=_chunkJOHZV3FDmincjs.a.call(void 0, m),[c]=_chunk2WE3FDDWmincjs.d.call(void 0, r.queryState),l=_react.useRef.call(void 0, !0),D=_react.useRef.call(void 0, ""),o=_react.useMemo.call(void 0, ()=>r.getQueryKey(s),[r,s]),f=_nullishCoalesce(c[o], () => (O)),[S,b]=_react.useState.call(void 0, );return _react.useEffect.call(void 0, ()=>{r.keepLastNonEmptyData&&f.data!==void 0&&b(f.data)},[r.keepLastNonEmptyData,f.data]),_react.useEffect.call(void 0, ()=>(l.current=!0,r.mount(o),()=>{l.current=!1,r.unmount(o)}),[r,o]),_react.useEffect.call(void 0, ()=>{D.current!==o&&(D.current=o,r.getCachedStateOrFetch(o,...s))},[r,o,s]),_react.useMemo.call(void 0, ()=>({...f,data:f.data!==void 0?f.data:S,latestData:f.data,abortCurrentQuery:T=>{let g=r.getAbortControllerByKey(o);return _optionalChain([g, 'optionalAccess', _31 => _31.abort, 'call', _32 => _32(T)]),!!g},getCachedOrFetch:async()=>await r.getCachedOrFetch(o,...s),getCachedStateOrFetch:async()=>await r.getCachedStateOrFetch(o,...s),refetch:()=>r.refetch(o,...s),setData:(T,g)=>{r.setData(o,T,g)},deleteData:()=>{r.deleteData(o)}}),[S,r,o,f,s])}exports.a = A; exports.b = At; exports.c = Ut; exports.d = xt;
+//# sourceMappingURL=chunk-AX6NADU2.min.cjs.map