@ic-reactor/react 3.12.4 → 3.13.0

package/dist/hooks/createAuthHooks.js

@@ -1,4 +1,27 @@
 import { useSyncExternalStore, useEffect, useRef, useMemo } from "react";
+/**
+ * The managers whose session a `useAuth()` has already started restoring.
+ *
+ * Restoring ends in `authenticate()`, which publishes `isAuthenticating: true`
+ * and then the restored state. It used to run once per mounted `useAuth()`
+ * rather than once per manager, so every consumer that mounted while signed out
+ * flipped `isAuthenticating` for the whole app, and one that mounted while a
+ * sign-in popup was open cleared `isAuthenticating` before the sign-in ended. A
+ * component that hides a `useAuth()` consumer while `isAuthenticating` never
+ * settled: each restore unmounted the consumer, and each remount restored
+ * again. Both clients answer from memory once loaded, so that loop ran on the
+ * microtask queue and the page never painted again.
+ *
+ * Keyed by manager rather than by `createAuthHooks` call, because reactors that
+ * share one `AuthenticationManager` each build their own hooks.
+ */
+const restoredSessions = new WeakSet();
+/**
+ * How many `useAuth()` consumers of each manager are mounted, so that a
+ * restore can tell a manager that was discarded from one StrictMode released
+ * and mounted again; see `useAuth()`.
+ */
+const mountedConsumers = new WeakMap();
 /**
  * The principal both hooks return.
  *
@@ -12,6 +35,30 @@ import { useSyncExternalStore, useEffect, useRef, useMemo } from "react";
 function usePrincipal(isAuthenticated, identity) {
     return useMemo(() => (isAuthenticated && identity ? identity.getPrincipal() : null), [isAuthenticated, identity]);
 }
+/**
+ * The auth state a server render shows, and so the one hydration shows.
+ *
+ * `useSyncExternalStore` renders `getServerSnapshot` on the server and again
+ * while hydrating, and both renders have to produce the HTML the server sent.
+ * The hooks passed the live state for both. A server holds no session, so its
+ * HTML is signed out. A component that hydrates after the session is restored,
+ * such as one inside a Suspense boundary whose code arrives later, read the
+ * restored state and no longer matched that HTML. React then reported a
+ * hydration error and threw the boundary's server HTML away to render it again
+ * on the client. A constant also keeps a server render from showing whatever a
+ * manager shared across requests happens to hold.
+ *
+ * It is the state the hooks report before the session has been checked: a
+ * server cannot know the session, so it renders the "checking" state that a
+ * browser shows until its restore settles. Once hydrated, React compares it
+ * with the live state and renders again with that.
+ */
+const SERVER_AUTH_STATE = Object.freeze({
+    identity: null,
+    isAuthenticating: true,
+    isAuthenticated: false,
+    error: undefined,
+});
 /**
  * Create authentication hooks for managing user sessions with Internet Identity.
  *
@@ -22,8 +69,8 @@ function usePrincipal(isAuthenticated, identity) {
  *   const { login, logout, principal, isAuthenticated } = useAuth()
  *
  *   return isAuthenticated
- *     ? <button onClick={logout}>Logout {principal?.toText()}</button>
- *     : <button onClick={login}>Login with II</button>
+ *     ? <button onClick={() => logout()}>Logout {principal?.toText()}</button>
+ *     : <button onClick={() => login()}>Login with II</button>
  * }
  */
 export const createAuthHooks = (authentication) => {
@@ -41,33 +88,86 @@ export const createAuthHooks = (authentication) => {
             "`defineReactor(...).authentication`.");
     }
     const { clientManager } = authentication;
+    // The agent state a manager starts in, for the reason given at
+    // SERVER_AUTH_STATE: `useAuth()` initializes the agent once hydrated, so a
+    // component hydrating later read `isInitialized: true` against server HTML
+    // rendered before any initialization. The network is kept: it comes from the
+    // agent's host, which initialization does not change.
+    const serverAgentState = Object.freeze({
+        isInitialized: false,
+        isInitializing: false,
+        error: undefined,
+        network: clientManager.network,
+        isLocalhost: clientManager.isLocal,
+    });
+    // What every consumer hands `useSyncExternalStore`, built once rather than
+    // on each render. React unsubscribes and subscribes again whenever the
+    // subscribe function changes, and each unsubscribe filters the manager's
+    // whole subscriber list. An auth state change re-renders every consumer, so
+    // a function per render cost k re-subscriptions and about k²/2 subscriber
+    // visits for k consumers: two million for 2,000 `useUserPrincipal()` rows.
+    const subscribeAgentState = (callback) => clientManager.subscribeAgentState(callback);
+    const getAgentState = () => clientManager.agentState;
+    const getServerAgentState = () => serverAgentState;
+    // Until the session has been checked, `authState` is the signed-out state
+    // the manager starts in, and reporting it as the answer sent signed-in users
+    // to the login page (#621). `useAuth()` starts the check from an effect, so
+    // on the first render nothing had been checked, yet `isAuthenticating` was
+    // false: a guard that redirects when `!isAuthenticating && !isAuthenticated`
+    // redirected before the session was ever read. The hooks report
+    // `isAuthenticating: true` until the check settles instead. The snapshot is
+    // kept per source state, because `useSyncExternalStore` needs the same object
+    // back until something changes.
+    let unchecked;
+    const subscribeAuthState = (callback) => {
+        const unsubscribeState = authentication.subscribeAuthState(callback);
+        const unsubscribeChecked = authentication.subscribeSessionChecked(callback);
+        return () => {
+            unsubscribeState();
+            unsubscribeChecked();
+        };
+    };
+    const getAuthState = () => {
+        const state = authentication.authState;
+        if (authentication.sessionChecked || state.isAuthenticating)
+            return state;
+        if (unchecked?.source !== state) {
+            unchecked = {
+                source: state,
+                state: Object.freeze({ ...state, isAuthenticating: true }),
+            };
+        }
+        return unchecked.state;
+    };
+    const getServerAuthState = () => SERVER_AUTH_STATE;
     /**
      * Subscribe to agent state changes.
      * Returns the current agent state (agent, isInitialized, etc.)
      */
