ic-mops 0.21.1 → 0.23.0

package/cli.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import fs from 'node:fs';
-import {program} from 'commander';
+import {program, Argument} from 'commander';
 import chalk from 'chalk';
 import {Principal} from '@dfinity/principal';
 
@@ -21,6 +21,7 @@ import {selfUpdate} from './commands/self-update.js';
 import {remove} from './commands/remove.js';
 import {getUserProp, setUserProp} from './commands/user.js';
 import {bump} from './commands/bump.js';
+import {sync} from './commands/sync.js';
 // import {docs} from './commands/docs.js';
 
 program.name('mops');
@@ -166,8 +167,9 @@ program
 
 // cache
 program
-	.command('cache [sub-command]')
+	.command('cache')
 	.description('Manage cache')
+	.addArgument(new Argument('<sub>').choices(['size', 'clean']))
 	.action(async (sub) => {
 		if (sub == 'clean') {
 			await cleanCache();
@@ -177,9 +179,6 @@ program
 			let size = await cacheSize();
 			console.log('Cache size is ' + size);
 		}
-		else {
-			console.log('Unknown sub command. Available sub commands: clean, size');
-		}
 	});
 
 // test
@@ -188,7 +187,12 @@ program
 	.description('Run tests')
 	.option('-r, --reporter <reporter>', 'Choose reporter: verbose, compact, files')
 	.option('-w, --watch', 'Enable watch mode')
+	.option('--mode <mode>', 'Test mode: \'interpreter\' or \'wasi\' (default \'interpreter\'')
 	.action(async (filter, options) => {
+		if (options.mode && !['interpreter', 'wasi'].includes(options.mode)) {
+			console.log(`Unknown --mode value '${options.mode}'. Allowed: interpreter, wasi`);
+			process.exit(1);
+		}
 		await test(filter, options);
 	});
 
@@ -231,7 +235,10 @@ program
 
 // user
 program
-	.command('user set|get <prop> [value]')
+	.command('user')
+	.addArgument(new Argument('<sub>').choices(['set', 'get']))
+	.addArgument(new Argument('<prop>').choices(['name', 'site', 'email', 'github', 'twitter']))
+	.addArgument(new Argument('[value]'))
 	.description('User settings')
 	.action(async (sub, prop, value) => {
 		if (sub == 'get') {
@@ -244,9 +251,6 @@ program
 			}
 			await setUserProp(prop, value);
 		}
-		else {
-			console.log('Unknown sub command. Available sub commands: set, get');
-		}
 	});
 
 // airdrop
@@ -289,4 +293,12 @@ program
 		bump(part);
 	});
 
+// sync
+program
+	.command('sync')
+	.description('Add missing packages and remove unused packages')
+	.action(async () => {
+		await sync();
+	});
+
 program.parse();

package/commands/remove.ts

@@ -77,7 +77,7 @@ export async function remove(name: string, {dev = false, verbose = false, dryRun
 			pkgDir = formatDir(dep.name, dep.version);
 		}
 		if (pkgDir && fs.existsSync(pkgDir)) {
-			dryRun || deleteSync([`${pkgDir}`]);
+			dryRun || deleteSync([`${pkgDir}`], {force: true});
 			verbose && console.log(`Removed local cache ${pkgDir}`);
 		}
 	}

package/commands/sync.ts

@@ -0,0 +1,98 @@
+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';
+
+let ignore = [
+	'**/node_modules/**',
+	'**/.vessel/**',
+	'**/.git/**',
+	'**/.mops/**',
+	'**/test/**',
+	'**/*.test.mo',
+];
+
+let mocPath = '';
+function getMocPath(): string {
+	if (!mocPath) {
+		mocPath = process.env.DFX_MOC_PATH || '';
+	}
+	if (!mocPath) {
+		try {
+			mocPath = execSync('dfx cache show').toString().trim() + '/moc';
+		}
+		catch {}
+	}
+	if (!mocPath) {
+		mocPath = 'moc';
+	}
+	return mocPath;
+}
+
+async function getUsedPackages(): Promise<string[]> {
+	let rootDir = getRootDir();
+	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(`${getMocPath()} --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 getUnusedPackages(): Promise<string[]> {
+	let config = readConfig();
+	let allDeps = new Set([...Object.keys(config.dependencies || {})]);
+	let used = await getUsedPackages();
+	for (let pkg of used) {
+		allDeps.delete(pkg);
+	}
+	return [...allDeps];
+}
+
+export async function sync() {
+	if (!checkConfigFile()) {
+		return;
+	}
+
+	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(', ')}`);
+
+	// add missing packages
+	for (let pkg of missing) {
+		await add(pkg);
+	}
+
+	// remove unused packages
+	for (let pkg of unused) {
+		await remove(pkg);
+	}
+}

