@choksheak/react-utils 0.2.8 → 0.2.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@choksheak/react-utils",
   "license": "The Unlicense",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Miscellaneous React+TypeScript utilities with support for full tree-shaking.",
   "private": false,
   "files": [
@@ -95,7 +95,7 @@
     "wretch": "^3.0.2"
   },
   "peerDependencies": {
-    "@choksheak/ts-utils": ">=0.2.9",
+    "@choksheak/ts-utils": ">=0.3.1",
     "lodash": ">=4.17.21",
     "object-sizeof": ">=2.6.5",
     "react": ">=16",
@@ -142,6 +142,45 @@
         "development": "./sharedState.cjs",
         "default": "./sharedState.cjs"
       }
+    },
+    "./storage": {
+      "types": "./storage.d.ts",
+      "import": {
+        "production": "./storage.min.mjs",
+        "development": "./storage.mjs",
+        "default": "./storage.mjs"
+      },
+      "require": {
+        "production": "./storage.min.cjs",
+        "development": "./storage.cjs",
+        "default": "./storage.cjs"
+      }
+    },
+    "./stringify": {
+      "types": "./stringify.d.ts",
+      "import": {
+        "production": "./stringify.min.mjs",
+        "development": "./stringify.mjs",
+        "default": "./stringify.mjs"
+      },
+      "require": {
+        "production": "./stringify.min.cjs",
+        "development": "./stringify.cjs",
+        "default": "./stringify.cjs"
+      }
+    },
+    "./useDeepMemo": {
+      "types": "./useDeepMemo.d.ts",
+      "import": {
+        "production": "./useDeepMemo.min.mjs",
+        "development": "./useDeepMemo.mjs",
+        "default": "./useDeepMemo.mjs"
+      },
+      "require": {
+        "production": "./useDeepMemo.min.cjs",
+        "development": "./useDeepMemo.cjs",
+        "default": "./useDeepMemo.cjs"
+      }
     }
   },
   "typesVersions": {
@@ -154,6 +193,15 @@
       ],
       "sharedState": [
         "./sharedState.d.ts"
+      ],
+      "storage": [
+        "./storage.d.ts"
+      ],
+      "stringify": [
+        "./stringify.d.ts"
+      ],
+      "useDeepMemo": [
+        "./useDeepMemo.d.ts"
       ]
     }
   }

package/sharedQuery.cjs

@@ -31,7 +31,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var sharedQuery_exports = {};
 __export(sharedQuery_exports, {
   SharedQuery: () => SharedQuery,
-  SharedQueryDefaults: () => SharedQueryDefaults,
+  SharedQueryConfig: () => SharedQueryConfig,
+  configureSharedQuery: () => configureSharedQuery,
   sharedQuery: () => sharedQuery,
   useSharedQuery: () => useSharedQuery
 });
@@ -44,108 +45,48 @@ var import_react3 = require("react");
 var import_timeConstants = require("@choksheak/ts-utils/timeConstants");
 var import_react = require("react");
 
-// src/utils/storage.ts
+// src/storage.ts
 var import_kvStore = require("@choksheak/ts-utils/kvStore");
