ic-mops 1.12.0 → 2.0.0

package/mops.ts

@@ -1,279 +1,302 @@
-import process from 'node:process';
-import path from 'node:path';
-import fs from 'node:fs';
-import {Identity} from '@icp-sdk/core/agent';
-import TOML from '@iarna/toml';
-import chalk from 'chalk';
-import prompts from 'prompts';
-import fetch from 'node-fetch';
-
-import {decodeFile} from './pem.js';
-import {Config, Dependency} from './types.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 { Identity } from "@icp-sdk/core/agent";
+import TOML from "@iarna/toml";
+import chalk from "chalk";
+import prompts from "prompts";
+import fetch from "node-fetch";
+
+import { decodeFile } from "./pem.js";
+import { Config, Dependency } from "./types.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 as any;
+  globalThis.fetch = fetch as any;
 }
 
 // (!) make changes in pair with backend
-export let apiVersion = '1.3';
+export let apiVersion = "1.3";
 
-export let globalConfigDir = '';
-export let globalCacheDir = '';
+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');
-}
-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');
+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 {
+  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() : string | URL {
-	let networkFile : string | URL = '';
-	try {
-		networkFile = new URL('./network.txt', import.meta.url);
-	}
-	catch {
-		networkFile = path.join(__dirname, 'network.txt');
-	}
-	return networkFile;
+export function getNetworkFile(): string | URL {
+  let networkFile: string | URL = "";
+  try {
+    networkFile = new URL("./network.txt", import.meta.url);
+  } catch {
+    networkFile = path.join(__dirname, "network.txt");
+  }
+  return networkFile;
 }
 
-export function setNetwork(network : string) {
-	fs.writeFileSync(getNetworkFile(), network);
+export function setNetwork(network: string) {
+  fs.writeFileSync(getNetworkFile(), network);
 }
 
-export let getIdentity = async () : Promise<Identity | undefined> => {
-	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:',
-		});
-		try {
-			return decodeFile(identityPemEncrypted, res.value);
-		}
-		catch (e) {
-			console.log(chalk.red('Error: ') + 'Invalid password');
-			process.exit(1);
-		}
-	}
-	if (fs.existsSync(identityPem)) {
-		return decodeFile(identityPem);
-	}
-	return undefined;
+export let getIdentity = async (): Promise<Identity | undefined> => {
+  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:",
+    });
+    try {
+      return decodeFile(identityPemEncrypted, res.value);
+    } catch (e) {
+      console.log(chalk.red("Error: ") + "Invalid password");
+      process.exit(1);
+    }
+  }
+  if (fs.existsSync(identityPem)) {
+    return decodeFile(identityPem);
+  }
+  return undefined;
 };
 
