ic-mops 1.11.1 → 2.0.0

package/dist/commands/watch/generator.js

@@ -1,26 +1,26 @@
-import os from 'node:os';
-import { promisify } from 'node:util';
-import { execFile } from 'node:child_process';
-import chalk from 'chalk';
-import { parallel } from '../../parallel.js';
-import { getRootDir } from '../../mops.js';
+import os from "node:os";
+import { promisify } from "node:util";
+import { execFile } from "node:child_process";
+import chalk from "chalk";
+import { parallel } from "../../parallel.js";
+import { getRootDir } from "../../mops.js";
 export class Generator {
     verbose = false;
     canisters = {};
-    status = 'pending';
+    status = "pending";
     errorChecker;
     success = 0;
     errors = [];
     aborted = false;
     controllers = new Map();
     currentRun;
-    constructor({ verbose, canisters, errorChecker }) {
+    constructor({ verbose, canisters, errorChecker, }) {
         this.verbose = verbose;
         this.canisters = canisters;
         this.errorChecker = errorChecker;
     }
     reset() {
-        this.status = 'pending';
+        this.status = "pending";
         this.success = 0;
         this.errors = [];
     }
@@ -36,21 +36,24 @@ export class Generator {
     }
     async run(onProgress) {
         await this.abortCurrent();
-        if (this.errorChecker.status === 'error') {
-            this.status = 'syntax-error';
+        if (this.errorChecker.status === "error") {
+            this.status = "syntax-error";
             onProgress();
             return;
         }
-        this.status = 'running';
+        this.status = "running";
         onProgress();
         let rootDir = getRootDir();
         this.currentRun = parallel(os.cpus().length, [...Object.keys(this.canisters)], async (canister) => {
             let controller = new AbortController();
             let { signal } = controller;
             this.controllers.set(canister, controller);
-            await promisify(execFile)('dfx', ['generate', canister], { cwd: rootDir, signal }).catch((error) => {
-                if (error.code === 'ABORT_ERR') {
-                    return { stderr: '' };
+            await promisify(execFile)("dfx", ["generate", canister], {
+                cwd: rootDir,
+                signal,
+            }).catch((error) => {
+                if (error.code === "ABORT_ERR") {
+                    return { stderr: "" };
                 }
                 throw error;
             });
@@ -60,21 +63,23 @@ export class Generator {
         });
         await this.currentRun;
         if (!this.aborted) {
-            this.status = 'success';
+            this.status = "success";
         }
         onProgress();
     }
     getOutput() {
         let get = (v) => v.toString();
-        let count = (this.status === 'running' ? get : chalk.bold[this.errors.length > 0 ? 'redBright' : 'green'])(this.errors.length || this.success);
-        if (this.status === 'pending') {
-            return `Generate: ${chalk.gray('(pending)')}`;
+        let count = (this.status === "running"
+            ? get
+            : chalk.bold[this.errors.length > 0 ? "redBright" : "green"])(this.errors.length || this.success);
+        if (this.status === "pending") {
+            return `Generate: ${chalk.gray("(pending)")}`;
         }
-        if (this.status === 'running') {
-            return `Generate: ${count}/${Object.keys(this.canisters).length} ${chalk.gray('(running)')}`;
+        if (this.status === "running") {
+            return `Generate: ${count}/${Object.keys(this.canisters).length} ${chalk.gray("(running)")}`;
         }
-        if (this.status === 'syntax-error') {
-            return `Generate: ${chalk.gray('(errors)')}`;
+        if (this.status === "syntax-error") {
+            return `Generate: ${chalk.gray("(errors)")}`;
         }
         return `Generate: ${count}`;
     }

package/dist/commands/watch/globMoFiles.js

@@ -1,15 +1,15 @@
-import { globSync } from 'glob';
+import { globSync } from "glob";
 let globConfig = {
     nocase: true,
     ignore: [
-        '**/node_modules/**',
-        '**/.mops/**',
-        '**/.vessel/**',
-        '**/.git/**',
-        '**/.dfx/**',
-        '**/{build,bundle,dist}/**',
+        "**/node_modules/**",
+        "**/.mops/**",
+        "**/.vessel/**",
+        "**/.git/**",
+        "**/.dfx/**",
+        "**/{build,bundle,dist}/**",
     ],
 };
 export function globMoFiles(rootDir) {
-    return globSync('**/*.mo', { cwd: rootDir, ...globConfig });
+    return globSync("**/*.mo", { cwd: rootDir, ...globConfig });
 }

package/dist/commands/watch/parseDfxJson.d.ts

@@ -1,10 +1,10 @@
 type DfxConfig = {
     $schema: string;
     version: number;
-    profile: 'Debug' | 'Release';
+    profile: "Debug" | "Release";
     canisters: {
         [key: string]: {
-            type: 'motoko' | 'assets';
+            type: "motoko" | "assets";
             main?: string;
             specified_id?: string;
             declarations?: {

package/dist/commands/watch/parseDfxJson.js

@@ -1,22 +1,22 @@
-import { existsSync, readFileSync } from 'node:fs';
-import path from 'node:path';
-import { getRootDir } from '../../mops.js';
+import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
+import { getRootDir } from "../../mops.js";
 export function readDfxJson() {
-    let dfxJsonPath = path.resolve(getRootDir(), 'dfx.json');
+    let dfxJsonPath = path.resolve(getRootDir(), "dfx.json");
     if (!existsSync(dfxJsonPath)) {
         return {};
     }
-    return JSON.parse(readFileSync(dfxJsonPath, 'utf8'));
+    return JSON.parse(readFileSync(dfxJsonPath, "utf8"));
 }
 export function getMotokoCanisters() {
     let dfxJson = readDfxJson();
     return Object.fromEntries(Object.entries(dfxJson.canisters || {})
-        .filter(([_, canister]) => canister.type === 'motoko')
-        .map(([name, canister]) => [name, canister.main ?? '']));
+        .filter(([_, canister]) => canister.type === "motoko")
+        .map(([name, canister]) => [name, canister.main ?? ""]));
 }
 export function getMotokoCanistersWithDeclarations() {
     let dfxJson = readDfxJson();
     return Object.fromEntries(Object.entries(dfxJson.canisters || {})
-        .filter(([_, canister]) => canister.type === 'motoko' && canister.declarations)
-        .map(([name, canister]) => [name, canister.main ?? '']));
+        .filter(([_, canister]) => canister.type === "motoko" && canister.declarations)
+        .map(([name, canister]) => [name, canister.main ?? ""]));
 }

package/dist/commands/watch/tester.d.ts

@@ -1,14 +1,14 @@
-import { ErrorChecker } from './error-checker.js';
-import { SilentReporter } from '../test/reporters/silent-reporter.js';
+import { ErrorChecker } from "./error-checker.js";
+import { SilentReporter } from "../test/reporters/silent-reporter.js";
 export declare class Tester {
     verbose: boolean;
-    status: 'pending' | 'running' | 'syntax-error' | 'error' | 'success';
+    status: "pending" | "running" | "syntax-error" | "error" | "success";
     errorChecker: ErrorChecker;
     reporter: SilentReporter;
     aborted: boolean;
     controller: AbortController;
     currentRun: Promise<any> | undefined;
-    constructor({ verbose, errorChecker }: {
+    constructor({ verbose, errorChecker, }: {
         verbose: boolean;
         errorChecker: ErrorChecker;
     });

package/dist/commands/watch/tester.js

@@ -1,21 +1,21 @@
-import chalk from 'chalk';
-import { readConfig } from '../../mops.js';
-import { testWithReporter } from '../test/test.js';
-import { SilentReporter } from '../test/reporters/silent-reporter.js';
+import chalk from "chalk";
+import { readConfig } from "../../mops.js";
+import { testWithReporter } from "../test/test.js";
+import { SilentReporter } from "../test/reporters/silent-reporter.js";
 export class Tester {
     verbose = false;
-    status = 'pending';
+    status = "pending";
     errorChecker;
     reporter = new SilentReporter(false);
     aborted = false;
     controller = new AbortController();
     currentRun;
-    constructor({ verbose, errorChecker }) {
+    constructor({ verbose, errorChecker, }) {
         this.verbose = verbose;
         this.errorChecker = errorChecker;
     }
     reset() {
-        this.status = 'pending';
+        this.status = "pending";
     }
     async abortCurrent() {
         this.aborted = true;
@@ -26,39 +26,41 @@ export class Tester {
     }
     async run(onProgress) {
         await this.abortCurrent();
-        if (this.errorChecker.status === 'error') {
-            this.status = 'syntax-error';
+        if (this.errorChecker.status === "error") {
+            this.status = "syntax-error";
             onProgress();
             return;
         }
-        this.status = 'running';
+        this.status = "running";
         onProgress();
         this.reporter = new SilentReporter(false, onProgress);
         this.controller = new AbortController();
         let config = readConfig();
-        this.currentRun = testWithReporter(this.reporter, '', 'interpreter', config.toolchain?.['pocket-ic'] ? 'pocket-ic' : 'dfx', true, this.controller.signal);
+        this.currentRun = testWithReporter(this.reporter, "", "interpreter", config.toolchain?.["pocket-ic"] ? "pocket-ic" : "dfx", true, this.controller.signal);
         await this.currentRun;
         if (!this.aborted) {
-            this.status = this.reporter.failed > 0 ? 'error' : 'success';
+            this.status = this.reporter.failed > 0 ? "error" : "success";
         }
         onProgress();
     }
     getOutput() {
         let get = (v) => v.toString();
-        let count = (this.status === 'running' ? get : chalk.bold[this.reporter.failed > 0 ? 'redBright' : 'green'])(this.reporter.failedFiles || this.reporter.passedFiles);
-        if (this.status === 'pending') {
-            return `Tests: ${chalk.gray('(pending)')}`;
+        let count = (this.status === "running"
+            ? get
+            : chalk.bold[this.reporter.failed > 0 ? "redBright" : "green"])(this.reporter.failedFiles || this.reporter.passedFiles);
+        if (this.status === "pending") {
+            return `Tests: ${chalk.gray("(pending)")}`;
         }
-        if (this.status === 'running') {
-            return `Tests: ${count}/${this.reporter.total} ${chalk.gray('(running)')}`;
+        if (this.status === "running") {
+            return `Tests: ${count}/${this.reporter.total} ${chalk.gray("(running)")}`;
         }
-        if (this.status === 'syntax-error') {
-            return `Tests: ${chalk.gray('(errors)')}`;
+        if (this.status === "syntax-error") {
+            return `Tests: ${chalk.gray("(errors)")}`;
         }
-        let output = '';
+        let output = "";
         output += `Tests: ${count}`;
         if (this.reporter.errorOutput) {
-            output += '\n' + this.reporter.errorOutput;
+            output += "\n" + this.reporter.errorOutput;
         }
         return output;
     }

package/dist/commands/watch/warning-checker.d.ts

@@ -1,8 +1,8 @@
-import { ErrorChecker } from './error-checker.js';
+import { ErrorChecker } from "./error-checker.js";
 export declare class WarningChecker {
     verbose: boolean;
     canisters: Record<string, string>;
-    status: 'pending' | 'running' | 'syntax-error' | 'error' | 'success';
+    status: "pending" | "running" | "syntax-error" | "error" | "success";
     warnings: string[];
     errorChecker: ErrorChecker;
     aborted: boolean;
@@ -10,7 +10,7 @@ export declare class WarningChecker {
     currentRun: Promise<any> | undefined;
     totalFiles: number;
     processedFiles: number;
-    constructor({ verbose, canisters, errorChecker }: {
+    constructor({ verbose, canisters, errorChecker, }: {
         verbose: boolean;
         canisters: Record<string, string>;
         errorChecker: ErrorChecker;

package/dist/commands/watch/warning-checker.js

@@ -1,16 +1,16 @@
-import { execFile } from 'node:child_process';
-import { promisify } from 'node:util';
-import os from 'node:os';
-import chalk from 'chalk';
-import { getMocPath } from '../../helpers/get-moc-path.js';
-import { getRootDir } from '../../mops.js';
-import { sources } from '../sources.js';
-import { parallel } from '../../parallel.js';
-import { globMoFiles } from './globMoFiles.js';
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import os from "node:os";
+import chalk from "chalk";
+import { getMocPath } from "../../helpers/get-moc-path.js";
+import { getRootDir } from "../../mops.js";
+import { sources } from "../sources.js";
+import { parallel } from "../../parallel.js";
+import { globMoFiles } from "./globMoFiles.js";
 export class WarningChecker {
     verbose = false;
     canisters = {};
-    status = 'pending';
+    status = "pending";
     warnings = [];
     errorChecker;
     aborted = false;
@@ -18,13 +18,13 @@ export class WarningChecker {
     currentRun;
     totalFiles = 0;
     processedFiles = 0;
-    constructor({ verbose, canisters, errorChecker }) {
+    constructor({ verbose, canisters, errorChecker, }) {
         this.verbose = verbose;
         this.canisters = canisters;
         this.errorChecker = errorChecker;
     }
     reset() {
-        this.status = 'pending';
+        this.status = "pending";
         this.warnings = [];
         this.totalFiles = 0;
         this.processedFiles = 0;
@@ -41,12 +41,12 @@ export class WarningChecker {
     }
     async run(onProgress) {
         await this.abortCurrent();
-        if (this.errorChecker.status === 'error') {
-            this.status = 'syntax-error';
+        if (this.errorChecker.status === "error") {
+            this.status = "syntax-error";
             onProgress();
             return;
         }
-        this.status = 'running';
+        this.status = "running";
         onProgress();
         let rootDir = getRootDir();
         let mocPath = getMocPath();
@@ -58,29 +58,29 @@ export class WarningChecker {
             let controller = new AbortController();
             let { signal } = controller;
             this.controllers.set(file, controller);
-            let { stderr } = await promisify(execFile)(mocPath, ['--check', ...deps.flatMap(x => x.split(' ')), file], { cwd: rootDir, signal }).catch((error) => {
-                if (error.code === 'ABORT_ERR') {
-                    return { stderr: '' };
+            let { stderr } = await promisify(execFile)(mocPath, ["--check", ...deps.flatMap((x) => x.split(" ")), file], { cwd: rootDir, signal }).catch((error) => {
+                if (error.code === "ABORT_ERR") {
+                    return { stderr: "" };
                 }
                 throw error;
             });
             if (stderr) {
-                stderr.split('\n').forEach((line) => {
+                stderr.split("\n").forEach((line) => {
                     // ignore deps warnings
-                    if (line.startsWith('.mops/')) {
+                    if (line.startsWith(".mops/")) {
                         return;
                     }
-                    else if (line.includes(': warning [')) {
+                    else if (line.includes(": warning [")) {
                         // better formatting
                         let str = line
-                            .replace(': warning [', `: ${chalk.yellow('warning')} [`)
-                            .replace(/unused field (\w+)/, `unused field ${chalk.bold('$1')}`)
-                            .replace(/unused identifier (\w+)/, `unused identifier ${chalk.bold('$1')}`)
+                            .replace(": warning [", `: ${chalk.yellow("warning")} [`)
+                            .replace(/unused field (\w+)/, `unused field ${chalk.bold("$1")}`)
+                            .replace(/unused identifier (\w+)/, `unused identifier ${chalk.bold("$1")}`)
                             .trim();
                         this.warnings.push(str);
                     }
-                    else if (line.startsWith('  ') && this.warnings.length) {
-                        this.warnings[this.warnings.length - 1] += '\n  ' + line;
+                    else if (line.startsWith("  ") && this.warnings.length) {
+                        this.warnings[this.warnings.length - 1] += "\n  " + line;
                     }
                     else {
                         // console.log('UNKNOWN WARNING', line);
@@ -93,25 +93,25 @@ export class WarningChecker {
         });
         await this.currentRun;
         if (!this.aborted) {
-            this.status = this.warnings.length ? 'error' : 'success';
+            this.status = this.warnings.length ? "error" : "success";
         }
         onProgress();
     }
     getOutput() {
-        if (this.status === 'pending') {
-            return `Warnings: ${chalk.gray('(pending)')}`;
+        if (this.status === "pending") {
+            return `Warnings: ${chalk.gray("(pending)")}`;
         }
-        if (this.status === 'running') {
-            return `Warnings: ${this.processedFiles}/${this.totalFiles} ${chalk.gray('(running)')}`;
+        if (this.status === "running") {
+            return `Warnings: ${this.processedFiles}/${this.totalFiles} ${chalk.gray("(running)")}`;
         }
-        if (this.status === 'syntax-error') {
-            return `Warnings: ${chalk.gray('(errors)')}`;
+        if (this.status === "syntax-error") {
+            return `Warnings: ${chalk.gray("(errors)")}`;
         }
-        let output = '';
+        let output = "";
         let uniqueWarnings = [...new Set(this.warnings)];
-        output += `Warnings: ${chalk.bold[uniqueWarnings.length ? 'yellowBright' : 'green'](uniqueWarnings.length)}`;
+        output += `Warnings: ${chalk.bold[uniqueWarnings.length ? "yellowBright" : "green"](uniqueWarnings.length)}`;
         if (this.verbose && uniqueWarnings.length) {
-            output += `\n  ${uniqueWarnings.join('\n  ')}`;
+            output += `\n  ${uniqueWarnings.join("\n  ")}`;
         }
         return output;
     }

package/dist/commands/watch/watch.js

@@ -1,20 +1,20 @@
-import chokidar from 'chokidar';
-import path from 'node:path';
-import debounce from 'debounce';
-import chalk from 'chalk';
-import { ErrorChecker } from './error-checker.js';
-import { WarningChecker } from './warning-checker.js';
-import { getMotokoCanisters, getMotokoCanistersWithDeclarations } from './parseDfxJson.js';
-import { getRootDir } from '../../mops.js';
-import { Tester } from './tester.js';
-import { Generator } from './generator.js';
-import { Deployer } from './deployer.js';
-import { Formatter } from './formatter.js';
+import chokidar from "chokidar";
+import path from "node:path";
+import debounce from "debounce";
+import chalk from "chalk";
+import { ErrorChecker } from "./error-checker.js";
+import { WarningChecker } from "./warning-checker.js";
+import { getMotokoCanisters, getMotokoCanistersWithDeclarations, } from "./parseDfxJson.js";
+import { getRootDir } from "../../mops.js";
+import { Tester } from "./tester.js";
+import { Generator } from "./generator.js";
+import { Deployer } from "./deployer.js";
+import { Formatter } from "./formatter.js";
 let ignore = [
-    '**/node_modules/**',
-    '**/.mops/**',
-    '**/.vessel/**',
-    '**/.git/**',
+    "**/node_modules/**",
+    "**/.mops/**",
+    "**/.vessel/**",
+    "**/.git/**",
 ];
 export async function watch(options) {
     let hasOptions = Object.values(options).includes(true);
@@ -33,15 +33,25 @@ export async function watch(options) {
     let canisters = getMotokoCanisters();
     let canistersWithDeclarations = getMotokoCanistersWithDeclarations();
     let errorChecker = new ErrorChecker({ verbose: true, canisters: canisters });
-    let warningChecker = new WarningChecker({ errorChecker, verbose: true, canisters: canisters });
+    let warningChecker = new WarningChecker({
+        errorChecker,
+        verbose: true,
+        canisters: canisters,
+    });
     let tester = new Tester({ errorChecker, verbose: true });
-    let generator = new Generator({ errorChecker, verbose: true, canisters: canistersWithDeclarations });
-    let deployer = new Deployer({ errorChecker, generator, verbose: true, canisters: canisters });
+    let generator = new Generator({
+        errorChecker,
+        verbose: true,
+        canisters: canistersWithDeclarations,
+    });
+    let deployer = new Deployer({
+        errorChecker,
+        generator,
+        verbose: true,
+        canisters: canisters,
+    });
     let formatter = new Formatter({ errorChecker, verbose: true });
-    let watcher = chokidar.watch([
-        path.join(rootDir, '**/*.mo'),
-        path.join(rootDir, 'mops.toml'),
-    ], {
+    let watcher = chokidar.watch([path.join(rootDir, "**/*.mo"), path.join(rootDir, "mops.toml")], {
         ignored: ignore,
         ignoreInitial: true,
     });
@@ -59,16 +69,19 @@ export async function watch(options) {
         if (options.format) {
             formatting = true;
         }
-        options.error && await errorChecker.run(print);
+        options.error && (await errorChecker.run(print));
         options.warning && warningChecker.run(print);
-        options.format && formatter.run(print).then(() => setTimeout(() => formatting = false, 500));
+        options.format &&
+            formatter
+                .run(print)
+                .then(() => setTimeout(() => (formatting = false), 500));
         options.test && tester.run(print);
-        options.generate && await generator.run(print);
+        options.generate && (await generator.run(print));
         options.deploy && deployer.run(print);
     }, 200);
     let print = () => {
         console.clear();
-        process.stdout.write('\x1Bc');
+        process.stdout.write("\x1Bc");
         options.error && console.log(errorChecker.getOutput());
         options.warning && console.log(warningChecker.getOutput());
         options.format && console.log(formatter.getOutput());
@@ -82,13 +95,13 @@ export async function watch(options) {
         options.test && statuses.push(tester.status);
         options.generate && statuses.push(generator.status);
         options.deploy && statuses.push(deployer.status);
-        if (statuses.every(status => status !== 'pending' && status !== 'running')) {
-            console.log(chalk.dim('-'.repeat(50)));
-            console.log(chalk.dim('Waiting for file changes...'));
-            console.log(chalk.dim(`Press ${chalk.bold('Ctrl+C')} to exit.`));
+        if (statuses.every((status) => status !== "pending" && status !== "running")) {
+            console.log(chalk.dim("-".repeat(50)));
+            console.log(chalk.dim("Waiting for file changes..."));
+            console.log(chalk.dim(`Press ${chalk.bold("Ctrl+C")} to exit.`));
         }
     };
-    watcher.on('all', () => {
+    watcher.on("all", () => {
         if (!formatting) {
             run();
         }

package/dist/declarations/bench/bench.did.d.ts

@@ -1,6 +1,6 @@
-import type { Principal } from '@dfinity/principal';
-import type { ActorMethod } from '@dfinity/agent';
-import type { IDL } from '@dfinity/candid';
+import type { Principal } from '@icp-sdk/core/principal';
+import type { ActorMethod } from '@icp-sdk/core/agent';
+import type { IDL } from '@icp-sdk/core/candid';
 
 export interface BenchResult {
   'rts_stable_memory_size' : bigint,

package/dist/declarations/bench/index.d.ts

@@ -3,9 +3,9 @@ import type {
   HttpAgentOptions,
   ActorConfig,
   Agent,
-} from "@dfinity/agent";
-import type { Principal } from "@dfinity/principal";
-import type { IDL } from "@dfinity/candid";
+} from "@icp-sdk/core/agent";
+import type { Principal } from "@icp-sdk/core/principal";
+import type { IDL } from "@icp-sdk/core/candid";
 
 import { _SERVICE } from './bench.did';
 

package/dist/declarations/bench/index.js

@@ -1,4 +1,4 @@
-import { Actor, HttpAgent } from "@dfinity/agent";
+import { Actor, HttpAgent } from "@icp-sdk/core/agent";
 
 // Imports and re-exports candid interface
 import { idlFactory } from "./bench.did.js";

package/dist/declarations/main/index.d.ts

@@ -3,9 +3,9 @@ import type {
   HttpAgentOptions,
   ActorConfig,
   Agent,
-} from "@dfinity/agent";
-import type { Principal } from "@dfinity/principal";
-import type { IDL } from "@dfinity/candid";
+} from "@icp-sdk/core/agent";
+import type { Principal } from "@icp-sdk/core/principal";
+import type { IDL } from "@icp-sdk/core/candid";
 
 import { _SERVICE } from './main.did';
 

package/dist/declarations/main/index.js

@@ -1,4 +1,4 @@
-import { Actor, HttpAgent } from "@dfinity/agent";
+import { Actor, HttpAgent } from "@icp-sdk/core/agent";
 
 // Imports and re-exports candid interface
 import { idlFactory } from "./main.did.js";

package/dist/declarations/main/main.did.d.ts

@@ -1,6 +1,6 @@
-import type { Principal } from '@dfinity/principal';
-import type { ActorMethod } from '@dfinity/agent';
-import type { IDL } from '@dfinity/candid';
+import type { Principal } from '@icp-sdk/core/principal';
+import type { ActorMethod } from '@icp-sdk/core/agent';
+import type { IDL } from '@icp-sdk/core/candid';
 
 export interface Benchmark {
   'gc' : string,

package/dist/declarations/storage/index.d.ts

@@ -3,9 +3,9 @@ import type {
   HttpAgentOptions,
   ActorConfig,
   Agent,
-} from "@dfinity/agent";
-import type { Principal } from "@dfinity/principal";
-import type { IDL } from "@dfinity/candid";
+} from "@icp-sdk/core/agent";
+import type { Principal } from "@icp-sdk/core/principal";
+import type { IDL } from "@icp-sdk/core/candid";
 
 import { _SERVICE } from './storage.did';