package/commands/test/test.ts

@@ -30,7 +30,9 @@ let globConfig = {
 	ignore: ignore,
 };
 
-export async function test(filter = '', {watch = false, reporter = 'verbose'} = {}) {
+type TestMode = 'interpreter' | 'wasi';
+
+export async function test(filter = '', {watch = false, reporter = 'verbose', mode = 'interpreter' as TestMode} = {}) {
 	let rootDir = getRootDir();
 
 	if (watch) {
@@ -59,7 +61,7 @@ export async function test(filter = '', {watch = false, reporter = 'verbose'} =
 		run();
 	}
 	else {
-		let passed = await runAll(filter, reporter);
+		let passed = await runAll(filter, reporter, mode);
 		if (!passed) {
 			process.exit(1);
 		}
@@ -68,7 +70,7 @@ export async function test(filter = '', {watch = false, reporter = 'verbose'} =
 
 let mocPath = process.env.DFX_MOC_PATH;
 
-export async function runAll(filter = '', reporterName = 'verbose') {
+export async function runAll(filter = '', reporterName = 'verbose', mode: TestMode = 'interpreter') {
 	let reporter: Reporter;
 	if (reporterName == 'compact') {
 		reporter = new CompactReporter;
@@ -116,7 +118,7 @@ export async function runAll(filter = '', reporterName = 'verbose') {
 
 	await parallel(os.cpus().length, files, async (file: string) => {
 		let mmf = new MMF1('store');
-		let wasiMode = fs.readFileSync(file, 'utf8').startsWith('// @testmode wasi');
+		let wasiMode = mode === 'wasi' || fs.readFileSync(file, 'utf8').startsWith('// @testmode wasi');
 
 		let promise = new Promise<void>((resolve) => {
 			if (!mocPath) {

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-import { program } from 'commander';
+import { program, Argument } from 'commander';
 import chalk from 'chalk';
 import { Principal } from '@dfinity/principal';
 import { init } from './commands/init.js';
@@ -19,6 +19,7 @@ import { selfUpdate } from './commands/self-update.js';
 import { remove } from './commands/remove.js';
 import { getUserProp, setUserProp } from './commands/user.js';
 import { bump } from './commands/bump.js';
+import { sync } from './commands/sync.js';
 // import {docs} from './commands/docs.js';
 program.name('mops');
 // --version
@@ -148,8 +149,9 @@ program
 });
 // cache
 program
-    .command('cache [sub-command]')
+    .command('cache')
     .description('Manage cache')
+    .addArgument(new Argument('<sub>').choices(['size', 'clean']))
     .action(async (sub) => {
     if (sub == 'clean') {
         await cleanCache();
@@ -159,9 +161,6 @@ program
         let size = await cacheSize();
         console.log('Cache size is ' + size);
     }
-    else {
-        console.log('Unknown sub command. Available sub commands: clean, size');
-    }
 });
 // test
 program
@@ -169,7 +168,12 @@ program
     .description('Run tests')
     .option('-r, --reporter <reporter>', 'Choose reporter: verbose, compact, files')
     .option('-w, --watch', 'Enable watch mode')
+    .option('--mode <mode>', 'Test mode: \'interpreter\' or \'wasi\' (default \'interpreter\'')
     .action(async (filter, options) => {
+    if (options.mode && !['interpreter', 'wasi'].includes(options.mode)) {
+        console.log(`Unknown --mode value '${options.mode}'. Allowed: interpreter, wasi`);
+        process.exit(1);
+    }
     await test(filter, options);
 });
 // template
@@ -208,7 +212,10 @@ program
 });
 // user
 program
-    .command('user set|get <prop> [value]')
+    .command('user')
+    .addArgument(new Argument('<sub>').choices(['set', 'get']))
+    .addArgument(new Argument('<prop>').choices(['name', 'site', 'email', 'github', 'twitter']))
+    .addArgument(new Argument('[value]'))
     .description('User settings')
     .action(async (sub, prop, value) => {
     if (sub == 'get') {
@@ -221,9 +228,6 @@ program
         }
         await setUserProp(prop, value);
     }
-    else {
-        console.log('Unknown sub command. Available sub commands: set, get');
-    }
 });
 // airdrop
 program
@@ -263,4 +267,11 @@ program
     .action(async (part) => {
     bump(part);
 });
+// sync
+program
+    .command('sync')
+    .description('Add missing packages and remove unused packages')
+    .action(async () => {
+    await sync();
+});
 program.parse();

package/dist/commands/remove.js

@@ -67,7 +67,7 @@ export async function remove(name, { dev = false, verbose = false, dryRun = fals
             pkgDir = formatDir(dep.name, dep.version);
         }
         if (pkgDir && fs.existsSync(pkgDir)) {
-            dryRun || deleteSync([`${pkgDir}`]);
+            dryRun || deleteSync([`${pkgDir}`], { force: true });
             verbose && console.log(`Removed local cache ${pkgDir}`);
         }
     }

package/dist/commands/sync.d.ts

@@ -0,0 +1 @@
+export declare function sync(): Promise<void>;

package/dist/commands/sync.js

@@ -0,0 +1,84 @@
+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';
+let ignore = [
+    '**/node_modules/**',
+    '**/.vessel/**',
+    '**/.git/**',
+    '**/.mops/**',
+    '**/test/**',
+    '**/*.test.mo',
+];
+let mocPath = '';
+function getMocPath() {
+    if (!mocPath) {
+        mocPath = process.env.DFX_MOC_PATH || '';
+    }
+    if (!mocPath) {
+        try {
+            mocPath = execSync('dfx cache show').toString().trim() + '/moc';
+        }
+        catch { }
+    }
+    if (!mocPath) {
+        mocPath = 'moc';
+    }
+    return mocPath;
+}
+async function getUsedPackages() {
+    let rootDir = getRootDir();
+    let files = globSync('**/*.mo', {
+        cwd: rootDir,
+        nocase: true,
+        ignore: ignore,
+    });
+    let packages = new Set;
+    for (let file of files) {
+        let deps = execSync(`${getMocPath()} --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() {
+    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() {
+    let config = readConfig();
+    let allDeps = new Set([...Object.keys(config.dependencies || {})]);
+    let used = await getUsedPackages();
+    for (let pkg of used) {
+        allDeps.delete(pkg);
+    }
+    return [...allDeps];
+}
+export async function sync() {
+    if (!checkConfigFile()) {
+        return;
+    }
+    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(', ')}`);
+    // add missing packages
+    for (let pkg of missing) {
+        await add(pkg);
+    }
+    // remove unused packages
+    for (let pkg of unused) {
+        await remove(pkg);
+    }
+}

package/dist/commands/test/test.d.ts

@@ -1,5 +1,8 @@
-export declare function test(filter?: string, { watch, reporter }?: {
+type TestMode = 'interpreter' | 'wasi';
+export declare function test(filter?: string, { watch, reporter, mode }?: {
     watch?: boolean | undefined;
     reporter?: string | undefined;
+    mode?: TestMode | undefined;
 }): Promise<void>;
-export declare function runAll(filter?: string, reporterName?: string): Promise<boolean | undefined>;
+export declare function runAll(filter?: string, reporterName?: string, mode?: TestMode): Promise<boolean | undefined>;
+export {};

package/dist/commands/test/test.js

@@ -24,7 +24,7 @@ let globConfig = {
     nocase: true,
     ignore: ignore,
 };
-export async function test(filter = '', { watch = false, reporter = 'verbose' } = {}) {
+export async function test(filter = '', { watch = false, reporter = 'verbose', mode = 'interpreter' } = {}) {
     let rootDir = getRootDir();
     if (watch) {
         // todo: run only changed for *.test.mo?
@@ -50,14 +50,14 @@ export async function test(filter = '', { watch = false, reporter = 'verbose' }
         run();
     }
     else {
-        let passed = await runAll(filter, reporter);
+        let passed = await runAll(filter, reporter, mode);
         if (!passed) {
             process.exit(1);
         }
     }
 }
 let mocPath = process.env.DFX_MOC_PATH;
-export async function runAll(filter = '', reporterName = 'verbose') {
+export async function runAll(filter = '', reporterName = 'verbose', mode = 'interpreter') {
     let reporter;
     if (reporterName == 'compact') {
         reporter = new CompactReporter;
@@ -99,7 +99,7 @@ export async function runAll(filter = '', reporterName = 'verbose') {
     fs.mkdirSync(wasmDir, { recursive: true });
     await parallel(os.cpus().length, files, async (file) => {
         let mmf = new MMF1('store');
-        let wasiMode = fs.readFileSync(file, 'utf8').startsWith('// @testmode wasi');
+        let wasiMode = mode === 'wasi' || fs.readFileSync(file, 'utf8').startsWith('// @testmode wasi');
         let promise = new Promise((resolve) => {
             if (!mocPath) {
                 mocPath = 'moc';

package/dist/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.21.1",
+	"version": "0.23.0",
 	"type": "module",
 	"bin": {
 		"mops": "dist/cli.js"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.21.1",
+	"version": "0.23.0",
 	"type": "module",
 	"bin": {
 		"mops": "dist/cli.js"