-    const useAgentState = () => useSyncExternalStore((callback) => clientManager.subscribeAgentState(callback), () => clientManager.agentState, 
-    // Server snapshot - provide initial state for SSR
-    () => clientManager.agentState);
+    const useAgentState = () => useSyncExternalStore(subscribeAgentState, getAgentState, getServerAgentState);
     /**
      * Subscribe to authentication state changes.
      * Returns auth state (isAuthenticated, isAuthenticating, identity, error)
      */
-    const useAuthState = () => useSyncExternalStore((callback) => authentication.subscribeAuthState(callback), () => authentication.authState, 
-    // Server snapshot - provide initial state for SSR
-    () => authentication.authState);
+    const useAuthState = () => useSyncExternalStore(subscribeAuthState, getAuthState, getServerAuthState);
     /**
      * Main authentication hook that provides login/logout methods and auth state.
      * Automatically initializes the session on first use, restoring any previous session.
      *
+     * `isAuthenticating` is `true` until that restore has settled, including on
+     * the first render and in a server render, so a guard that shows a spinner
+     * while `isAuthenticating` never takes the state before the restore for a
+     * signed-out user. A restore that fails settles it too.
+     *
      * @example
      * function AuthButton() {
      *   const { login, logout, isAuthenticated, isAuthenticating } = useAuth()
      *
      *   if (isAuthenticated) {
-     *     return <button onClick={logout}>Logout</button>
+     *     return <button onClick={() => logout()}>Logout</button>
      *   }
      *   return (
-     *     <button onClick={login} disabled={isAuthenticating}>
+     *     <button onClick={() => login()} disabled={isAuthenticating}>
      *       {isAuthenticating ? "Connecting..." : "Login"}
      *     </button>
      *   )
@@ -76,23 +176,83 @@ export const createAuthHooks = (authentication) => {
     const useAuth = () => {
         const { login, logout, authenticate } = authentication;
         const { isAuthenticated, isAuthenticating, identity, error } = useAuthState();
-        // Track if we've already initialized to avoid duplicate calls
+        // Keeps a StrictMode re-run of the effect below from repeating it.
         const initializedRef = useRef(false);
-        // Auto-initialize on first mount to restore previous session.
-        // `prepareClient` also warms up the AuthClient so a later `login()` can
-        // open the identity provider window inside the click handler.
+        // Restore the previous session when the first consumer of this manager
+        // mounts. `prepareClient` also warms up the AuthClient so a later
+        // `login()` can open the identity provider window inside the click handler.
         useEffect(() => {
-            if (!initializedRef.current) {
-                initializedRef.current = true;
-                authentication
-                    .prepareClient()
-                    .catch(() => undefined)
-                    .then(() => clientManager.initialize())
-                    .then(() => authentication.authenticate())
-                    // Failures are already reflected in authState/agentState; without
-                    // this the rejection escapes as an unhandled promise rejection.
-                    .catch(() => undefined);
+            mountedConsumers.set(authentication, (mountedConsumers.get(authentication) ?? 0) + 1);
+            const unmount = () => {
+                mountedConsumers.set(authentication, (mountedConsumers.get(authentication) ?? 1) - 1);
+            };
+            if (initializedRef.current && restoredSessions.has(authentication)) {
+                return unmount;
+            }
+            const firstRun = !initializedRef.current;
+            initializedRef.current = true;
+            if (restoredSessions.has(authentication)) {
+                // Restored already. A live session is still checked again, which
+                // notices a delegation that has lapsed since and publishes nothing
+                // while it is valid.
+                if (firstRun && authentication.authState.isAuthenticated) {
+                    authentication.authenticate().catch(() => undefined);
+                }
+                return unmount;
             }
+            restoredSessions.add(authentication);
+            // A provider that builds its managers per mount disposes the manager
+            // from its cleanup. One that unmounted before this restore had built
+            // the client still got one, built after `dispose()` and never released,
+            // so each quick remount left a live client listening to the page. The
+            // restore stops instead once the manager has been disposed since it
+            // began and no `useAuth()` of it is mounted, releasing what it built.
+            // StrictMode's cleanup disposes the manager too, but mounts this
+            // consumer again before the restore looks, and that restore goes on.
+            // One that stopped counts as not having run, so a manager mounted again,
+            // as `<Activity>` mounts a tree it showed again, restores.
+            const releases = authentication.releaseCount;
+            const abandoned = () => {
+                if (authentication.releaseCount === releases ||
+                    (mountedConsumers.get(authentication) ?? 0) > 0) {
+                    return false;
+                }
+                authentication.dispose();
+                restoredSessions.delete(authentication);
+                return true;
+            };
+            void authentication
+                .prepareClient()
+                .catch(() => undefined)
+                .then(async () => {
+                if (abandoned())
+                    return false;
+                await clientManager.initialize();
+                if (abandoned())
+                    return false;
+                // A check that has settled already and found no session, such as
+                // the one a manager runs over a client handed to its constructor,
+                // or a route loader's `authenticate()`, answered what this restore
+                // would. Running it again only flashed `isAuthenticating`, and a
+                // guard redirected a second time. A live session is still checked,
+                // which publishes nothing while it is valid.
+                const { isAuthenticated, error } = authentication.authState;
+                if (authentication.sessionChecked && !isAuthenticated && !error) {
+                    return true;
+                }
+                await authentication.authenticate().catch(() => undefined);
+                return !abandoned();
+            })
+                // Failures are already reflected in authState/agentState; without
+                // this the rejection escapes as an unhandled promise rejection. A
+                // restore that failed before it reached `authenticate()`, such as a
+                // root key that could not be fetched, has settled all the same.
+                .catch(() => true)
+                .then((settled) => {
+                if (settled)
+                    authentication.markSessionChecked();
+            });
+            return unmount;
         }, []);
         const principal = usePrincipal(isAuthenticated, identity);
         return {

package/dist/hooks/createAuthHooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAuthHooks.js","sourceRoot":"","sources":["../../src/hooks/createAuthHooks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createAuthHooks.js","sourceRoot":"","sources":["../../src/hooks/createAuthHooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAoCxE;;;;;;;;;;;;;;;GAeG;AACH,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAAyB,CAAA;AAE7D;;;;GAIG;AACH,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAAiC,CAAA;AAErE;;;;;;;;;GASG;AACH,SAAS,YAAY,CACnB,eAAwB,EACxB,QAAyB;IAEzB,OAAO,OAAO,CACZ,GAAG,EAAE,CAAC,CAAC,eAAe,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EACpE,CAAC,eAAe,EAAE,QAAQ,CAAC,CAC5B,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,iBAAiB,GAAc,MAAM,CAAC,MAAM,CAAC;IACjD,QAAQ,EAAE,IAAI;IACd,gBAAgB,EAAE,IAAI;IACtB,eAAe,EAAE,KAAK;IACtB,KAAK,EAAE,SAAS;CACjB,CAAC,CAAA;AAEF;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,cAAqC,EACd,EAAE;IACzB,mEAAmE;IACnE,2EAA2E;IAC3E,2EAA2E;IAC3E,8EAA8E;IAC9E,6EAA6E;IAC7E,qBAAqB;IACrB,IACE,CAAC,cAAc;QACf,OAAO,cAAc,CAAC,kBAAkB,KAAK,UAAU,EACvD,CAAC;QACD,MAAM,IAAI,SAAS,CACjB,yEAAyE;YACvE,kCAAkC;YAClC,kEAAkE;YAClE,sCAAsC,CACzC,CAAA;IACH,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,cAAc,CAAA;IAExC,+DAA+D;IAC/D,2EAA2E;IAC3E,2EAA2E;IAC3E,6EAA6E;IAC7E,sDAAsD;IACtD,MAAM,gBAAgB,GAAe,MAAM,CAAC,MAAM,CAAC;QACjD,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,KAAK;QACrB,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,WAAW,EAAE,aAAa,CAAC,OAAO;KACnC,CAAC,CAAA;IAEF,2EAA2E;IAC3E,uEAAuE;IACvE,yEAAyE;IACzE,4EAA4E;IAC5E,0EAA0E;IAC1E,2EAA2E;IAC3E,MAAM,mBAAmB,GAAG,CAAC,QAAoB,EAAE,EAAE,CACnD,aAAa,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAA;IAC7C,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,aAAa,CAAC,UAAU,CAAA;IACpD,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,gBAAgB,CAAA;IAElD,0EAA0E;IAC1E,6EAA6E;IAC7E,4EAA4E;IAC5E,2EAA2E;IAC3E,6EAA6E;IAC7E,gEAAgE;IAChE,4EAA4E;IAC5E,8EAA8E;IAC9E,gCAAgC;IAChC,IAAI,SAA8D,CAAA;IAClE,MAAM,kBAAkB,GAAG,CAAC,QAAoB,EAAE,EAAE;QAClD,MAAM,gBAAgB,GAAG,cAAc,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAA;QACpE,MAAM,kBAAkB,GAAG,cAAc,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAA;QAC3E,OAAO,GAAG,EAAE;YACV,gBAAgB,EAAE,CAAA;YAClB,kBAAkB,EAAE,CAAA;QACtB,CAAC,CAAA;IACH,CAAC,CAAA;IACD,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,MAAM,KAAK,GAAG,cAAc,CAAC,SAAS,CAAA;QACtC,IAAI,cAAc,CAAC,cAAc,IAAI,KAAK,CAAC,gBAAgB;YAAE,OAAO,KAAK,CAAA;QACzE,IAAI,SAAS,EAAE,MAAM,KAAK,KAAK,EAAE,CAAC;YAChC,SAAS,GAAG;gBACV,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;aAC3D,CAAA;QACH,CAAC;QACD,OAAO,SAAS,CAAC,KAAK,CAAA;IACxB,CAAC,CAAA;IACD,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,iBAAiB,CAAA;IAElD;;;OAGG;IACH,MAAM,aAAa,GAAG,GAAe,EAAE,CACrC,oBAAoB,CAClB,mBAAmB,EACnB,aAAa,EACb,mBAAmB,CACpB,CAAA;IAEH;;;OAGG;IACH,MAAM,YAAY,GAAG,GAAc,EAAE,CACnC,oBAAoB,CAAC,kBAAkB,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAA;IAE5E;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,MAAM,OAAO,GAAG,GAAkB,EAAE;QAClC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,cAAc,CAAA;QACtD,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,EAAE,KAAK,EAAE,GAC1D,YAAY,EAAE,CAAA;QAEhB,mEAAmE;QACnE,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAEpC,uEAAuE;QACvE,kEAAkE;QAClE,4EAA4E;QAC5E,SAAS,CAAC,GAAG,EAAE;YACb,gBAAgB,CAAC,GAAG,CAClB,cAAc,EACd,CAAC,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAChD,CAAA;YACD,MAAM,OAAO,GAAG,GAAG,EAAE;gBACnB,gBAAgB,CAAC,GAAG,CAClB,cAAc,EACd,CAAC,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAChD,CAAA;YACH,CAAC,CAAA;YAED,IAAI,cAAc,CAAC,OAAO,IAAI,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;gBACnE,OAAO,OAAO,CAAA;YAChB,CAAC;YACD,MAAM,QAAQ,GAAG,CAAC,cAAc,CAAC,OAAO,CAAA;YACxC,cAAc,CAAC,OAAO,GAAG,IAAI,CAAA;YAE7B,IAAI,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;gBACzC,iEAAiE;gBACjE,mEAAmE;gBACnE,qBAAqB;gBACrB,IAAI,QAAQ,IAAI,cAAc,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;oBACzD,cAAc,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;gBACtD,CAAC;gBACD,OAAO,OAAO,CAAA;YAChB,CAAC;YACD,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;YAEpC,qEAAqE;YACrE,qEAAqE;YACrE,wEAAwE;YACxE,sEAAsE;YACtE,oEAAoE;YACpE,sEAAsE;YACtE,iEAAiE;YACjE,qEAAqE;YACrE,yEAAyE;YACzE,2DAA2D;YAC3D,MAAM,QAAQ,GAAG,cAAc,CAAC,YAAY,CAAA;YAC5C,MAAM,SAAS,GAAG,GAAG,EAAE;gBACrB,IACE,cAAc,CAAC,YAAY,KAAK,QAAQ;oBACxC,CAAC,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAC/C,CAAC;oBACD,OAAO,KAAK,CAAA;gBACd,CAAC;gBACD,cAAc,CAAC,OAAO,EAAE,CAAA;gBACxB,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;gBACvC,OAAO,IAAI,CAAA;YACb,CAAC,CAAA;YAED,KAAK,cAAc;iBAChB,aAAa,EAAE;iBACf,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;iBACtB,IAAI,CAAC,KAAK,IAAI,EAAE;gBACf,IAAI,SAAS,EAAE;oBAAE,OAAO,KAAK,CAAA;gBAC7B,MAAM,aAAa,CAAC,UAAU,EAAE,CAAA;gBAChC,IAAI,SAAS,EAAE;oBAAE,OAAO,KAAK,CAAA;gBAC7B,iEAAiE;gBACjE,kEAAkE;gBAClE,mEAAmE;gBACnE,iEAAiE;gBACjE,mEAAmE;gBACnE,6CAA6C;gBAC7C,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,SAAS,CAAA;gBAC3D,IAAI,cAAc,CAAC,cAAc,IAAI,CAAC,eAAe,IAAI,CAAC,KAAK,EAAE,CAAC;oBAChE,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,MAAM,cAAc,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;gBAC1D,OAAO,CAAC,SAAS,EAAE,CAAA;YACrB,CAAC,CAAC;gBACF,kEAAkE;gBAClE,kEAAkE;gBAClE,oEAAoE;gBACpE,gEAAgE;iBAC/D,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;iBACjB,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChB,IAAI,OAAO;oBAAE,cAAc,CAAC,kBAAkB,EAAE,CAAA;YAClD,CAAC,CAAC,CAAA;YAEJ,OAAO,OAAO,CAAA;QAChB,CAAC,EAAE,EAAE,CAAC,CAAA;QAEN,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAA;QAEzD,OAAO;YACL,YAAY;YACZ,KAAK;YACL,MAAM;YACN,eAAe;YACf,gBAAgB;YAChB,SAAS;YACT,QAAQ;YACR,KAAK;SACN,CAAA;IACH,CAAC,CAAA;IAED;;;;;;;;;;;OAWG;IACH,MAAM,gBAAgB,GAAG,GAAqB,EAAE;QAC9C,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,YAAY,EAAE,CAAA;QACpD,OAAO,YAAY,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC,CAAA;IAED,OAAO;QACL,OAAO;QACP,aAAa;QACb,gBAAgB;KACjB,CAAA;AACH,CAAC,CAAA"}

package/dist/hooks/useActorInfiniteQuery.d.ts

@@ -1,4 +1,4 @@
-import { QueryKey, UseInfiniteQueryResult, UseInfiniteQueryOptions, InfiniteData } from "@tanstack/react-query";
+import { QueryKey, UseInfiniteQueryResult, UseInfiniteQueryOptions, InfiniteData, type SkipToken } from "@tanstack/react-query";
 import { FunctionName, Reactor, TransformKey, ReactorArgs, ReactorReturnOk, ReactorQueryData, ReactorReturnErr } from "@ic-reactor/core";
 import { CallConfig } from "@icp-sdk/core/agent";
 /**
@@ -10,8 +10,25 @@ export interface UseActorInfiniteQueryParameters<Service, Method extends Functio
     reactor: Reactor<Service, Transform>;
     /** The method name to call on the canister */
     functionName: Method;
