@ic-reactor/react 3.12.4 → 3.13.0

package/dist/createMutation.js

@@ -9,6 +9,9 @@
  * @example
  * const transferMutation = createMutation(reactor, {
  *   functionName: "transfer",
+ *   // Refetched before onSuccess runs: a query factory covers every args
+ *   // instance, a `{ functionName }` every query of that method
+ *   invalidateQueries: [getBalance, { functionName: "get_history" }],
  *   onSuccess: () => console.log("Success!"),
  * })
  *
@@ -26,13 +29,7 @@
  */
 import { useMutation, } from "@tanstack/react-query";
 import { isCanisterError } from "@ic-reactor/core";
-// ============================================================================
-// Internal helpers
-// ============================================================================
-/** Invalidate a list of query keys in parallel, filtering out undefineds. */
-async function invalidateAll(queryClient, keys) {
-    await Promise.all(keys.map((queryKey) => queryKey ? queryClient.invalidateQueries({ queryKey }) : Promise.resolve()));
-}
+import { invalidateTargets, useMountQueryClient } from "./utils.js";
 // ============================================================================
 // Internal Implementation
 // ============================================================================
@@ -45,86 +42,49 @@ const createMutationImpl = (reactor, config) => {
      */
     const callFn = (args) => reactor.callMethod({ functionName, args, callConfig });
     /**
-     * Imperative execution for non-React usage.
-     *
-     * Runs the same factory-level chain the hook does — invalidation, then
-     * `onSuccess`, or `onCanisterError`/`onError` on failure — so a mutation
-     * object behaves the same through both call paths. Only hook-level callbacks
-     * are absent, because there is no hook here to supply them.
-     *
-     * The callbacks get the same `{ client, meta, mutationKey }` context
-     * TanStack Query passes them on the hook path.
-     *
-     * The error is rethrown after the callbacks run, so `await execute(...)`
-     * still rejects for the caller.
+     * The factory's own `onMutate` result for each call.
      *
-     * Use this in route loaders, scripts, or server-side code.
+     * TanStack Query stores one `onMutate` result per mutation and hands it to
+     * every callback. That slot holds the hook's result, which the mutation also
+     * exposes as `context`, so this map holds the factory's. Each key is the
+     * context object TanStack Query creates for a call and passes to every
+     * callback of that call.
      */
-    const execute = async (args) => {
-        // TanStack Query builds this for the hook path, and the callback types
-        // declare it as always present. None of it is mutation state, so this path
-        // builds the same object. Passing `undefined` made a callback that reads
-        // `context.client` throw here and nowhere else.
-        //
-        // The hook path takes `meta` and `mutationKey` from the client's defaulted
-        // options, so this runs the same spread through `defaultMutationOptions`.
-        // Reading `factoryOptions` alone dropped mutation defaults registered on
-        // the QueryClient (`defaultOptions.mutations`, `setMutationDefaults`).
-        const effectiveOptions = reactor.queryClient.defaultMutationOptions({
-            mutationKey: reactor.getQueryOptions({ functionName }).queryKey,
-            ...factoryOptions,
-        });
-        const context = {
-            client: reactor.queryClient,
-            meta: effectiveOptions.meta,
-            mutationKey: effectiveOptions.mutationKey,
-        };
-        let result;
-        try {
-            result = await callFn(args);
-        }
-        catch (error) {
-            if (isCanisterError(error)) {
-                factoryOnCanisterError?.(error, args);
-            }
-            // `onMutate` does not run on this path, so there is no result to pass.
-            // Awaited like `onSuccess` below and like the hook path, so an async
-            // rollback or report finishes before `execute()` rejects.
-            await factoryOnError?.(error, args, undefined, context);
-            throw error;
-        }
-        if (factoryInvalidateQueries) {
-            await invalidateAll(reactor.queryClient, factoryInvalidateQueries);
-        }
-        await factoryOnSuccess?.(result, args, undefined, context);
-        return result;
-    };
-    // Hook implementation
-    const useMutationHook = (options) => {
-        const baseOptions = reactor.getQueryOptions({ functionName });
+    const factoryOnMutateResults = new WeakMap();
+    /**
+     * The `onMutate` result a factory callback receives. A factory without its
+     * own `onMutate` gets the hook's, as it always has.
+     */
+    const factoryOnMutateResult = (onMutateResult, context) => (factoryOnMutate && context
+        ? factoryOnMutateResults.get(context)
+        : onMutateResult);
+    /**
+     * The options a mutation of this factory runs with, on both call paths: the
+     * factory's config, the hook's options on top when there is a hook, and the
+     * callbacks of both levels chained, factory first. `useMutation()` hands
+     * them to TanStack Query's `useMutation`, and `execute()` builds a mutation
+     * from them in the QueryClient's MutationCache.
+     */
+    const mutationOptions = (options) => {
         const { invalidateQueries: hookInvalidateQueries, onCanisterError: hookOnCanisterError, ...restOptions } = options ?? {};
-        return useMutation({
-            mutationKey: baseOptions.queryKey,
+        return {
+            mutationKey: reactor.getQueryOptions({ functionName }).queryKey,
             ...factoryOptions,
             ...restOptions,
             // Use callFn (not execute) to avoid double-invalidation:
             // factoryInvalidateQueries are handled in onSuccess below.
             mutationFn: callFn,
-            onSuccess: async (...args) => {
+            onSuccess: async (data, variables, onMutateResult, context) => {
                 // 1. Factory-level invalidation
-                if (factoryInvalidateQueries) {
-                    await invalidateAll(reactor.queryClient, factoryInvalidateQueries);
-                }
+                await invalidateTargets(reactor, factoryInvalidateQueries, callConfig);
                 // 2. Hook-level invalidation
-                if (hookInvalidateQueries) {
-                    await invalidateAll(reactor.queryClient, hookInvalidateQueries);
-                }
+                await invalidateTargets(reactor, hookInvalidateQueries, callConfig);
                 // 3. Factory onSuccess
-                await factoryOnSuccess?.(...args);
+                await factoryOnSuccess?.(data, variables, factoryOnMutateResult(onMutateResult, context), context);
                 // 4. Hook onSuccess
-                await restOptions.onSuccess?.(...args);
+                await restOptions.onSuccess?.(data, variables, onMutateResult, context);
             },
-            onError: async (error, variables, context, mutation) => {
+            onError: async (error, variables, onMutateResult, context) => {
                 if (isCanisterError(error)) {
                     factoryOnCanisterError?.(error, variables);
                     hookOnCanisterError?.(error, variables);
@@ -132,8 +92,8 @@ const createMutationImpl = (reactor, config) => {
                 // Awaited in order, like `onSuccess`. TanStack Query holds
                 // `onSettled` and the settled state until this promise resolves, so
                 // an async `onError` must be part of it.
-                await factoryOnError?.(error, variables, context, mutation);
-                await restOptions.onError?.(error, variables, context, mutation);
+                await factoryOnError?.(error, variables, factoryOnMutateResult(onMutateResult, context), context);
+                await restOptions.onError?.(error, variables, onMutateResult, context);
             },
             // `onMutate` and `onSettled` are composed like `onSuccess`/`onError`
             // above. They used to arrive through the `...restOptions` spread, so a
@@ -141,22 +101,99 @@ const createMutationImpl = (reactor, config) => {
             // telemetry or logging simply vanished the moment any call site passed
             // its own, with no warning and no type error. Chaining is what a
             // reader who has seen `onSuccess` chain already expects.
-            onMutate: async (...params) => {
-                await factoryOnMutate?.(...params);
-                return await restOptions.onMutate?.(...params);
+            onMutate: async (variables, context) => {
+                if (factoryOnMutate) {
+                    const result = await factoryOnMutate(variables, context);
+                    if (context)
+                        factoryOnMutateResults.set(context, result);
+                }
+                // Without a hook-level `onMutate` this is `undefined`, and
+                // THookOnMutateResult is then `unknown`.
+                return (await restOptions.onMutate?.(variables, context));
+            },
+            onSettled: async (data, error, variables, onMutateResult, context) => {
+                await factoryOnSettled?.(data, error, variables, factoryOnMutateResult(onMutateResult, context), context);
+                await restOptions.onSettled?.(data, error, variables, onMutateResult, context);
             },
-            onSettled: async (...params) => {
-                await factoryOnSettled?.(...params);
-                await restOptions.onSettled?.(...params);
+        };
+    };
+    /**
+     * Imperative execution for non-React usage.
+     *
+     * Builds the mutation in the QueryClient's MutationCache and runs it, as
+     * TanStack Query's `useMutation` does, with the options the hook path uses
+     * minus the hook's own. It used to call the canister and the factory's
+     * callbacks itself, so the MutationCache never saw it: its global
+     * `onError`, `onSuccess` and `onSettled` did not run, `useIsMutating` did
+     * not count it, and neither the factory's `retry` or `networkMode` nor the
+     * same options in the QueryClient's mutation defaults applied to the call.
+     * The factory's `onMutate` and `onSettled` did not run either.
+     *
+     * Now the factory's chain runs as it does through `useMutation()`:
+     * `onMutate`, then the factory's invalidation and `onSuccess`, or
+     * `onCanisterError` and `onError` on failure, then `onSettled`. Each factory
+     * callback gets the result of the factory's `onMutate` for this call. Only
+     * hook-level callbacks are absent, because there is no hook here to supply
+     * them.
+     *
+     * The QueryClient's mutation defaults apply as well, so a `mutations.retry`
+     * there re-sends a failed call here too. Each retry of an update method is
+     * a new call the canister runs; set `retry` on the factory (`false`, or
+     * `reactorUpdateRetry` to retry only a SysTransient rejection) to decide it
+     * per method.
+     *
+     * It resolves with the method's result. On failure it rejects with the
+     * call's error once the callbacks have run, so `await execute(...)` still
+     * rejects for the caller.
+     *
+     * Use this in route loaders, scripts, or server-side code.
+     */
+    const execute = async (args) => {
+        const { queryClient } = reactor;
+        const options = mutationOptions();
+        const { onError } = options;
+        // What the factory's `onError` or `onCanisterError` throws, if either
+        // does. execute() has always rejected with it, and a TanStack Query
+        // mutation at the 5.90.2 peer floor does too. Later releases reject with
+        // the call's error and report the thrown one as an unhandled rejection,
+        // which ends a Node script, so it is caught here and rethrown below.
+        let thrownByOnError;
+        const mutation = queryClient
+            .getMutationCache()
+            .build(queryClient, {
+            ...options,
+            onError: async (error, variables, onMutateResult, context) => {
+                try {
+                    await onError?.(error, variables, onMutateResult, context);
+                }
+                catch (thrown) {
+                    thrownByOnError = { error: thrown };
+                }
             },
-        }, reactor.queryClient);
+        });
+        try {
+            return await mutation.execute(args);
+        }
+        catch (error) {
+            throw thrownByOnError ? thrownByOnError.error : error;
+        }
+    };
+    // Hook implementation
+    const useMutationHook = (options) => {
+        useMountQueryClient(reactor.queryClient);
+        return useMutation(mutationOptions(options), reactor.queryClient);
     };
     return { useMutation: useMutationHook, execute };
 };
 // ============================================================================
 // Public Factory Function
 // ============================================================================
-export function createMutation(reactor, config) {
+export function createMutation(reactor, 
+// A factory `onError` or `onSettled` gets no `onMutate` result when
+// `onMutate` throws, so the result can also be `undefined`. `onSuccess`
+// shares the type argument. It kept the `undefined` from when `execute()`
+// ran no `onMutate`, although it now always gets a result.
+config) {
     return createMutationImpl(reactor, config);
 }
 //# sourceMappingURL=createMutation.js.map

package/dist/createMutation.js.map

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

package/dist/createQuery.d.ts

@@ -24,7 +24,40 @@
  * await userQuery.invalidate()
  */
 import type { Reactor, FunctionName, ReactorArgs, TransformKey } from "@ic-reactor/core";
-import type { QueryFnData, QueryError, QueryConfig, QueryResult, QueryFactoryConfig, NoInfer } from "./types.js";
+import type { QueryFnData, QueryError, QueryConfig, QueryResult, QueryFactoryConfig, SkippableQueryFactoryFn, NoInfer } from "./types.js";
 export declare function createQuery<Service, Transform extends TransformKey, Method extends FunctionName<Service> = FunctionName<Service>, Selected = QueryFnData<Service, Method, Transform>>(reactor: Reactor<Service, Transform>, config: QueryConfig<NoInfer<Service>, Method, Transform, Selected>): QueryResult<QueryFnData<Service, Method, Transform>, Selected, QueryError<Service, Method, Transform>>;
-export declare function createQueryFactory<Service, Transform extends TransformKey, Method extends FunctionName<Service> = FunctionName<Service>, Selected = QueryFnData<Service, Method, Transform>>(reactor: Reactor<Service, Transform>, config: QueryFactoryConfig<NoInfer<Service>, Method, Transform, Selected>): (args: ReactorArgs<Service, Method, Transform>) => QueryResult<QueryFnData<Service, Method, Transform>, Selected, QueryError<Service, Method, Transform>>;
+/**
+ * Create a query factory: a function that takes the method's args and returns
+ * the query object for them, the same object for the same args.
+ *
+ * The function also has `getQueryKey()`, the key prefix every query it
+ * returns shares, and `invalidate()`, which invalidates all of them whatever
+ * their args. Pass the function itself to a mutation's `invalidateQueries` to
+ * refresh every instance after the mutation.
+ *
+ * It also takes TanStack Query's `skipToken` in place of args, for a
+ * component whose args are not known yet, and returns a query with only
+ * `useQuery()`, which waits without fetching; see
+ * {@link SkippableQueryFactoryFn}.
+ *
+ * @example
+ * const getBalance = createQueryFactory(ledger, {
+ *   functionName: "icrc1_balance_of",
+ * })
+ *
+ * // In a component
+ * const { data } = getBalance([{ owner, subaccount: [] }]).useQuery()
+ *
+ * // In a component whose owner may not be known yet
+ * const { data: maybe } = getBalance(
+ *   owner ? [{ owner, subaccount: [] }] : skipToken
+ * ).useQuery()
+ *
+ * // Refetch every account's balance after a transfer
+ * const transfer = createMutation(ledger, {
+ *   functionName: "icrc1_transfer",
+ *   invalidateQueries: [getBalance],
+ * })
+ */
+export declare function createQueryFactory<Service, Transform extends TransformKey, Method extends FunctionName<Service> = FunctionName<Service>, Selected = QueryFnData<Service, Method, Transform>>(reactor: Reactor<Service, Transform>, config: QueryFactoryConfig<NoInfer<Service>, Method, Transform, Selected>): SkippableQueryFactoryFn<ReactorArgs<Service, Method, Transform>, QueryResult<QueryFnData<Service, Method, Transform>, Selected, QueryError<Service, Method, Transform>>>;
 //# sourceMappingURL=createQuery.d.ts.map

package/dist/createQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createQuery.d.ts","sourceRoot":"","sources":["../src/createQuery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,KAAK,EACV,OAAO,EACP,YAAY,EACZ,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAA;AAQzB,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,WAAW,EAEX,WAAW,EACX,kBAAkB,EAClB,OAAO,EACR,MAAM,YAAY,CAAA;AA0HnB,wBAAgB,WAAW,CACzB,OAAO,EACP,SAAS,SAAS,YAAY,EAC9B,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,EAC5D,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAElD,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EACpC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,GACjE,WAAW,CACZ,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EACvC,QAAQ,EACR,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CACvC,CAKA;AAMD,wBAAgB,kBAAkB,CAChC,OAAO,EACP,SAAS,SAAS,YAAY,EAC9B,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,EAC5D,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAElD,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EACpC,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,GACxE,CACD,IAAI,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,KAC1C,WAAW,CACd,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EACvC,QAAQ,EACR,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CACvC,CA8BA"}
+{"version":3,"file":"createQuery.d.ts","sourceRoot":"","sources":["../src/createQuery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,KAAK,EACV,OAAO,EACP,YAAY,EACZ,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAA;AAUzB,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,WAAW,EAGX,WAAW,EACX,kBAAkB,EAClB,uBAAuB,EAEvB,OAAO,EACR,MAAM,YAAY,CAAA;AAwLnB,wBAAgB,WAAW,CACzB,OAAO,EACP,SAAS,SAAS,YAAY,EAC9B,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,EAC5D,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAElD,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EACpC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,GACjE,WAAW,CACZ,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EACvC,QAAQ,EACR,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CACvC,CAKA;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EACP,SAAS,SAAS,YAAY,EAC9B,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,EAC5D,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAElD,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EACpC,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,GACxE,uBAAuB,CACxB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EACvC,WAAW,CACT,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EACvC,QAAQ,EACR,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CACvC,CACF,CA6DA"}

package/dist/createQuery.js

@@ -24,33 +24,72 @@
  * await userQuery.invalidate()
  */
 import { useMemo } from "react";
-import { useQuery, } from "@tanstack/react-query";
-import { buildChainedSelect, createBoundedCache } from "./utils.js";
+import { useQuery, skipToken, } from "@tanstack/react-query";
+import { buildChainedSelect, createBoundedCache, pickFetchOptions, queryCacheControls, retryOption, skippedQueryKey, useMountQueryClient, withQueryFactoryMethods, } from "./utils.js";
 // ============================================================================
 // Internal Implementation
 // ============================================================================
-const createQueryImpl = (reactor, config) => {
-    const { functionName, args, staleTime = 5 * 60 * 1000, select, queryKey: customQueryKey, ...rest } = config;
-    const params = { functionName, args, queryKey: customQueryKey };
-    const getQueryKey = () => reactor.generateQueryKey(params);
+const createQueryImpl = (reactor, 
+// `args` is `skipToken` only for a factory's skipped query, which exposes
+// nothing but `useQuery`; see createQueryFactory.
+config) => {
+    const { functionName, args, callConfig, staleTime = 5 * 60 * 1000, select, queryKey: customQueryKey, ...rest } = config;
+    const skipped = args === skipToken;
+    // `callConfig` goes wherever the hooks send it: to the call and into the
+    // key, so a query of another canister or agent has an entry of its own.
+    const params = {
+        functionName,
+        args: skipped ? undefined : args,
+        queryKey: customQueryKey,
+        callConfig,
+    };
+    // What the hook observes: the call, or for a query still waiting for its
+    // args, an entry of its own under the method's key, with nothing to run;
+    // see skippedQueryKey.
+    const queryOptions = () => skipped
+        ? {
+            queryKey: skippedQueryKey(reactor.generateQueryKey({ functionName }, callConfig), "query"),
+            // Kept as the unique symbol, which an object literal widens.
+            queryFn: skipToken,
+            retry: undefined,
+        }
+        : reactor.getQueryOptions(params);
+    const getQueryKey = () => reactor.generateQueryKey(params, callConfig);
     // Apply config.select to raw data (shared by fetch, getCacheData, and the hook)
     const applySelect = (raw) => select ? select(raw) : raw;
+    // How the query function runs, shared with the hook; see pickFetchOptions.
+    const fetchOptions = pickFetchOptions(rest);
     /** Cache-first fetch for use in loaders / route preloading. */
     const fetch = async () => {
-        const result = await reactor.fetchQuery(params);
+        // Through the reactor rather than straight to the QueryClient: overriding
+        // `fetchQuery` in a Reactor subclass is a documented way to add logic to
+        // every factory fetch.
+        const result = await reactor.fetchQuery(params, fetchOptions);
         return applySelect(result);
     };
     /** Fire-and-forget prefetch — warms the cache without blocking. */
     const prefetch = () => {
         const baseOptions = reactor.getQueryOptions(params);
-        return reactor.queryClient.prefetchQuery({
+        // A sign-in or sign-out cancels a prefetch in flight, and TanStack
+        // resolves it all the same: an entry nothing observes was left empty, and
+        // one a mounted query shows still held the previous principal's data
+        // until that query's refetch landed. It now runs again for the principal
+        // signed in, as `fetch()` does. Like `prefetchQuery` it never rejects, so
+        // the CallError for a principal that keeps switching is dropped too.
+        return reactor.clientManager
+            .fetchAcrossIdentitySwitch(() => reactor.queryClient.prefetchQuery({
+            ...fetchOptions,
+            // An update method's default `retry`; see `Reactor.getQueryRetry`.
+            ...retryOption(fetchOptions.retry, baseOptions.retry),
             queryKey: baseOptions.queryKey,
             queryFn: baseOptions.queryFn,
             staleTime,
-        });
+        }))
+            .catch(() => undefined);
     };
     const useQueryHook = ((options) => {
-        const baseOptions = reactor.getQueryOptions(params);
+        useMountQueryClient(reactor.queryClient);
+        const baseOptions = queryOptions();
         // Memoized so the observer's select-result cache can hit; see
         // buildChainedSelect. `select` comes from the factory config and is stable.
         const chainedSelect = useMemo(() => buildChainedSelect(select, options?.select), [options?.select]);
@@ -61,13 +100,16 @@ const createQueryImpl = (reactor, config) => {
             ...options,
             queryFn: baseOptions.queryFn,
             select: chainedSelect,
+            // The hook's `retry`, else the config's, else an update method's
+            // default; see `Reactor.getQueryRetry`.
+            ...retryOption(options?.retry ?? rest.retry, baseOptions.retry),
         }, reactor.queryClient);
     });
     const invalidate = async () => {
         await reactor.queryClient.invalidateQueries({ queryKey: getQueryKey() });
     };
     const getCacheData = ((selectFn) => {
-        const raw = reactor.getQueryData(params);
+        const raw = reactor.getQueryData(params, callConfig);
         if (raw === undefined)
             return undefined;
         const selected = applySelect(raw);
@@ -84,6 +126,7 @@ const createQueryImpl = (reactor, config) => {
         getQueryKey,
         getCacheData,
         setData,
+        ...queryCacheControls(reactor, getQueryKey),
     };
 };
 // ============================================================================
@@ -95,13 +138,53 @@ export function createQuery(reactor, config) {
 // ============================================================================
 // Convenience: Create query with dynamic args
 // ============================================================================
+/**
+ * Create a query factory: a function that takes the method's args and returns
+ * the query object for them, the same object for the same args.
+ *
+ * The function also has `getQueryKey()`, the key prefix every query it
+ * returns shares, and `invalidate()`, which invalidates all of them whatever
+ * their args. Pass the function itself to a mutation's `invalidateQueries` to
+ * refresh every instance after the mutation.
+ *
+ * It also takes TanStack Query's `skipToken` in place of args, for a
+ * component whose args are not known yet, and returns a query with only
+ * `useQuery()`, which waits without fetching; see
+ * {@link SkippableQueryFactoryFn}.
+ *
+ * @example
+ * const getBalance = createQueryFactory(ledger, {
+ *   functionName: "icrc1_balance_of",
+ * })
+ *
+ * // In a component
+ * const { data } = getBalance([{ owner, subaccount: [] }]).useQuery()
+ *
+ * // In a component whose owner may not be known yet
+ * const { data: maybe } = getBalance(
+ *   owner ? [{ owner, subaccount: [] }] : skipToken
+ * ).useQuery()
+ *
+ * // Refetch every account's balance after a transfer
+ * const transfer = createMutation(ledger, {
+ *   functionName: "icrc1_transfer",
+ *   invalidateQueries: [getBalance],
+ * })
+ */
 export function createQueryFactory(reactor, config) {
     const cache = createBoundedCache();
-    return (args) => {
-        const key = reactor.generateQueryKey({
-            functionName: config.functionName,
-            args,
-        });
+    // One skipped query per factory, built on first use. Only its hook is
+    // handed out: until the args are known there is no call to make and no
+    // entry of their own to read or write.
+    let skippedQuery;
+    function factory(args) {
+        if (args === skipToken) {
+            skippedQuery ?? (skippedQuery = {
+                useQuery: createQueryImpl(reactor, { ...config, args: skipToken }).useQuery,
+            });
+            return skippedQuery;
+        }
+        const key = reactor.generateQueryKey({ functionName: config.functionName, args }, config.callConfig);
         const cacheKey = JSON.stringify(key);
         const existing = cache.get(cacheKey);
         if (existing)
@@ -112,6 +195,10 @@ export function createQueryFactory(reactor, config) {
         });
         cache.set(cacheKey, result);
         return result;
-    };
+    }
+    // The method's own prefix, at the canister and agent the config's
+    // `callConfig` names. A config `queryKey` follows the args segment in every
+    // instance's key, so it cannot narrow the prefix.
+    return withQueryFactoryMethods(factory, reactor, () => reactor.generateQueryKey({ functionName: config.functionName }, config.callConfig));
 }
 //# sourceMappingURL=createQuery.js.map

package/dist/createQuery.js.map

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