ic-mops 1.12.0 → 2.0.0

package/commands/search.ts

@@ -1,42 +1,48 @@
-import process from 'node:process';
-import asTable from 'as-table';
-import chalk from 'chalk';
-import {mainActor} from '../api/actors.js';
+import process from "node:process";
+import asTable from "as-table";
+import chalk from "chalk";
+import { mainActor } from "../api/actors.js";
 
-export async function search(text : string) {
-	let actor = await mainActor();
-	let [packages, _pageCount] = await actor.search(text, [], []);
+export async function search(text: string) {
+  let actor = await mainActor();
+  let [packages, _pageCount] = await actor.search(text, [], []);
 
-	if (!packages.length) {
-		console.log('Packages not found');
-		return;
-	}
+  if (!packages.length) {
+    console.log("Packages not found");
+    return;
+  }
 
-	let ellipsis = (text : string, max : number) => {
-		if (text.length <= max) {
-			return text;
-		}
-		else {
-			return text.slice(0, max) + '…';
-		}
-	};
+  let ellipsis = (text: string, max: number) => {
+    if (text.length <= max) {
+      return text;
+    } else {
+      return text.slice(0, max) + "…";
+    }
+  };
 
-	let maxNameLength = Math.max(...packages.map(a => a.config.name.length));
+  let maxNameLength = Math.max(...packages.map((a) => a.config.name.length));
 
-	let table = packages.map((item) => {
-		return {
-			NAME: chalk.bold(item.config.name),
-			DESCRIPTION: ellipsis(item.config.description, process.stdout.columns - 40 - maxNameLength),
-			VERSION: item.config.version,
-			UPDATED: new Date(Number(item.publication.time / 1_000_000n)).toISOString().split('T')[0],
-		};
-	});
+  let table = packages.map((item) => {
+    return {
+      NAME: chalk.bold(item.config.name),
+      DESCRIPTION: ellipsis(
+        item.config.description,
+        process.stdout.columns - 40 - maxNameLength,
+      ),
+      VERSION: item.config.version,
+      UPDATED: new Date(Number(item.publication.time / 1_000_000n))
+        .toISOString()
+        .split("T")[0],
+    };
+  });
 
-	console.log('');
-	console.log(asTable.configure({
-		delimiter: chalk.gray(' | '),
-		dash: chalk.gray('─'),
-		title: t => chalk.gray.bold(t),
-	})(table));
-	console.log('');
-}
+  console.log("");
+  console.log(
+    asTable.configure({
+      delimiter: chalk.gray(" | "),
+      dash: chalk.gray("─"),
+      title: (t) => chalk.gray.bold(t),
+    })(table),
+  );
+  console.log("");
+}

package/commands/self.ts

@@ -1,76 +1,83 @@
-import process from 'node:process';
-import child_process, {execSync} from 'node:child_process';
-import chalk from 'chalk';
-import {version, globalConfigDir} from '../mops.js';
-import {cleanCache} from '../cache.js';
-import {toolchain} from './toolchain/index.js';
+import process from "node:process";
+import child_process, { execSync } from "node:child_process";
+import chalk from "chalk";
+import { version, globalConfigDir } from "../mops.js";
+import { cleanCache } from "../cache.js";
+import { toolchain } from "./toolchain/index.js";
 