-    /** Function to get args from page parameter */
-    getArgs: (pageParam: TPageParam) => ReactorArgs<Service, Method, Transform>;
+    /**
+     * Function to get args from page parameter, or TanStack Query's `skipToken`
+     * while the args are not known: the query then waits without fetching, in
+     * an entry of its own under its method and `queryKey`, which no call's key
+     * shares, so it shows no data until the args arrive.
+     */
+    getArgs: ((pageParam: TPageParam) => ReactorArgs<Service, Method, Transform>) | SkipToken;
+    /**
+     * Narrows what the cache key derives from the call arguments.
+     *
+     * By default the key is scoped by `getArgs(initialPageParam)`, so two
+     * infinite queries on the same method with different arguments stay in
+     * separate cache entries. Supply this when those args embed the cursor and
+     * only part of them identifies the query — return the stable, serializable
+     * portion (typically everything except the pagination field). It is required
+     * when `initialPageParam` changes between renders, as `Date.now()` does:
+     * without it every render keys a new query.
+     */
+    getKeyArgs?: (args: ReactorArgs<Service, Method, Transform>) => unknown;
     /** Agent call configuration (effectiveCanisterId, etc.) */
     callConfig?: CallConfig;
     /** Custom query key (auto-generated if not provided) */
@@ -21,19 +38,30 @@ export interface UseActorInfiniteQueryParameters<Service, Method extends Functio
     /** Function to determine next page parameter */
     getNextPageParam: (lastPage: ReactorQueryData<ReactorReturnOk<Service, Method, Transform>>, allPages: ReactorQueryData<ReactorReturnOk<Service, Method, Transform>>[], lastPageParam: TPageParam, allPageParams: TPageParam[]) => TPageParam | undefined | null;
 }
