@ic-reactor/core 0.0.1 → 0.0.3

package/dist/index.js

@@ -46,7 +46,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const store_1 = __importStar(require("@ic-reactor/store"));
 const defaultCreateReActorOptions = {
     initializeOnMount: true,
-    host: process.env.NODE_ENV === "production"
+    host: process.env.NODE_ENV === "production" || process.env.DFX_NETWORK === "ic"
         ? "https://icp-api.io"
         : "http://localhost:4943",
 };
@@ -68,10 +68,16 @@ const createReActor = (actorInitializer, options = {}) => {
                 console.error("Actor not initialized");
                 return state;
             }
-            const methodState = state.actorState[method] || { states: {} };
-            const currentMethodState = methodState.states[hash] || {};
-            const updatedStates = Object.assign(Object.assign({}, methodState.states), { [hash]: Object.assign(Object.assign({}, currentMethodState), newState) });
-            return Object.assign(Object.assign({}, state), { actorState: Object.assign(Object.assign({}, state.actorState), { [method]: Object.assign(Object.assign({}, methodState), { states: updatedStates }) }) });
+            if (!state.actorState[method]) {
+                console.error(`Method ${String(method)} not found`);
+                return state;
+            }
+            const currentMethodState = state.actorState[method].states[hash] || {
+                loading: false,
+                data: undefined,
+                error: undefined,
+            };
+            return Object.assign(Object.assign({}, state), { actorState: Object.assign(Object.assign({}, state.actorState), { [method]: Object.assign(Object.assign({}, state.actorState[method]), { states: Object.assign(Object.assign({}, state.actorState[method].states), { [hash]: Object.assign(Object.assign({}, currentMethodState), newState) }) }) }) });
         });
         return hash;
     };
@@ -80,17 +86,15 @@ const createReActor = (actorInitializer, options = {}) => {
             const requestHash = updateMethodState(functionName, args);
             const getState = (key) => {
                 const state = store.getState().actorState[functionName].states[requestHash];
-                if (key === "data") {
-                    return state.data;
-                }
-                else if (key === "loading") {
-                    return state.loading;
-                }
-                else if (key === "error") {
-                    return state.error;
-                }
-                else {
-                    return state;
+                switch (key) {
+                    case "data":
+                        return state.data;
+                    case "loading":
+                        return state.loading;
+                    case "error":
+                        return state.error;
+                    default:
+                        return state;
                 }
             };
             const subscribe = (callback) => {

package/dist/types.d.ts

@@ -1,6 +1,11 @@
 /// <reference types="node" />
 import { ActorMethod, ActorSubclass, ExtractReActorMethodArgs, ExtractReActorMethodReturnType, ReActorMethodState } from "@ic-reactor/store";
-export type ReActorGetStateFunction<A, M extends keyof A> = (key?: keyof ReActorMethodState<A, M>["states"][string]) => ReActorMethodState<A, M>["states"][string] | ExtractReActorMethodReturnType<A[M]> | boolean | Error | undefined;
+export type ReActorGetStateFunction<A, M extends keyof A> = {
+    (key: "data"): ExtractReActorMethodReturnType<A[M]> | undefined;
+    (key: "loading"): boolean;
+    (key: "error"): Error | undefined;
+    (): ReActorMethodState<A, M>["states"][string];
+};
 export type ReActorSubscribeFunction<A, M extends keyof A> = (callback: (state: ReActorMethodState<A, M>["states"][string]) => void) => () => void;
 export type ReActorCallFunction<A, M extends keyof A> = (replaceArgs?: ExtractReActorMethodArgs<A[M]>) => Promise<ExtractReActorMethodReturnType<A[M]>>;
 export type ReActorQueryReturn<A, M extends keyof A> = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/core",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "A React library for interacting with Dfinity actors",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -47,5 +47,5 @@
   "peerDependencies": {
     "@peculiar/webcrypto": "1.4"
   },
-  "gitHead": "b1f673a150b591ad3cfbb8964794e4ea9b0ff1c2"
+  "gitHead": "b64c094f66a177bd410f9231e229b6f6da24f081"
 }