@ic-reactor/core 1.15.0 → 1.16.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.14.2/ic-reactor-core.min.js"></script>
+<script src="https://github.com/B3Pay/ic-reactor/releases/download/v1.15.0/ic-reactor-core.min.js"></script>
 ```
 
 ### Using `createReactorCore`

package/dist/classes/actor/index.js

@@ -14,7 +14,14 @@ exports.ActorManager = void 0;
 const agent_1 = require("@dfinity/agent");
 const helper_1 = require("../../utils/helper");
 const candid_1 = require("@dfinity/candid");
-const utils_1 = require("../../utils");
+const ACTOR_INITIAL_STATE = {
+    name: "",
+    version: 0,
+    methodState: {},
+    initializing: false,
+    initialized: false,
+    error: undefined,
+};
 class ActorManager {
     constructor(actorConfig) {
         this._actor = null;
@@ -152,8 +159,15 @@ class ActorManager {
         this.getState = () => {
             return this.actorStore.getState();
         };
-        this.subscribeActorState = (listener) => {
-            const unsubscribe = this.actorStore.subscribe(listener);
+        // @ts-expect-error: Overrides subscribe method signature
+        this.subscribeActorState = (selectorOrListener, listener, options) => {
+            let unsubscribe = () => { };
+            if (listener) {
+                unsubscribe = this.actorStore.subscribe(selectorOrListener, listener, options);
+            }
+            else {
+                unsubscribe = this.actorStore.subscribe(selectorOrListener);
+            }
             this._subscribers.push(unsubscribe);
             return unsubscribe;
         };
@@ -179,7 +193,7 @@ class ActorManager {
         }
         this._agentManager = agentManager;
         // Initialize stores
-        this.actorStore = (0, helper_1.createStoreWithOptionalDevtools)(Object.assign(Object.assign({}, utils_1.ACTOR_INITIAL_STATE), { name }), {
+        this.actorStore = (0, helper_1.createStoreWithOptionalDevtools)(Object.assign(Object.assign({}, ACTOR_INITIAL_STATE), { name }), {
             withDevtools,
             name: "reactor-actor",
             store: canisterId.toString(),

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

@@ -1,5 +1,5 @@
 import type { AgentManager } from "../agent";
-import type { IDL, StoreApiWithDevtools, ActorMethod, ActorSubclass, Principal } from "../../types";
+import type { IDL, ActorMethod, ActorSubclass, Principal, StoreWithAllMiddleware } from "../../types";
 import { CallConfig } from "@dfinity/agent";
 export interface DefaultActorType {
     [key: string]: ActorMethod;
@@ -48,7 +48,7 @@ export type ActorState<A = BaseActor> = {
     error: Error | undefined;
     methodState: ActorMethodStates<A>;
 };
-export type ActorStore<A = BaseActor> = StoreApiWithDevtools<ActorState<A>>;
+export type ActorStore<A = BaseActor> = StoreWithAllMiddleware<ActorState<A>>;
 export type CallActorMethod<A = BaseActor> = <M extends FunctionName<A> = FunctionName<A>>(functionName: M, ...args: ActorMethodParameters<A[M]>) => Promise<ActorMethodReturnType<A[M]>>;
 export type MethodAttributes<A = BaseActor> = Record<FunctionName<A>, {
     type: FunctionType;

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

@@ -8,12 +8,10 @@ export declare class AgentManager {
     private _subscribers;
     agentStore: AgentStore;
     authStore: AuthStore;
-    private initialAgentState;
-    private initialAuthState;
     private updateAgentState;
     private updateAuthState;
     constructor(options?: AgentManagerParameters);
-    private initializeAgent;
+    initializeAgent: () => Promise<void>;
     subscribeAgent: (callback: (agent: HttpAgent) => void, initialize?: boolean) => () => void;
     unsubscribeAgent: (callback: (agent: HttpAgent) => void) => void;
     private notifySubscribers;

package/dist/classes/agent/index.js

@@ -26,23 +26,23 @@ const agent_1 = require("@dfinity/agent");
 const helper_1 = require("../../utils/helper");
 const auth_client_1 = require("@dfinity/auth-client");
 const constants_1 = require("../../utils/constants");
+const AGENT_INITIAL_STATE = {
+    initialized: false,
+    initializing: false,
+    error: undefined,
+    network: undefined,
+};
+const AUTH_INITIAL_STATE = {
+    identity: null,
+    authenticating: false,
+    authenticated: false,
+    error: undefined,
+};
 class AgentManager {
     constructor(options) {
         var _a;
         this._auth = null;
         this._subscribers = [];
-        this.initialAgentState = {
-            initialized: false,
-            initializing: false,
-            error: undefined,
-            network: "ic",
-        };
-        this.initialAuthState = {
-            identity: null,
-            authenticating: false,
-            authenticated: false,
-            error: undefined,
-        };
         this.updateAgentState = (newState, action) => {
             this.agentStore.setState((state) => (Object.assign(Object.assign({}, state), newState)), false, action);
         };
@@ -155,15 +155,23 @@ class AgentManager {
         this.getAgentState = () => {
             return this.agentStore.getState();
         };
-        this.subscribeAgentState = (listener) => {
-            return this.agentStore.subscribe(listener);
+        // @ts-expect-error: Overrides subscribe method signature
+        this.subscribeAgentState = (selectorOrListener, listener, options) => {
+            if (listener) {
+                return this.agentStore.subscribe(selectorOrListener, listener, options);
+            }
+            return this.agentStore.subscribe(selectorOrListener);
         };
         // auth store
         this.getAuthState = () => {
             return this.authStore.getState();
         };
-        this.subscribeAuthState = (listener) => {
-            return this.authStore.subscribe(listener);
+        // @ts-expect-error: Overrides subscribe method signature
+        this.subscribeAuthState = (selectorOrListener, listener, options) => {
+            if (listener) {
+                return this.authStore.subscribe(selectorOrListener, listener, options);
+            }
+            return this.authStore.subscribe(selectorOrListener);
         };
         this.getAuth = () => {
             return this._auth;
@@ -175,7 +183,7 @@ class AgentManager {
             const identity = this.authStore.getState().identity;
             return identity ? identity.getPrincipal() : null;
         };
-        const _b = options || {}, { withDevtools, port = 4943, withLocalEnv, withProcessEnv } = _b, agentOptions = __rest(_b, ["withDevtools", "port", "withLocalEnv", "withProcessEnv"]);
+        const _b = options || {}, { withDevtools, port = 4943, withLocalEnv, withProcessEnv, initializeOnCreate = true } = _b, agentOptions = __rest(_b, ["withDevtools", "port", "withLocalEnv", "withProcessEnv", "initializeOnCreate"]);
         if (withProcessEnv) {
             const processNetwork = (0, helper_1.getProcessEnvNetwork)();
             agentOptions.host =
@@ -187,18 +195,20 @@ class AgentManager {
         else {
             agentOptions.host = (_a = agentOptions.host) !== null && _a !== void 0 ? _a : constants_1.IC_HOST_NETWORK_URI;
         }
-        this.agentStore = (0, helper_1.createStoreWithOptionalDevtools)(this.initialAgentState, {
+        this.agentStore = (0, helper_1.createStoreWithOptionalDevtools)(AGENT_INITIAL_STATE, {
             withDevtools,
             name: "reactor-agent",
             store: "agent",
         });
-        this.authStore = (0, helper_1.createStoreWithOptionalDevtools)(this.initialAuthState, {
+        this.authStore = (0, helper_1.createStoreWithOptionalDevtools)(AUTH_INITIAL_STATE, {
             withDevtools,
             name: "reactor-agent",
             store: "auth",
         });
         this._agent = agent_1.HttpAgent.createSync(agentOptions);
-        this.initializeAgent();
+        if (initializeOnCreate) {
+            this.initializeAgent();
+        }
     }
 }
 exports.AgentManager = AgentManager;

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

@@ -1,18 +1,19 @@
 import type { HttpAgent, HttpAgentOptions, Identity } from "@dfinity/agent";
 import type { AuthClient } from "@dfinity/auth-client";
-import type { StoreApiWithDevtools } from "../../types";
+import type { StoreWithAllMiddleware } from "../../types";
 export { HttpAgentOptions, AuthClient, Identity };
 export interface AgentManagerParameters extends HttpAgentOptions {
     port?: number;
     withLocalEnv?: boolean;
     withDevtools?: boolean;
     withProcessEnv?: boolean;
+    initializeOnCreate?: boolean;
 }
 export interface AgentState {
     initialized: boolean;
     initializing: boolean;
     error: Error | undefined;
-    network: string;
+    network: string | undefined;
 }
 export interface AuthState {
     identity: Identity | null;
@@ -23,5 +24,5 @@ export interface AuthState {
 export interface UpdateAgentParameters extends HttpAgentOptions {
     agent?: HttpAgent;
 }
-export type AgentStore = StoreApiWithDevtools<AgentState>;
-export type AuthStore = StoreApiWithDevtools<AuthState>;
+export type AgentStore = StoreWithAllMiddleware<AgentState>;
+export type AuthStore = StoreWithAllMiddleware<AuthState>;

package/dist/classes/types.d.ts

@@ -1,8 +1,15 @@
 export * from "./agent/types";
 export * from "./actor/types";
 export * from "./adapter/types";
-import type { NamedSet } from "zustand/middleware";
-import type { StoreApi } from "zustand";
-export interface StoreApiWithDevtools<T> extends StoreApi<T> {
-    setState: NamedSet<T>;
-}
+import { type StateCreator, type StoreApi, type StoreMutatorIdentifier, type Mutate } from "zustand";
+export type StoreWithMiddleware<T, Mis extends [StoreMutatorIdentifier, unknown][] = [], Mos extends [StoreMutatorIdentifier, unknown][] = []> = StateCreator<T, Mis, Mos>;
+export type StoreApiWithMiddleware<T, Mos extends [StoreMutatorIdentifier, unknown][] = []> = Mutate<StoreApi<T>, Mos>;
+export type WithDevtools = ["zustand/devtools", never];
+export type WithSubscribeSelector = ["zustand/subscribeWithSelector", never];
+export type StoreWithAllMiddleware<T> = StoreApiWithMiddleware<T, [
+    WithDevtools,
+    WithSubscribeSelector
+]>;
+export type StoreWithSubscribeOnly<T> = StoreApiWithMiddleware<T, [
+    WithSubscribeSelector
+]>;

package/dist/classes/types.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+// Re-export existing types
 __exportStar(require("./agent/types"), exports);
 __exportStar(require("./actor/types"), exports);
 __exportStar(require("./adapter/types"), exports);

package/dist/utils/constants.d.ts

@@ -6,11 +6,3 @@ export declare const DEFAULT_LOCAL_DIDJS_ID = "bd3sg-teaaa-aaaaa-qaaba-cai";
 export declare const DEFAULT_IC_DIDJS_ID = "a4gq6-oaaaa-aaaab-qaa4q-cai";
 export declare const IC_INTERNET_IDENTITY_PROVIDER = "https://identity.ic0.app/#authorize";
 export declare const LOCAL_INTERNET_IDENTITY_PROVIDER = "http://rdmx6-jaaaa-aaaaa-aaadq-cai.localhost:4943/#authorize";
-export declare const ACTOR_INITIAL_STATE: {
-    name: string;
-    version: number;
-    methodState: {};
-    initializing: boolean;
-    initialized: boolean;
-    error: undefined;
-};

package/dist/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ACTOR_INITIAL_STATE = exports.LOCAL_INTERNET_IDENTITY_PROVIDER = exports.IC_INTERNET_IDENTITY_PROVIDER = exports.DEFAULT_IC_DIDJS_ID = exports.DEFAULT_LOCAL_DIDJS_ID = exports.LOCAL_HOST_NETWORK_URI = exports.IC_HOST_NETWORK_URI = exports.LOCAL_HOSTS = exports.REMOTE_HOSTS = void 0;
+exports.LOCAL_INTERNET_IDENTITY_PROVIDER = exports.IC_INTERNET_IDENTITY_PROVIDER = exports.DEFAULT_IC_DIDJS_ID = exports.DEFAULT_LOCAL_DIDJS_ID = exports.LOCAL_HOST_NETWORK_URI = exports.IC_HOST_NETWORK_URI = exports.LOCAL_HOSTS = exports.REMOTE_HOSTS = void 0;
 exports.REMOTE_HOSTS = [".github.dev", ".gitpod.io"];
 exports.LOCAL_HOSTS = ["localhost", "127.0.0.1"];
 exports.IC_HOST_NETWORK_URI = "https://ic0.app";
@@ -9,11 +9,3 @@ exports.DEFAULT_LOCAL_DIDJS_ID = "bd3sg-teaaa-aaaaa-qaaba-cai";
 exports.DEFAULT_IC_DIDJS_ID = "a4gq6-oaaaa-aaaab-qaa4q-cai";
 exports.IC_INTERNET_IDENTITY_PROVIDER = "https://identity.ic0.app/#authorize";
 exports.LOCAL_INTERNET_IDENTITY_PROVIDER = "http://rdmx6-jaaaa-aaaaa-aaadq-cai.localhost:4943/#authorize";
-exports.ACTOR_INITIAL_STATE = {
-    name: "",
-    version: 0,
-    methodState: {},
-    initializing: false,
-    initialized: false,
-    error: undefined,
-};

package/dist/utils/helper.d.ts

@@ -1,6 +1,5 @@
 import { DevtoolsOptions } from "zustand/middleware";
-import { StoreApi } from "zustand";
-import type { CompiledResult, BaseActor, CandidDefenition, IDL, StoreApiWithDevtools, ExtractOk } from "../types";
+import type { CompiledResult, BaseActor, CandidDefenition, IDL, ExtractOk, StoreWithAllMiddleware, StoreWithSubscribeOnly } from "../types";
 /**
  * Creates a Zustand store with optional DevTools middleware.
  *
@@ -8,7 +7,9 @@ import type { CompiledResult, BaseActor, CandidDefenition, IDL, StoreApiWithDevt
  * @param config - Configuration options for DevTools.
  * @returns A Zustand store with DevTools enabled if configured, otherwise a standard store.
  */
-export declare function createStoreWithOptionalDevtools<T>(initialState: T, config: DevtoolsOptions): StoreApiWithDevtools<T> | StoreApi<T>;
+export declare function createStoreWithOptionalDevtools<T extends object>(initialState: T, config: DevtoolsOptions & {
+    withDevtools?: boolean;
+}): StoreWithAllMiddleware<T> | StoreWithSubscribeOnly<T>;
 export declare const importCandidDefinition: (candidDef: string) => Promise<CandidDefenition>;
 /**
  * Checks if the current environment is local or development.

package/dist/utils/helper.js

@@ -28,14 +28,13 @@ const constants_1 = require("./constants");
  * @returns A Zustand store with DevTools enabled if configured, otherwise a standard store.
  */
 function createStoreWithOptionalDevtools(initialState, config) {
+    const createState = () => initialState;
     if (config.withDevtools) {
-        return (0, zustand_1.createStore)((0, middleware_1.devtools)(() => initialState, Object.assign({ serialize: {
+        return (0, zustand_1.createStore)((0, middleware_1.subscribeWithSelector)((0, middleware_1.devtools)(createState, Object.assign({ serialize: {
                 replacer: (_, value) => typeof value === "bigint" ? value.toString() : value,
-            } }, config)));
-    }
-    else {
-        return (0, zustand_1.createStore)(() => initialState);
+            } }, config))));
     }
+    return (0, zustand_1.createStore)((0, middleware_1.subscribeWithSelector)(createState));
 }
 const importCandidDefinition = (candidDef) => __awaiter(void 0, void 0, void 0, function* () {
     if (typeof window === "undefined") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/core",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "A library for intracting with the Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -42,7 +42,7 @@
     "@dfinity/principal": ">=2.1"
   },
   "devDependencies": {
-    "@ic-reactor/parser": "^0.4.3",
+    "@ic-reactor/parser": "^0.4.4",
     "@types/node": "^22.9.0",
     "ts-loader": "^9.5.1",
     "webpack": "^5.96.1"
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=10"
   },
-  "gitHead": "4c6badf97d6d2845f6bed00bf21274a72dc68134"
+  "gitHead": "6110fb3f75c7927086d828c912855589e2a33eb3"
 }