-export type UseActorInfiniteQueryConfig<Service, Method extends FunctionName<Service>, Transform extends TransformKey = "candid", TPageParam = unknown> = Omit<UseActorInfiniteQueryParameters<Service, Method, Transform, TPageParam>, "reactor">;
-export type UseActorInfiniteQueryResult<Service, Method extends FunctionName<Service>, Transform extends TransformKey = "candid", TPageParam = unknown> = UseInfiniteQueryResult<InfiniteData<ReactorQueryData<ReactorReturnOk<Service, Method, Transform>>, TPageParam>, ReactorReturnErr<Service, Method, Transform>>;
+export type UseActorInfiniteQueryConfig<Service, Method extends FunctionName<Service>, Transform extends TransformKey = "candid", TPageParam = unknown, Selected = InfiniteData<ReactorQueryData<ReactorReturnOk<Service, Method, Transform>>, TPageParam>> = Omit<UseActorInfiniteQueryParameters<Service, Method, Transform, TPageParam, Selected>, "reactor">;
+export type UseActorInfiniteQueryResult<Service, Method extends FunctionName<Service>, Transform extends TransformKey = "candid", TPageParam = unknown, Selected = InfiniteData<ReactorQueryData<ReactorReturnOk<Service, Method, Transform>>, TPageParam>> = UseInfiniteQueryResult<Selected, ReactorReturnErr<Service, Method, Transform>>;
 /**
  * Hook for executing infinite/paginated query calls on a canister.
  *
  * @example
- * const { data, fetchNextPage, hasNextPage } = useActorInfiniteQuery({
+ * const { data, fetchNextPage, hasNextPage } = useReactorInfiniteQuery({
  *   reactor,
  *   functionName: "getItems",
- *   getArgs: (pageParam) => [{ offset: pageParam, limit: 10 }],
+ *   getArgs: (pageParam) => [{ offset: pageParam, limit: 10 }] as const,
+ *   initialPageParam: 0,
+ *   getNextPageParam: (lastPage) => lastPage.nextOffset,
+ * })
+ *
+ * // Wait for the args: no fetch until userId is known
+ * const { data } = useReactorInfiniteQuery({
+ *   reactor,
+ *   functionName: "getUserItems",
+ *   getArgs: userId
+ *     ? (pageParam) => [{ userId, offset: pageParam, limit: 10 }] as const
+ *     : skipToken,
  *   initialPageParam: 0,
  *   getNextPageParam: (lastPage) => lastPage.nextOffset,
  * })
  */