+var import_localStore = require("@choksheak/ts-utils/localStore");
 function getStorageAdapter(options, defaultStoreExpiryMs) {
-  const { localStorageKey, indexedDbKey, storeExpiryMs, store } = options ?? {};
-  if (store) {
-    return store;
-  }
-  const expiryMs = storeExpiryMs || defaultStoreExpiryMs;
-  if (localStorageKey) {
-    return new LocalStorageAdapter(localStorageKey, expiryMs);
-  }
-  if (indexedDbKey) {
-    return new IndexedDbAdapter(indexedDbKey, expiryMs);
-  }
-  return null;
-}
-var LocalStorageAdapter = class {
-  constructor(keyPrefix, expiryMs) {
-    this.keyPrefix = keyPrefix;
-    this.expiryMs = expiryMs;
-  }
-  save(key, value) {
-    if (typeof window === "undefined") return;
-    const fullKey = this.keyPrefix + ":" + key;
-    window.localStorage.setItem(
-      fullKey,
-      JSON.stringify({
-        value,
-        expiresAt: this.expiryMs ? Date.now() + this.expiryMs : 0
-      })
-    );
-  }
-  load(key) {
-    if (typeof window === "undefined") return void 0;
-    const fullKey = this.keyPrefix + ":" + key;
-    const raw = window.localStorage.getItem(fullKey);
-    if (!raw) return void 0;
-    try {
-      const box = JSON.parse(raw);
-      if (!box || box.expiresAt && Date.now() >= box.expiresAt) {
-        window.localStorage.removeItem(fullKey);
-        return void 0;
-      }
-      return box.value;
-    } catch {
-      window.localStorage.removeItem(fullKey);
-      return void 0;
-    }
-  }
-  delete(key) {
-    if (typeof window === "undefined") return;
-    const fullKey = this.keyPrefix + ":" + key;
-    window.localStorage.removeItem(fullKey);
-  }
-  clear() {
-    if (typeof window === "undefined") return;
-    for (const key of Object.keys(window.localStorage)) {
-      if (key.startsWith(this.keyPrefix)) {
-        window.localStorage.removeItem(key);
+  const { store } = options ?? {};
+  if (!store) {
+    return null;
+  }
+  if ("persistTo" in store && typeof store.persistTo === "string" && "key" in store && typeof store.key === "string") {
+    const expiryMs = store.expiryMs || defaultStoreExpiryMs;
+    switch (store.persistTo) {
+      case "localStorage":
+        return new import_localStore.LocalStore(store.key, {
+          defaultExpiryMs: expiryMs
+        }).asStorageAdapter();
+      case "indexedDb": {
+        const keyPrefix = store.key + ":";
+        return {
+          set: async (key, value) => {
+            await import_kvStore.kvStore.set(keyPrefix + key, value, expiryMs);
+          },
+          get: async (key) => {
+            return await import_kvStore.kvStore.get(keyPrefix + key);
+          },
+          delete: async (key) => {
+            await import_kvStore.kvStore.delete(keyPrefix + key);
+          },
+          clear: async () => {
+            await import_kvStore.kvStore.clear();
+          }
+        };
       }
+      default:
+        store.persistTo;
+        throw new Error(`Unknown store.adapter ${store.persistTo}`);
     }
   }
-};
-var IndexedDbAdapter = class {
-  constructor(keyPrefix, expiryMs) {
-    this.keyPrefix = keyPrefix;
-    this.expiryMs = expiryMs;
-  }
-  async save(key, value) {
-    if (typeof window === "undefined") return;
-    const fullKey = this.keyPrefix + ":" + key;
-    await import_kvStore.kvStore.set(fullKey, JSON.stringify(value), this.expiryMs);
-  }
-  async load(key) {
-    if (typeof window === "undefined") return void 0;
-    const fullKey = this.keyPrefix + ":" + key;
-    const raw = await import_kvStore.kvStore.get(fullKey);
-    if (raw === void 0) return void 0;
-    try {
-      return JSON.parse(raw);
-    } catch {
-      await import_kvStore.kvStore.delete(fullKey);
-      return void 0;
-    }
-  }
-  async delete(key) {
-    if (typeof window === "undefined") return;
-    const fullKey = this.keyPrefix + ":" + key;
-    await import_kvStore.kvStore.delete(fullKey);
-  }
-  async clear() {
-    if (typeof window === "undefined") return;
-    await import_kvStore.kvStore.forEach(async (k) => {
-      if (k.startsWith(this.keyPrefix)) {
-        await import_kvStore.kvStore.delete(k);
-      }
-    });
-  }
-};
+  return store;
+}
 
 // src/sharedState.ts
-var SharedStateDefaults = {
+var SharedStateConfig = {
   /**
    * Default duration for storage expiration in milliseconds. Initial value
    * is 30 days, but can be changed to anything.
@@ -212,14 +153,14 @@ var SharedState = class {
     this.pubSubKey = String(stateKey++);
     this.storageAdapter = getStorageAdapter(
       options,
-      SharedStateDefaults.storeExpiryMs
+      SharedStateConfig.storeExpiryMs
     );
     this.setValueBounded = (next) => {
       this.setValue(next);
     };
     pubSubStore.setNoNotify(this.pubSubKey, defaultValue);
     const lazyLoad = options?.lazyLoad;
-    const lazy = lazyLoad !== void 0 ? lazyLoad : SharedStateDefaults.lazyLoad;
+    const lazy = lazyLoad !== void 0 ? lazyLoad : SharedStateConfig.lazyLoad;
     if (!lazy) {
       void this.initDefaultValueOnce();
     }
@@ -244,19 +185,19 @@ var SharedState = class {
       next = next(prev);
     }
     pubSubStore.set(this.pubSubKey, next);
-    void this.storageAdapter?.save(STORAGE_KEY, next);
+    void this.storageAdapter?.set(STORAGE_KEY, next);
   }
   // Remove the value of the shared state. Actually this just sets the value
   // back to the given default value.
   delete() {
     pubSubStore.set(this.pubSubKey, this.defaultValue);
-    void this.storageAdapter?.save(STORAGE_KEY, this.defaultValue);
+    void this.storageAdapter?.set(STORAGE_KEY, this.defaultValue);
   }
   // Initial default handling
   async initDefaultValueOnce() {
     if (this.initDone) return;
     this.initDone = true;
-    const v = await this.storageAdapter?.load(STORAGE_KEY);
+    const v = await this.storageAdapter?.get(STORAGE_KEY);
     pubSubStore.set(this.pubSubKey, v !== void 0 ? v : this.defaultValue);
   }
 };
@@ -274,7 +215,7 @@ function useSharedState(state) {
   return [value, state.setValueBounded];
 }
 
-// src/utils/stringify.ts
+// src/stringify.ts
 function stringifyDeterministicForKeys(params) {
   const cache = /* @__PURE__ */ new Set();
   return JSON.stringify(params, (_, value) => {
@@ -305,7 +246,7 @@ function stringifyDeterministicForKeys(params) {
   });
 }
 
-// src/utils/useDeepMemo.ts
+// src/useDeepMemo.ts
 var import_isEqual = __toESM(require("lodash/isEqual"));
 var import_react2 = require("react");
 function useDeepMemo(value) {
@@ -320,7 +261,7 @@ function useDeepMemo(value) {
 }
 
 // src/sharedQuery.ts
-var SharedQueryDefaults = {
+var SharedQueryConfig = {
   /** Refetch on every page load. */
   staleMs: 0,
   /** Keep in cache for a long time. */
@@ -336,6 +277,9 @@ var SharedQueryDefaults = {
   /** Default to log to console. */
   log: (...args) => console.log("[sharedQuery]", ...args)
 };
+function configureSharedQuery(config) {
+  Object.assign(SharedQueryConfig, config);
+}
 var SharedQuery = class {
   inflightQueries = /* @__PURE__ */ new Map();
   queryState;
@@ -357,29 +301,27 @@ var SharedQuery = class {
   constructor(options) {
     this.queryName = options.queryName;
     this.queryFn = options.queryFn;
-    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.staleMs = options?.staleMs ?? SharedQueryConfig.staleMs;
+    this.expiryMs = options?.expiryMs ?? SharedQueryConfig.expiryMs;
+    this.refetchOnStale = options?.refetchOnStale ?? SharedQueryConfig.refetchOnStale;
+    if (!options.store) {
+      const persistTo = options.persistTo ?? SharedQueryConfig.persistTo;
+      if (persistTo) {
+        options.store = {
+          persistTo,
+          key: options.queryName,
+          expiryMs: this.expiryMs
+        };
       }
     }
-    this.maxSize = options?.maxSize ?? SharedQueryDefaults.maxSize;
-    this.maxBytes = options?.maxBytes ?? SharedQueryDefaults.maxBytes;
+    this.maxSize = options?.maxSize ?? SharedQueryConfig.maxSize;
+    this.maxBytes = options?.maxBytes ?? SharedQueryConfig.maxBytes;
     this.keepLastNonEmptyData = Boolean(options?.keepLastNonEmptyData);
-    this.log = options?.log ?? SharedQueryDefaults.log;
+    this.log = options?.log ?? SharedQueryConfig.log;
     this.queryState = sharedState(
       {},
       // defaultValue
-      {
-        ...options,
-        // Fallback to use expiryMs for the storeExpiryMs.
-        storeExpiryMs: options?.storeExpiryMs || this.expiryMs
-      }
+      options
     );
   }
   /** Returns a key to identify requests based on the given args. */
@@ -490,7 +432,14 @@ var SharedQuery = class {
   }
   /** Get the current stored data for a query key. */
   getData(queryKey) {
-    return this.queryState.getSnapshot()?.[queryKey]?.data;
+    const stateValue = this.queryState.getSnapshot()?.[queryKey];
+    if (stateValue?.lastUpdatedMs) {
+      if (this.isExpired(stateValue.lastUpdatedMs)) {
+        this.deleteData(queryKey);
+        return void 0;
+      }
+    }
+    return stateValue?.data;
   }
   /** Set the data directly if the user obtained it from somewhere else. */
   setData(queryKey, data, dataUpdatedMs = Date.now()) {
@@ -573,25 +522,41 @@ var SharedQuery = class {
     );
     const newState = { ...oldState };
     let needUpdate = false;
-    const entriesByTimeAscending = Object.entries(newState).sort(
-      (entry1, entry2) => entry1[1].lastUpdatedMs - entry2[1].lastUpdatedMs
-    );
-    for (const [key] of entriesByTimeAscending) {
+    const deleteKeyIfNotMounted = (key, expired) => {
       if (this.mountedKeys.has(key)) {
         this.log(`Cannot clean up ${key} as it is mounted`);
-        continue;
+        return;
       }
       const byteSize = (0, import_object_sizeof.default)(key) + (0, import_object_sizeof.default)(newState[key]);
       this.log(
-        `Cleaning up unmounted ${key} (byteSize=${byteSize.toLocaleString()})`
+        `Cleaning up unmounted${expired ? ", expired" : ""} ${key} (byteSize=${byteSize.toLocaleString()})`
       );
       numToCut--;
       bytesToCut -= byteSize;
       delete newState[key];
       needUpdate = true;
-      if (numToCut <= 0 && bytesToCut <= 0) {
+    };
+    let entriesByTimeAscending = Object.entries(newState).sort(
+      (entry1, entry2) => entry1[1].lastUpdatedMs - entry2[1].lastUpdatedMs
+    );
+    for (const [key] of entriesByTimeAscending) {
+      if (!this.isExpired(newState[key].lastUpdatedMs)) {
         break;
       }
+      deleteKeyIfNotMounted(key, true);
+    }
+    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) {
+        deleteKeyIfNotMounted(key, false);
+        if (numToCut <= 0 && bytesToCut <= 0) {
+          break;
+        }
+      }
     }
     if (!needUpdate) {
       this.log(
@@ -617,7 +582,7 @@ var DEFAULT_QUERY_STATE_ENTRY = {
   lastUpdatedMs: 0,
   loading: true
 };
-function useSharedQuery(query, args = []) {
+function useSharedQuery(query, ...args) {
   const stableArgs = useDeepMemo(args);
   const [queryState, setQueryState] = useSharedState(query.queryState);
   const isMounted = (0, import_react3.useRef)(true);
@@ -734,7 +699,8 @@ function useSharedQuery(query, args = []) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SharedQuery,
-  SharedQueryDefaults,
+  SharedQueryConfig,
+  configureSharedQuery,
   sharedQuery,
   useSharedQuery
 });

package/sharedQuery.d.mts

@@ -1,6 +1,7 @@
 import { SharedStateOptions, SharedState } from './sharedState.mjs';
+import { PersistTo } from './storage.mjs';
 import 'react';
-import './utils/storage.mjs';
+import '@choksheak/ts-utils/storageAdapter';
 
 /**
  * @packageDocumentation
@@ -128,8 +129,6 @@ type UseQueryResult<TData> = QueryStateValue<TData> & Readonly<{
     setData: (data: TData, dataUpdatedMs?: number) => void;
     deleteData: () => void;
 }>;
-/** List of all available persistence options. */
-type PersistTo = "localStorage" | "indexedDb";
 /**
  * The full query state is a record of all the fetch states mapped by
  * query key to the state entry.
@@ -188,7 +187,7 @@ type SharedQueryOptions<TArgs extends unknown[], TData> = {
     log?: (...args: unknown[]) => void;
 } & SharedStateOptions<SharedQueryState<TData>>;
 /** Users can override these values globally. */
-declare const SharedQueryDefaults: {
+declare const SharedQueryConfig: {
     /** Refetch on every page load. */
     staleMs: number;
     /** Keep in cache for a long time. */
@@ -204,6 +203,9 @@ declare const SharedQueryDefaults: {
     /** Default to log to console. */
     log: (...args: unknown[]) => void;
 };
+type SharedQueryConfig = typeof SharedQueryConfig;
+/** Convenience function to update global defaults. */
+declare function configureSharedQuery(config: Partial<SharedQueryConfig>): void;
 /** Please use sharedQuery() instead. */
 declare class SharedQuery<TArgs extends unknown[], TData> {
     private readonly inflightQueries;
@@ -311,13 +313,17 @@ declare class SharedQuery<TArgs extends unknown[], TData> {
  */
 declare function sharedQuery<TArgs extends unknown[], TData>(options: SharedQueryOptions<TArgs, TData>): SharedQuery<TArgs, TData>;
 /**
- * React hook to make use of a shared query inside any React component.
+ * React hook to make use of a shared query inside any React component. The
+ * args do not need to be specified if no args are needed, i.e. this would work
+ * ```
+ *   const allUsers = useSharedQuery(listUsersQuery);
+ * ```
  *
  * Example:
  * ```
- *   const users = useSharedQuery(usersQuery, ["123"]);
+ *   const users = useSharedQuery(usersQuery, "userid123");
  * ```
  */
-declare function useSharedQuery<TArgs extends unknown[], TData>(query: SharedQuery<TArgs, TData>, args?: TArgs): UseQueryResult<TData>;
+declare function useSharedQuery<TArgs extends unknown[], TData>(query: SharedQuery<TArgs, TData>, ...args: TArgs): UseQueryResult<TData>;
 
-export { type PersistTo, type QueryFn, type QueryStateValue, SharedQuery, SharedQueryDefaults, type SharedQueryOptions, type SharedQueryState, type UseQueryResult, sharedQuery, useSharedQuery };
+export { type QueryFn, type QueryStateValue, SharedQuery, SharedQueryConfig, type SharedQueryOptions, type SharedQueryState, type UseQueryResult, configureSharedQuery, sharedQuery, useSharedQuery };

package/sharedQuery.d.ts

@@ -82,6 +82,7 @@
  * ```
  */
 import { SharedState, SharedStateOptions } from "./sharedState";
+import { PersistTo } from "./storage";
 /** Type of the queryFn used to fetch the data from source. */
 export type QueryFn<TArgs extends unknown[], TData> = (...args: TArgs) => Promise<TData> | TData;
 /** An entry for a persisted state corresponding to one query key. */
@@ -124,8 +125,6 @@ export type UseQueryResult<TData> = QueryStateValue<TData> & Readonly<{
     setData: (data: TData, dataUpdatedMs?: number) => void;
     deleteData: () => void;
 }>;
-/** List of all available persistence options. */
-export type PersistTo = "localStorage" | "indexedDb";
 /**
  * The full query state is a record of all the fetch states mapped by
  * query key to the state entry.
@@ -184,7 +183,7 @@ export type SharedQueryOptions<TArgs extends unknown[], TData> = {
     log?: (...args: unknown[]) => void;
 } & SharedStateOptions<SharedQueryState<TData>>;
 /** Users can override these values globally. */
-export declare const SharedQueryDefaults: {
+export declare const SharedQueryConfig: {
     /** Refetch on every page load. */
     staleMs: number;
     /** Keep in cache for a long time. */
@@ -200,6 +199,9 @@ export declare const SharedQueryDefaults: {
     /** Default to log to console. */
     log: (...args: unknown[]) => void;
 };
+export type SharedQueryConfig = typeof SharedQueryConfig;
+/** Convenience function to update global defaults. */
+export declare function configureSharedQuery(config: Partial<SharedQueryConfig>): void;
 /** Please use sharedQuery() instead. */
 export declare class SharedQuery<TArgs extends unknown[], TData> {
     private readonly inflightQueries;
@@ -307,11 +309,15 @@ export declare class SharedQuery<TArgs extends unknown[], TData> {
  */
 export declare function sharedQuery<TArgs extends unknown[], TData>(options: SharedQueryOptions<TArgs, TData>): SharedQuery<TArgs, TData>;
 /**
- * React hook to make use of a shared query inside any React component.
+ * React hook to make use of a shared query inside any React component. The
+ * args do not need to be specified if no args are needed, i.e. this would work
+ * ```
+ *   const allUsers = useSharedQuery(listUsersQuery);
+ * ```
  *
  * Example:
  * ```
- *   const users = useSharedQuery(usersQuery, ["123"]);
+ *   const users = useSharedQuery(usersQuery, "userid123");
  * ```
  */
-export declare function useSharedQuery<TArgs extends unknown[], TData>(query: SharedQuery<TArgs, TData>, args?: TArgs): UseQueryResult<TData>;
+export declare function useSharedQuery<TArgs extends unknown[], TData>(query: SharedQuery<TArgs, TData>, ...args: TArgs): UseQueryResult<TData>;

package/sharedQuery.min.cjs

@@ -1,2 +1,2 @@
-"use strict";var q=Object.create;var T=Object.defineProperty;var _=Object.getOwnPropertyDescriptor;var j=Object.getOwnPropertyNames;var J=Object.getPrototypeOf,W=Object.prototype.hasOwnProperty;var Y=(i,e)=>{for(var t in e)T(i,t,{get:e[t],enumerable:!0})},k=(i,e,t,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of j(e))!W.call(i,a)&&a!==t&&T(i,a,{get:()=>e[a],enumerable:!(r=_(e,a))||r.enumerable});return i};var B=(i,e,t)=>(t=i!=null?q(J(i)):{},k(e||!i||!i.__esModule?T(t,"default",{value:i,enumerable:!0}):t,i)),I=i=>k(T({},"__esModule",{value:!0}),i);var Z={};Y(Z,{SharedQuery:()=>w,SharedQueryDefaults:()=>h,sharedQuery:()=>H,useSharedQuery:()=>X});module.exports=I(Z);var R=require("@choksheak/ts-utils/timeConstants"),b=B(require("object-sizeof")),u=require("react");var E=require("@choksheak/ts-utils/timeConstants"),z=require("react");var f=require("@choksheak/ts-utils/kvStore");function N(i,e){let{localStorageKey:t,indexedDbKey:r,storeExpiryMs:a,store:n}=i??{};if(n)return n;let s=a||e;return t?new A(t,s):r?new M(r,s):null}var A=class{constructor(e,t){this.keyPrefix=e;this.expiryMs=t}save(e,t){if(typeof window>"u")return;let r=this.keyPrefix+":"+e;window.localStorage.setItem(r,JSON.stringify({value:t,expiresAt:this.expiryMs?Date.now()+this.expiryMs:0}))}load(e){if(typeof window>"u")return;let t=this.keyPrefix+":"+e,r=window.localStorage.getItem(t);if(r)try{let a=JSON.parse(r);if(!a||a.expiresAt&&Date.now()>=a.expiresAt){window.localStorage.removeItem(t);return}return a.value}catch{window.localStorage.removeItem(t);return}}delete(e){if(typeof window>"u")return;let t=this.keyPrefix+":"+e;window.localStorage.removeItem(t)}clear(){if(!(typeof window>"u"))for(let e of Object.keys(window.localStorage))e.startsWith(this.keyPrefix)&&window.localStorage.removeItem(e)}},M=class{constructor(e,t){this.keyPrefix=e;this.expiryMs=t}async save(e,t){if(typeof window>"u")return;let r=this.keyPrefix+":"+e;await f.kvStore.set(r,JSON.stringify(t),this.expiryMs)}async load(e){if(typeof window>"u")return;let t=this.keyPrefix+":"+e,r=await f.kvStore.get(t);if(r!==void 0)try{return JSON.parse(r)}catch{await f.kvStore.delete(t);return}}async delete(e){if(typeof window>"u")return;let t=this.keyPrefix+":"+e;await f.kvStore.delete(t)}async clear(){typeof window>"u"||await f.kvStore.forEach(async e=>{e.startsWith(this.keyPrefix)&&await f.kvStore.delete(e)})}};var O={storeExpiryMs:30*E.MS_PER_DAY,lazyLoad:!1},K=class{dataByKey=new Map;subscribersByKey=new Map;get(e){return this.dataByKey.get(e)}set(e,t){let r=this.dataByKey.get(e);r!==t&&(this.dataByKey.set(e,t),this.notify(e,t,r))}delete(e){this.dataByKey.delete(e)}setNoNotify(e,t){this.dataByKey.set(e,t)}subscribe(e,t){let r=this.subscribersByKey.get(e);return r||(r=new Set,this.subscribersByKey.set(e,r)),r.add(t),()=>{r.delete(t),r.size===0&&this.subscribersByKey.delete(e)}}notify(e,t,r){let a=this.subscribersByKey.get(e);if(!a)return;let n=Array.from(a.values());for(let s of n)try{s(t,r)}catch(y){console.error("Error invoking subscriber:",y)}}},g=new K,v="state",G=0,Q=class{constructor(e,t){this.defaultValue=e;this.pubSubKey=String(G++),this.storageAdapter=N(t,O.storeExpiryMs),this.setValueBounded=n=>{this.setValue(n)},g.setNoNotify(this.pubSubKey,e);let r=t?.lazyLoad;(r!==void 0?r:O.lazyLoad)||this.initDefaultValueOnce()}pubSubKey;storageAdapter;setValueBounded;initDone=!1;subscribe(e){return g.subscribe(this.pubSubKey,()=>e())}getSnapshot(){return g.get(this.pubSubKey)}setValue(e){if(typeof e=="function"){let t=g.get(this.pubSubKey);e=e(t)}g.set(this.pubSubKey,e),this.storageAdapter?.save(v,e)}delete(){g.set(this.pubSubKey,this.defaultValue),this.storageAdapter?.save(v,this.defaultValue)}async initDefaultValueOnce(){if(this.initDone)return;this.initDone=!0;let e=await this.storageAdapter?.load(v);g.set(this.pubSubKey,e!==void 0?e:this.defaultValue)}};function $(i,e){return new Q(i,e)}function P(i){return i.initDefaultValueOnce(),[(0,z.useSyncExternalStore)(t=>i.subscribe(t),()=>i.getSnapshot(),()=>i.getSnapshot()),i.setValueBounded]}function V(i){let e=new Set;return JSON.stringify(i,(t,r)=>{if(typeof r=="function")throw new Error("Functions should not be passed into query parameters");if(!r||typeof r!="object"||Array.isArray(r))return r;if(e.has(r))return"[Circular]";if(e.add(r),r!==i)try{JSON.stringify(r)}catch{return"[Unserializable]"}return Object.keys(r).sort().reduce((a,n)=>(a[n]=r[n],a),{})})}var C=B(require("lodash/isEqual")),x=require("react");function U(i){let[e,t]=(0,x.useState)(i);return(0,x.useMemo)(()=>e===i||(0,C.default)(e,i)?e:(t(i),i),[e,i])}var h={staleMs:0,expiryMs:30*R.MS_PER_DAY,refetchOnStale:!0,persistTo:void 0,maxSize:100,maxBytes:1e5,log:(...i)=>console.log("[sharedQuery]",...i)},w=class{inflightQueries=new Map;queryState;mountedKeys=new Map;queryName;queryFn;expiryMs;staleMs;refetchOnStale;maxSize;maxBytes;keepLastNonEmptyData;log;constructor(e){if(this.queryName=e.queryName,this.queryFn=e.queryFn,this.staleMs=e?.staleMs??h.staleMs,this.expiryMs=e?.expiryMs??h.expiryMs,this.refetchOnStale=e?.refetchOnStale??h.refetchOnStale,!e.localStorageKey&&!e.indexedDbKey){let t=e.persistTo??h.persistTo;t==="localStorage"?e.localStorageKey=e.queryName:t==="indexedDb"&&(e.indexedDbKey=e.queryName)}this.maxSize=e?.maxSize??h.maxSize,this.maxBytes=e?.maxBytes??h.maxBytes,this.keepLastNonEmptyData=!!e?.keepLastNonEmptyData,this.log=e?.log??h.log,this.queryState=$({},{...e,storeExpiryMs:e?.storeExpiryMs||this.expiryMs})}getQueryKey(e){return this.queryName+":"+V(e)}getAbortController(e){let t=this.getQueryKey(e);return this.getAbortControllerByKey(t)}getAbortControllerByKey(e){return this.inflightQueries.get(e)?.abortController??null}getAbortSignal(e){let t=this.getQueryKey(e);return this.getAbortSignalByKey(t)}getAbortSignalByKey(e){return this.getAbortControllerByKey(e)?.signal??null}isStale(e){return this.staleMs===0?!0:Date.now()-e>this.staleMs}isExpired(e){return this.expiryMs===0?!1:Date.now()-e>this.expiryMs}async getCachedOrFetch(...e){let t=this.getQueryKey(e),r=this.queryState.getSnapshot()?.[t];return r?.data&&!this.isExpired(r.dataUpdatedMs??0)?this.isStale(r.dataUpdatedMs??0)?(this.refetchOnStale&&(this.log(`refetchOnStale for ${t}`),this.dedupedFetch(t,...e)),this.log(`Returning stale data for ${t}`),r.data):(this.log(`Return fresh data ${t} from cache without fetching`),r.data):await this.dedupedFetch(t,...e)}dedupedFetch(e,...t){let r=this.inflightQueries.get(e);if(r)return this.log(`Deduplicating inflight fetch for ${e}`),r.promise;let a=this.startFetching(e,t),n=new AbortController;return this.inflightQueries.set(e,{promise:a,abortController:n}),a}async startFetching(e,t){this.log(`Start fetching ${e}`);try{let r=await this.queryFn(...t);return this.log(`Successfully fetched ${e}`),this.setData(e,r,Date.now()),r}catch(r){throw this.log(`Failed to fetch ${e}: ${r}`),r}finally{this.inflightQueries.delete(e)}}getQueryValue(e){return this.queryState.getSnapshot()?.[e]}getData(e){return this.queryState.getSnapshot()?.[e]?.data}setData(e,t,r=Date.now()){let a={lastUpdatedMs:Date.now(),loading:!1,data:t,dataUpdatedMs:r};this.queryState.setValue(n=>({...n,[e]:a})),this.enforceSizeLimit()}async updateFromSource(...e){let t=this.getQueryKey(e);return await this.dedupedFetch(t,...e)}deleteData(e){let r={...this.queryState.getSnapshot()};delete r[e],this.queryState.setValue(r);let a=this.inflightQueries.get(e);a&&(this.inflightQueries.delete(e),a.abortController.abort("Deleted"))}clear(){this.queryState.delete();for(let{abortController:e}of Array.from(this.inflightQueries.values()))e.abort("Cleared");this.inflightQueries.clear()}mount(e){this.mountedKeys.set(e,(this.mountedKeys.get(e)??0)+1)}unmount(e){let t=this.mountedKeys.get(e);t===1?this.mountedKeys.delete(e):this.mountedKeys.set(e,(t??0)-1)}enforceSizeLimit(){if(!this.maxSize&&!this.maxBytes)return;let e=this.queryState.getSnapshot(),t=Object.keys(e).length;if(t<=1)return;let r=(0,b.default)(e),a=this.maxSize?t-this.maxSize:0,n=this.maxBytes?r-this.maxBytes:0;if(a<=0&&n<=0){this.log(`No need to trim data for ${this.queryName}: size=${t} (limit=${this.maxSize}), byteSize=${r.toLocaleString()} (limit=${this.maxBytes.toLocaleString()})`);return}this.log(`Need to trim ${this.queryName}: numToCut=${a}, bytesToCut=${n}`);let s={...e},y=!1,p=Object.entries(s).sort((d,S)=>d[1].lastUpdatedMs-S[1].lastUpdatedMs);for(let[d]of p){if(this.mountedKeys.has(d)){this.log(`Cannot clean up ${d} as it is mounted`);continue}let S=(0,b.default)(d)+(0,b.default)(s[d]);if(this.log(`Cleaning up unmounted ${d} (byteSize=${S.toLocaleString()})`),a--,n-=S,delete s[d],y=!0,a<=0&&n<=0)break}if(!y){this.log(`No trimmable entries found for ${this.queryName}: size=${t} (limit=${this.maxSize}), byteSize=${r.toLocaleString()} (limit=${this.maxBytes.toLocaleString()})`);return}this.queryState.setValue(s),this.log(`Trimmed data for ${this.queryName}: size=[${t} -> ${Object.keys(s).length}] (limit=${this.maxSize}), byteSize=[${r.toLocaleString()} -> ${(0,b.default)(s).toLocaleString()}] (limit=${this.maxBytes.toLocaleString()})`)}},F=new Set;function H(i){if(F.has(i.queryName))throw new Error(`Duplicate shared query "${i.queryName}"`);return F.add(i.queryName),new w(i)}var L={lastUpdatedMs:0,loading:!0};function X(i,e=[]){let t=U(e),[r,a]=P(i.queryState),n=(0,u.useRef)(!0),s=(0,u.useMemo)(()=>i.getQueryKey(t),[i,t]),y=r[s]??L,p=(0,u.useCallback)(c=>{a(o=>{let l={...o};return l[s]=typeof c=="function"?c(l[s]??L):c,l})},[s,a]),[d,S]=(0,u.useState)();(0,u.useEffect)(()=>{i.keepLastNonEmptyData&&y.data!==void 0&&S(y.data)},[i.keepLastNonEmptyData,y.data]);let m=(0,u.useCallback)(async c=>{i.log(`Begin executing shared query ${s}`),p(o=>({...o,lastUpdatedMs:Date.now(),loading:!0}));try{let o=await(c?i.updateFromSource(...t):i.getCachedOrFetch(...t));if(n.current){let l=Date.now();p({lastUpdatedMs:l,loading:!1,data:o,dataUpdatedMs:l})}}catch(o){if(n.current){let l=Date.now();p(D=>({...D,lastUpdatedMs:l,loading:!1,error:o,errorUpdatedMs:l}))}}},[i,s,p,t]);return(0,u.useEffect)(()=>(n.current=!0,i.mount(s),m(!1),()=>{n.current=!1,i.unmount(s)}),[m,i,s]),(0,u.useMemo)(()=>({...y,lastNonEmptyData:d,abortCurrentQuery:c=>{let o=i.getAbortControllerByKey(s);return o?.abort(c),!!o},refetch:()=>{m(!0)},setData:(c,o)=>{let l=Date.now();p(D=>({...D,data:c,dataUpdatedMs:o??l,lastUpdatedMs:l,loading:!1}))},deleteData:()=>{a(c=>{let o={...c};return delete o[s],o})}}),[m,d,i,s,y,a,p])}0&&(module.exports={SharedQuery,SharedQueryDefaults,sharedQuery,useSharedQuery});
+"use strict";var R=Object.create;var T=Object.defineProperty;var q=Object.getOwnPropertyDescriptor;var _=Object.getOwnPropertyNames;var j=Object.getPrototypeOf,Y=Object.prototype.hasOwnProperty;var J=(r,t)=>{for(var e in t)T(r,e,{get:t[e],enumerable:!0})},B=(r,t,e,a)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of _(t))!Y.call(r,s)&&s!==e&&T(r,s,{get:()=>t[s],enumerable:!(a=q(t,s))||a.enumerable});return r};var O=(r,t,e)=>(e=r!=null?R(j(r)):{},B(t||!r||!r.__esModule?T(e,"default",{value:r,enumerable:!0}):e,r)),G=r=>B(T({},"__esModule",{value:!0}),r);var Z={};J(Z,{SharedQuery:()=>x,SharedQueryConfig:()=>g,configureSharedQuery:()=>H,sharedQuery:()=>W,useSharedQuery:()=>X});module.exports=G(Z);var P=require("@choksheak/ts-utils/timeConstants"),m=O(require("object-sizeof")),d=require("react");var $=require("@choksheak/ts-utils/timeConstants"),z=require("react");var b=require("@choksheak/ts-utils/kvStore"),v=require("@choksheak/ts-utils/localStore");function C(r,t){let{store:e}=r??{};if(!e)return null;if("persistTo"in e&&typeof e.persistTo=="string"&&"key"in e&&typeof e.key=="string"){let a=e.expiryMs||t;switch(e.persistTo){case"localStorage":return new v.LocalStore(e.key,{defaultExpiryMs:a}).asStorageAdapter();case"indexedDb":{let s=e.key+":";return{set:async(i,n)=>{await b.kvStore.set(s+i,n,a)},get:async i=>await b.kvStore.get(s+i),delete:async i=>{await b.kvStore.delete(s+i)},clear:async()=>{await b.kvStore.clear()}}}default:throw e.persistTo,new Error(`Unknown store.adapter ${e.persistTo}`)}}return e}var K={storeExpiryMs:30*$.MS_PER_DAY,lazyLoad:!1};var M=class{dataByKey=new Map;subscribersByKey=new Map;get(t){return this.dataByKey.get(t)}set(t,e){let a=this.dataByKey.get(t);a!==e&&(this.dataByKey.set(t,e),this.notify(t,e,a))}delete(t){this.dataByKey.delete(t)}setNoNotify(t,e){this.dataByKey.set(t,e)}subscribe(t,e){let a=this.subscribersByKey.get(t);return a||(a=new Set,this.subscribersByKey.set(t,a)),a.add(e),()=>{a.delete(e),a.size===0&&this.subscribersByKey.delete(t)}}notify(t,e,a){let s=this.subscribersByKey.get(t);if(!s)return;let i=Array.from(s.values());for(let n of i)try{n(e,a)}catch(p){console.error("Error invoking subscriber:",p)}}},S=new M,w="state",I=0,Q=class{constructor(t,e){this.defaultValue=t;this.pubSubKey=String(I++),this.storageAdapter=C(e,K.storeExpiryMs),this.setValueBounded=i=>{this.setValue(i)},S.setNoNotify(this.pubSubKey,t);let a=e?.lazyLoad;(a!==void 0?a:K.lazyLoad)||this.initDefaultValueOnce()}pubSubKey;storageAdapter;setValueBounded;initDone=!1;subscribe(t){return S.subscribe(this.pubSubKey,()=>t())}getSnapshot(){return S.get(this.pubSubKey)}setValue(t){if(typeof t=="function"){let e=S.get(this.pubSubKey);t=t(e)}S.set(this.pubSubKey,t),this.storageAdapter?.set(w,t)}delete(){S.set(this.pubSubKey,this.defaultValue),this.storageAdapter?.set(w,this.defaultValue)}async initDefaultValueOnce(){if(this.initDone)return;this.initDone=!0;let t=await this.storageAdapter?.get(w);S.set(this.pubSubKey,t!==void 0?t:this.defaultValue)}};function N(r,t){return new Q(r,t)}function k(r){return r.initDefaultValueOnce(),[(0,z.useSyncExternalStore)(e=>r.subscribe(e),()=>r.getSnapshot(),()=>r.getSnapshot()),r.setValueBounded]}function E(r){let t=new Set;return JSON.stringify(r,(e,a)=>{if(typeof a=="function")throw new Error("Functions should not be passed into query parameters");if(!a||typeof a!="object"||Array.isArray(a))return a;if(t.has(a))return"[Circular]";if(t.add(a),a!==r)try{JSON.stringify(a)}catch{return"[Unserializable]"}return Object.keys(a).sort().reduce((s,i)=>(s[i]=a[i],s),{})})}var U=O(require("lodash/isEqual")),D=require("react");function V(r){let[t,e]=(0,D.useState)(r);return(0,D.useMemo)(()=>t===r||(0,U.default)(t,r)?t:(e(r),r),[t,r])}var g={staleMs:0,expiryMs:30*P.MS_PER_DAY,refetchOnStale:!0,persistTo:void 0,maxSize:100,maxBytes:1e5,log:(...r)=>console.log("[sharedQuery]",...r)};function H(r){Object.assign(g,r)}var x=class{inflightQueries=new Map;queryState;mountedKeys=new Map;queryName;queryFn;expiryMs;staleMs;refetchOnStale;maxSize;maxBytes;keepLastNonEmptyData;log;constructor(t){if(this.queryName=t.queryName,this.queryFn=t.queryFn,this.staleMs=t?.staleMs??g.staleMs,this.expiryMs=t?.expiryMs??g.expiryMs,this.refetchOnStale=t?.refetchOnStale??g.refetchOnStale,!t.store){let e=t.persistTo??g.persistTo;e&&(t.store={persistTo:e,key:t.queryName,expiryMs:this.expiryMs})}this.maxSize=t?.maxSize??g.maxSize,this.maxBytes=t?.maxBytes??g.maxBytes,this.keepLastNonEmptyData=!!t?.keepLastNonEmptyData,this.log=t?.log??g.log,this.queryState=N({},t)}getQueryKey(t){return this.queryName+":"+E(t)}getAbortController(t){let e=this.getQueryKey(t);return this.getAbortControllerByKey(e)}getAbortControllerByKey(t){return this.inflightQueries.get(t)?.abortController??null}getAbortSignal(t){let e=this.getQueryKey(t);return this.getAbortSignalByKey(e)}getAbortSignalByKey(t){return this.getAbortControllerByKey(t)?.signal??null}isStale(t){return this.staleMs===0?!0:Date.now()-t>this.staleMs}isExpired(t){return this.expiryMs===0?!1:Date.now()-t>this.expiryMs}async getCachedOrFetch(...t){let e=this.getQueryKey(t),a=this.queryState.getSnapshot()?.[e];return a?.data&&!this.isExpired(a.dataUpdatedMs??0)?this.isStale(a.dataUpdatedMs??0)?(this.refetchOnStale&&(this.log(`refetchOnStale for ${e}`),this.dedupedFetch(e,...t)),this.log(`Returning stale data for ${e}`),a.data):(this.log(`Return fresh data ${e} from cache without fetching`),a.data):await this.dedupedFetch(e,...t)}dedupedFetch(t,...e){let a=this.inflightQueries.get(t);if(a)return this.log(`Deduplicating inflight fetch for ${t}`),a.promise;let s=this.startFetching(t,e),i=new AbortController;return this.inflightQueries.set(t,{promise:s,abortController:i}),s}async startFetching(t,e){this.log(`Start fetching ${t}`);try{let a=await this.queryFn(...e);return this.log(`Successfully fetched ${t}`),this.setData(t,a,Date.now()),a}catch(a){throw this.log(`Failed to fetch ${t}: ${a}`),a}finally{this.inflightQueries.delete(t)}}getQueryValue(t){return this.queryState.getSnapshot()?.[t]}getData(t){let e=this.queryState.getSnapshot()?.[t];if(e?.lastUpdatedMs&&this.isExpired(e.lastUpdatedMs)){this.deleteData(t);return}return e?.data}setData(t,e,a=Date.now()){let s={lastUpdatedMs:Date.now(),loading:!1,data:e,dataUpdatedMs:a};this.queryState.setValue(i=>({...i,[t]:s})),this.enforceSizeLimit()}async updateFromSource(...t){let e=this.getQueryKey(t);return await this.dedupedFetch(e,...t)}deleteData(t){let a={...this.queryState.getSnapshot()};delete a[t],this.queryState.setValue(a);let s=this.inflightQueries.get(t);s&&(this.inflightQueries.delete(t),s.abortController.abort("Deleted"))}clear(){this.queryState.delete();for(let{abortController:t}of Array.from(this.inflightQueries.values()))t.abort("Cleared");this.inflightQueries.clear()}mount(t){this.mountedKeys.set(t,(this.mountedKeys.get(t)??0)+1)}unmount(t){let e=this.mountedKeys.get(t);e===1?this.mountedKeys.delete(t):this.mountedKeys.set(t,(e??0)-1)}enforceSizeLimit(){if(!this.maxSize&&!this.maxBytes)return;let t=this.queryState.getSnapshot(),e=Object.keys(t).length;if(e<=1)return;let a=(0,m.default)(t),s=this.maxSize?e-this.maxSize:0,i=this.maxBytes?a-this.maxBytes:0;if(s<=0&&i<=0){this.log(`No need to trim data for ${this.queryName}: size=${e} (limit=${this.maxSize}), byteSize=${a.toLocaleString()} (limit=${this.maxBytes.toLocaleString()})`);return}this.log(`Need to trim ${this.queryName}: numToCut=${s}, bytesToCut=${i}`);let n={...t},p=!1,h=(o,y)=>{if(this.mountedKeys.has(o)){this.log(`Cannot clean up ${o} as it is mounted`);return}let l=(0,m.default)(o)+(0,m.default)(n[o]);this.log(`Cleaning up unmounted${y?", expired":""} ${o} (byteSize=${l.toLocaleString()})`),s--,i-=l,delete n[o],p=!0},f=Object.entries(n).sort((o,y)=>o[1].lastUpdatedMs-y[1].lastUpdatedMs);for(let[o]of f){if(!this.isExpired(n[o].lastUpdatedMs))break;h(o,!0)}if(s>0||i>0){p&&(f=Object.entries(n).sort((o,y)=>o[1].lastUpdatedMs-y[1].lastUpdatedMs));for(let[o]of f)if(h(o,!1),s<=0&&i<=0)break}if(!p){this.log(`No trimmable entries found for ${this.queryName}: size=${e} (limit=${this.maxSize}), byteSize=${a.toLocaleString()} (limit=${this.maxBytes.toLocaleString()})`);return}this.queryState.setValue(n),this.log(`Trimmed data for ${this.queryName}: size=[${e} -> ${Object.keys(n).length}] (limit=${this.maxSize}), byteSize=[${a.toLocaleString()} -> ${(0,m.default)(n).toLocaleString()}] (limit=${this.maxBytes.toLocaleString()})`)}},L=new Set;function W(r){if(L.has(r.queryName))throw new Error(`Duplicate shared query "${r.queryName}"`);return L.add(r.queryName),new x(r)}var F={lastUpdatedMs:0,loading:!0};function X(r,...t){let e=V(t),[a,s]=k(r.queryState),i=(0,d.useRef)(!0),n=(0,d.useMemo)(()=>r.getQueryKey(e),[r,e]),p=a[n]??F,h=(0,d.useCallback)(l=>{s(u=>{let c={...u};return c[n]=typeof l=="function"?l(c[n]??F):l,c})},[n,s]),[f,o]=(0,d.useState)();(0,d.useEffect)(()=>{r.keepLastNonEmptyData&&p.data!==void 0&&o(p.data)},[r.keepLastNonEmptyData,p.data]);let y=(0,d.useCallback)(async l=>{r.log(`Begin executing shared query ${n}`),h(u=>({...u,lastUpdatedMs:Date.now(),loading:!0}));try{let u=await(l?r.updateFromSource(...e):r.getCachedOrFetch(...e));if(i.current){let c=Date.now();h({lastUpdatedMs:c,loading:!1,data:u,dataUpdatedMs:c})}}catch(u){if(i.current){let c=Date.now();h(A=>({...A,lastUpdatedMs:c,loading:!1,error:u,errorUpdatedMs:c}))}}},[r,n,h,e]);return(0,d.useEffect)(()=>(i.current=!0,r.mount(n),y(!1),()=>{i.current=!1,r.unmount(n)}),[y,r,n]),(0,d.useMemo)(()=>({...p,lastNonEmptyData:f,abortCurrentQuery:l=>{let u=r.getAbortControllerByKey(n);return u?.abort(l),!!u},refetch:()=>{y(!0)},setData:(l,u)=>{let c=Date.now();h(A=>({...A,data:l,dataUpdatedMs:u??c,lastUpdatedMs:c,loading:!1}))},deleteData:()=>{s(l=>{let u={...l};return delete u[n],u})}}),[y,f,r,n,p,s,h])}0&&(module.exports={SharedQuery,SharedQueryConfig,configureSharedQuery,sharedQuery,useSharedQuery});
 //# sourceMappingURL=sharedQuery.min.cjs.map