ic-mops 0.6.6 → 0.7.1

package/cli.js

@@ -39,6 +39,7 @@ program
 program
 	.command('add <pkg>')
 	.description('Install the package and save it to mops.toml')
+	.option('--dev')
 	.option('--verbose')
 	.action(async (pkg, options) => {
 		await add(pkg, options);
@@ -114,7 +115,8 @@ program
 	.option('--verbose')
 	.action(async (options) => {
 		await installAll({silent: true});
-		await sources(options);
+		let sourcesArr = await sources(options);
+		console.log(sourcesArr.join('\n'));
 	});
 
 // whoami
@@ -155,8 +157,9 @@ program
 program
 	.command('test')
 	.description('Run tests')
-	.action(async () => {
-		await test();
+	.option('--watch', 'Enable watch mode')
+	.action(async (options) => {
+		await test(options);
 	});
 
 // // upgrade

package/commands/add.js

@@ -5,14 +5,21 @@ import {checkConfigFile, getHighestVersion, parseGithubURL, readConfig, writeCon
 import {installFromGithub} from '../vessel.js';
 import {install} from './install.js';
 
-export async function add(name, {verbose} = {}) {
+export async function add(name, {verbose, dev} = {}) {
 	if (!checkConfigFile()) {
 		return false;
 	}
 
 	let config = readConfig();
-	if (!config.dependencies) {
-		config.dependencies = {};
+	if (dev) {
+		if (!config['dev-dependencies']) {
+			config['dev-dependencies'] = {};
+		}
+	}
+	else {
+		if (!config.dependencies) {
+			config.dependencies = {};
+		}
 	}
 
 	let pkgDetails;
@@ -68,7 +75,7 @@ export async function add(name, {verbose} = {}) {
 		}
 	}
 
-	config.dependencies[pkgDetails.name] = pkgDetails;
+	config[dev ? 'dev-dependencies' : 'dependencies'][pkgDetails.name] = pkgDetails;
 	writeConfig(config);
 
 	logUpdate.clear();

package/commands/install-all.js

@@ -10,9 +10,11 @@ export async function installAll({verbose, silent} = {}) {
 	}
 
 	let config = readConfig();
-	const deps = Object.values(config.dependencies || {});
+	let deps = Object.values(config.dependencies || {});
+	let devDeps = Object.values(config['dev-dependencies'] || {});
+	let allDeps = [...deps, ...devDeps];
 
-	for (let {name, repo, path, version} of deps) {
+	for (let {name, repo, path, version} of allDeps) {
 		if (repo) {
 			await installFromGithub(name, repo, {verbose, silent});
 		}

package/commands/install.js

@@ -110,7 +110,8 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	// install dependencies
 	let ok = true;
 	let config = readConfig(path.join(dir, 'mops.toml'));
-	for (const {name, repo, version} of Object.values(config.dependencies || {})) {
+	let deps = Object.values(config.dependencies || {});
+	for (const {name, repo, version} of deps) {
 		if (repo) {
 			await installFromGithub(name, repo, {silent, verbose});
 		}

package/commands/mmf1.js

@@ -0,0 +1,83 @@
+// mops message format v1
+// mops:1:start
+// mops:1:end
+// mops:1:skip
+import chalk from 'chalk';
+
+export class MMF1 {
+	stack = [];
+	currSuite = '';
+	failed = 0;
+	passed = 0;
+	skipped = 0;
+
+	parseLine(line) {
+		if (line.startsWith('mops:1:start ')) {
+			this._testStart(line.split('mops:1:start ')[1]);
+		}
+		else if (line.startsWith('mops:1:end ')) {
+			this._testEnd(line.split('mops:1:end ')[1]);
+		}
+		else if (line.startsWith('mops:1:skip ')) {
+			this._testSkip(line.split('mops:1:skip ')[1]);
+		}
+		else {
+			console.log(' '.repeat(this.stack.length * 2), chalk.gray('stdout'), line);
+		}
+	}
+
+	_testStart(name) {
+		if (this.stack.length) {
+			let suite = this.stack.at(-1);
+			if (this.currSuite !== suite) {
+				this.currSuite = suite;
+				console.log(' '.repeat((this.stack.length - 1) * 2), (chalk.gray('•')) + '', this.stack.at(-1));
+			}
+		}
+		this.stack.push(name);
+	}
+
+	_testEnd(name) {
+		if (name !== this.stack.pop()) {
+			throw 'mmf1._testEnd: start and end test mismatch';
+		}
+		this._status(name, 'pass');
+	}
+
+	_testSkip(name) {
+		this._status(name, 'skip');
+	}
+
+	_status(name, status) {
+		if (status === 'pass') {
+			// do not print suite at the end
+			if (name === this.currSuite) {
+				return;
+			}
+			this.passed++;
+			console.log(' '.repeat(this.stack.length * 2), chalk.green('✓'), name);
+		}
+		else if (status === 'fail') {
+			this.failed++;
+			console.log(' '.repeat(this.stack.length * 2), chalk.red('×'), name);
+		}
+		else if (status === 'skip') {
+			this.skipped++;
+			console.log(' '.repeat(this.stack.length * 2), chalk.yellow('−'), name);
+		}
+	}
+
+	fail(stderr) {
+		let name = this.stack.pop() || '';
+		this._status(name, 'fail');
+		console.log(' '.repeat(this.stack.length * 2), chalk.red('FAIL'), stderr);
+	}
+
+	pass() {
+		let name = this.stack.pop();
+		if (name) {
+			this._status(name, 'pass');
+		}
+		console.log(' '.repeat(this.stack.length * 2), chalk.green('PASS'));
+	}
+}

package/commands/publish.js

@@ -17,7 +17,7 @@ export async function publish() {
 
 	// validate
 	for (let key of Object.keys(config)) {
-		if (!['package', 'dependencies', 'scripts'].includes(key)) {
+		if (!['package', 'dependencies', 'dev-dependencies', 'scripts'].includes(key)) {
 			console.log(chalk.red('Error: ') + `Unknown config section [${key}]`);
 			return;
 		}
@@ -112,6 +112,21 @@ export async function publish() {
 		}
 	}
 
+	if (config['dev-dependencies']) {
+		if (Object.keys(config['dev-dependencies']).length > 100) {
+			console.log(chalk.red('Error: ') + 'max dev-dependencies is 100');
+			return;
+		}
+
+		for (let dep of Object.values(config['dev-dependencies'])) {
+			if (dep.path) {
+				console.log(chalk.red('Error: ') + 'you can\'t publish packages with local dev-dependencies');
+				return;
+			}
+			delete dep.path;
+		}
+	}
+
 	if (config.package.keywords) {
 		for (let keyword of config.package.keywords) {
 			if (keyword.length > 20) {
@@ -147,7 +162,7 @@ export async function publish() {
 		moc: config.package.moc || '',
 		donation: config.package.donation || '',
 		dependencies: Object.values(config.dependencies || {}),
-		devDependencies: [],
+		devDependencies: Object.values(config['dev-dependencies'] || {}),
 		scripts: [],
 	};
 

package/commands/sources.js

@@ -59,7 +59,11 @@ export async function sources({verbose} = {}) {
 	};
 
 	let collectDeps = async (config, isRoot = false) => {
-		for (const pkgDetails of Object.values(config.dependencies || {})) {
+		let allDeps = [...Object.values(config.dependencies || {})];
+		if (isRoot) {
+			allDeps = [...allDeps, ...Object.values(config['dev-dependencies'] || {})];
+		}
+		for (const pkgDetails of allDeps) {
 			const {name, repo, version} = pkgDetails;
 
 			// take root dep version or bigger one
@@ -117,7 +121,7 @@ export async function sources({verbose} = {}) {
 	}
 
 	// sources
-	for (let [name, pkg] of Object.entries(packages)) {
+	return Object.entries(packages).map(([name, pkg]) => {
 		let pkgDir;
 		if (pkg.path) {
 			pkgDir = path.relative(process.cwd(), path.resolve(pkg.path));
@@ -139,6 +143,6 @@ export async function sources({verbose} = {}) {
 			pkgBaseDir = path.join(pkgDir, 'src');
 		}
 
-		console.log(`--package ${name} ${pkgBaseDir}`);
-	}
+		return `--package ${name} ${pkgBaseDir}`;
+	});
 }

package/commands/test.js

@@ -1,17 +1,59 @@
-import {execSync} from 'child_process';
+import {spawn, execSync} from 'child_process';
 import chalk from 'chalk';
 import glob from 'glob';
+import chokidar from 'chokidar';
+import debounce from 'debounce';
+import {MMF1} from './mmf1.js';
+import {sources} from './sources.js';
+
+let ignore = [
+	'**/node_modules/**',
+	'**/.mops/**',
+	'**/.vessel/**',
+	'**/.git/**',
+];
 
 let globConfig = {
 	nocase: true,
-	ignore: [
-		'**/node_modules/**',
-		'**/.mops/**',
-		'**/.vessel/**',
-	],
+	ignore: ignore,
 };
 
-export async function test() {
+export async function test({watch = false} = {}) {
+	if (watch) {
+		// todo: run only changed for *.test.mo?
+		// todo: run all for *.mo?
+		let run = debounce(async () => {
+			console.clear();
+			process.stdout.write('\x1Bc');
+			await runAll();
+			console.log('-'.repeat(50));
+			console.log('Waiting for file changes...');
+			console.log(chalk.gray((`Press ${chalk.gray('Ctrl+C')} to exit.`)));
+		}, 200);
+
+		let watcher = chokidar.watch('**/*.mo', {
+			ignored: ignore,
+			ignoreInitial: true,
+		});
+
+		watcher.on('all', () => {
+			run();
+		});
+		run();
+	}
+	else {
+		let failed = await runAll();
+		if (failed) {
+			process.exit(1);
+		}
+	}
+}
+
+let dfxCache;
+
+export async function runAll() {
+	let start = Date.now();
+
 	let files = [];
 	let libFiles = glob.sync('**/test?(s)/lib.mo', globConfig);
 	if (libFiles.length) {
@@ -22,6 +64,7 @@ export async function test() {
 	}
 	if (!files.length) {
 		console.log('No test files found');
+		console.log('Put your tests in \'test\' directory in *.test.mo files');
 		return;
 	}
 
@@ -31,31 +74,68 @@ export async function test() {
 	}
 	console.log('-'.repeat(50));
 
-	let start = Date.now();
 	let failed = 0;
 	let passed = 0;
-	let dfxCache = execSync('dfx cache show').toString().trim();
-	let mopsSources = execSync('mops-local sources').toString().trim().replace(/\n/g, ' ');
+	let skipped = 0;
+	let sourcesArr = await sources();
+	if (!dfxCache) {
+		dfxCache = execSync('dfx cache show').toString().trim();
+	}
 
 	for (let file of files) {
-		try {
+		let mmf1 = new MMF1;
+
+		await new Promise((resolve) => {
 			console.log(`Running ${chalk.gray(file)}`);
-			execSync(`${dfxCache}/moc -r -wasi-system-api --hide-warnings --error-detail 2 ${mopsSources} ${file}`, {stdio: 'pipe'});
-			console.log(' ', chalk.green('PASS'));
-			passed++;
-		}
-		catch (err) {
-			failed++;
-			if (err.status === 1) {
-				console.log(' ', chalk.red('FAIL'), err.stderr.toString().trim());
-			}
-			else {
-				console.log(chalk.red('Unknown status:'), err.status);
-				console.log(err.message);
-			}
-		}
-	}
 
+			let proc = spawn(`${dfxCache}/moc`, ['-r', '-wasi-system-api', '-ref-system-api', '--hide-warnings', '--error-detail=2', ...sourcesArr.join(' ').split(' '), file]);
+
+			// stdout
+			proc.stdout.on('data', (data) => {
+				for (let line of data.toString().split('\n')) {
+					line = line.trim();
+					if (line) {
+						mmf1.parseLine(line);
+					}
+				}
+			});
+
+			// stderr
+			proc.stderr.on('data', (data) => {
+				let text = data.toString().trim();
+				text = text.replace(/:(\d+).(\d+)(-\d+.\d+)/, ':$1:$2');
+				mmf1.fail(text);
+			});
+
+			// exit
+			proc.on('exit', (code) => {
+				if (code === 0) {
+					mmf1.pass();
+				}
+				else if (code !== 1) {
+					console.log(chalk.red('unknown code:'), code);
+				}
+				resolve();
+			});
+		});
+
+		passed += mmf1.passed;
+		failed += mmf1.failed;
+		skipped += mmf1.skipped;
+	}
 	console.log('-'.repeat(50));
-	console.log(`Done in ${chalk.gray(((Date.now() - start) / 1000).toFixed(2) + 's')}, failed ${chalk[failed ? 'redBright' : 'gray'](failed)}, passed ${chalk.greenBright(passed)}`);
+	if (failed) {
+		console.log(chalk.redBright('Tests failed'));
+	}
+	else {
+		console.log(chalk.greenBright('Tests passed'));
+	}
+
+	console.log(`Done in ${chalk.gray(((Date.now() - start) / 1000).toFixed(2) + 's')}`
+		+ `, passed ${chalk.greenBright(passed)}`
+		+ (skipped ? `, skipped ${chalk[skipped ? 'yellowBright' : 'gray'](skipped)}` : '')
+		+ (failed ? `, failed ${chalk[failed ? 'redBright' : 'gray'](failed)}` : '')
+	);
+
+	return failed === 0;
 }

package/mops.js

@@ -124,33 +124,40 @@ export function readConfig(configFile = path.join(process.cwd(), 'mops.toml')) {
 	let text = fs.readFileSync(configFile).toString();
 	let toml = TOML.parse(text);
 
-	const deps = toml.dependencies || {};
-
-	Object.entries(deps).forEach(([name, data]) => {
-		if (!data || typeof data !== 'string') {
-			throw Error(`Invalid dependency value ${name} = "${data}"`);
-		}
-		if (data.startsWith('https://github.com/')) {
-			deps[name] = {name, repo: data, version: ''};
-		}
-		else if (data.match(/^(\.?\.)?\//)) {
-			deps[name] = {name, repo: '', path: data, version: ''};
-		}
-		else {
-			deps[name] = {name, repo: '', version: data};
-		}
-	});
+	let processDeps = (deps) => {
+		Object.entries(deps).forEach(([name, data]) => {
+			if (!data || typeof data !== 'string') {
+				throw Error(`Invalid dependency value ${name} = "${data}"`);
+			}
+			if (data.startsWith('https://github.com/')) {
+				deps[name] = {name, repo: data, version: ''};
+			}
+			else if (data.match(/^(\.?\.)?\//)) {
+				deps[name] = {name, repo: '', path: data, version: ''};
+			}
+			else {
+				deps[name] = {name, repo: '', version: data};
+			}
+		});
+	};
+
+	processDeps(toml.dependencies || {});
+	processDeps(toml['dev-dependencies'] || {});
 
 	return toml;
 }
 
 export function writeConfig(config, configFile = path.join(process.cwd(), 'mops.toml')) {
 	const deps = config.dependencies || {};
-
 	Object.entries(deps).forEach(([name, {repo, path, version}]) => {
 		deps[name] = repo || path || version;
 	});
 
+	const devDeps = config['dev-dependencies'] || {};
+	Object.entries(devDeps).forEach(([name, {repo, path, version}]) => {
+		devDeps[name] = repo || path || version;
+	});
+
 	fs.writeFileSync(configFile, TOML.stringify(config).trim());
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.6.6",
+	"version": "0.7.1",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"
@@ -11,6 +11,7 @@
 		"url": "https://github.com/ZenVoich/mops.git"
 	},
 	"author": "Zen Voich <zen.voich@gmail.com>",
+	"license": "MIT",
 	"dependencies": {
 		"@dfinity/agent": "^0.11.0",
 		"@dfinity/candid": "^0.11.0",
@@ -19,7 +20,9 @@
 		"@iarna/toml": "^2.2.5",
 		"as-table": "^1.0.55",
 		"chalk": "^4.1.2",
+		"chokidar": "^3.5.3",
 		"commander": "^9.2.0",
+		"debounce": "^1.2.1",
 		"decompress": "^4.2.1",
 		"del": "^6.0.0",
 		"dhall-to-json-cli": "^1.7.6",