-export declare const useActorInfiniteQuery: <Service, Method extends FunctionName<Service>, Transform extends TransformKey = "candid", TPageParam = unknown>({ reactor, functionName, getArgs, callConfig, queryKey, ...options }: UseActorInfiniteQueryParameters<Service, Method, Transform, TPageParam>) => UseActorInfiniteQueryResult<Service, Method, Transform, TPageParam>;
+export declare const useActorInfiniteQuery: <Service, Method extends FunctionName<Service>, Transform extends TransformKey = "candid", TPageParam = unknown, Selected = InfiniteData<ReactorQueryData<ReactorReturnOk<Service, Method, Transform>>, TPageParam>>({ reactor, functionName, getArgs, getKeyArgs, callConfig, queryKey, ...options }: UseActorInfiniteQueryParameters<Service, Method, Transform, TPageParam, Selected>) => UseActorInfiniteQueryResult<Service, Method, Transform, TPageParam, Selected>;
 //# sourceMappingURL=useActorInfiniteQuery.d.ts.map

package/dist/hooks/useActorInfiniteQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useActorInfiniteQuery.d.ts","sourceRoot":"","sources":["../../src/hooks/useActorInfiniteQuery.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAER,sBAAsB,EACtB,uBAAuB,EACvB,YAAY,EACb,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EACL,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,WAAW,EACX,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGhD;;;GAGG;AACH,MAAM,WAAW,+BAA+B,CAC9C,OAAO,EACP,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,EACpC,SAAS,SAAS,YAAY,GAAG,QAAQ,EACzC,UAAU,GAAG,OAAO,EACpB,QAAQ,GAAG,YAAY,CACrB,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,EAC7D,UAAU,CACX,CACD,SAAQ,IAAI,CACZ,uBAAuB,CACrB,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,EAC7D,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAC5C,QAAQ,EACR,QAAQ,EACR,UAAU,CACX,EACD,UAAU,GAAG,SAAS,GAAG,kBAAkB,GAAG,kBAAkB,CACjE;IACC,mDAAmD;IACnD,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;IACpC,8CAA8C;IAC9C,YAAY,EAAE,MAAM,CAAA;IACpB,+CAA+C;IAC/C,OAAO,EAAE,CAAC,SAAS,EAAE,UAAU,KAAK,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;IAC3E,2DAA2D;IAC3D,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,wDAAwD;IACxD,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,6BAA6B;IAC7B,gBAAgB,EAAE,UAAU,CAAA;IAC5B,gDAAgD;IAChD,gBAAgB,EAAE,CAChB,QAAQ,EAAE,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,EACvE,QAAQ,EAAE,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,EAAE,EACzE,aAAa,EAAE,UAAU,EACzB,aAAa,EAAE,UAAU,EAAE,KACxB,UAAU,GAAG,SAAS,GAAG,IAAI,CAAA;CACnC;AAED,MAAM,MAAM,2BAA2B,CACrC,OAAO,EACP,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,EACpC,SAAS,SAAS,YAAY,GAAG,QAAQ,EACzC,UAAU,GAAG,OAAO,IAClB,IAAI,CACN,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,EACvE,SAAS,CACV,CAAA;AAED,MAAM,MAAM,2BAA2B,CACrC,OAAO,EACP,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,EACpC,SAAS,SAAS,YAAY,GAAG,QAAQ,EACzC,UAAU,GAAG,OAAO,IAClB,sBAAsB,CACxB,YAAY,CACV,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,EAC7D,UAAU,CACX,EACD,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAC7C,CAAA;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,qBAAqB,GAChC,OAAO,EACP,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,EACpC,SAAS,SAAS,YAAY,GAAG,QAAQ,EACzC,UAAU,GAAG,OAAO,EACpB,sEAOC,+BAA+B,CAChC,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CACX,KAAG,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,CA4DrE,CAAA"}
+{"version":3,"file":"useActorInfiniteQuery.d.ts","sourceRoot":"","sources":["../../src/hooks/useActorInfiniteQuery.ts"],"names":[],"mappings":"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"}

