ic-mops 0.8.12-pre.3 → 0.9.0

package/.gitignore

@@ -1,3 +1,2 @@
 identity.pem
-network.txt
-cli.dist.js
+network.txt

package/cli.js

@@ -17,6 +17,7 @@ import {cacheSize, cleanCache} from './cache.js';
 import {test} from './commands/test.js';
 import {template} from './commands/template.js';
 import {selfUpdate} from './commands/self-update.js';
+import {remove} from './commands/remove.js';
 
 program.name('mops');
 
@@ -45,6 +46,21 @@ program
 		await add(pkg, options);
 	});
 
+// remove
+program
+	.command('remove <pkg>')
+	.alias('rm')
+	.description('Remove package and update mops.toml')
+	.option('--dev', 'Remove from dev-dependencies instead of dependencies')
+	.option('--verbose', 'Show more information')
+	.option('--dry-run', 'Do not actually remove anything')
+	.action(async (pkg, options) => {
+		if (!checkConfigFile()) {
+			process.exit(1);
+		}
+		await remove(pkg, options);
+	});
+
 // install
 program
 	.command('install [pkg]')
@@ -87,6 +103,7 @@ program
 // set-network
 program
 	.command('set-network <network>')
+	.alias('sn')
 	.description('Set network local|dev|ic')
 	.action(async (network) => {
 		await setNetwork(network);
@@ -96,6 +113,7 @@ program
 // get-network
 program
 	.command('get-network')
+	.alias('gn')
 	.description('Get network')
 	.action(async () => {
 		console.log(getNetwork().network);

package/commands/remove.js

@@ -0,0 +1,88 @@
+import {checkConfigFile, readConfig, writeConfig} from '../mops.js';
+import fs from 'fs';
+import del from 'del';
+import chalk from 'chalk';
+import {formatDir, formatGithubDir} from '../mops.js';
+
+export async function remove(name, {dev, verbose, dryRun} = {}) {
+	if (!checkConfigFile()) {
+		return;
+	}
+
+	function getTransitiveDependencies(config, exceptPkgId) {
+		let deps = Object.values(config.dependencies || {});
+		let devDeps = Object.values(config['dev-dependencies'] || {});
+		return [...deps, ...devDeps]
+			.filter((dep) => {
+				let depId = dep.name + '@' + dep.version;
+				return depId !== exceptPkgId;
+			}).map((dep) => {
+				return [dep, ...getTransitiveDependenciesOf(dep.name, dep.version, dep.repo)];
+			}).flat();
+	}
+
+	function getTransitiveDependenciesOf(name, version, repo) {
+		let pkgDir = repo ? formatGithubDir(name, repo) : formatDir(name, version);
+		let configFile = pkgDir + '/mops.toml';
+		if (!fs.existsSync(configFile)) {
+			verbose && console.log('no config', configFile);
+			return [];
+		}
+		let config = readConfig(configFile);
+		let deps = Object.values(config.dependencies || {}).map((dep) => {
+			return [dep, ...getTransitiveDependenciesOf(dep.name, dep.version)];
+		}).flat();
+		return deps;
+	}
+
+	let config = readConfig();
+	let deps = dev ? config['dev-dependencies'] : config.dependencies;
+	let pkgDetails = deps[name];
+
+	if (!pkgDetails) {
+		return console.log(chalk.red('Error: ') + `No ${dev ? 'dev ' : ''}dependency to remove "${name}"`);
+	}
+
+	let version = pkgDetails.version;
+	let packageId = `${name}@${version}`;
+
+	// transitive deps ignoring deps of this package
+	let transitiveDeps = getTransitiveDependencies(config, packageId);
+	let transitiveDepIds = new Set(transitiveDeps.map((dep) => {
+		return dep.name + '@' + dep.version;
+	}));
+
+	// transitive deps of this package (including itself)
+	let transitiveDepsOfPackage = [pkgDetails, ...getTransitiveDependenciesOf(name, version)];
+
+	// remove local cache
+	for (let dep of transitiveDepsOfPackage) {
+		let depId = dep.name + '@' + dep.version;
+		if (transitiveDepIds.has(depId)) {
+			verbose && console.log(`Ignored transitive dependency ${depId} (other deps depend on it)`);
+			continue;
+		}
+		let pkgDir;
+		if (dep.repo) {
+			pkgDir = formatGithubDir(dep.name, dep.repo);
+		}
+		else {
+			pkgDir = formatDir(dep.name, dep.version);
+		}
+		if (fs.existsSync(pkgDir)) {
+			dryRun || del.sync([`${pkgDir}`]);
+			verbose && console.log(`Removed local cache ${pkgDir}`);
+		}
+	}
+
+	// remove from config
+	if (dev) {
+		delete config['dev-dependencies'][name];
+	}
+	else {
+		delete config.dependencies[name];
+	}
+	dryRun || writeConfig(config);
+
+	console.log(chalk.green('Package removed ') + `${name} = "${version}"`);
+}

package/package.json

@@ -1,9 +1,9 @@
 {
 	"name": "ic-mops",
-	"version": "0.8.12-pre.3",
+	"version": "0.9.0",
 	"type": "module",
 	"bin": {
-		"mops": "cli.dist.js"
+		"mops": "cli.js"
 	},
 	"files": [
 		"*",
@@ -11,12 +11,6 @@
 		"!.mops",
 		"/templates"
 	],
-	"scripts": {
-		"esbuild": "esbuild cli.js --bundle --format=esm --platform=node --target=node12 --packages=external --outfile=./cli.dist.js",
-		"clean": "rm -rf dist",
-		"build": "npm run clean && npm run esbuild",
-		"prepublishOnly": "npm run build"
-	},
 	"homepage": "https://mops.one",
 	"repository": {
 		"type": "git",
@@ -24,6 +18,9 @@
 	},
 	"author": "Zen Voich <zen.voich@gmail.com>",
 	"license": "MIT",
+	"engines": {
+		"node": ">=14.0.0"
+	},
 	"dependencies": {
 		"@dfinity/agent": "^0.11.0",
 		"@dfinity/candid": "^0.11.0",
@@ -50,8 +47,5 @@
 		"node-fetch": "^3.3.0",
 		"pem-file": "^1.0.1",
 		"prompts": "^2.4.2"
-	},
-	"devDependencies": {
-		"esbuild": "0.17.14"
 	}
 }