-let url = 'https://x344g-ziaaa-aaaap-abl7a-cai.icp0.io';
+let url = "https://x344g-ziaaa-aaaap-abl7a-cai.icp0.io";
 
 function detectPackageManager() {
-	let res = '';
-	try {
-		res = execSync('which mops').toString();
-	}
-	catch (e) {}
-	if (!res) {
-		console.error(chalk.red('Couldn\'t detect package manager'));
-		process.exit(1);
-	}
-	if (res.includes('pnpm/')) {
-		return 'pnpm';
-	}
-	// else if (res.includes('bun/')) {
-	// 	return 'bun';
-	// }
-	else {
-		return 'npm';
-	}
+  let res = "";
+  try {
+    res = execSync("which mops").toString();
+  } catch (e) {}
+  if (!res) {
+    console.error(chalk.red("Couldn't detect package manager"));
+    process.exit(1);
+  }
+  if (res.includes("pnpm/")) {
+    return "pnpm";
+  }
+  // else if (res.includes('bun/')) {
+  // 	return 'bun';
+  // }
+  else {
+    return "npm";
+  }
 }
 
 export async function getLatestVersion() {
-	let res = await fetch(url + '/tags/latest');
-	return res.text();
+  let res = await fetch(url + "/tags/latest");
+  return res.text();
 }
 
 export async function update() {
-	let latest = await getLatestVersion();
-	let current = version();
+  let latest = await getLatestVersion();
+  let current = version();
 
-	if (latest === current) {
-		console.log(chalk.green('You are up to date. Version: ' + current));
-	}
-	else {
-		console.log('Current version: ' + chalk.yellow(current));
-		console.log('Updating to version: ' + chalk.green(latest));
+  if (latest === current) {
+    console.log(chalk.green("You are up to date. Version: " + current));
+  } else {
+    console.log("Current version: " + chalk.yellow(current));
+    console.log("Updating to version: " + chalk.green(latest));
 
-		let pm = detectPackageManager();
-		let npmArgs = pm === 'npm' ? ['--no-fund', '--silent'] : [];
+    let pm = detectPackageManager();
+    let npmArgs = pm === "npm" ? ["--no-fund", "--silent"] : [];
 
-		let proc = child_process.spawn(pm, ['add', '-g', ...npmArgs, `${url}/versions/${latest}.tgz`], {stdio: 'inherit', detached: false});
+    let proc = child_process.spawn(
+      pm,
+      ["add", "-g", ...npmArgs, `${url}/versions/${latest}.tgz`],
+      { stdio: "inherit", detached: false },
+    );
 
-		proc.on('exit', (res) => {
-			if (res !== 0) {
-				console.log(chalk.red('Failed to update.'));
-				process.exit(1);
-			}
-			console.log(chalk.green('Success'));
-		});
-	}
+    proc.on("exit", (res) => {
+      if (res !== 0) {
+        console.log(chalk.red("Failed to update."));
+        process.exit(1);
+      }
+      console.log(chalk.green("Success"));
+    });
+  }
 }
 
 export async function uninstall() {
-	console.log('Cleaning cache...');
-	cleanCache();
+  console.log("Cleaning cache...");
+  cleanCache();
 
-	console.log('Resetting toolchain management...');
-	toolchain.init({reset: true, silent: true});
+  console.log("Resetting toolchain management...");
+  toolchain.init({ reset: true, silent: true });
 
-	console.log('Uninstalling mops CLI...');
-	let pm = detectPackageManager();
-	child_process.spawn(pm, ['remove', '-g', '--silent', 'ic-mops'], {stdio: 'inherit', detached: false});
+  console.log("Uninstalling mops CLI...");
+  let pm = detectPackageManager();
+  child_process.spawn(pm, ["remove", "-g", "--silent", "ic-mops"], {
+    stdio: "inherit",
+    detached: false,
+  });
 
-	console.log(chalk.yellow('Config directory has not been deleted: ' + globalConfigDir));
+  console.log(
+    chalk.yellow("Config directory has not been deleted: " + globalConfigDir),
+  );
 
-	console.log('Uninstalled');
-}
+  console.log("Uninstalled");
+}

package/commands/sources.ts

