@ic-reactor/core 1.6.3 → 1.6.4

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

@@ -8,10 +8,11 @@ export declare class CandidAdapter {
     constructor({ agentManager, agent, didjsCanisterId, }: CandidAdapterParameters);
     initializeParser(module?: ReactorParser): Promise<void>;
     private getDefaultDidJsId;
+    fetchCandidDefinition(canisterId: CanisterId): Promise<string>;
     getCandidDefinition(canisterId: CanisterId): Promise<CandidDefenition>;
     getFromMetadata(canisterId: CanisterId): Promise<string | undefined>;
-    getFromTmpHack(canisterId: CanisterId): Promise<string | undefined>;
+    getFromTmpHack(canisterId: CanisterId): Promise<string>;
     dynamicEvalJs(data: string): Promise<CandidDefenition>;
-    fetchDidTojs(candidSource: string): Promise<[string]>;
+    fetchDidTojs(candidSource: string, didjsCanisterId?: string): Promise<[string]>;
     parseDidToJs(candidSource: string): string;
 }

package/dist/classes/adapter/index.js

@@ -55,26 +55,36 @@ class CandidAdapter {
             ? constants_1.DEFAULT_LOCAL_DIDJS_ID
             : constants_1.DEFAULT_IC_DIDJS_ID;
     }
-    getCandidDefinition(canisterId) {
+    fetchCandidDefinition(canisterId) {
         return __awaiter(this, void 0, void 0, function* () {
+            let candidDef = "";
+            // First attempt: Try getting Candid definition from metadata
             try {
-                // First attempt: Try getting Candid definition from metadata
-                const fromMetadata = yield this.getFromMetadata(canisterId).catch(() => {
-                    return undefined;
-                });
-                if (fromMetadata)
-                    return this.dynamicEvalJs(fromMetadata);
+                candidDef = yield this.getFromMetadata(canisterId);
+                if (!candidDef) {
+                    throw new Error("Cannot retrieve Candid definition from metadata");
+                }
+            }
+            catch (error) {
                 // Second attempt: Try the temporary hack method
-                const fromTmpHack = yield this.getFromTmpHack(canisterId).catch(() => {
+                candidDef = yield this.getFromTmpHack(canisterId).catch(() => {
                     return undefined;
                 });
-                if (fromTmpHack)
-                    return this.dynamicEvalJs(fromTmpHack);
-                // If both attempts fail, throw an error
-                throw "Failed to retrieve Candid definition by any method.";
             }
-            catch (err) {
-                throw new Error(`Error fetching canister ${canisterId}: ${err}`);
+            if (!candidDef) {
+                throw new Error("Failed to retrieve Candid definition by any method.");
+            }
+            return candidDef;
+        });
+    }
+    getCandidDefinition(canisterId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const candidDef = yield this.fetchCandidDefinition(canisterId);
+                return this.dynamicEvalJs(candidDef);
+            }
+            catch (error) {
+                throw new Error(`Error fetching canister ${canisterId}: ${error}`);
             }
         });
     }
@@ -116,21 +126,21 @@ class CandidAdapter {
                 if (JSON.stringify(candidDef) === JSON.stringify([])) {
                     throw new Error("Cannot compile Candid to JavaScript");
                 }
-                return (0, utils_1.importCandidDefinition)(candidDef);
+                return yield (0, utils_1.importCandidDefinition)(candidDef);
             }
             catch (error) {
                 throw new Error(`Error evaluating Candid definition: ${error}`);
             }
         });
     }
-    fetchDidTojs(candidSource) {
+    fetchDidTojs(candidSource, didjsCanisterId) {
         return __awaiter(this, void 0, void 0, function* () {
             const didjsInterface = ({ IDL }) => IDL.Service({
                 did_to_js: IDL.Func([IDL.Text], [IDL.Opt(IDL.Text)], ["query"]),
             });
             const didjs = agent_1.Actor.createActor(didjsInterface, {
                 agent: this.agent,
-                canisterId: this.didjsCanisterId,
+                canisterId: didjsCanisterId || this.didjsCanisterId,
             });
             return didjs.did_to_js(candidSource);
         });

package/dist/utils/helper.d.ts

@@ -1,11 +1,11 @@
 import { DevtoolsOptions } from "zustand/middleware";
-import type { BaseActor, IDL } from "../types";
+import type { BaseActor, CandidDefenition, IDL } from "../types";
 export declare function createStoreWithOptionalDevtools<T>(initialState: T, config: DevtoolsOptions): Omit<import("zustand/vanilla").StoreApi<T>, "setState"> & {
     setState<A extends string | {
         type: string;
     }>(partial: T | Partial<T> | ((state: T) => T | Partial<T>), replace?: boolean | undefined, action?: A | undefined): void;
 };
-export declare const importCandidDefinition: (candidDef: string) => any;
+export declare const importCandidDefinition: (candidDef: string) => Promise<CandidDefenition>;
 export declare const isInLocalOrDevelopment: () => boolean;
 export declare const getProcessEnvNetwork: () => string;
 export declare function isQuery(func: IDL.FuncClass): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/core",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "A library for intracting with the Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -41,7 +41,7 @@
     "zustand": "^4.5"
   },
   "devDependencies": {
-    "@ic-reactor/parser": "^0.1.1"
+    "@ic-reactor/parser": "^0.1.2"
   },
   "scripts": {
     "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest",
@@ -56,5 +56,5 @@
   "engines": {
     "node": ">=10"
   },
-  "gitHead": "1837563a23d243a72a7979e09dd89a128ac23e16"
+  "gitHead": "5d30e3c8027caa50babc82409fead2169ab6adbd"
 }