@ic-reactor/core 1.5.4-beta.0 → 1.5.4-beta.2

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

@@ -7,7 +7,9 @@ export declare class CandidAdapter {
     constructor({ agentManager, agent, didjsCanisterId, }: CandidAdapterParameters);
     private getDefaultDidJsId;
     getCandidDefinition(canisterId: CanisterId): Promise<CandidDefenition>;
-    getFromMetadata(canisterId: CanisterId): Promise<CandidDefenition | undefined>;
-    getFromTmpHack(canisterId: CanisterId): Promise<CandidDefenition | undefined>;
-    didTojs(candidSource: string): Promise<CandidDefenition>;
+    getFromMetadata(canisterId: CanisterId): Promise<string | undefined>;
+    getFromTmpHack(canisterId: CanisterId): Promise<string | undefined>;
+    evaluateJs(data: string): Promise<CandidDefenition>;
+    fetchDidTojs(candidSource: string): Promise<[string]>;
+    parseDidToJs(candidSource: string): Promise<string>;
 }

package/dist/classes/candid/index.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -44,13 +67,13 @@ class CandidAdapter {
                     return undefined;
                 });
                 if (fromMetadata)
-                    return fromMetadata;
+                    return this.evaluateJs(fromMetadata);
                 // Second attempt: Try the temporary hack method
                 const fromTmpHack = yield this.getFromTmpHack(canisterId).catch(() => {
                     return undefined;
                 });
                 if (fromTmpHack)
-                    return fromTmpHack;
+                    return this.evaluateJs(fromTmpHack);
                 // If both attempts fail, throw an error
                 throw "Failed to retrieve Candid definition by any method.";
             }
@@ -66,8 +89,7 @@ class CandidAdapter {
                 canisterId: canisterId,
                 paths: ["candid"],
             });
-            const did = status.get("candid");
-            return did ? this.didTojs(did) : undefined;
+            return status.get("candid");
         });
     }
     getFromTmpHack(canisterId) {
@@ -79,11 +101,31 @@ class CandidAdapter {
                 agent: this.agent,
                 canisterId,
             });
-            const data = (yield actor.__get_candid_interface_tmp_hack());
-            return data ? this.didTojs(data) : undefined;
+            return (yield actor.__get_candid_interface_tmp_hack());
         });
     }
-    didTojs(candidSource) {
+    evaluateJs(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let candidDef = "";
+                try {
+                    candidDef = yield this.parseDidToJs(data);
+                }
+                catch (error) {
+                    candidDef = (yield this.fetchDidTojs(data))[0];
+                }
+                if (JSON.stringify(candidDef) === JSON.stringify([])) {
+                    throw new Error("Cannot compile Candid to JavaScript");
+                }
+                const dataUri = "data:text/javascript;charset=utf-8," + encodeURIComponent(candidDef);
+                return eval('import("' + dataUri + '")');
+            }
+            catch (error) {
+                throw new Error("Error evaluating Candid definition");
+            }
+        });
+    }
+    fetchDidTojs(candidSource) {
         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"]),
@@ -92,13 +134,20 @@ class CandidAdapter {
                 agent: this.agent,
                 canisterId: this.didjsCanisterId,
             });
-            const js = yield didjs.did_to_js(candidSource);
-            if (JSON.stringify(js) === JSON.stringify([])) {
-                throw new Error("Cannot compile Candid to JavaScript");
+            return didjs.did_to_js(candidSource);
+        });
+    }
+    parseDidToJs(candidSource) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // This is a dynamic import if the module is available in the environment
+                const parser = yield Promise.resolve().then(() => __importStar(require("@ic-reactor/parser")));
+                yield parser.default();
+                return parser.did_to_js(candidSource);
+            }
+            catch (error) {
+                throw new Error("@ic-reactor/parser module is not available");
             }
-            const dataUri = "data:text/javascript;charset=utf-8," +
-                encodeURIComponent(js[0]);
-            return eval('import("' + dataUri + '")');
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/core",
-  "version": "1.5.4-beta.0",
+  "version": "1.5.4-beta.2",
   "description": "A library for intracting with the Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -52,5 +52,5 @@
   "engines": {
     "node": ">=10"
   },
-  "gitHead": "dfc8ce03a6a0f8aadf28bba2b21c70729278b5fd"
+  "gitHead": "bf632e49a5a4d1128531a6fc50b5c2f97dee58c9"
 }