@@ -1,49 +1,66 @@
-import process from 'node:process';
-import path from 'node:path';
-import fs from 'node:fs';
-import {checkConfigFile, formatDir, formatGithubDir, getDependencyType, readConfig} from '../mops.js';
-import {resolvePackages} from '../resolve-packages.js';
-
-export async function sources({conflicts = 'ignore' as 'warning' | 'error' | 'ignore', cwd = process.cwd()} = {}) {
-	if (!checkConfigFile()) {
-		return [];
-	}
-
-	let resolvedPackages = await resolvePackages({conflicts});
-
-	// sources
-	return Object.entries(resolvedPackages).map(([name, version]) => {
-		let depType = getDependencyType(version);
-
-		let pkgDir;
-		if (depType === 'local') {
-			pkgDir = path.relative(cwd, version);
-		}
-		else if (depType === 'github') {
-			pkgDir = path.relative(cwd, formatGithubDir(name, version));
-		}
-		else if (depType === 'mops') {
-			pkgDir = path.relative(cwd, formatDir(name, version));
-		}
-		else {
-			return;
-		}
-
-		// append baseDir
-		let pkgBaseDir;
-		if (fs.existsSync(path.join(pkgDir, 'mops.toml'))) {
-			let config = readConfig(path.join(pkgDir, 'mops.toml'));
-			pkgBaseDir = path.join(pkgDir, config.package?.baseDir || 'src');
-		}
-		else {
-			pkgBaseDir = path.join(pkgDir, 'src');
-		}
-
-		// use pkgDir if baseDir doesn't exist for local packages
-		if (depType === 'local' && !fs.existsSync(path.resolve(cwd, pkgBaseDir))) {
-			pkgBaseDir = pkgDir;
-		}
-
-		return `--package ${name} ${pkgBaseDir}`;
-	}).filter(x => x != null);
-}
+import process from "node:process";
+import path from "node:path";
+import fs from "node:fs";
+import {
+  checkConfigFile,
+  formatDir,
+  formatGithubDir,
+  getDependencyType,
+  readConfig,
+} from "../mops.js";
+import { resolvePackages } from "../resolve-packages.js";
+
+export async function sourcesArgs({
+  conflicts = "ignore" as "warning" | "error" | "ignore",
+  cwd = process.cwd(),
+} = {}): Promise<string[][]> {
+  if (!checkConfigFile()) {
+    return [];
+  }
+
+  let resolvedPackages = await resolvePackages({ conflicts });
+
+  // sources
+  return Object.entries(resolvedPackages)
+    .map(([name, version]) => {
+      let depType = getDependencyType(version);
+
+      let pkgDir;
+      if (depType === "local") {
+        pkgDir = path.relative(cwd, version);
+      } else if (depType === "github") {
+        pkgDir = path.relative(cwd, formatGithubDir(name, version));
+      } else if (depType === "mops") {
+        pkgDir = path.relative(cwd, formatDir(name, version));
+      } else {
+        return;
+      }
+
+      // append baseDir
+      let pkgBaseDir;
+      if (fs.existsSync(path.join(pkgDir, "mops.toml"))) {
+        let config = readConfig(path.join(pkgDir, "mops.toml"));
+        pkgBaseDir = path.join(pkgDir, config.package?.baseDir || "src");
+      } else {
+        pkgBaseDir = path.join(pkgDir, "src");
+      }
+
+      // use pkgDir if baseDir doesn't exist for local packages
+      if (
+        depType === "local" &&
+        !fs.existsSync(path.resolve(cwd, pkgBaseDir))
+      ) {
+        pkgBaseDir = pkgDir;
+      }
+
+      return ["--package", name, pkgBaseDir];
+    })
+    .filter((x) => x != null);
+}
+
+export async function sources({
+  conflicts = "ignore" as "warning" | "error" | "ignore",
+  cwd = process.cwd(),
+} = {}): Promise<string[]> {
+  return (await sourcesArgs({ conflicts, cwd })).map((args) => args.join(" "));
+}

package/commands/sync.ts

@@ -1,94 +1,111 @@
-import path from 'node:path';
-import {execSync} from 'node:child_process';
-import {globSync} from 'glob';
-import chalk from 'chalk';
-import {checkConfigFile, getRootDir, readConfig} from '../mops.js';
-import {add} from './add.js';
-import {remove} from './remove.js';
-import {checkIntegrity} from '../integrity.js';
-import {getMocPath} from '../helpers/get-moc-path.js';
+import path from "node:path";
+import { execSync } from "node:child_process";
+import { globSync } from "glob";
+import chalk from "chalk";
+import { checkConfigFile, getRootDir, readConfig } from "../mops.js";
+import { add } from "./add.js";
+import { remove } from "./remove.js";
+import { checkIntegrity } from "../integrity.js";
+import { getMocPath } from "../helpers/get-moc-path.js";
 
 type SyncOptions = {
-	lock ?: 'update' | 'ignore';
+  lock?: "update" | "ignore";
 };
 