-export function getClosestConfigFile(dir = process.cwd()) : string {
-	if (!path.basename(dir)) {
-		return '';
-	}
-	let configFile = path.join(dir, 'mops.toml');
-	if (fs.existsSync(configFile)) {
-		return configFile;
-	}
-	return getClosestConfigFile(path.resolve(dir, '..'));
+export function getClosestConfigFile(dir = process.cwd()): string {
+  if (!path.basename(dir)) {
+    return "";
+  }
+  let configFile = path.join(dir, "mops.toml");
+  if (fs.existsSync(configFile)) {
+    return configFile;
+  }
+  return getClosestConfigFile(path.resolve(dir, ".."));
 }
 
 export function getRootDir() {
-	let configFile = getClosestConfigFile();
-	if (!configFile) {
-		return '';
-	}
-	return path.dirname(configFile);
+  let configFile = getClosestConfigFile();
+  if (!configFile) {
+    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`);
-		if (exit) {
-			process.exit(1);
-		}
-		return false;
-	}
-	return true;
+  let configFile = getClosestConfigFile();
+  if (!configFile) {
+    console.log(
+      chalk.red("Error: ") +
+        `Config file 'mops.toml' not found. Please run ${chalk.green("mops init")} first`,
+    );
+    if (exit) {
+      process.exit(1);
+    }
+    return false;
+  }
+  return true;
 }
 
-export function progressBar(step : number, total : number) {
-	let done = Math.round(step / total * 10);
-	return `[${':'.repeat(done)}${' '.repeat(Math.max(0, 10 - done))}]`;
+export function progressBar(step: number, total: number) {
+  let done = Math.round((step / total) * 10);
+  return `[${":".repeat(done)}${" ".repeat(Math.max(0, 10 - done))}]`;
 }
 
-export function parseGithubURL(href : string) {
-	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')) {
-		gitName = gitName.substring(0, gitName.length - 4);
-	}
-	return {org, gitName, branch, commitHash};
+export function parseGithubURL(href: string) {
+  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")) {
+    gitName = gitName.substring(0, gitName.length - 4);
+  }
+  return { org, gitName, branch, commitHash };
 }
 
-export async function getGithubCommit(repo : string, ref : string) : Promise<any> {
-	let res = await fetch(`https://api.github.com/repos/${repo}/commits/${ref}`);
-	let json : any = await res.json();
+export async function getGithubCommit(repo: string, ref: string): Promise<any> {
+  let res = await fetch(`https://api.github.com/repos/${repo}/commits/${ref}`);
+  let json: any = await res.json();
 
-	// try on main branch
-	if (json.message && ref === 'master') {
-		res = await fetch(`https://api.github.com/repos/${repo}/commits/main`);
-		json = await res.json();
-	}
-	return json;
+  // try on main branch
+  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 : string) {
-	if (!version || typeof version !== 'string') {
-		throw Error(`Invalid dependency value "${version}"`);
-	}
-	if (version.startsWith('https://github.com/')) {
-		return 'github';
-	}
-	else if (version.match(/^(\.?\.)?\//)) {
-		return 'local';
-	}
-	else {
-		return 'mops';
-	}
+export function getDependencyType(version: string) {
+  if (!version || typeof version !== "string") {
+    throw Error(`Invalid dependency value "${version}"`);
+  }
+  if (version.startsWith("https://github.com/")) {
+    return "github";
+  } else if (version.match(/^(\.?\.)?\//)) {
+    return "local";
+  } else {
+    return "mops";
+  }
 }
 
-export function parseDepValue(name : string, value : string) : Dependency {
-	let depType = getDependencyType(value);
-	if (depType === 'github') {
-		return {name, repo: value, version: ''};
-	}
-	else if (depType === 'local') {
-		return {name, repo: '', path: value, version: ''};
-	}
-	else {
-		return {name, repo: '', version: value};
-	}
+export function parseDepValue(name: string, value: string): Dependency {
+  let depType = getDependencyType(value);
+  if (depType === "github") {
+    return { name, repo: value, version: "" };
+  } else if (depType === "local") {
+    return { name, repo: "", path: value, version: "" };
+  } else {
+    return { name, repo: "", version: value };
+  }
 }
 
-export function readConfig(configFile = getClosestConfigFile()) : Config {
-	let text = fs.readFileSync(configFile).toString();
-	let toml = TOML.parse(text);
+export function readConfig(configFile = getClosestConfigFile()): Config {
+  let text = fs.readFileSync(configFile).toString();
+  let toml = TOML.parse(text);
 
-	let processDeps = (deps : any) => {
-		Object.entries(deps).forEach(([name, data]) => {
-			if (!data || typeof data !== 'string') {
-				throw Error(`Invalid dependency value ${name} = "${data}"`);
-			}
-			deps[name] = parseDepValue(name, data);
-		});
-	};
+  let processDeps = (deps: any) => {
+    Object.entries(deps).forEach(([name, data]) => {
+      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.dependencies || {});
+  processDeps(toml["dev-dependencies"] || {});
 
-	let config : Config = {...toml};
+  let config: Config = { ...toml };
 
-	Object.entries(config.requirements || {}).forEach(([name, value]) => {
-		if (name === 'moc') {
-			config.requirements = config.requirements || {};
-			config.requirements.moc = value;
-		}
-	});
+  Object.entries(config.requirements || {}).forEach(([name, value]) => {
+    if (name === "moc") {
+      config.requirements = config.requirements || {};
+      config.requirements.moc = value;
+    }
+  });
 
-	return config;
+  return config;
 }
 
-export function writeConfig(config : Config, configFile = getClosestConfigFile()) {
-	let resConfig : any = JSON.parse(JSON.stringify(config));
-
-	let deps = resConfig.dependencies || {};
-	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}]) => {
-		devDeps[name] = repo || path || version;
-	});
-
-	let text = TOML.stringify(resConfig).trim();
-	if (fs.existsSync(configFile) && fs.readFileSync(configFile).toString().endsWith('\n')) {
-		text += '\n';
-	}
-	fs.writeFileSync(configFile, text);
+export function writeConfig(
+  config: Config,
+  configFile = getClosestConfigFile(),
+) {
+  let resConfig: any = JSON.parse(JSON.stringify(config));
+
+  let deps = resConfig.dependencies || {};
+  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 }]) => {
+      devDeps[name] = repo || path || version;
+    },
+  );
+
+  let text = TOML.stringify(resConfig).trim();
+  if (
+    fs.existsSync(configFile) &&
+    fs.readFileSync(configFile).toString().endsWith("\n")
+  ) {
+    text += "\n";
+  }
+  fs.writeFileSync(configFile, text);
 }
 
-export function formatDir(name : string, version : string) {
-	return path.join(getRootDir(), '.mops', getPackageId(name, version));
+export function formatDir(name: string, version: string) {
+  return path.join(getRootDir(), ".mops", getPackageId(name, version));
 }
 
-export function formatGithubDir(name : string, repo : string) {
-	const {branch, commitHash} = parseGithubURL(repo);
-	return path.join(getRootDir(), '.mops/_github', `${name}#${branch.replaceAll('/', '___')}` + (commitHash ? `@${commitHash}` : ''));
+export function formatGithubDir(name: string, repo: string) {
+  const { branch, commitHash } = parseGithubURL(repo);
+  return path.join(
+    getRootDir(),
+    ".mops/_github",
+    `${name}#${branch.replaceAll("/", "___")}` +
+      (commitHash ? `@${commitHash}` : ""),
+  );
 }
 
-export function readDfxJson() : any {
-	let dir = process.cwd();
-	let dfxJson = null;
-	for (let i = 0; i < 5; i++) {
-		let file = path.resolve(dir, 'dfx.json');
-		if (fs.existsSync(file)) {
-			dfxJson = JSON.parse(fs.readFileSync(file).toString());
-			break;
-		}
-		dir = path.resolve(dir, '..');
-	}
-	return dfxJson;
+export function readDfxJson(): any {
+  let dir = process.cwd();
+  let dfxJson = null;
+  for (let i = 0; i < 5; i++) {
+    let file = path.resolve(dir, "dfx.json");
+    if (fs.existsSync(file)) {
+      dfxJson = JSON.parse(fs.readFileSync(file).toString());
+      break;
+    }
+    dir = path.resolve(dir, "..");
+  }
+  return dfxJson;
 }
 
 // warn on minor mismatch
 // err on major mismatch
 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.');
-		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));
-	}
-	return true;
+  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.",
+    );
+    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));
+  }
+  return true;
 }
 
 export function version() {
-	let packageJson = JSON.parse(fs.readFileSync(new URL('./package.json', import.meta.url)).toString());
-	return packageJson.version;
+  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/notify-installs.ts

@@ -1,20 +1,19 @@
-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 : Record<string, string>) {
-	let packages = Object.entries(installedDeps)
-		.filter(([_, version]) => getDependencyType(version) === 'mops')
-		.map(([name, version]) => [getDepName(name), version] as [string, string]);
+export async function notifyInstalls(installedDeps: Record<string, string>) {
+  let packages = Object.entries(installedDeps)
+    .filter(([_, version]) => getDependencyType(version) === "mops")
+    .map(([name, version]) => [getDepName(name), version] as [string, string]);
 
-	if (packages.length) {
-		let actor = await mainActor();
+  if (packages.length) {
+    let actor = await mainActor();
 
-		try {
-			await actor.notifyInstalls(packages);
-		}
-		catch (err) {
-			// console.error('Failed to notify installs:', err);
-		}
-	}
-}
+    try {
+      await actor.notifyInstalls(packages);
+    } catch (err) {
+      // console.error('Failed to notify installs:', err);
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.12.0",
+  "version": "2.0.0",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",
@@ -15,33 +15,39 @@
     "!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"
   },
   "scripts": {
-    "build": "npm run prepare && npm run bundle",
-    "dist": "tsc",
-    "bundle": "rm -rf ./bundle && bun build ./cli.ts --outdir ./bundle --target node --minify --external @napi-rs/lzma --external fsevents --format esm --define '__dirname=import.meta.dirname' && npm run bundle:fix && npm run bundle:copy && npm run bundle:package-json && npm run bundle:tar",
+    "mops": "tsx ./environments/nodejs/cli",
+    "build": "run-s prepare bundle",
+    "build:wasm": "run-s build:wasm:nodejs build:wasm:web",
+    "build:wasm:nodejs": "wasm-pack build wasm --target nodejs --out-dir pkg/nodejs && rm wasm/pkg/nodejs/.gitignore",
+    "build:wasm:web": "wasm-pack build wasm --target web --out-dir pkg/web && rm wasm/pkg/web/.gitignore",
+    "dist": "npm run build:wasm && tsc && mkdir -p dist/wasm && cp -r wasm/pkg dist/wasm",
+    "bundle": "rm -rf ./bundle && bun build ./environments/web/cli.ts --outdir ./bundle --target node --minify --external @napi-rs/lzma --external fsevents --format esm --define '__dirname=import.meta.dirname' && run-s bundle:fix bundle:copy bundle:package-json bundle:tar",
     "bundle:fix": "rexreplace 'new URL\\(\"\\.\\./templates' 'new URL(\"./templates' bundle/cli.js && rexreplace 'resolve\\(\".*?/xhr-sync-worker\\.js\"\\)' 'resolve(\"./xhr-sync-worker.js\")' bundle/cli.js && rexreplace '\"import.meta.dirname\",\"wasm_bg.wasm\"' 'import.meta.dirname || new URL(\".\", import.meta.url).pathname,\"wasm_bg.wasm\"' bundle/cli.js",
     "bundle:copy": "cp -r commands/bench bundle && cp -r bin declarations templates package.json bundle && cp -r node_modules/prettier-plugin-motoko/wasm/pkg/nodejs/wasm_bg.wasm node_modules/jsdom/lib/jsdom/living/xhr/xhr-sync-worker.js bundle",
     "bundle:package-json": "tsx bundle-package-json.ts",
     "bundle:tar": "rm -f bundle/cli.tgz && touch -t 200101010101 bundle/cli.tgz && find bundle -exec touch -d '1970-01-01 00:00:00' {} + && tar --sort name --exclude bundle/cli.tgz -cvf - bundle | gzip -n > bundle/cli.tgz",
     "copy": "cp -r commands/bench dist/commands && cp -r declarations templates package.json bin dist | true",
-    "prepare": "rm -rf dist && npm run dist && npm run copy && npm run fix-dist",
+    "prepare": "rm -rf dist && run-s dist copy fix-dist",
     "fix-dist": "tsx ./fix-dist.ts",
     "release": "tsx release-cli.ts",
     "check": "tsc --project tsconfig.json --noEmit",
     "tsc": "tsc",
-    "esbuild": "esbuild"
+    "esbuild": "esbuild",
+    "test": "NODE_OPTIONS=\"--experimental-vm-modules\" jest"
   },
   "dependencies": {
     "@iarna/toml": "2.2.5",
@@ -103,8 +109,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"
   }
 }