@choksheak/react-utils 0.2.3 → 0.2.4

package/README.md

@@ -1,3 +1,5 @@
-# Chok's React Utilities
+# @choksheak/react-utils
 
 Miscellaneous React+TypeScript utilities with support for full tree-shaking.
+
+Online docs: https://choksheak.github.io/react-utils/

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@choksheak/react-utils",
   "license": "The Unlicense",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Miscellaneous React+TypeScript utilities with support for full tree-shaking.",
   "private": false,
   "main": "index.js",
@@ -13,7 +13,7 @@
   "scripts": {
     "lint": "eslint .",
     "fix": "eslint . --fix",
-    "tsc": "tsc --noEmit",
+    "tsc": "tsc --noEmit --allowSyntheticDefaultImports",
     "ft": "npm run fix && npm run tsc",
     "build": "tsup src/*",
     "test": "vitest run",
@@ -64,6 +64,7 @@
     "@eslint/compat": "^1.4.0",
     "@eslint/js": "^9.38.0",
     "@types/jest": "^30.0.0",
+    "@types/lodash": "^4.17.20",
     "@types/react": "^19.2.2",
     "@types/react-dom": "^19.2.2",
     "@typescript-eslint/eslint-plugin": "^8.46.2",
@@ -79,6 +80,7 @@
     "globals": "^16.4.0",
     "jiti": "^2.6.1",
     "lint-staged": "^16.2.6",
+    "lodash": "^4.17.21",
     "object-sizeof": "^2.6.5",
     "prettier": "^3.6.2",
     "react": "^19.2.0",
@@ -89,13 +91,16 @@
     "typedoc": "^0.28.14",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.46.2",
+    "use-deep-compare": "^1.3.0",
     "vitest": "^4.0.3",
     "wretch": "^3.0.2"
   },
   "peerDependencies": {
     "@choksheak/ts-utils": ">=0.2.9",
+    "lodash": ">=4.17.21",
     "object-sizeof": ">=2.6.5",
     "react": ">=16",
+    "use-deep-compare": ">=1.3.0",
     "wretch": ">=3"
   },
   "exports": {

package/sharedQuery.d.mts

@@ -1,7 +1,7 @@
 import { SharedStateOptions, SharedState } from './sharedState.mjs';
 import './utils/storage.mjs';
 
-type FetchFn<TArgs extends unknown[], TData> = (...args: TArgs) => Promise<TData> | TData;
+type QueryFn<TArgs extends unknown[], TData> = (...args: TArgs) => Promise<TData> | TData;
 type QueryStateValue<TData> = {
     /**
      * When this record was last updated. Used for LRU determination. If you want
@@ -11,11 +11,27 @@ type QueryStateValue<TData> = {
     loading: boolean;
     data?: TData;
     dataUpdatedMs?: number;
-    error?: Error;
+    /**
+     * Use unknown type for error because we can't assume what type of variable
+     * will be thrown from the query function. We also don't want to add this
+     * type to QueryStateValue<TError> as it adds complexity to the type.
+     */
+    error?: unknown;
     errorUpdatedMs?: number;
 };
 type UseQueryResult<TData> = QueryStateValue<TData> & {
-    refetch: () => Promise<TData>;
+    /**
+     * Cancels the inflight query (if any). Returns true if canceled.
+     */
+    abortCurrentQuery: (reason?: unknown) => boolean;
+    /**
+     * Manually refresh the data by doing a new query.
+     */
+    refetch: () => void;
+    /**
+     * If you got the data from somewhere else (e.g. an in-memory data update),
+     * just set it directly.
+     */
     setData: (data: TData, dataUpdatedMs?: number) => void;
     deleteData: () => void;
 };
@@ -27,24 +43,27 @@ type PersistTo = "localStorage" | "indexedDb";
 type SharedQueryState<TData> = Record<string, QueryStateValue<TData>>;
 type SharedQueryOptions<TArgs extends unknown[], TData> = {
     queryName: string;
-    queryFn: FetchFn<TArgs, TData>;
+    queryFn: QueryFn<TArgs, TData>;
     staleMs?: number;
     expiryMs?: number;
     refetchOnStale?: boolean;
     persistTo?: PersistTo;
     maxSize?: number;
     maxBytes?: number;
+    log?: (...args: unknown[]) => void;
 } & SharedStateOptions<SharedQueryState<TData>>;
 /** Users can override these values globally. */
 declare const SharedQueryDefaults: {
     staleMs: number;
     expiryMs: number;
+    refetchOnStale: boolean;
     persistTo: PersistTo | undefined;
     maxSize: number;
     maxBytes: number;
+    log: (...args: unknown[]) => void;
 };
 declare class SharedQuery<TArgs extends unknown[], TData> {
-    private readonly inflightPromises;
+    private readonly inflightQueries;
     readonly queryState: SharedState<SharedQueryState<TData>>;
     readonly queryName: string;
     private readonly queryFn;
@@ -53,8 +72,20 @@ declare class SharedQuery<TArgs extends unknown[], TData> {
     readonly refetchOnStale: boolean;
     readonly maxSize: number;
     readonly maxBytes: number;
+    readonly log: (...args: unknown[]) => void;
     constructor(options: SharedQueryOptions<TArgs, TData>);
+    /** Returns a key to identify requests based on the given args. */
     getQueryKey(args: TArgs): string;
+    /**
+     * 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: string): AbortController | null;
+    /** Get the AbortSignal to check for query abortions. */
+    getAbortSignal(queryKey: string): AbortSignal | null;
     private isStale;
     private isExpired;
     getCachedOrFetch(...args: TArgs): Promise<TData>;
@@ -65,7 +96,7 @@ declare class SharedQuery<TArgs extends unknown[], TData> {
     /** Do a new fetch even when the data is already cached. */
     updateFromSource(...args: TArgs): Promise<TData>;
     /** Delete the cached data for one set of arguments. */
-    deleteData(args: TArgs): void;
+    deleteData(queryKey: string): void;
     /** Delete all currently cached data & all inflight promises. */
     clear(): void;
     /**
@@ -102,4 +133,4 @@ declare function sharedQuery<TArgs extends unknown[], TData>(options: SharedQuer
  */
 declare function useSharedQuery<TArgs extends unknown[], TData>(query: SharedQuery<TArgs, TData>, args?: TArgs): UseQueryResult<TData>;
 
-export { type FetchFn, type PersistTo, type QueryStateValue, SharedQuery, SharedQueryDefaults, type SharedQueryOptions, type SharedQueryState, type UseQueryResult, sharedQuery, useSharedQuery };
+export { type PersistTo, type QueryFn, type QueryStateValue, SharedQuery, SharedQueryDefaults, type SharedQueryOptions, type SharedQueryState, type UseQueryResult, sharedQuery, useSharedQuery };

package/sharedQuery.d.ts

@@ -1,5 +1,5 @@
 import { SharedState, SharedStateOptions } from "./sharedState";
-export type FetchFn<TArgs extends unknown[], TData> = (...args: TArgs) => Promise<TData> | TData;
+export type QueryFn<TArgs extends unknown[], TData> = (...args: TArgs) => Promise<TData> | TData;
 export type QueryStateValue<TData> = {
     /**
      * When this record was last updated. Used for LRU determination. If you want
@@ -9,11 +9,27 @@ export type QueryStateValue<TData> = {
     loading: boolean;
     data?: TData;
     dataUpdatedMs?: number;
-    error?: Error;
+    /**
+     * Use unknown type for error because we can't assume what type of variable
+     * will be thrown from the query function. We also don't want to add this
+     * type to QueryStateValue<TError> as it adds complexity to the type.
+     */
+    error?: unknown;
     errorUpdatedMs?: number;
 };
 export type UseQueryResult<TData> = QueryStateValue<TData> & {
-    refetch: () => Promise<TData>;
+    /**
+     * Cancels the inflight query (if any). Returns true if canceled.
+     */
+    abortCurrentQuery: (reason?: unknown) => boolean;
+    /**
+     * Manually refresh the data by doing a new query.
+     */
+    refetch: () => void;
+    /**
+     * If you got the data from somewhere else (e.g. an in-memory data update),
+     * just set it directly.
+     */
     setData: (data: TData, dataUpdatedMs?: number) => void;
     deleteData: () => void;
 };
@@ -25,24 +41,27 @@ export type PersistTo = "localStorage" | "indexedDb";
 export type SharedQueryState<TData> = Record<string, QueryStateValue<TData>>;
 export type SharedQueryOptions<TArgs extends unknown[], TData> = {
     queryName: string;
-    queryFn: FetchFn<TArgs, TData>;
+    queryFn: QueryFn<TArgs, TData>;
     staleMs?: number;
     expiryMs?: number;
     refetchOnStale?: boolean;
     persistTo?: PersistTo;
     maxSize?: number;
     maxBytes?: number;
+    log?: (...args: unknown[]) => void;
 } & SharedStateOptions<SharedQueryState<TData>>;
 /** Users can override these values globally. */
 export declare const SharedQueryDefaults: {
     staleMs: number;
     expiryMs: number;
+    refetchOnStale: boolean;
     persistTo: PersistTo | undefined;
     maxSize: number;
     maxBytes: number;
+    log: (...args: unknown[]) => void;
 };
 export declare class SharedQuery<TArgs extends unknown[], TData> {
-    private readonly inflightPromises;
+    private readonly inflightQueries;
     readonly queryState: SharedState<SharedQueryState<TData>>;
     readonly queryName: string;
     private readonly queryFn;
@@ -51,8 +70,20 @@ export declare class SharedQuery<TArgs extends unknown[], TData> {
     readonly refetchOnStale: boolean;
     readonly maxSize: number;
     readonly maxBytes: number;
+    readonly log: (...args: unknown[]) => void;
     constructor(options: SharedQueryOptions<TArgs, TData>);
+    /** Returns a key to identify requests based on the given args. */
     getQueryKey(args: TArgs): string;
+    /**
+     * 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: string): AbortController | null;
+    /** Get the AbortSignal to check for query abortions. */
+    getAbortSignal(queryKey: string): AbortSignal | null;
     private isStale;
     private isExpired;
     getCachedOrFetch(...args: TArgs): Promise<TData>;
@@ -63,7 +94,7 @@ export declare class SharedQuery<TArgs extends unknown[], TData> {
     /** Do a new fetch even when the data is already cached. */
     updateFromSource(...args: TArgs): Promise<TData>;
     /** Delete the cached data for one set of arguments. */
-    deleteData(args: TArgs): void;
+    deleteData(queryKey: string): void;
     /** Delete all currently cached data & all inflight promises. */
     clear(): void;
     /**

package/sharedQuery.js

@@ -38,7 +38,7 @@ __export(sharedQuery_exports, {
 module.exports = __toCommonJS(sharedQuery_exports);
 var import_timeConstants2 = require("@choksheak/ts-utils/timeConstants");
 var import_object_sizeof = __toESM(require("object-sizeof"));
-var import_react2 = require("react");
+var import_react3 = require("react");
 
 // src/sharedState.ts
 var import_timeConstants = require("@choksheak/ts-utils/timeConstants");
@@ -303,18 +303,39 @@ function stringifyDeterministicForKeys(params) {
   });
 }
 
+// src/utils/useDeepMemo.ts
+var import_isEqual = __toESM(require("lodash/isEqual"));
+var import_react2 = require("react");
+function useDeepMemo(value) {
+  const [state, setState] = (0, import_react2.useState)(value);
+  return (0, import_react2.useMemo)(() => {
+    if (state === value || (0, import_isEqual.default)(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 * import_timeConstants2.MS_PER_DAY,
+  // 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;
@@ -323,22 +344,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.
@@ -346,9 +372,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;
@@ -364,42 +405,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. */
@@ -419,18 +459,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
@@ -451,7 +499,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 };
@@ -470,7 +518,7 @@ var SharedQuery = class {
       const currentByteSize = needUpdate ? (0, import_object_sizeof.default)(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) {
@@ -495,12 +543,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()} -> ${(0, import_object_sizeof.default)(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()})`
     );
   }
@@ -518,77 +566,89 @@ var DEFAULT_QUERY_STATE_ENTRY = {
   loading: true
 };
 function useSharedQuery(query, args = []) {
+  const stableArgs = useDeepMemo(args);
   const [queryState, setQueryState] = useSharedState(query.queryState);
-  const isMounted = (0, import_react2.useRef)(true);
-  const queryKey = query.getQueryKey(args);
-  const execute = (0, import_react2.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 isMounted = (0, import_react3.useRef)(true);
+  const queryKey = (0, import_react3.useMemo)(
+    () => query.getQueryKey(stableArgs),
+    [query, stableArgs]
+  );
+  const queryStateValue = queryState[queryKey];
+  const execute = (0, import_react3.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]);
-  (0, import_react2.useEffect)(() => {
+    },
+    [query, queryKey, setQueryState, stableArgs]
+  );
+  (0, import_react3.useEffect)(() => {
     isMounted.current = true;
-    void execute();
+    void execute(false);
     return () => {
       isMounted.current = false;
     };
   }, [execute]);
-  return (0, import_react2.useMemo)(() => {
-    const state = queryState[queryKey] ?? DEFAULT_QUERY_STATE_ENTRY;
+  return (0, import_react3.useMemo)(() => {
+    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]);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {