ic-mops 1.12.0 → 2.0.0

package/commands/watch/watch.ts

@@ -1,111 +1,139 @@
-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 : {error : boolean, warning : boolean, test : boolean, generate : boolean, deploy : boolean, format : boolean}) {
-	let hasOptions = Object.values(options).includes(true);
-	if (!hasOptions) {
-		options = {
-			error: true,
-			warning: true,
-			test: true,
-			generate: true,
-			deploy: true,
-			format: false,
-		};
-	}
-	options.error = true;
+export async function watch(options: {
+  error: boolean;
+  warning: boolean;
+  test: boolean;
+  generate: boolean;
+  deploy: boolean;
+  format: boolean;
+}) {
+  let hasOptions = Object.values(options).includes(true);
+  if (!hasOptions) {
+    options = {
+      error: true,
+      warning: true,
+      test: true,
+      generate: true,
+      deploy: true,
+      format: false,
+    };
+  }
+  options.error = true;
 
-	let rootDir = getRootDir();
-	let canisters = getMotokoCanisters();
-	let canistersWithDeclarations = getMotokoCanistersWithDeclarations();
-	let errorChecker = new 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 formatter = new Formatter({errorChecker, verbose: true});
+  let rootDir = getRootDir();
+  let canisters = getMotokoCanisters();
+  let canistersWithDeclarations = getMotokoCanistersWithDeclarations();
+  let errorChecker = new 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 formatter = new Formatter({ errorChecker, verbose: true });
 
-	let watcher = chokidar.watch([
-		path.join(rootDir, '**/*.mo'),
-		path.join(rootDir, 'mops.toml'),
-	], {
-		ignored: ignore,
-		ignoreInitial: true,
-	});
+  let watcher = chokidar.watch(
+    [path.join(rootDir, "**/*.mo"), path.join(rootDir, "mops.toml")],
+    {
+      ignored: ignore,
+      ignoreInitial: true,
+    },
+  );
 
-	let formatting = false;
+  let formatting = false;
 
-	let run = debounce(async () => {
-		if (formatting) {
-			return;
-		}
+  let run = debounce(async () => {
+    if (formatting) {
+      return;
+    }
 
-		errorChecker.reset();
-		warningChecker.reset();
-		tester.reset();
-		generator.reset();
-		deployer.reset();
-		formatter.reset();
+    errorChecker.reset();
+    warningChecker.reset();
+    tester.reset();
+    generator.reset();
+    deployer.reset();
+    formatter.reset();
 
-		if (options.format) {
-			formatting = true;
-		}
+    if (options.format) {
+      formatting = true;
+    }
 
-		options.error && await errorChecker.run(print);
-		options.warning && warningChecker.run(print);
-		options.format && formatter.run(print).then(() => setTimeout(() => formatting = false, 500));
-		options.test && tester.run(print);
-		options.generate && await generator.run(print);
-		options.deploy && deployer.run(print);
-	}, 200);
+    options.error && (await errorChecker.run(print));
+    options.warning && warningChecker.run(print);
+    options.format &&
+      formatter
+        .run(print)
+        .then(() => setTimeout(() => (formatting = false), 500));
+    options.test && tester.run(print);
+    options.generate && (await generator.run(print));
+    options.deploy && deployer.run(print);
+  }, 200);
 
-	let print = () => {
-		console.clear();
-		process.stdout.write('\x1Bc');
+  let print = () => {
+    console.clear();
+    process.stdout.write("\x1Bc");
 
-		options.error && console.log(errorChecker.getOutput());
-		options.warning && console.log(warningChecker.getOutput());
-		options.format && console.log(formatter.getOutput());
-		options.test && console.log(tester.getOutput());
-		options.generate && console.log(generator.getOutput());
-		options.deploy && console.log(deployer.getOutput());
+    options.error && console.log(errorChecker.getOutput());
+    options.warning && console.log(warningChecker.getOutput());
+    options.format && console.log(formatter.getOutput());
+    options.test && console.log(tester.getOutput());
+    options.generate && console.log(generator.getOutput());
+    options.deploy && console.log(deployer.getOutput());
 
-		let statuses = [];
-		options.error && statuses.push(errorChecker.status);
-		options.warning && statuses.push(warningChecker.status);
-		options.format && statuses.push(formatter.status);
-		options.test && statuses.push(tester.status);
-		options.generate && statuses.push(generator.status);
-		options.deploy && statuses.push(deployer.status);
+    let statuses = [];
+    options.error && statuses.push(errorChecker.status);
+    options.warning && statuses.push(warningChecker.status);
+    options.format && statuses.push(formatter.status);
+    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', () => {
-		if (!formatting) {
-			run();
-		}
-	});
-	run();
-}
+  watcher.on("all", () => {
+    if (!formatting) {
+      run();
+    }
+  });
+  run();
+}