package/dist/hooks/useActorInfiniteQuery.js

@@ -1,30 +1,56 @@
-import { useMemo, useCallback } from "react";
-import { useInfiniteQuery, } from "@tanstack/react-query";
-import { mergeFactoryQueryKey, normalizeQueryData } from "../utils.js";
+import { useMemo } from "react";
+import { useInfiniteQuery, skipToken, } from "@tanstack/react-query";
+import { callConfigForKey, mergeFactoryQueryKey, normalizeQueryData, retryOption, skippedQueryKey, useMountQueryClient, } from "../utils.js";
 /**
  * Hook for executing infinite/paginated query calls on a canister.
  *
  * @example
- * const { data, fetchNextPage, hasNextPage } = useActorInfiniteQuery({
+ * const { data, fetchNextPage, hasNextPage } = useReactorInfiniteQuery({
  *   reactor,
  *   functionName: "getItems",
- *   getArgs: (pageParam) => [{ offset: pageParam, limit: 10 }],
+ *   getArgs: (pageParam) => [{ offset: pageParam, limit: 10 }] as const,
+ *   initialPageParam: 0,
+ *   getNextPageParam: (lastPage) => lastPage.nextOffset,
+ * })
+ *
+ * // Wait for the args: no fetch until userId is known
+ * const { data } = useReactorInfiniteQuery({
+ *   reactor,
+ *   functionName: "getUserItems",
+ *   getArgs: userId
+ *     ? (pageParam) => [{ userId, offset: pageParam, limit: 10 }] as const
+ *     : skipToken,
  *   initialPageParam: 0,
  *   getNextPageParam: (lastPage) => lastPage.nextOffset,
  * })
  */
