ic-mops 1.12.0 → 2.0.0

package/dist/mops.js

@@ -1,49 +1,49 @@
-import process from 'node:process';
-import path from 'node:path';
-import fs from 'node:fs';
-import TOML from '@iarna/toml';
-import chalk from 'chalk';
-import prompts from 'prompts';
-import fetch from 'node-fetch';
-import { decodeFile } from './pem.js';
-import { mainActor, storageActor } from './api/actors.js';
-import { getNetwork } from './api/network.js';
-import { getHighestVersion } from './api/getHighestVersion.js';
-import { getPackageId } from './helpers/get-package-id.js';
+import process from "node:process";
+import path from "node:path";
+import fs from "node:fs";
+import TOML from "@iarna/toml";
+import chalk from "chalk";
+import prompts from "prompts";
+import fetch from "node-fetch";
+import { decodeFile } from "./pem.js";
+import { mainActor, storageActor } from "./api/actors.js";
+import { getNetwork } from "./api/network.js";
+import { getHighestVersion } from "./api/getHighestVersion.js";
+import { getPackageId } from "./helpers/get-package-id.js";
 if (!globalThis.fetch) {
     globalThis.fetch = fetch;
 }
 // (!) make changes in pair with backend
-export let apiVersion = '1.3';
-export let globalConfigDir = '';
-export let globalCacheDir = '';
+export let apiVersion = "1.3";
+export let globalConfigDir = "";
+export let globalCacheDir = "";
 // OS specific dirs