package/dist/api/actors.d.ts

@@ -1,6 +1,6 @@
-import { Identity } from '@icp-sdk/core/agent';
-import { Principal } from '@icp-sdk/core/principal';
-import { _SERVICE } from '../declarations/main/main.did.js';
-import { _SERVICE as _STORAGE_SERVICE } from '../declarations/storage/storage.did.js';
+import { Identity } from "@icp-sdk/core/agent";
+import { Principal } from "@icp-sdk/core/principal";
+import { _SERVICE } from "../declarations/main/main.did.js";
+import { _SERVICE as _STORAGE_SERVICE } from "../declarations/storage/storage.did.js";
 export declare let mainActor: (identity?: Identity) => Promise<_SERVICE>;
 export declare let storageActor: (storageId: Principal, identity?: Identity) => Promise<_STORAGE_SERVICE>;

package/dist/api/actors.js

@@ -1,11 +1,11 @@
-import { Actor, HttpAgent } from '@icp-sdk/core/agent';
-import { idlFactory } from '../declarations/main/main.did.js';
-import { idlFactory as storageIdlFactory } from '../declarations/storage/storage.did.js';
-import { getEndpoint } from './network.js';
-import { getNetwork } from './network.js';
+import { Actor, HttpAgent } from "@icp-sdk/core/agent";
+import { idlFactory } from "../declarations/main/main.did.js";
+import { idlFactory as storageIdlFactory } from "../declarations/storage/storage.did.js";
+import { getEndpoint } from "./network.js";
+import { getNetwork } from "./network.js";
 let agentPromiseByPrincipal = new Map();
 let getAgent = async (identity) => {
-    let principal = identity ? identity?.getPrincipal().toText() : '';
+    let principal = identity ? identity?.getPrincipal().toText() : "";
     let agentPromise = agentPromiseByPrincipal.get(principal);
     if (!agentPromise) {
         let network = getNetwork();
@@ -13,8 +13,8 @@ let getAgent = async (identity) => {
         agentPromise = HttpAgent.create({
             host,
             identity,
-            shouldFetchRootKey: network === 'local',
-            verifyQuerySignatures: process.env.MOPS_VERIFY_QUERY_SIGNATURES !== 'false',
+            shouldFetchRootKey: network === "local",
+            verifyQuerySignatures: process.env.MOPS_VERIFY_QUERY_SIGNATURES !== "false",
             shouldSyncTime: true,
         });
         agentPromiseByPrincipal.set(principal, agentPromise);

package/dist/api/downloadPackageFiles.d.ts

@@ -1,5 +1,5 @@
-import { Principal } from '@icp-sdk/core/principal';
-import { Storage } from '../declarations/storage/storage.did.js';
+import { Principal } from "@icp-sdk/core/principal";
+import { Storage } from "../declarations/storage/storage.did.js";
 export declare function downloadPackageFiles(pkg: string, version?: string, threads?: number, onLoad?: (_fileIds: string[], _fileId: string) => void): Promise<Map<string, Array<number>>>;
 export declare function getPackageFilesInfo(pkg: string, version: string): Promise<{
     storageId: Principal;

package/dist/api/downloadPackageFiles.js

@@ -1,8 +1,8 @@
-import { Principal } from '@icp-sdk/core/principal';
-import { mainActor, storageActor } from './actors.js';
-import { resolveVersion } from './resolveVersion.js';
-import { parallel } from '../parallel.js';
-export async function downloadPackageFiles(pkg, version = '', threads = 8, onLoad = (_fileIds, _fileId) => { }) {
+import { Principal } from "@icp-sdk/core/principal";
+import { mainActor, storageActor } from "./actors.js";
+import { resolveVersion } from "./resolveVersion.js";
+import { parallel } from "../parallel.js";
+export async function downloadPackageFiles(pkg, version = "", threads = 8, onLoad = (_fileIds, _fileId) => { }) {
     version = await resolveVersion(pkg, version);
     let { storageId, fileIds } = await getPackageFilesInfo(pkg, version);
     let storage = await storageActor(storageId);
@@ -21,7 +21,7 @@ export async function getPackageFilesInfo(pkg, version) {
         actor.getPackageDetails(pkg, version),
         getFileIds(pkg, version),
     ]);
-    if ('err' in packageDetailsRes) {
+    if ("err" in packageDetailsRes) {
         throw packageDetailsRes.err;
     }
     let packageDetails = packageDetailsRes.ok;
@@ -34,7 +34,7 @@ export async function getPackageFilesInfo(pkg, version) {
 export async function getFileIds(pkg, version) {
     let actor = await mainActor();
     let fileIdsRes = await actor.getFileIds(pkg, version);
-    if ('err' in fileIdsRes) {
+    if ("err" in fileIdsRes) {
         throw fileIdsRes.err;
     }
     let filesIds = fileIdsRes.ok;
@@ -42,18 +42,18 @@ export async function getFileIds(pkg, version) {
 }
 // download single file
 export async function downloadFile(storage, fileId) {
-    if (typeof storage === 'string') {
+    if (typeof storage === "string") {
         storage = await storageActor(Principal.fromText(storage));
     }
     let fileMetaRes = await storage.getFileMeta(fileId);
-    if ('err' in fileMetaRes) {
+    if ("err" in fileMetaRes) {
         throw fileMetaRes.err;
     }
     let fileMeta = fileMetaRes.ok;
     let data = [];
     for (let i = 0n; i < fileMeta.chunkCount; i++) {
         let chunkRes = await storage.downloadChunk(fileId, i);
-        if ('err' in chunkRes) {
+        if ("err" in chunkRes) {
             throw chunkRes.err;
         }
         let chunk = chunkRes.ok;

package/dist/api/getHighestVersion.js

@@ -1,4 +1,4 @@
-import { mainActor } from './actors.js';
+import { mainActor } from "./actors.js";
 export async function getHighestVersion(pkgName) {
     let actor = await mainActor();
     return actor.getHighestVersion(pkgName);

package/dist/api/index.d.ts

@@ -1,4 +1,4 @@
-export { mainActor, storageActor } from './actors.js';
-export { downloadPackageFiles } from './downloadPackageFiles.js';
-export { getEndpoint, getNetwork } from './network.js';
-export { resolveVersion } from './resolveVersion.js';
+export { mainActor, storageActor } from "./actors.js";
+export { downloadPackageFiles } from "./downloadPackageFiles.js";
+export { getEndpoint, getNetwork } from "./network.js";
+export { resolveVersion } from "./resolveVersion.js";

package/dist/api/index.js

@@ -1,4 +1,4 @@
-export { mainActor, storageActor } from './actors.js';
-export { downloadPackageFiles } from './downloadPackageFiles.js';
-export { getEndpoint, getNetwork } from './network.js';
-export { resolveVersion } from './resolveVersion.js';
+export { mainActor, storageActor } from "./actors.js";
+export { downloadPackageFiles } from "./downloadPackageFiles.js";
+export { getEndpoint, getNetwork } from "./network.js";
+export { resolveVersion } from "./resolveVersion.js";

package/dist/api/network.js

@@ -1,23 +1,23 @@
 export function getNetwork() {
-    return globalThis.MOPS_NETWORK || 'ic';
+    return globalThis.MOPS_NETWORK || "ic";
 }
 export function getEndpoint(network) {
-    if (network === 'staging') {
+    if (network === "staging") {
         return {
-            host: 'https://icp-api.io',
-            canisterId: '2d2zu-vaaaa-aaaak-qb6pq-cai',
+            host: "https://icp-api.io",
+            canisterId: "2d2zu-vaaaa-aaaak-qb6pq-cai",
         };
     }
-    else if (network === 'ic') {
+    else if (network === "ic") {
         return {
-            host: 'https://icp-api.io',
-            canisterId: 'oknww-riaaa-aaaam-qaf6a-cai',
+            host: "https://icp-api.io",
+            canisterId: "oknww-riaaa-aaaam-qaf6a-cai",
         };
     }
     else {
         return {
-            host: 'http://127.0.0.1:4943',
-            canisterId: '2d2zu-vaaaa-aaaak-qb6pq-cai',
+            host: "http://127.0.0.1:4943",
+            canisterId: "2d2zu-vaaaa-aaaak-qb6pq-cai",
         };
     }
 }

package/dist/api/resolveVersion.js

@@ -1,8 +1,8 @@
-import { getHighestVersion } from './getHighestVersion.js';
-export async function resolveVersion(pkg, version = '') {
+import { getHighestVersion } from "./getHighestVersion.js";
+export async function resolveVersion(pkg, version = "") {
     if (!version) {
         let versionRes = await getHighestVersion(pkg);
-        if ('err' in versionRes) {
+        if ("err" in versionRes) {
             throw versionRes.err;
         }
         version = versionRes.ok;

package/dist/bin/mops.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-import '../cli.js';
+import "../cli.js";

package/dist/bundle-package-json.js

@@ -1,13 +1,13 @@
-import { readFileSync, writeFileSync } from 'node:fs';
-let packageJson = JSON.parse(readFileSync('./bundle/package.json', 'utf8'));
-packageJson.bin.mops = 'bin/mops.js';
-packageJson.bin['ic-mops'] = 'bin/mops.js';
+import { readFileSync, writeFileSync } from "node:fs";
+let packageJson = JSON.parse(readFileSync("./bundle/package.json", "utf8"));
+packageJson.bin.mops = "bin/mops.js";
+packageJson.bin["ic-mops"] = "bin/mops.js";
 delete packageJson.scripts;
 delete packageJson.devDependencies;
 delete packageJson.overrides;
 packageJson.dependencies = {
-    'dhall-to-json-cli': packageJson.dependencies['dhall-to-json-cli'],
-    'decomp-tarxz': packageJson.dependencies['decomp-tarxz'],
-    'buffer': packageJson.dependencies['buffer'],
+    "dhall-to-json-cli": packageJson.dependencies["dhall-to-json-cli"],
+    "decomp-tarxz": packageJson.dependencies["decomp-tarxz"],
+    buffer: packageJson.dependencies["buffer"],
 };
-writeFileSync('./bundle/package.json', JSON.stringify(packageJson, null, '  '));
+writeFileSync("./bundle/package.json", JSON.stringify(packageJson, null, "  "));

package/dist/cache.js

@@ -1,18 +1,18 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import ncp from 'ncp';
-import getFolderSize from 'get-folder-size';
-import { getDependencyType, getNetwork, getRootDir, globalCacheDir, parseGithubURL } from './mops.js';
-import { getPackageId } from './helpers/get-package-id.js';
+import fs from "node:fs";
+import path from "node:path";
+import ncp from "ncp";
+import getFolderSize from "get-folder-size";
+import { getDependencyType, getNetwork, getRootDir, globalCacheDir, parseGithubURL, } from "./mops.js";
+import { getPackageId } from "./helpers/get-package-id.js";
 let getGlobalCacheDir = () => {
     let network = getNetwork();
-    return path.join(globalCacheDir, network === 'ic' ? '' : network);
+    return path.join(globalCacheDir, network === "ic" ? "" : network);
 };
 export let show = () => {
     return getGlobalCacheDir();
 };
 export let getDepCacheDir = (cacheName) => {
-    return path.join(getGlobalCacheDir(), 'packages', cacheName);
+    return path.join(getGlobalCacheDir(), "packages", cacheName);
 };
 export let isDepCached = (cacheName) => {
     let dir = getDepCacheDir(cacheName);
@@ -20,17 +20,20 @@ export let isDepCached = (cacheName) => {
 };
 export function getDepCacheName(name, version) {
     let depType = getDependencyType(version);
-    return depType === 'mops' ? getMopsDepCacheName(name, version) : getGithubDepCacheName(name, version);
+    return depType === "mops"
+        ? getMopsDepCacheName(name, version)
+        : getGithubDepCacheName(name, version);
 }
 export function getMopsDepCacheName(name, version) {
     return getPackageId(name, version);
 }
 export function getGithubDepCacheName(name, repo) {
     const { branch, commitHash } = parseGithubURL(repo);
-    return `_github/${name}#${branch.replaceAll('/', '___')}` + (commitHash ? `@${commitHash}` : '');
+    return (`_github/${name}#${branch.replaceAll("/", "___")}` +
+        (commitHash ? `@${commitHash}` : ""));
 }
 export let addCache = (cacheName, source) => {
-    let dest = path.join(getGlobalCacheDir(), 'packages', cacheName);
+    let dest = path.join(getGlobalCacheDir(), "packages", cacheName);
     fs.mkdirSync(dest, { recursive: true });
     return new Promise((resolve, reject) => {
         ncp.ncp(source, dest, { stopOnErr: true }, (err) => {
@@ -42,7 +45,7 @@ export let addCache = (cacheName, source) => {
     });
 };
 export let copyCache = (cacheName, dest) => {
-    let source = path.join(getGlobalCacheDir(), 'packages', cacheName);
+    let source = path.join(getGlobalCacheDir(), "packages", cacheName);
     fs.mkdirSync(dest, { recursive: true });
     return new Promise((resolve, reject) => {
         ncp.ncp(source, dest, { stopOnErr: true }, (err) => {
@@ -58,16 +61,18 @@ export let cacheSize = async () => {
     fs.mkdirSync(dir, { recursive: true });
     let size = await getFolderSize.strict(dir);
     if (size < 1024 * 1024) {
-        return (size / 1024).toFixed(2) + ' KB';
+        return (size / 1024).toFixed(2) + " KB";
     }
-    return (size / 1024 / 1024).toFixed(2) + ' MB';
+    return (size / 1024 / 1024).toFixed(2) + " MB";
 };
 export let cleanCache = async () => {
-    if (!getGlobalCacheDir().endsWith('mops/cache') && !getGlobalCacheDir().endsWith('/mops') && !getGlobalCacheDir().endsWith('/mops/' + getNetwork())) {
-        throw new Error('Invalid cache directory: ' + getGlobalCacheDir());
+    if (!getGlobalCacheDir().endsWith("mops/cache") &&
+        !getGlobalCacheDir().endsWith("/mops") &&
+        !getGlobalCacheDir().endsWith("/mops/" + getNetwork())) {
+        throw new Error("Invalid cache directory: " + getGlobalCacheDir());
     }
     // local cache
-    fs.rmSync(path.join(getRootDir(), '.mops'), { recursive: true, force: true });
+    fs.rmSync(path.join(getRootDir(), ".mops"), { recursive: true, force: true });
     // global cache
     fs.rmSync(getGlobalCacheDir(), { recursive: true, force: true });
 };

package/dist/check-requirements.js

@@ -1,10 +1,10 @@
-import path from 'node:path';
-import { SemVer } from 'semver';
-import chalk from 'chalk';
-import { getDependencyType, getRootDir, readConfig } from './mops.js';
-import { resolvePackages } from './resolve-packages.js';
-import { getMocVersion } from './helpers/get-moc-version.js';
-import { getPackageId } from './helpers/get-package-id.js';
+import path from "node:path";
+import { SemVer } from "semver";
+import chalk from "chalk";
+import { getDependencyType, getRootDir, readConfig } from "./mops.js";
+import { resolvePackages } from "./resolve-packages.js";
+import { getMocVersion } from "./helpers/get-moc-version.js";
+import { getPackageId } from "./helpers/get-package-id.js";
 export async function checkRequirements({ verbose = false } = {}) {
     let config = readConfig();
     let mocVersion = config.toolchain?.moc;
@@ -15,14 +15,14 @@ export async function checkRequirements({ verbose = false } = {}) {
         return;
     }
     let installedMoc = new SemVer(mocVersion);
-    let highestRequiredMoc = new SemVer('0.0.0');
-    let highestRequiredMocPkgId = '';
+    let highestRequiredMoc = new SemVer("0.0.0");
+    let highestRequiredMocPkgId = "";
     let rootDir = getRootDir();
     let resolvedPackages = await resolvePackages();
     for (let [name, version] of Object.entries(resolvedPackages)) {
-        if (getDependencyType(version) === 'mops') {
+        if (getDependencyType(version) === "mops") {
             let pkgId = getPackageId(name, version);
-            let depConfig = readConfig(path.join(rootDir, '.mops', pkgId, 'mops.toml'));
+            let depConfig = readConfig(path.join(rootDir, ".mops", pkgId, "mops.toml"));
             let moc = depConfig.requirements?.moc;
             if (moc) {
                 let requiredMoc = new SemVer(moc);