@ic-reactor/core 1.6.4 → 1.7.0

package/README.md

@@ -19,7 +19,7 @@ yarn add @ic-reactor/core
 or you can use the UMD version:
 
 ```html
-<script src="https://github.com/B3Pay/ic-reactor/releases/download/v1.6.2/ic-reactor-core.min.js"></script>
+<script src="https://github.com/B3Pay/ic-reactor/releases/download/v1.6.5/ic-reactor-core.min.js"></script>
 ```
 
 ### Using `createReactorCore`

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

@@ -1,3 +1,4 @@
+import type { CallConfig } from "@dfinity/agent";
 import type { ActorMethodParameters, ActorMethodReturnType, ActorStore, ActorManagerParameters, FunctionName, VisitService, BaseActor, ActorMethodState, MethodAttributes } from "./types";
 import { IDL } from "@dfinity/candid";
 import type { AgentManager } from "../agent";
@@ -25,7 +26,9 @@ export declare class ActorManager<A = BaseActor> {
     extractMethodAttributes: () => MethodAttributes<A>;
     extractVisitor: () => VisitService<A>;
     private initializeActor;
+    private _getActorMethod;
     callMethod: <M extends FunctionName<A>>(functionName: M, ...args: ActorMethodParameters<A[M]>) => Promise<ActorMethodReturnType<A[M]>>;
+    callMethodWithOptions: (options: CallConfig) => <M extends FunctionName<A>>(functionName: M, ...args: ActorMethodParameters<A[M]>) => Promise<ActorMethodReturnType<A[M]>>;
     get agentManager(): AgentManager;
     getActor: () => A | null;
     getState: ActorStore<A>["getState"];

package/dist/classes/actor/index.js

@@ -68,7 +68,7 @@ class ActorManager {
                 const functionName = service[0];
                 const type = service[1];
                 const visit = ((extractorClass, data) => {
-                    return type.accept(extractorClass, data || functionName);
+                    return type.accept(extractorClass, data);
                 });
                 acc[functionName] = visit;
                 return acc;
@@ -103,7 +103,7 @@ class ActorManager {
                 this.updateState({ error: error, initializing: false }, "error");
             }
         };
-        this.callMethod = (functionName, ...args) => __awaiter(this, void 0, void 0, function* () {
+        this._getActorMethod = (functionName) => {
             if (!this._actor) {
                 throw new Error("Actor not initialized");
             }
@@ -111,10 +111,20 @@ class ActorManager {
                 typeof this._actor[functionName] !== "function") {
                 throw new Error(`Method ${String(functionName)} not found`);
             }
-            const method = this._actor[functionName];
+            return this._actor[functionName];
+        };
+        this.callMethod = (functionName, ...args) => __awaiter(this, void 0, void 0, function* () {
+            const method = this._getActorMethod(functionName);
             const data = yield method(...args);
             return data;
         });
+        this.callMethodWithOptions = (options) => {
+            return (functionName, ...args) => __awaiter(this, void 0, void 0, function* () {
+                const method = this._getActorMethod(functionName);
+                const data = yield method.withOptions(options)(...args);
+                return data;
+            });
+        };
         // actor store
         this.getActor = () => {
             return this._actor;

package/dist/classes/actor/types.d.ts

@@ -1,5 +1,6 @@
 import type { AgentManager } from "../agent";
 import type { IDL, StoreApiWithDevtools, ActorMethod, ActorSubclass, Principal } from "../../types";
+import { CallConfig } from "@dfinity/agent";
 export interface DefaultActorType {
     [key: string]: ActorMethod;
 }
@@ -20,7 +21,7 @@ export type VisitorType<V> = V extends IDL.Visitor<infer D, infer R> ? {
     returnType: R;
 } : never;
 export type VisitService<A = BaseActor, M extends FunctionName<A> = FunctionName<A>> = {
-    [K in M]: <V extends IDL.Visitor<unknown, unknown>>(extractorClass: V, data?: VisitorType<V>["data"]) => ReturnType<V["visitFunc"]>;
+    [K in M]: <V extends IDL.Visitor<unknown, unknown>>(extractorClass: V, data: VisitorType<V>["data"]) => ReturnType<V["visitFunc"]>;
 };
 export type ActorMethodParameters<T> = T extends ActorMethod<infer Args, any> ? Args : never;
 export type ActorMethodReturnType<T> = T extends ActorMethod<any, infer Ret> ? Ret : never;
@@ -34,6 +35,10 @@ export interface ActorMethodState<A = BaseActor, M extends FunctionName<A> = Fun
 export type ActorMethodStates<A = BaseActor> = {
     [M in FunctionName<A>]: ActorMethodState<A, M>;
 };
+export type ActorMethodType<A, M extends keyof A> = {
+    (...args: ActorMethodParameters<A[M]>): Promise<ActorMethodReturnType<A[M]>>;
+    withOptions: (options: CallConfig) => (...args: ActorMethodParameters<A[M]>) => Promise<ActorMethodReturnType<A[M]>>;
+};
 export type ActorState<A = BaseActor> = {
     initialized: boolean;
     initializing: boolean;

package/dist/classes/adapter/index.js

@@ -149,7 +149,7 @@ class CandidAdapter {
         if (!this.parserModule) {
             throw new Error("Parser module not available");
         }
-        return this.parserModule.did_to_js(candidSource);
+        return this.parserModule.didToJs(candidSource);
     }
 }
 exports.CandidAdapter = CandidAdapter;

package/dist/createReactorCore.js

@@ -32,8 +32,8 @@ const utils_1 = require("./utils");
  * @includeExample ./packages/core/README.md:32-86
  */
 const createReactorCore = (config) => {
-    const _a = (0, createReactorStore_1.createReactorStore)(config), { subscribeActorState, updateMethodState, callMethod, getState, agentManager } = _a, rest = __rest(_a, ["subscribeActorState", "updateMethodState", "callMethod", "getState", "agentManager"]);
-    const actorMethod = (functionName, ...args) => {
+    const _a = (0, createReactorStore_1.createReactorStore)(config), { subscribeActorState, updateMethodState, callMethodWithOptions, callMethod, getState, agentManager } = _a, rest = __rest(_a, ["subscribeActorState", "updateMethodState", "callMethodWithOptions", "callMethod", "getState", "agentManager"]);
+    const actorMethod = (functionName, args, options = {}) => {
         const requestHash = (0, utils_1.generateRequestHash)(args);
         const updateState = (newState = {}) => {
             updateMethodState(functionName, requestHash, newState);
@@ -70,7 +70,7 @@ const createReactorCore = (config) => {
                     error: undefined,
                 });
                 try {
-                    const data = yield callMethod(functionName, ...(replaceArgs !== null && replaceArgs !== void 0 ? replaceArgs : args));
+                    const data = yield callMethodWithOptions(options)(functionName, ...(replaceArgs !== null && replaceArgs !== void 0 ? replaceArgs : args));
                     updateState({ data, loading: false });
                     return data;
                 }
@@ -97,26 +97,34 @@ const createReactorCore = (config) => {
             throw error;
         }
     };
-    const queryCall = ({ functionName, args = [], refetchOnMount = true, refetchInterval = false, }) => {
+    const queryCall = (_a) => {
+        var { functionName, args = [], refetchOnMount = true, refetchInterval = false } = _a, options = __rest(_a, ["functionName", "args", "refetchOnMount", "refetchInterval"]);
         let intervalId = null;
-        const _a = actorMethod(functionName, ...args), { call } = _a, rest = __rest(_a, ["call"]);
+        const _b = actorMethod(functionName, args, options), { call } = _b, rest = __rest(_b, ["call"]);
         if (refetchInterval) {
             intervalId = setInterval(() => {
                 call();
             }, refetchInterval);
         }
+        const clearRefetchInterval = () => {
+            if (intervalId) {
+                clearInterval(intervalId);
+            }
+        };
         let dataPromise = Promise.resolve();
         if (refetchOnMount)
             dataPromise = call();
-        return Object.assign(Object.assign({}, rest), { call, dataPromise, intervalId });
+        return Object.assign(Object.assign({}, rest), { call, dataPromise, intervalId, clearRefetchInterval });
     };
-    const updateCall = ({ functionName, args = [] }) => {
-        return actorMethod(functionName, ...args);
+    const updateCall = (_a) => {
+        var { functionName, args = [] } = _a, options = __rest(_a, ["functionName", "args"]);
+        return actorMethod(functionName, args, options);
     };
-    return Object.assign(Object.assign({ queryCall,
+    return Object.assign(Object.assign({ getState,
+        queryCall,
         updateCall,
         callMethod,
-        getState,
+        callMethodWithOptions,
         subscribeActorState }, agentManager), rest);
 };
 exports.createReactorCore = createReactorCore;

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { ActorMethod, ActorSubclass, HttpAgentOptions, HttpAgent, Identity } from "@dfinity/agent";
+import type { ActorMethod, ActorSubclass, HttpAgentOptions, HttpAgent, Identity, CallConfig } from "@dfinity/agent";
 import type { Principal } from "@dfinity/principal";
 import type { IDL } from "@dfinity/candid";
 import type { ActorManagerParameters, ActorMethodParameters, ActorMethodReturnType, ActorMethodState, BaseActor, FunctionName } from "./classes/actor/types";
@@ -36,19 +36,19 @@ export type ActorUpdateReturnType<A, M extends FunctionName<A>> = {
     subscribe: ActorSubscribeFunction<A, M>;
     call: ActorCallFunction<A, M>;
 };
-export type ActorQueryParameters<A, M extends FunctionName<A>> = {
+export interface ActorQueryParameters<A, M extends FunctionName<A>> extends CallConfig {
     functionName: M;
     args?: ActorMethodParameters<A[M]>;
     refetchOnMount?: boolean;
     refetchInterval?: number | false;
-};
-export type ActorUpdateParameters<A, M extends FunctionName<A>> = {
+}
+export interface ActorUpdateParameters<A, M extends FunctionName<A>> extends CallConfig {
     functionName: M;
     args?: ActorMethodParameters<A[M]>;
-};
-export type ActorMethodCall<A = Record<string, ActorMethod>> = <M extends FunctionName<A>>(functionName: M, ...args: ActorMethodParameters<A[M]>) => ActorUpdateReturnType<A, M>;
-export type ActorQuery<A = Record<string, ActorMethod>> = <M extends FunctionName<A>>(config: ActorQueryParameters<A, M>) => ActorQueryReturnType<A, M>;
-export type ActorUpdate<A = Record<string, ActorMethod>> = <M extends FunctionName<A>>(config: ActorUpdateParameters<A, M>) => ActorUpdateReturnType<A, M>;
+}
+export type ActorMethodCall<A = Record<string, ActorMethod>> = <M extends FunctionName<A>>(functionName: M, args: ActorMethodParameters<A[M]>, options?: CallConfig) => ActorUpdateReturnType<A, M>;
+export type ActorQuery<A = Record<string, ActorMethod>> = <M extends FunctionName<A>>(params: ActorQueryParameters<A, M>) => ActorQueryReturnType<A, M>;
+export type ActorUpdate<A = Record<string, ActorMethod>> = <M extends FunctionName<A>>(params: ActorUpdateParameters<A, M>) => ActorUpdateReturnType<A, M>;
 export interface CreateReactorCoreParameters extends CreateReactorStoreParameters {
 }
 export interface CreateReactorCoreReturnType<A = BaseActor> extends AgentManager, Omit<ActorManager<A>, "updateMethodState"> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/core",
-  "version": "1.6.4",
+  "version": "1.7.0",
   "description": "A library for intracting with the Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,22 +26,22 @@
   },
   "homepage": "https://b3pay.github.io/ic-reactor/modules/core.html",
   "peerDependencies": {
-    "@dfinity/agent": "^1.2",
-    "@dfinity/auth-client": "^1.2",
-    "@dfinity/candid": "^1.2",
-    "@dfinity/identity": "^1.2",
-    "@dfinity/principal": "^1.2"
+    "@dfinity/agent": "^1.3",
+    "@dfinity/auth-client": "^1.3",
+    "@dfinity/candid": "^1.3",
+    "@dfinity/identity": "^1.3",
+    "@dfinity/principal": "^1.3"
   },
   "dependencies": {
-    "@dfinity/agent": "^1.2",
-    "@dfinity/auth-client": "^1.2",
-    "@dfinity/candid": "^1.2",
-    "@dfinity/identity": "^1.2",
-    "@dfinity/principal": "^1.2",
+    "@dfinity/agent": "^1.3",
+    "@dfinity/auth-client": "^1.3",
+    "@dfinity/candid": "^1.3",
+    "@dfinity/identity": "^1.3",
+    "@dfinity/principal": "^1.3",
     "zustand": "^4.5"
   },
   "devDependencies": {
-    "@ic-reactor/parser": "^0.1.2"
+    "@ic-reactor/parser": "^0.3.0"
   },
   "scripts": {
     "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest",
@@ -56,5 +56,5 @@
   "engines": {
     "node": ">=10"
   },
-  "gitHead": "5d30e3c8027caa50babc82409fead2169ab6adbd"
+  "gitHead": "0fac1036d11ae1b2498e6568d5eff514bd657116"
 }