@ic-reactor/react 1.2.3 → 1.3.1

package/dist/context/actor.js

@@ -90,9 +90,11 @@ function createActorContext(contextConfig = {}) {
         const config = react_1.default.useMemo(() => (Object.assign(Object.assign({}, defaultConfig), restConfig)), [defaultConfig, restConfig]);
         const { fetchError, authenticating, hooks } = (0, useActor_1.useActor)(Object.assign({ canisterId }, config));
         return (react_1.default.createElement(ActorContext.Provider, { value: hooks }, hooks === null
-            ? (fetchError !== null && fetchError !== void 0 ? fetchError : authenticating)
-                ? authenticatingComponent
-                : loadingComponent
+            ? fetchError
+                ? fetchError
+                : authenticating
+                    ? authenticatingComponent
+                    : loadingComponent
             : children));
     };
     ActorProvider.displayName = "ActorProvider";

package/dist/helpers/actorHooks.js

@@ -47,10 +47,10 @@ const DEFAULT_STATE = {
  * Each hook is designed to simplify the process of interacting with actors in IC projects by abstracting away the complexity of state management, error handling, and method invocation.
  */
 const actorHooks = (actorManager) => {
-    const { actorStore, canisterId, visitFunction, extractInterface, extractMethodNames, callMethod, initialize, } = actorManager;
+    const { actorStore, canisterId, visitFunction, methodAttributes, extractMethodAttributes, extractInterface, callMethod, initialize, } = actorManager;
     const useActorState = () => (Object.assign(Object.assign({}, (0, zustand_1.useStore)(actorStore)), { canisterId }));
     const useMethodNames = () => {
-        return react_1.default.useMemo(() => extractMethodNames(), []);
+        return react_1.default.useMemo(() => Object.keys(extractMethodAttributes()), []);
     };
     const useActorInterface = () => {
         return react_1.default.useMemo(() => extractInterface(), []);
@@ -111,10 +111,31 @@ const actorHooks = (actorManager) => {
     };
     const useUpdateCall = useSharedCall;
     const useMethod = (args) => {
-        const _a = useSharedCall(args), { call } = _a, state = __rest(_a, ["call"]);
         const visit = useVisitMethod(args.functionName);
-        return Object.assign({ call,
-            visit }, state);
+        const attributes = methodAttributes[args.functionName];
+        let refetchOnMount = args.refetchOnMount;
+        let refetchInterval = args.refetchInterval;
+        let formRequired = true;
+        switch (attributes.type) {
+            case "query":
+                try {
+                    if (attributes.numberOfArgs > 0 && args.args === undefined) {
+                        throw new Error("Args required");
+                    }
+                    attributes.validate((args.args || []));
+                    formRequired = args.refetchOnMount === false ? true : false;
+                }
+                catch (error) {
+                    refetchOnMount = false;
+                    refetchInterval = false;
+                }
+                return Object.assign(Object.assign({ visit }, useQueryCall(Object.assign(Object.assign({}, args), { refetchOnMount,
+                    refetchInterval }))), { formRequired });
+            case "update":
+                return Object.assign(Object.assign({ visit }, useUpdateCall(args)), { formRequired });
+            default:
+                throw new Error(`Method type ${attributes.type} not found`);
+        }
     };
     return {
         initialize,

package/dist/helpers/types.d.ts

@@ -71,10 +71,11 @@ export interface DynamicDataArgs<V = unknown> {
     label: string;
     value: V;
 }
-export interface UseMethodParameters<A, M extends FunctionName<A>> extends UseSharedCallParameters<A, M> {
+export interface UseMethodParameters<A, M extends FunctionName<A>> extends UseQueryCallParameters<A, M> {
 }
 export interface UseMethodReturnType<A, M extends FunctionName<A> = FunctionName<A>> {
     loading: boolean;
+    formRequired: boolean;
     error: Error | undefined;
     data: ActorMethodReturnType<A[M]> | undefined;
     visit: VisitService<A>[M];
@@ -88,7 +89,7 @@ export interface ActorHooksReturnType<A = BaseActor> {
     initialize: () => Promise<void>;
     useActorState: () => UseActorState;
     useActorInterface: () => ServiceClass;
-    useMethodNames: () => FunctionName<A>[];
+    useMethodNames: <Actor = A>() => FunctionName<Actor>[];
     useMethod: UseMethod<A>;
     useQueryCall: UseQueryCall<A>;
     useUpdateCall: UseUpdateCall<A>;

package/dist/hooks/actor/index.d.ts

@@ -2,6 +2,7 @@ export * from "./useMethod";
 export * from "./useActorState";
 export * from "./useQueryCall";
 export * from "./useUpdateCall";
+export * from "./useMethodNames";
 export * from "./useVisitMethod";
 export * from "./useVisitService";
 export * from "./useActorInterface";

package/dist/hooks/actor/index.js

@@ -18,6 +18,7 @@ __exportStar(require("./useMethod"), exports);
 __exportStar(require("./useActorState"), exports);
 __exportStar(require("./useQueryCall"), exports);
 __exportStar(require("./useUpdateCall"), exports);
+__exportStar(require("./useMethodNames"), exports);
 __exportStar(require("./useVisitMethod"), exports);
 __exportStar(require("./useVisitService"), exports);
 __exportStar(require("./useActorInterface"), exports);

package/dist/hooks/actor/useMethodNames.d.ts

@@ -1,6 +1,7 @@
+import { BaseActor } from "../../types";
 /**
  * Hook for accessing the method names of an actor.
  *
  * @returns An array of method names for the actor.
  */
-export declare const useMethodNames: () => string[];
+export declare const useMethodNames: <A = BaseActor>() => Extract<keyof A, string>[];

package/dist/hooks/actor/useMethodNames.js

@@ -7,4 +7,5 @@ const hooks_1 = require("./hooks");
  *
  * @returns An array of method names for the actor.
  */
-exports.useMethodNames = hooks_1.ActorHooks.useMethodNames;
+const useMethodNames = () => hooks_1.ActorHooks.useMethodNames();
+exports.useMethodNames = useMethodNames;

package/dist/hooks/useActor.js

@@ -129,30 +129,33 @@ const useActor = (config) => {
             });
         }
     }), [canisterId, authenticating, didjsCanisterId]);
+    const initialActorManager = (0, react_1.useCallback)((idlFactory) => {
+        if (authenticating)
+            return;
+        const actorManager = (0, core_1.createActorManager)(Object.assign({ agentManager,
+            idlFactory,
+            canisterId }, actorConfig));
+        setActorManager(() => actorManager);
+    }, [canisterId, agentManager, authenticating]);
     (0, react_1.useEffect)(() => {
         if (maybeIdlFactory) {
-            const actorManager = (0, core_1.createActorManager)(Object.assign({ agentManager, idlFactory: maybeIdlFactory, canisterId }, actorConfig));
-            setActorManager(() => actorManager);
+            initialActorManager(maybeIdlFactory);
         }
         else {
+            setActorManager(undefined);
             fetchCandid().then((idlFactory) => {
                 if (!idlFactory)
                     return;
-                const actorManager = (0, core_1.createActorManager)(Object.assign({ agentManager,
-                    idlFactory,
-                    canisterId }, actorConfig));
-                setActorManager(() => actorManager);
+                initialActorManager(idlFactory);
             });
         }
         return actorManager === null || actorManager === void 0 ? void 0 : actorManager.cleanup();
-    }, [fetchCandid, maybeIdlFactory, canisterId, agentManager]);
+    }, [fetchCandid, maybeIdlFactory, initialActorManager]);
     const hooks = (0, react_1.useMemo)(() => {
-        if (fetching)
-            return null;
         if (!actorManager)
             return null;
         return (0, helpers_1.actorHooks)(actorManager);
-    }, [canisterId, authenticating, actorManager, fetching]);
+    }, [actorManager]);
     return { hooks, authenticating, fetching, fetchError };
 };
 exports.useActor = useActor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/react",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "description": "A React library for interacting with Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -35,7 +35,7 @@
     "node": ">=10"
   },
   "dependencies": {
-    "@ic-reactor/core": "^1.2.3",
+    "@ic-reactor/core": "^1.3.1",
     "zustand-utils": "^1.3"
   },
   "peerDependencies": {
@@ -47,5 +47,5 @@
     "react": ">=16.8",
     "zustand": "4.5"
   },
-  "gitHead": "ae71ae0c7eee0ebe8a97751d4222054668a6b994"
+  "gitHead": "05130e2581edfafd6390cf04ba618cb084bafc31"
 }