-export async function sync({lock} : SyncOptions = {}) {
-	if (!checkConfigFile()) {
-		return;
-	}
+export async function sync({ lock }: SyncOptions = {}) {
+  if (!checkConfigFile()) {
+    return;
+  }
 
-	let missing = await getMissingPackages();
-	let unused = await getUnusedPackages();
+  let missing = await getMissingPackages();
+  let unused = await getUnusedPackages();
 
-	missing.length && console.log(`${chalk.yellow('Missing packages:')} ${missing.join(', ')}`);
-	unused.length && console.log(`${chalk.yellow('Unused packages:')} ${unused.join(', ')}`);
+  missing.length &&
+    console.log(`${chalk.yellow("Missing packages:")} ${missing.join(", ")}`);
+  unused.length &&
+    console.log(`${chalk.yellow("Unused packages:")} ${unused.join(", ")}`);
 
-	let config = readConfig();
-	let deps = new Set(Object.keys(config.dependencies || {}));
-	let devDeps = new Set(Object.keys(config['dev-dependencies'] || {}));
+  let config = readConfig();
+  let deps = new Set(Object.keys(config.dependencies || {}));
+  let devDeps = new Set(Object.keys(config["dev-dependencies"] || {}));
 
-	// add missing packages
-	for (let pkg of missing) {
-		await add(pkg, {lock: 'ignore'});
-	}
+  // add missing packages
+  for (let pkg of missing) {
+    await add(pkg, { lock: "ignore" });
+  }
 
-	// remove unused packages
-	for (let pkg of unused) {
-		let dev = devDeps.has(pkg) && !deps.has(pkg);
-		await remove(pkg, {dev, lock: 'ignore'});
-	}
+  // remove unused packages
+  for (let pkg of unused) {
+    let dev = devDeps.has(pkg) && !deps.has(pkg);
+    await remove(pkg, { dev, lock: "ignore" });
+  }
 
-	await checkIntegrity(lock);
+  await checkIntegrity(lock);
 }
 
 let ignore = [
-	'**/node_modules/**',
-	'**/.vessel/**',
-	'**/.git/**',
-	'**/.mops/**',
+  "**/node_modules/**",
+  "**/.vessel/**",
+  "**/.git/**",
+  "**/.mops/**",
 ];
 
-async function getUsedPackages() : Promise<string[]> {
-	let rootDir = getRootDir();
-	let mocPath = getMocPath();
-
-	let files = globSync('**/*.mo', {
-		cwd: rootDir,
-		nocase: true,
-		ignore: ignore,
-	});
-
-	let packages : Set<string> = new Set;
-
-	for (let file of files) {
-		let deps : string[] = execSync(`${mocPath} --print-deps ${path.join(rootDir, file)}`).toString().trim().split('\n');
-
-		for (let dep of deps) {
-			if (dep.startsWith('mo:') && !dep.startsWith('mo:prim') && !dep.startsWith('mo:⛔')) {
-				packages.add(dep.replace(/^mo:([^/]+).*$/, '$1'));
-			}
-		}
-	}
-
-	return [...packages];
+async function getUsedPackages(): Promise<string[]> {
+  let rootDir = getRootDir();
+  let mocPath = getMocPath();
+
+  let files = globSync("**/*.mo", {
+    cwd: rootDir,
+    nocase: true,
+    ignore: ignore,
+  });
+
+  let packages: Set<string> = new Set();
+
+  for (let file of files) {
+    let deps: string[] = execSync(
+      `${mocPath} --print-deps ${path.join(rootDir, file)}`,
+    )
+      .toString()
+      .trim()
+      .split("\n");
+
+    for (let dep of deps) {
+      if (
+        dep.startsWith("mo:") &&
+        !dep.startsWith("mo:prim") &&
+        !dep.startsWith("mo:⛔")
+      ) {
+        packages.add(dep.replace(/^mo:([^/]+).*$/, "$1"));
+      }
+    }
+  }
+
+  return [...packages];
 }
 
-async function getMissingPackages() : Promise<string[]> {
-	let config = readConfig();
-	let allDeps = [...Object.keys(config.dependencies || {}), ...Object.keys(config['dev-dependencies'] || {})];
-	let missing = new Set(await getUsedPackages());
-	for (let pkg of allDeps) {
-		missing.delete(pkg);
-	}
-	return [...missing];
+async function getMissingPackages(): Promise<string[]> {
+  let config = readConfig();
+  let allDeps = [
+    ...Object.keys(config.dependencies || {}),
+    ...Object.keys(config["dev-dependencies"] || {}),
+  ];
+  let missing = new Set(await getUsedPackages());
+  for (let pkg of allDeps) {
+    missing.delete(pkg);
+  }
+  return [...missing];
 }
 
-async function getUnusedPackages() : Promise<string[]> {
-	let config = readConfig();
-	let allDeps = new Set([...Object.keys(config.dependencies || {}), ...Object.keys(config['dev-dependencies'] || {})]);
-	let used = await getUsedPackages();
-	for (let pkg of used) {
-		allDeps.delete(pkg);
-	}
-	return [...allDeps];
-}
+async function getUnusedPackages(): Promise<string[]> {
+  let config = readConfig();
+  let allDeps = new Set([
+    ...Object.keys(config.dependencies || {}),
+    ...Object.keys(config["dev-dependencies"] || {}),
+  ]);
+  let used = await getUsedPackages();
+  for (let pkg of used) {
+    allDeps.delete(pkg);
+  }
+  return [...allDeps];
+}