-export const useActorInfiniteQuery = ({ reactor, functionName, getArgs, callConfig, queryKey, ...options }) => {
+export const useActorInfiniteQuery = ({ reactor, functionName, getArgs, getKeyArgs, callConfig, queryKey, ...options }) => {
+    useMountQueryClient(reactor.queryClient);
     // Always pass queryKey through generateQueryKey so it is merged with the
     // reactor/function identity. Using the custom key verbatim would cause cache
     // collisions if two different actors or methods share the same key string.
-    const baseQueryKey = useMemo(() => reactor.generateQueryKey({
-        functionName,
+    const baseQueryKey = useMemo(() => {
+        // Waiting for its args: an entry of its own under the method and the
+        // custom key, which every key the args will give extends; see
+        // skippedQueryKey.
+        if (getArgs === skipToken) {
+            return skippedQueryKey(reactor.generateQueryKey({ functionName, queryKey: mergeFactoryQueryKey(queryKey) }, callConfig), "infinite");
+        }
         // Fold the call arguments into the key. They live in the `getArgs`
         // closure rather than in the config, so without this two hooks on the
-        // same method with different arguments share one cache entry and
-        // serve each other's pages.
-        queryKey: mergeFactoryQueryKey(queryKey, undefined, getArgs(options.initialPageParam)),
-    }, callConfig), [
+        // same method with different arguments share one cache entry and serve
+        // each other's pages. `getKeyArgs` narrows them exactly as it does for the
+        // factories, which the bound hook's config type always accepted: it used
+        // to be ignored here, so the cursor stayed in the key, and an
+        // `initialPageParam` that changes every render (`Date.now()`) keyed a new
+        // query on every render — an endless loop of first-page fetches.
+        const initialArgs = getArgs(options.initialPageParam);
+        const keyArgs = getKeyArgs?.(initialArgs) ?? initialArgs;
+        return reactor.generateQueryKey({
+            functionName,
+            queryKey: mergeFactoryQueryKey(queryKey, undefined, keyArgs),
+        }, callConfig);
+    }, [
         queryKey,
         reactor,
         // `canisterId` is mutable reactor state that `setCanisterId` can change,
@@ -35,22 +61,29 @@ export const useActorInfiniteQuery = ({ reactor, functionName, getArgs, callConf
         functionName,
         callConfig,
         getArgs,
+        getKeyArgs,
         options.initialPageParam,
     ]);
     // Memoize queryFn to prevent recreation on every render
-    const queryFn = useCallback(async ({ pageParam }) => {
-        const args = getArgs(pageParam);
-        const result = await reactor.callMethod({
-            functionName,
-            args,
-            callConfig,
-        });
-        return normalizeQueryData(result);
-    }, [reactor, functionName, getArgs, callConfig]);
+    const queryFn = useMemo(() => getArgs === skipToken
+        ? skipToken
+        : async ({ pageParam, queryKey: fetchedKey, }) => {
+            const args = getArgs(pageParam);
+            const result = await reactor.callMethod({
+                functionName,
+                args,
+                callConfig: callConfigForKey(fetchedKey, callConfig),
+            });
+            return normalizeQueryData(result);
+        }, [reactor, functionName, getArgs, callConfig]);
+    // The method's default `retry`: for an update method, only failures that
+    // prove the canister never ran the call; see `Reactor.getQueryRetry`.
+    const defaultRetry = useMemo(() => reactor.getQueryRetry(functionName, baseQueryKey), [reactor, functionName, baseQueryKey]);
     return useInfiniteQuery({
         queryKey: baseQueryKey,
         queryFn,
         ...options,
+        ...retryOption(options.retry, defaultRetry),
     }, reactor.queryClient);
 };
 //# sourceMappingURL=useActorInfiniteQuery.js.map

package/dist/hooks/useActorInfiniteQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"useActorInfiniteQuery.js","sourceRoot":"","sources":["../../src/hooks/useActorInfiniteQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAC5C,OAAO,EAEL,gBAAgB,GAIjB,MAAM,uBAAuB,CAAA;AAW9B,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAqEtE;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAKnC,EACA,OAAO,EACP,YAAY,EACZ,OAAO,EACP,UAAU,EACV,QAAQ,EACR,GAAG,OAAO,EAMX,EAAuE,EAAE;IACxE,yEAAyE;IACzE,6EAA6E;IAC7E,2EAA2E;IAC3E,MAAM,YAAY,GAAG,OAAO,CAC1B,GAAG,EAAE,CACH,OAAO,CAAC,gBAAgB,CACtB;QACE,YAAY;QACZ,mEAAmE;QACnE,sEAAsE;QACtE,iEAAiE;QACjE,4BAA4B;QAC5B,QAAQ,EAAE,oBAAoB,CAC5B,QAAQ,EACR,SAAS,EACT,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAClC;KACF,EACD,UAAU,CACX,EACH;QACE,QAAQ;QACR,OAAO;QACP,yEAAyE;QACzE,mEAAmE;QACnE,0EAA0E;QAC1E,+CAA+C;QAC/C,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE;QAC9B,YAAY;QACZ,UAAU;QACV,OAAO;QACP,OAAO,CAAC,gBAAgB;KACzB,CACF,CAAA;IAED,wDAAwD;IACxD,MAAM,OAAO,GAAG,WAAW,CACzB,KAAK,EAAE,EAAE,SAAS,EAA6B,EAAE,EAAE;QACjD,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;QAC/B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC;YACtC,YAAY;YACZ,IAAI;YACJ,UAAU;SACX,CAAC,CAAA;QACF,OAAO,kBAAkB,CACvB,MAAqD,CACtD,CAAA;IACH,CAAC,EACD,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,CAC7C,CAAA;IAED,OAAO,gBAAgB,CACrB;QACE,QAAQ,EAAE,YAAY;QACtB,OAAO;QACP,GAAG,OAAO;KACJ,EACR,OAAO,CAAC,WAAW,CACmD,CAAA;AAC1E,CAAC,CAAA"}
+{"version":3,"file":"useActorInfiniteQuery.js","sourceRoot":"","sources":["../../src/hooks/useActorInfiniteQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAEL,gBAAgB,EAChB,SAAS,GAKV,MAAM,uBAAuB,CAAA;AAW9B,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,WAAW,EACX,eAAe,EACf,mBAAmB,GACpB,MAAM,aAAa,CAAA;AAmGpB;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CASnC,EACA,OAAO,EACP,YAAY,EACZ,OAAO,EACP,UAAU,EACV,UAAU,EACV,QAAQ,EACR,GAAG,OAAO,EAOX,EAMC,EAAE;IACF,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAExC,yEAAyE;IACzE,6EAA6E;IAC7E,2EAA2E;IAC3E,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,qEAAqE;QACrE,8DAA8D;QAC9D,mBAAmB;QACnB,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,eAAe,CACpB,OAAO,CAAC,gBAAgB,CACtB,EAAE,YAAY,EAAE,QAAQ,EAAE,oBAAoB,CAAC,QAAQ,CAAC,EAAE,EAC1D,UAAU,CACX,EACD,UAAU,CACX,CAAA;QACH,CAAC;QACD,mEAAmE;QACnE,sEAAsE;QACtE,uEAAuE;QACvE,2EAA2E;QAC3E,yEAAyE;QACzE,8DAA8D;QAC9D,0EAA0E;QAC1E,iEAAiE;QACjE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;QACrD,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC,WAAW,CAAC,IAAI,WAAW,CAAA;QAExD,OAAO,OAAO,CAAC,gBAAgB,CAC7B;YACE,YAAY;YACZ,QAAQ,EAAE,oBAAoB,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC;SAC7D,EACD,UAAU,CACX,CAAA;IACH,CAAC,EAAE;QACD,QAAQ;QACR,OAAO;QACP,yEAAyE;QACzE,mEAAmE;QACnE,0EAA0E;QAC1E,+CAA+C;QAC/C,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE;QAC9B,YAAY;QACZ,UAAU;QACV,OAAO;QACP,UAAU;QACV,OAAO,CAAC,gBAAgB;KACzB,CAAC,CAAA;IAEF,wDAAwD;IACxD,MAAM,OAAO,GAAG,OAAO,CACrB,GAAG,EAAE,CACH,OAAO,KAAK,SAAS;QACnB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,KAAK,EAAE,EACL,SAAS,EACT,QAAQ,EAAE,UAAU,GAIrB,EAAE,EAAE;YACH,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;YAC/B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC;gBACtC,YAAY;gBACZ,IAAI;gBACJ,UAAU,EAAE,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC;aACrD,CAAC,CAAA;YACF,OAAO,kBAAkB,CAEvB,MAAqD,CAAC,CAAA;QAC1D,CAAC,EACP,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,CAC7C,CAAA;IAED,yEAAyE;IACzE,sEAAsE;IACtE,MAAM,YAAY,GAAG,OAAO,CAC1B,GAAG,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC,EACvD,CAAC,OAAO,EAAE,YAAY,EAAE,YAAY,CAAC,CACtC,CAAA;IAED,OAAO,gBAAgB,CACrB;QACE,QAAQ,EAAE,YAAY;QACtB,OAAO;QACP,GAAG,OAAO;QACV,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,YAAY,CAAC;KACrC,EACR,OAAO,CAAC,WAAW,CAOpB,CAAA;AACH,CAAC,CAAA"}

package/dist/hooks/useActorMethod.d.ts

@@ -1,6 +1,7 @@
 import { type UseQueryResult, type UseMutationResult, type QueryKey, type QueryObserverOptions } from "@tanstack/react-query";
 import { Reactor, BaseActor, FunctionName, TransformKey, ReactorArgs, ReactorReturnOk, ReactorQueryData, ReactorReturnErr, FunctionType } from "@ic-reactor/core";
 import { CallConfig } from "@icp-sdk/core/agent";
+import type { InvalidationTarget } from "../types.js";
 /**
  * Configuration for useActorMethod hook.
  * Extends react-query's QueryObserverOptions with custom reactor params.
@@ -8,6 +9,13 @@ import { CallConfig } from "@icp-sdk/core/agent";
  * This is a unified hook that handles both query and mutation methods.
  * Query-specific options (like refetchInterval) only apply to query methods.
  * Mutation-specific options (like invalidateQueries) only apply to mutation methods.
+ *
+ * `retry`, `retryDelay`, `networkMode` and `meta` decide how a call runs, so
+ * they apply to both. An update method's call is a mutation: without a `retry`
+ * here it follows the QueryClient's mutation defaults, which retry nothing
+ * unless the app set `mutations.retry`, because each attempt runs the update
+ * on the canister again. Its query defaults, such as `reactorRetry`, do not
+ * apply to it.
  */
 export interface UseActorMethodParameters<Service = BaseActor, Method extends FunctionName<Service> = FunctionName<Service>, Transform extends TransformKey = "candid"> extends Omit<QueryObserverOptions<ReactorQueryData<ReactorReturnOk<Service, Method, Transform>>, ReactorReturnErr<Service, Method, Transform>, ReactorQueryData<ReactorReturnOk<Service, Method, Transform>>, ReactorQueryData<ReactorReturnOk<Service, Method, Transform>>, QueryKey>, "queryKey" | "queryFn"> {
     /** The reactor instance to use for method calls */
@@ -34,10 +42,19 @@ export interface UseActorMethodParameters<Service = BaseActor, Method extends Fu
      */
     onError?: (error: ReactorReturnErr<Service, Method, Transform>) => void;
     /**
-     * Query keys to invalidate after a successful mutation.
+     * Queries to invalidate after a successful mutation.
      * Only applies to mutation methods (updates).
+     *
+     * Each entry is a query key, a query object or query factory, or a
+     * `{ functionName, args? }` method of `reactor`; see
+     * {@link InvalidationTarget}. `undefined` entries are skipped.
+     *
+     * The invalidation is awaited before `onSuccess` runs, as in
+     * `useActorMutation` and `createMutation`, so `onSuccess` sees the
+     * refetched data, and `call()` resolves once the invalidated queries in use
+     * have refetched.
      */
-    invalidateQueries?: QueryKey[];
+    invalidateQueries?: InvalidationTarget<Service, Transform>[];
 }
 /**
  * Configuration type for bound useActorMethod hook (reactor omitted).
@@ -51,8 +68,9 @@ export type UseActorMethodConfig<Service = BaseActor, Method extends FunctionNam
 export interface UseActorMethodResult<Service = BaseActor, Method extends FunctionName<Service> = FunctionName<Service>, Transform extends TransformKey = "candid"> {
     /**
      * The returned data from the method call. A method's `undefined` result is
-     * `null` here, as in `useActorQuery`, so `undefined` only means no call has
-     * settled yet.
+     * `null` here, as in `useActorQuery`, so `undefined` means that no call has
+     * settled yet, that the last call failed, or that an update call is
+     * running. A query keeps its earlier data when a refetch fails.
      */
     data: ReactorQueryData<ReactorReturnOk<Service, Method, Transform>> | undefined;
     /** Whether the method is currently executing */
@@ -73,6 +91,15 @@ export interface UseActorMethodResult<Service = BaseActor, Method extends Functi
      * Call the method with optional arguments.
      * For queries: triggers a refetch
      * For mutations: executes the mutation with the provided args
+     *
+     * For a query method, `call(args)` fetches those args from the canister
+     * even when they are cached, and reports the result to `onSuccess` or
+     * `onError` itself. `call()` refetches the hook's own args, as `refetch()`
+     * does. Either resolves `undefined` when its fetch fails. A sign-in or
+     * sign-out while either is in flight cancels the fetch, which then runs
+     * again for the principal signed in, so the call resolves with that
+     * principal's answer rather than the previous one's; see
+     * `ClientManager.fetchAcrossIdentitySwitch`.
      */
     call: (args?: ReactorArgs<Service, Method, Transform>) => Promise<ReactorQueryData<ReactorReturnOk<Service, Method, Transform>> | undefined>;
     /**
@@ -86,6 +113,12 @@ export interface UseActorMethodResult<Service = BaseActor, Method extends Functi
     reset: () => void;
     /**
      * For queries only: Refetch the query
+     *
+     * Resolves with the answer, or `undefined` when the refetch fails, whose
+     * error the hook reports to `onError`; `data` keeps the last answer. A
+     * sign-in or sign-out while it is in flight makes it refetch for the
+     * principal signed in, and it resolves with that principal's answer, as
+     * `call()` does.
      */
     refetch: () => Promise<ReactorQueryData<ReactorReturnOk<Service, Method, Transform>> | undefined>;
     /** The raw query result (only available for query methods) */

package/dist/hooks/useActorMethod.d.ts.map

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