-if (process.platform == 'win32') {
-    globalConfigDir = path.join(process.env.LOCALAPPDATA || '', 'mops/config');
-    globalCacheDir = path.join(process.env.LOCALAPPDATA || '', 'mops/cache');
+if (process.platform == "win32") {
+    globalConfigDir = path.join(process.env.LOCALAPPDATA || "", "mops/config");
+    globalCacheDir = path.join(process.env.LOCALAPPDATA || "", "mops/cache");
 }
-else if (process.platform == 'darwin') {
-    globalConfigDir = path.join(process.env.HOME || '', 'Library/Application Support/mops');
-    globalCacheDir = path.join(process.env.HOME || '', 'Library/Caches/mops');
+else if (process.platform == "darwin") {
+    globalConfigDir = path.join(process.env.HOME || "", "Library/Application Support/mops");
+    globalCacheDir = path.join(process.env.HOME || "", "Library/Caches/mops");
 }
 else {
-    globalConfigDir = path.join(process.env.HOME || '', '.config/mops');
-    globalCacheDir = path.join(process.env.HOME || '', '.cache/mops');
+    globalConfigDir = path.join(process.env.HOME || "", ".config/mops");
+    globalCacheDir = path.join(process.env.HOME || "", ".cache/mops");
 }
 // XDG overrides
 if (process.env.XDG_CONFIG_HOME) {
-    globalConfigDir = path.join(process.env.XDG_CONFIG_HOME, 'mops');
+    globalConfigDir = path.join(process.env.XDG_CONFIG_HOME, "mops");
 }
 if (process.env.XDG_CACHE_HOME) {
-    globalCacheDir = path.join(process.env.XDG_CACHE_HOME, 'mops');
+    globalCacheDir = path.join(process.env.XDG_CACHE_HOME, "mops");
 }
 export function getNetworkFile() {
-    let networkFile = '';
+    let networkFile = "";
     try {
-        networkFile = new URL('./network.txt', import.meta.url);
+        networkFile = new URL("./network.txt", import.meta.url);
     }
     catch {
-        networkFile = path.join(__dirname, 'network.txt');
+        networkFile = path.join(__dirname, "network.txt");
     }
     return networkFile;
 }
@@ -51,19 +51,19 @@ export function setNetwork(network) {
     fs.writeFileSync(getNetworkFile(), network);
 }
 export let getIdentity = async () => {
-    let identityPem = path.resolve(globalConfigDir, 'identity.pem');
-    let identityPemEncrypted = path.resolve(globalConfigDir, 'identity.pem.encrypted');
+    let identityPem = path.resolve(globalConfigDir, "identity.pem");
+    let identityPemEncrypted = path.resolve(globalConfigDir, "identity.pem.encrypted");
     if (fs.existsSync(identityPemEncrypted)) {
         let res = await prompts({
-            type: 'invisible',
-            name: 'value',
-            message: 'Enter password:',
+            type: "invisible",
+            name: "value",
+            message: "Enter password:",
         });
         try {
             return decodeFile(identityPemEncrypted, res.value);
         }
         catch (e) {
-            console.log(chalk.red('Error: ') + 'Invalid password');
+            console.log(chalk.red("Error: ") + "Invalid password");
             process.exit(1);
         }
     }
@@ -74,25 +74,26 @@ export let getIdentity = async () => {
 };
 export function getClosestConfigFile(dir = process.cwd()) {
     if (!path.basename(dir)) {
-        return '';
+        return "";
     }
-    let configFile = path.join(dir, 'mops.toml');
+    let configFile = path.join(dir, "mops.toml");
     if (fs.existsSync(configFile)) {
         return configFile;
     }
-    return getClosestConfigFile(path.resolve(dir, '..'));
+    return getClosestConfigFile(path.resolve(dir, ".."));
 }
 export function getRootDir() {
     let configFile = getClosestConfigFile();
     if (!configFile) {
-        return '';
+        return "";
     }
     return path.dirname(configFile);
 }
 export function checkConfigFile(exit = false) {
     let configFile = getClosestConfigFile();
     if (!configFile) {
-        console.log(chalk.red('Error: ') + `Config file 'mops.toml' not found. Please run ${chalk.green('mops init')} first`);
+        console.log(chalk.red("Error: ") +
+            `Config file 'mops.toml' not found. Please run ${chalk.green("mops init")} first`);
         if (exit) {
             process.exit(1);
         }
@@ -101,18 +102,18 @@ export function checkConfigFile(exit = false) {
     return true;
 }
 export function progressBar(step, total) {
-    let done = Math.round(step / total * 10);
-    return `[${':'.repeat(done)}${' '.repeat(Math.max(0, 10 - done))}]`;
+    let done = Math.round((step / total) * 10);
+    return `[${":".repeat(done)}${" ".repeat(Math.max(0, 10 - done))}]`;
 }
 export function parseGithubURL(href) {
     const url = new URL(href);
-    let branchAndSha = url.hash?.substring(1).split('@');
-    let branch = branchAndSha[0] || 'master';
-    let commitHash = branchAndSha[1] || '';
-    let [org, gitName] = url.pathname.split('/').filter(path => !!path);
-    org = org || '';
-    gitName = gitName || '';
-    if (gitName?.endsWith('.git')) {
+    let branchAndSha = url.hash?.substring(1).split("@");
+    let branch = branchAndSha[0] || "master";
+    let commitHash = branchAndSha[1] || "";
+    let [org, gitName] = url.pathname.split("/").filter((path) => !!path);
+    org = org || "";
+    gitName = gitName || "";
+    if (gitName?.endsWith(".git")) {
         gitName = gitName.substring(0, gitName.length - 4);
     }
     return { org, gitName, branch, commitHash };
@@ -121,36 +122,36 @@ export async function getGithubCommit(repo, ref) {
     let res = await fetch(`https://api.github.com/repos/${repo}/commits/${ref}`);
     let json = await res.json();
     // try on main branch
-    if (json.message && ref === 'master') {
+    if (json.message && ref === "master") {
         res = await fetch(`https://api.github.com/repos/${repo}/commits/main`);
         json = await res.json();
     }
     return json;
 }
 export function getDependencyType(version) {
-    if (!version || typeof version !== 'string') {
+    if (!version || typeof version !== "string") {
         throw Error(`Invalid dependency value "${version}"`);
     }
-    if (version.startsWith('https://github.com/')) {
-        return 'github';
+    if (version.startsWith("https://github.com/")) {
+        return "github";
     }
     else if (version.match(/^(\.?\.)?\//)) {
-        return 'local';
+        return "local";
     }
     else {
-        return 'mops';
+        return "mops";
     }
 }
 export function parseDepValue(name, value) {
     let depType = getDependencyType(value);
-    if (depType === 'github') {
-        return { name, repo: value, version: '' };
+    if (depType === "github") {
+        return { name, repo: value, version: "" };
     }
-    else if (depType === 'local') {
-        return { name, repo: '', path: value, version: '' };
+    else if (depType === "local") {
+        return { name, repo: "", path: value, version: "" };
     }
     else {
-        return { name, repo: '', version: value };
+        return { name, repo: "", version: value };
     }
 }
 export function readConfig(configFile = getClosestConfigFile()) {
@@ -158,17 +159,17 @@ export function readConfig(configFile = getClosestConfigFile()) {
     let toml = TOML.parse(text);
     let processDeps = (deps) => {
         Object.entries(deps).forEach(([name, data]) => {
-            if (!data || typeof data !== 'string') {
+            if (!data || typeof data !== "string") {
                 throw Error(`Invalid dependency value ${name} = "${data}"`);
             }
             deps[name] = parseDepValue(name, data);
         });
     };
     processDeps(toml.dependencies || {});
-    processDeps(toml['dev-dependencies'] || {});
+    processDeps(toml["dev-dependencies"] || {});
     let config = { ...toml };
     Object.entries(config.requirements || {}).forEach(([name, value]) => {
-        if (name === 'moc') {
+        if (name === "moc") {
             config.requirements = config.requirements || {};
             config.requirements.moc = value;
         }
@@ -181,33 +182,35 @@ export function writeConfig(config, configFile = getClosestConfigFile()) {
     Object.entries(config.dependencies || {}).forEach(([name, { repo, path, version }]) => {
         deps[name] = repo || path || version;
     });
-    let devDeps = resConfig['dev-dependencies'] || {};
-    Object.entries(config['dev-dependencies'] || {}).forEach(([name, { repo, path, version }]) => {
+    let devDeps = resConfig["dev-dependencies"] || {};
+    Object.entries(config["dev-dependencies"] || {}).forEach(([name, { repo, path, version }]) => {
         devDeps[name] = repo || path || version;
     });
     let text = TOML.stringify(resConfig).trim();
-    if (fs.existsSync(configFile) && fs.readFileSync(configFile).toString().endsWith('\n')) {
-        text += '\n';
+    if (fs.existsSync(configFile) &&
+        fs.readFileSync(configFile).toString().endsWith("\n")) {
+        text += "\n";
     }
     fs.writeFileSync(configFile, text);
 }
 export function formatDir(name, version) {
-    return path.join(getRootDir(), '.mops', getPackageId(name, version));
+    return path.join(getRootDir(), ".mops", getPackageId(name, version));
 }
 export function formatGithubDir(name, repo) {
     const { branch, commitHash } = parseGithubURL(repo);
-    return path.join(getRootDir(), '.mops/_github', `${name}#${branch.replaceAll('/', '___')}` + (commitHash ? `@${commitHash}` : ''));
+    return path.join(getRootDir(), ".mops/_github", `${name}#${branch.replaceAll("/", "___")}` +
+        (commitHash ? `@${commitHash}` : ""));
 }
 export function readDfxJson() {
     let dir = process.cwd();
     let dfxJson = null;
     for (let i = 0; i < 5; i++) {
-        let file = path.resolve(dir, 'dfx.json');
+        let file = path.resolve(dir, "dfx.json");
         if (fs.existsSync(file)) {
             dfxJson = JSON.parse(fs.readFileSync(file).toString());
             break;
         }
-        dir = path.resolve(dir, '..');
+        dir = path.resolve(dir, "..");
     }
     return dfxJson;
 }
@@ -216,22 +219,26 @@ export function readDfxJson() {
 export async function checkApiCompatibility() {
     let actor = await mainActor();
     let backendApiVer = await actor.getApiVersion();
-    if (backendApiVer.split('.')[0] !== apiVersion.split('.')[0]) {
-        console.log(chalk.red('ERR: ') + `CLI incompatible with backend. CLI v${apiVersion}, Backend v${backendApiVer}`);
-        console.log('Run ' + chalk.greenBright('mops self update') + ' to upgrade cli.');
+    if (backendApiVer.split(".")[0] !== apiVersion.split(".")[0]) {
+        console.log(chalk.red("ERR: ") +
+            `CLI incompatible with backend. CLI v${apiVersion}, Backend v${backendApiVer}`);
+        console.log("Run " + chalk.greenBright("mops self update") + " to upgrade cli.");
         return false;
     }
-    else if (backendApiVer.split('.')[1] !== apiVersion.split('.')[1]) {
-        console.log('-'.repeat(50));
-        console.log(chalk.yellow('WARN: ') + `CLI probably incompatible with backend. CLI v${apiVersion}, Backend v${backendApiVer}`);
-        console.log('Recommended to run ' + chalk.greenBright('mops self update') + ' to upgrade cli.');
-        console.log('-'.repeat(50));
+    else if (backendApiVer.split(".")[1] !== apiVersion.split(".")[1]) {
+        console.log("-".repeat(50));
+        console.log(chalk.yellow("WARN: ") +
+            `CLI probably incompatible with backend. CLI v${apiVersion}, Backend v${backendApiVer}`);
+        console.log("Recommended to run " +
+            chalk.greenBright("mops self update") +
+            " to upgrade cli.");
+        console.log("-".repeat(50));
     }
     return true;
 }
 export function version() {
-    let packageJson = JSON.parse(fs.readFileSync(new URL('./package.json', import.meta.url)).toString());
+    let packageJson = JSON.parse(fs.readFileSync(new URL("./package.json", import.meta.url)).toString());
     return packageJson.version;
 }
 // compatibility with older versions
-export { getNetwork, mainActor, storageActor, getHighestVersion, };
+export { getNetwork, mainActor, storageActor, getHighestVersion };

package/dist/notify-installs.js

@@ -1,9 +1,9 @@
-import { getDependencyType } from './mops.js';
-import { mainActor } from './api/actors.js';
-import { getDepName } from './helpers/get-dep-name.js';
+import { getDependencyType } from "./mops.js";
+import { mainActor } from "./api/actors.js";
+import { getDepName } from "./helpers/get-dep-name.js";
 export async function notifyInstalls(installedDeps) {
     let packages = Object.entries(installedDeps)
-        .filter(([_, version]) => getDependencyType(version) === 'mops')
+        .filter(([_, version]) => getDependencyType(version) === "mops")
         .map(([name, version]) => [getDepName(name), version]);
     if (packages.length) {
         let actor = await mainActor();

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.12.0",
+  "version": "2.0.0",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",
@@ -15,14 +15,15 @@
     "!build.sh",
     "!DEVELOPMENT.md",
     "!.mops",
-    "/templates"
+    "/templates",
+    "/wasm"
   ],
   "homepage": "https://mops.one",
   "repository": {
     "type": "git",
-    "url": "https://github.com/ZenVoich/mops.git"
+    "url": "https://github.com/caffeinelabs/mops.git"
   },
-  "author": "Zen Voich <zen.voich@gmail.com>",
+  "author": "DFINITY",
   "license": "MIT",
   "engines": {
     "node": ">=18.0.0"
@@ -87,8 +88,11 @@
     "@types/tar": "6.1.13",
     "esbuild": "0.23.1",
     "eslint": "8.57.0",
+    "npm-run-all": "4.1.5",
     "rexreplace": "7.1.13",
+    "ts-jest": "29.4.5",
     "tsx": "4.19.2",
-    "typescript": "5.9.2"
+    "typescript": "5.9.2",
+    "wasm-pack": "0.13.1"
   }
 }

package/dist/pem.d.ts

@@ -1,5 +1,5 @@
-import { Buffer } from 'node:buffer';
-import { Ed25519KeyIdentity } from '@icp-sdk/core/identity';
-import { Secp256k1KeyIdentity } from '@icp-sdk/core/identity/secp256k1';
+import { Buffer } from "node:buffer";
+import { Ed25519KeyIdentity } from "@icp-sdk/core/identity";
+import { Secp256k1KeyIdentity } from "@icp-sdk/core/identity/secp256k1";
 export declare function decodeFile(file: string, password?: string): Secp256k1KeyIdentity | Ed25519KeyIdentity;
 export declare function encrypt(buffer: Buffer, password: string): Buffer<ArrayBuffer>;

package/dist/pem.js

@@ -1,9 +1,9 @@
-import fs from 'node:fs';
-import { Buffer } from 'node:buffer';
-import crypto from 'node:crypto';
-import { Ed25519KeyIdentity } from '@icp-sdk/core/identity';
-import { Secp256k1KeyIdentity } from '@icp-sdk/core/identity/secp256k1';
-import pemfile from 'pem-file';
+import fs from "node:fs";
+import { Buffer } from "node:buffer";
+import crypto from "node:crypto";
+import { Ed25519KeyIdentity } from "@icp-sdk/core/identity";
+import { Secp256k1KeyIdentity } from "@icp-sdk/core/identity/secp256k1";
+import pemfile from "pem-file";
 export function decodeFile(file, password) {
     let rawKey = fs.readFileSync(file);
     if (password) {
@@ -13,21 +13,25 @@ export function decodeFile(file, password) {
 }
 function decode(rawKey) {
     let buf = pemfile.decode(rawKey);
-    if (rawKey.includes('EC PRIVATE KEY')) {
+    if (rawKey.includes("EC PRIVATE KEY")) {
         if (buf.length != 118) {
-            throw 'expecting byte length 118 but got ' + buf.length;
+            throw "expecting byte length 118 but got " + buf.length;
         }
         return Secp256k1KeyIdentity.fromSecretKey(buf.subarray(7, 39));
     }
     if (buf.length != 85) {
-        throw 'expecting byte length 85 but got ' + buf.length;
+        throw "expecting byte length 85 but got " + buf.length;
     }
     let secretKey = Buffer.concat([buf.subarray(16, 48)]);
     return Ed25519KeyIdentity.fromSecretKey(secretKey);
 }
-let algorithm = 'aes-256-ctr';
+let algorithm = "aes-256-ctr";
 export function encrypt(buffer, password) {
-    let key = crypto.createHash('sha256').update(password).digest('base64').slice(0, 32);
+    let key = crypto
+        .createHash("sha256")
+        .update(password)
+        .digest("base64")
+        .slice(0, 32);
     // Create an initialization vector
     let iv = crypto.randomBytes(16);
     // Create a new cipher using the algorithm, key, and iv
@@ -37,7 +41,11 @@ export function encrypt(buffer, password) {
     return result;
 }
 function decrypt(encrypted, password) {
-    let key = crypto.createHash('sha256').update(password).digest('base64').slice(0, 32);
+    let key = crypto
+        .createHash("sha256")
+        .update(password)
+        .digest("base64")
+        .slice(0, 32);
     // Get the iv: the first 16 bytes
     let iv = encrypted.subarray(0, 16);
     // Get the rest

package/dist/release-cli.js

@@ -1,33 +1,33 @@
 /* eslint-disable no-undef */
-import fs from 'node:fs';
-import path from 'node:path';
-import { URL } from 'node:url';
-import { execSync } from 'node:child_process';
-import semver from 'semver';
-import { sha256 } from '@noble/hashes/sha256';
-import { bytesToHex } from '@noble/hashes/utils';
-import { findChangelogEntry } from './helpers/find-changelog-entry.js';
-let __dirname = new URL('.', import.meta.url).pathname;
+import fs from "node:fs";
+import path from "node:path";
+import { URL } from "node:url";
+import { execSync } from "node:child_process";
+import semver from "semver";
+import { sha256 } from "@noble/hashes/sha256";
+import { bytesToHex } from "@noble/hashes/utils";
+import { findChangelogEntry } from "./helpers/find-changelog-entry.js";
+let __dirname = new URL(".", import.meta.url).pathname;
 // build using Docker
-execSync('./build.sh', { stdio: 'inherit', cwd: __dirname });
-let commitHash = process.env.COMMIT_HASH || execSync('git rev-parse HEAD').toString().trim();
-let version = JSON.parse(fs.readFileSync(path.resolve(__dirname, 'package.json'), 'utf8')).version;
+execSync("./build.sh", { stdio: "inherit", cwd: __dirname });
+let commitHash = process.env.COMMIT_HASH || execSync("git rev-parse HEAD").toString().trim();
+let version = JSON.parse(fs.readFileSync(path.resolve(__dirname, "package.json"), "utf8")).version;
 let major = semver.parse(version)?.major;
-let tag = semver.parse(version)?.prerelease[0] || 'latest';
-let releaseNotes = findChangelogEntry(fs.readFileSync(path.resolve(__dirname, 'CHANGELOG.md'), 'utf8'), version);
-let data = fs.readFileSync(path.resolve(__dirname, 'bundle/cli.tgz'));
+let tag = semver.parse(version)?.prerelease[0] || "latest";
+let releaseNotes = findChangelogEntry(fs.readFileSync(path.resolve(__dirname, "CHANGELOG.md"), "utf8"), version);
+let data = fs.readFileSync(path.resolve(__dirname, "bundle/cli.tgz"));
 let hash = bytesToHex(sha256(data));
 let size = data.byteLength;
 console.log(`Commit hash of release: ${commitHash}`);
-fs.cpSync(path.resolve(__dirname, 'bundle/cli.tgz'), path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), { force: false, errorOnExist: true });
+fs.cpSync(path.resolve(__dirname, "bundle/cli.tgz"), path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), { force: false, errorOnExist: true });
 fs.cpSync(path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), path.resolve(__dirname, `../cli-releases/versions/${tag}.tgz`), { force: true, errorOnExist: false, recursive: true });
 fs.cpSync(path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), path.resolve(__dirname, `../cli-releases/versions/${major}.tgz`), { force: true, errorOnExist: false, recursive: true });
 fs.writeFileSync(path.resolve(__dirname, `../cli-releases/tags/${tag}`), version);
 console.log(`Release '${version}' created with tag '${tag}'`);
-if (!fs.existsSync(path.resolve(__dirname, '../cli-releases/releases.json'))) {
-    fs.writeFileSync(path.resolve(__dirname, '../cli-releases/releases.json'), JSON.stringify({ tags: {}, versions: {} }, null, 2));
+if (!fs.existsSync(path.resolve(__dirname, "../cli-releases/releases.json"))) {
+    fs.writeFileSync(path.resolve(__dirname, "../cli-releases/releases.json"), JSON.stringify({ tags: {}, versions: {} }, null, 2));
 }
-let releases = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../cli-releases/releases.json'), 'utf8'));
+let releases = JSON.parse(fs.readFileSync(path.resolve(__dirname, "../cli-releases/releases.json"), "utf8"));
 releases.tags[tag] = version;
 releases.versions[version] = {
     time: new Date().getTime(),
@@ -37,4 +37,4 @@ releases.versions[version] = {
     url: `https://cli.mops.one/versions/${version}.tgz`,
     hash,
 };
-fs.writeFileSync(path.resolve(__dirname, '../cli-releases/releases.json'), JSON.stringify(releases, null, 2));
+fs.writeFileSync(path.resolve(__dirname, "../cli-releases/releases.json"), JSON.stringify(releases, null, 2));

package/dist/resolve-packages.d.ts

@@ -1,3 +1,3 @@
-export declare function resolvePackages({ conflicts }?: {
+export declare function resolvePackages({ conflicts, }?: {
     conflicts?: "ignore" | "error" | "warning" | undefined;
 }): Promise<Record<string, string>>;