ic-mops 0.20.2 → 0.21.1

package/cli.ts

@@ -15,7 +15,7 @@ import {installAll} from './commands/install-all.js';
 import {search} from './commands/search.js';
 import {add} from './commands/add.js';
 import {cacheSize, cleanCache} from './cache.js';
-import {test} from './commands/test.js';
+import {test} from './commands/test/test.js';
 import {template} from './commands/template.js';
 import {selfUpdate} from './commands/self-update.js';
 import {remove} from './commands/remove.js';
@@ -186,6 +186,7 @@ program
 program
 	.command('test [filter]')
 	.description('Run tests')
+	.option('-r, --reporter <reporter>', 'Choose reporter: verbose, compact, files')
 	.option('-w, --watch', 'Enable watch mode')
 	.action(async (filter, options) => {
 		await test(filter, options);

package/commands/sources.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fs from 'node:fs';
 import chalk from 'chalk';
-import {checkConfigFile, formatDir, formatGithubDir, parseGithubURL, readConfig} from '../mops.js';
+import {checkConfigFile, formatDir, formatGithubDir, getRootDir, parseGithubURL, readConfig} from '../mops.js';
 import {VesselConfig, readVesselConfig} from '../vessel.js';
 import {Config, Dependency} from '../types.js';
 
@@ -111,10 +111,11 @@ export async function sources({verbose = false} = {}) {
 	}
 
 	// sources
+	let rootDir = getRootDir();
 	return Object.entries(packages).map(([name, pkg]) => {
 		let pkgDir;
 		if (pkg.path) {
-			pkgDir = path.relative(process.cwd(), path.resolve(pkg.path));
+			pkgDir = path.relative(process.cwd(), path.resolve(rootDir, pkg.path));
 			pkgDir = pkgDir.replaceAll('{MOPS_ENV}', process.env.MOPS_ENV || 'local');
 		}
 		else if (pkg.repo) {

package/commands/{mmf1.ts → test/mmf1.ts}

@@ -5,6 +5,8 @@
 import chalk from 'chalk';
 
 type Strategy = 'store' | 'print';
+type TestStatus = 'pass' | 'fail' | 'skip';
+type MessageType = 'pass' | 'fail' | 'skip' | 'suite' | 'stdout';
 
 export class MMF1 {
 	stack: string[] = [];
@@ -13,24 +15,32 @@ export class MMF1 {
 	passed = 0;
 	skipped = 0;
 	srategy: Strategy;
-	output: string[] = [];
+	output: {
+		type: MessageType;
+		message: string;
+	}[] = [];
 
 	constructor(srategy: Strategy) {
 		this.srategy = srategy;
 	}
 
-	_log(...args: string[]) {
+	_log(type: MessageType,  ...args: string[]) {
 		if (this.srategy === 'store') {
-			this.output.push(args.join(' '));
+			this.output.push({
+				type,
+				message: args.join(' ')
+			});
 		}
 		else if (this.srategy === 'print') {
 			console.log(...args);
 		}
 	}
 
-	flush() {
+	flush(messageType?: MessageType) {
 		for (let out of this.output) {
-			console.log(out);
+			if (!messageType || out.type === messageType) {
+				console.log(out.message);
+			}
 		}
 		this.output = [];
 	}
@@ -46,7 +56,7 @@ export class MMF1 {
 			this._testSkip(line.split('mops:1:skip ')[1] || '');
 		}
 		else {
-			this._log(' '.repeat(this.stack.length * 2), chalk.gray('stdout'), line);
+			this._log('stdout', ' '.repeat(this.stack.length * 2), chalk.gray('stdout'), line);
 		}
 	}
 
@@ -55,7 +65,7 @@ export class MMF1 {
 		if (suite) {
 			if (this.currSuite !== suite) {
 				this.currSuite = suite;
-				this._log(' '.repeat((this.stack.length - 1) * 2), (chalk.gray('•')) + '', suite);
+				this._log('suite', ' '.repeat((this.stack.length - 1) * 2), (chalk.gray('•')) + '', suite);
 			}
 		}
 		this.stack.push(name);
@@ -72,29 +82,29 @@ export class MMF1 {
 		this._status(name, 'skip');
 	}
 
-	_status(name: string, status: string) {
+	_status(name: string, status: TestStatus) {
 		if (status === 'pass') {
 			// do not print suite at the end
 			if (name === this.currSuite) {
 				return;
 			}
 			this.passed++;
-			this._log(' '.repeat(this.stack.length * 2), chalk.green('✓'), name);
+			this._log(status, ' '.repeat(this.stack.length * 2), chalk.green('✓'), name);
 		}
 		else if (status === 'fail') {
 			this.failed++;
-			this._log(' '.repeat(this.stack.length * 2), chalk.red('✖'), name);
+			this._log(status, ' '.repeat(this.stack.length * 2), chalk.red('✖'), name);
 		}
 		else if (status === 'skip') {
 			this.skipped++;
-			this._log(' '.repeat(this.stack.length * 2), chalk.yellow('−'), name);
+			this._log(status, ' '.repeat(this.stack.length * 2), chalk.yellow('−'), name);
 		}
 	}
 
 	fail(stderr: string) {
 		let name = this.stack.pop() || '';
 		this._status(name, 'fail');
-		this._log(' '.repeat(this.stack.length * 2), chalk.red('FAIL'), stderr);
+		this._log('fail', ' '.repeat(this.stack.length * 2), chalk.red('FAIL'), stderr);
 	}
 
 	pass() {
@@ -102,6 +112,6 @@ export class MMF1 {
 		if (name) {
 			this._status(name, 'pass');
 		}
-		this._log(' '.repeat(this.stack.length * 2), chalk.green('PASS'));
+		this._log('pass', ' '.repeat(this.stack.length * 2), chalk.green('PASS'));
 	}
 }

package/commands/test/reporters/compact-reporter.ts

@@ -0,0 +1,95 @@
+import chalk from 'chalk';
+import logUpdate from 'log-update';
+import {absToRel} from '../utils.js';
+import {MMF1} from '../mmf1.js';
+import {Reporter} from './reporter.js';
+
+export class CompactReporter implements Reporter {
+	passed = 0;
+	failed = 0;
+	skipped = 0;
+	passedFiles = 0;
+	failedFiles = 0;
+
+	#allFiles = new Set<string>();
+	#runningFiles = new Set<string>();
+	#failedFiles = new Set<string>();
+	#finishedFiles = new Set<string>();
+	#startTime = Date.now();
+
+	addFiles(files: string[]) {
+		this.#allFiles = new Set(files);
+		this.#log();
+		this.#startTimer();
+	}
+
+	addRun(file: string, mmf: MMF1, state: Promise<void>, _wasiMode: boolean) {
+		this.#runningFiles.add(file);
+		this.#log();
+
+		state.then(() => {
+			this.passed += mmf.passed;
+			this.failed += mmf.failed;
+			this.skipped += mmf.skipped;
+
+			this.passedFiles += Number(mmf.failed === 0);
+			this.failedFiles += Number(mmf.failed !== 0);
+
+			if (mmf.failed) {
+				this.#failedFiles.add(file);
+				logUpdate.clear();
+				console.log(chalk.red('✖'), absToRel(file));
+				mmf.flush('fail');
+				console.log('-'.repeat(50));
+			}
+
+			this.#runningFiles.delete(file);
+			this.#finishedFiles.add(file);
+			this.#log();
+		});
+	}
+
+	done(): boolean {
+		this.#log();
+		logUpdate.done();
+		this.#clearTimer();
+		return this.failed === 0;
+	}
+
+	#timerId: NodeJS.Timer | null = null;
+	#startTimer() {
+		this.#timerId = setInterval(() => this.#log(), 55);
+	}
+
+	#clearTimer() {
+		if (this.#timerId) {
+			clearInterval(this.#timerId);
+		}
+	}
+
+	#log() {
+		let res: string[] = [];
+		let i = 0;
+		for (let file of this.#allFiles) {
+			if (this.#runningFiles.has(file)) {
+				res[Number(i)] = '.';
+			}
+			else if (this.#finishedFiles.has(file)) {
+				res[Number(i)] = this.#failedFiles.has(file) ? chalk.red(':') : ':';
+			}
+			else {
+				res[Number(i)] = ' ';
+			}
+			i++;
+		}
+
+		let output = `[${res.join('')}]\n`
+			+ `${chalk.gray(((Date.now() - this.#startTime) / 1000).toFixed(2) + 's')}`
+			+ `, total ${this.#allFiles.size} files`
+			+ `, passed ${chalk.greenBright(this.passedFiles)} files`
+			+ (this.skipped ? `, skipped ${chalk[this.skipped ? 'yellowBright' : 'gray'](this.skipped)} cases` : '')
+			+ (this.failed ? `, failed ${chalk[this.failed ? 'redBright' : 'gray'](this.failed)} cases` : '');
+
+		logUpdate(output);
+	}
+}

package/commands/test/reporters/files-reporter.ts

@@ -0,0 +1,52 @@
+import chalk from 'chalk';
+import {absToRel} from '../utils.js';
+import {MMF1} from '../mmf1.js';
+import {Reporter} from './reporter.js';
+
+export class FilesReporter implements Reporter {
+	passed = 0;
+	failed = 0;
+	skipped = 0;
+
+	#startTime = Date.now();
+
+	addFiles(files: string[]) {
+		console.log(`Test files: ${files.length}`);
+		console.log('='.repeat(50));
+	}
+
+	addRun(file: string, mmf: MMF1, state: Promise<void>, wasiMode: boolean) {
+		state.then(() => {
+			this.passed += Number(mmf.failed === 0);
+			this.failed += Number(mmf.failed !== 0);
+			this.skipped += mmf.skipped;
+
+			if (mmf.failed) {
+				console.log(chalk.red('✖'), absToRel(file));
+				mmf.flush('fail');
+				console.log('-'.repeat(50));
+			}
+			else {
+				console.log(`${chalk.green('✓')} ${absToRel(file)} ${wasiMode ? chalk.gray('(wasi)') : ''}`);
+			}
+		});
+	}
+
+	done(): boolean {
+		console.log('='.repeat(50));
+		if (this.failed) {
+			console.log(chalk.redBright('Tests failed'));
+		}
+		else {
+			console.log(chalk.greenBright('Tests passed'));
+		}
+
+		console.log(`Done in ${chalk.gray(((Date.now() - this.#startTime) / 1000).toFixed(2) + 's')}`
+			+ `, passed ${chalk.greenBright(this.passed)} files`
+			+ (this.skipped ? `, skipped ${chalk[this.skipped ? 'yellowBright' : 'gray'](this.skipped)} cases` : '')
+			+ (this.failed ? `, failed ${chalk[this.failed ? 'redBright' : 'gray'](this.failed)} files` : '')
+		);
+
+		return this.failed === 0;
+	}
+}

package/commands/test/reporters/reporter.ts

@@ -0,0 +1,7 @@
+import {MMF1} from '../mmf1.js';
+
+export interface Reporter {
+	addFiles(files: string[]): void;
+	addRun(file: string, mmf: MMF1, state: Promise<void>, wasiMode: boolean): void;
+	done(): boolean;
+}

package/commands/test/reporters/verbose-reporter.ts

@@ -0,0 +1,51 @@
+import chalk from 'chalk';
+import {absToRel} from '../utils.js';
+import {MMF1} from '../mmf1.js';
+import {Reporter} from './reporter.js';
+
+export class VerboseReporter implements Reporter {
+	passed = 0;
+	failed = 0;
+	skipped = 0;
+
+	#startTime = Date.now();
+	#curFileIndex = 0;
+
+	addFiles(files: string[]) {
+		console.log('Test files:');
+		for (let file of files) {
+			console.log(chalk.gray(`• ${absToRel(file)}`));
+		}
+		console.log('='.repeat(50));
+	}
+
+	addRun(file: string, mmf: MMF1, state: Promise<void>, wasiMode: boolean) {
+		state.then(() => {
+			this.passed += mmf.passed;
+			this.failed += mmf.failed;
+			this.skipped += mmf.skipped;
+
+			this.#curFileIndex++ && console.log('-'.repeat(50));
+			console.log(`Running ${chalk.gray(absToRel(file))} ${wasiMode ? chalk.gray('(wasi)') : ''}`);
+			mmf.flush();
+		});
+	}
+
+	done(): boolean {
+		console.log('='.repeat(50));
+		if (this.failed) {
+			console.log(chalk.redBright('Tests failed'));
+		}
+		else {
+			console.log(chalk.greenBright('Tests passed'));
+		}
+
+		console.log(`Done in ${chalk.gray(((Date.now() - this.#startTime) / 1000).toFixed(2) + 's')}`
+			+ `, passed ${chalk.greenBright(this.passed)}`
+			+ (this.skipped ? `, skipped ${chalk[this.skipped ? 'yellowBright' : 'gray'](this.skipped)}` : '')
+			+ (this.failed ? `, failed ${chalk[this.failed ? 'redBright' : 'gray'](this.failed)}` : '')
+		);
+
+		return this.failed === 0;
+	}
+}

package/commands/{test.ts → test/test.ts}

@@ -7,10 +7,16 @@ import {globSync} from 'glob';
 import chokidar from 'chokidar';
 import debounce from 'debounce';
 
+import {sources} from '../sources.js';
+import {getRootDir} from '../../mops.js';
+import {parallel} from '../../parallel.js';
+
 import {MMF1} from './mmf1.js';
-import {sources} from './sources.js';
-import {getRootDir} from '../mops.js';
-import {parallel} from '../parallel.js';
+import {absToRel} from './utils.js';
+import {VerboseReporter} from './reporters/verbose-reporter.js';
+import {FilesReporter} from './reporters/files-reporter.js';
+import {CompactReporter} from './reporters/compact-reporter.js';
+import {Reporter} from './reporters/reporter.js';
 
 let ignore = [
 	'**/node_modules/**',
@@ -24,7 +30,7 @@ let globConfig = {
 	ignore: ignore,
 };
 
-export async function test(filter = '', {watch = false} = {}) {
+export async function test(filter = '', {watch = false, reporter = 'verbose'} = {}) {
 	let rootDir = getRootDir();
 
 	if (watch) {
@@ -33,7 +39,7 @@ export async function test(filter = '', {watch = false} = {}) {
 		let run = debounce(async () => {
 			console.clear();
 			process.stdout.write('\x1Bc');
-			await runAll(filter);
+			await runAll(filter, reporter);
 			console.log('-'.repeat(50));
 			console.log('Waiting for file changes...');
 			console.log(chalk.gray((`Press ${chalk.gray('Ctrl+C')} to exit.`)));
@@ -53,7 +59,7 @@ export async function test(filter = '', {watch = false} = {}) {
 		run();
 	}
 	else {
-		let passed = await runAll(filter);
+		let passed = await runAll(filter, reporter);
 		if (!passed) {
 			process.exit(1);
 		}
@@ -62,8 +68,18 @@ export async function test(filter = '', {watch = false} = {}) {
 
 let mocPath = process.env.DFX_MOC_PATH;
 
-export async function runAll(filter = '') {
-	let start = Date.now();
+export async function runAll(filter = '', reporterName = 'verbose') {
+	let reporter: Reporter;
+	if (reporterName == 'compact') {
+		reporter = new CompactReporter;
+	}
+	else if (reporterName == 'files') {
+		reporter = new FilesReporter;
+	}
+	else {
+		reporter = new VerboseReporter;
+	}
+
 	let rootDir = getRootDir();
 	let files: string[] = [];
 	let libFiles = globSync('**/test?(s)/lib.mo', globConfig);
@@ -87,15 +103,8 @@ export async function runAll(filter = '') {
 		return;
 	}
 
-	console.log('Test files:');
-	for (let file of files) {
-		console.log(chalk.gray(`• ${absToRel(file)}`));
-	}
-	console.log('='.repeat(50));
+	reporter.addFiles(files);
 
-	let failed = 0;
-	let passed = 0;
-	let skipped = 0;
 	let sourcesArr = await sources();
 
 	if (!mocPath) {
@@ -105,77 +114,52 @@ export async function runAll(filter = '') {
 	let wasmDir = `${getRootDir()}/.mops/.test/`;
 	fs.mkdirSync(wasmDir, {recursive: true});
 
-	let i = 0;
-
 	await parallel(os.cpus().length, files, async (file: string) => {
-		if (!mocPath) {
-			mocPath = 'moc';
-		}
-
 		let mmf = new MMF1('store');
-
 		let wasiMode = fs.readFileSync(file, 'utf8').startsWith('// @testmode wasi');
 
-		let mocArgs = ['--hide-warnings', '--error-detail=2', ...sourcesArr.join(' ').split(' '), file].filter(x => x);
-
-		// build and run wasm
-		if (wasiMode) {
-			let wasmFile = `${path.join(wasmDir, path.parse(file).name)}.wasm`;
+		let promise = new Promise<void>((resolve) => {
+			if (!mocPath) {
+				mocPath = 'moc';
+			}
 
-			// build
-			let buildProc = spawn(mocPath, [`-o=${wasmFile}`, '-wasi-system-api', ...mocArgs]);
-			await pipeMMF(buildProc, mmf).then(async () => {
-				if (mmf.failed > 0) {
-					return;
-				}
-				// run
-				let proc = spawn('wasmtime', [wasmFile]);
-				await pipeMMF(proc, mmf);
-			}).finally(() => {
-				fs.rmSync(wasmFile, {force: true});
-			});
-		}
-		// interpret
-		else {
-			let proc = spawn(mocPath, ['-r', '-ref-system-api', ...mocArgs]);
-			await pipeMMF(proc, mmf);
-		}
+			let mocArgs = ['--hide-warnings', '--error-detail=2', ...sourcesArr.join(' ').split(' '), file].filter(x => x);
+
+			// build and run wasm
+			if (wasiMode) {
+				let wasmFile = `${path.join(wasmDir, path.parse(file).name)}.wasm`;
+
+				// build
+				let buildProc = spawn(mocPath, [`-o=${wasmFile}`, '-wasi-system-api', ...mocArgs]);
+				pipeMMF(buildProc, mmf).then(async () => {
+					if (mmf.failed > 0) {
+						return;
+					}
+					// run
+					let proc = spawn('wasmtime', [wasmFile]);
+					await pipeMMF(proc, mmf);
+				}).finally(() => {
+					fs.rmSync(wasmFile, {force: true});
+				}).then(resolve);
+			}
+			// interpret
+			else {
+				let proc = spawn(mocPath, ['-r', '-ref-system-api', ...mocArgs]);
+				pipeMMF(proc, mmf).then(resolve);
+			}
+		});
 
-		passed += mmf.passed;
-		failed += mmf.failed;
-		skipped += mmf.skipped;
+		reporter.addRun(file, mmf, promise, wasiMode);
 
-		i++ && console.log('-'.repeat(50));
-		console.log(`Running ${chalk.gray(path.relative(rootDir, file))} ${wasiMode ? chalk.gray('(wasi)') : ''}`);
-		mmf.flush();
+		await promise;
 	});
 
 	fs.rmSync(wasmDir, {recursive: true, force: true});
-
-	console.log('='.repeat(50));
-	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;
-}
-
-function absToRel(p: string) {
-	let rootDir = getRootDir();
-	return path.relative(rootDir, path.resolve(p));
+	return reporter.done();
 }
 
 function pipeMMF(proc: ChildProcessWithoutNullStreams, mmf: MMF1) {
-	return new Promise((resolve) => {
+	return new Promise<void>((resolve) => {
 		// stdout
 		proc.stdout.on('data', (data) => {
 			for (let line of data.toString().split('\n')) {
@@ -202,16 +186,16 @@ function pipeMMF(proc: ChildProcessWithoutNullStreams, mmf: MMF1) {
 				// show failed line
 				let content = fs.readFileSync(m1);
 				let lines = content.toString().split('\n') || [];
-				failedLine += chalk.dim`\n   ...`;
+				failedLine += chalk.dim('\n   ...');
 				let lineBefore = lines[+m2 - 2];
 				if (lineBefore) {
-					failedLine += chalk.dim`\n   ${+m2 - 1}\t| ${lineBefore.replaceAll('\t', '  ')}`;
+					failedLine += chalk.dim(`\n   ${+m2 - 1}\t| ${lineBefore.replaceAll('\t', '  ')}`);
 				}
 				failedLine += `\n${chalk.redBright`->`} ${m2}\t| ${lines[+m2 - 1]?.replaceAll('\t', '  ')}`;
 				if (lines.length > +m2) {
-					failedLine += chalk.dim`\n   ${+m2 + 1}\t| ${lines[+m2]?.replaceAll('\t', '  ')}`;
+					failedLine += chalk.dim(`\n   ${+m2 + 1}\t| ${lines[+m2]?.replaceAll('\t', '  ')}`);
 				}
-				failedLine += chalk.dim`\n   ...`;
+				failedLine += chalk.dim('\n   ...');
 				return res;
 			});
 			if (failedLine) {
@@ -228,7 +212,7 @@ function pipeMMF(proc: ChildProcessWithoutNullStreams, mmf: MMF1) {
 			else if (code !== 1) {
 				mmf.fail(`unknown exit code: ${code}`);
 			}
-			resolve(mmf);
+			resolve();
 		});
 	});
 }

package/commands/test/utils.ts

@@ -0,0 +1,7 @@
+import path from 'node:path';
+import {getRootDir} from '../../mops.js';
+
+export function absToRel(p: string) {
+	let rootDir = getRootDir();
+	return path.relative(rootDir, path.resolve(p));
+}

package/dist/cli.js

@@ -13,7 +13,7 @@ import { installAll } from './commands/install-all.js';
 import { search } from './commands/search.js';
 import { add } from './commands/add.js';
 import { cacheSize, cleanCache } from './cache.js';
-import { test } from './commands/test.js';
+import { test } from './commands/test/test.js';
 import { template } from './commands/template.js';
 import { selfUpdate } from './commands/self-update.js';
 import { remove } from './commands/remove.js';
@@ -167,6 +167,7 @@ program
 program
     .command('test [filter]')
     .description('Run tests')
+    .option('-r, --reporter <reporter>', 'Choose reporter: verbose, compact, files')
     .option('-w, --watch', 'Enable watch mode')
     .action(async (filter, options) => {
     await test(filter, options);

package/dist/commands/sources.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fs from 'node:fs';
 import chalk from 'chalk';
-import { checkConfigFile, formatDir, formatGithubDir, parseGithubURL, readConfig } from '../mops.js';
+import { checkConfigFile, formatDir, formatGithubDir, getRootDir, parseGithubURL, readConfig } from '../mops.js';
 import { readVesselConfig } from '../vessel.js';
 // TODO: resolve conflicts
 export async function sources({ verbose = false } = {}) {
@@ -91,10 +91,11 @@ export async function sources({ verbose = false } = {}) {
         }
     }
     // sources
+    let rootDir = getRootDir();
     return Object.entries(packages).map(([name, pkg]) => {
         let pkgDir;
         if (pkg.path) {
-            pkgDir = path.relative(process.cwd(), path.resolve(pkg.path));
+            pkgDir = path.relative(process.cwd(), path.resolve(rootDir, pkg.path));
             pkgDir = pkgDir.replaceAll('{MOPS_ENV}', process.env.MOPS_ENV || 'local');
         }
         else if (pkg.repo) {

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

@@ -0,0 +1,26 @@
+type Strategy = 'store' | 'print';
+type TestStatus = 'pass' | 'fail' | 'skip';
+type MessageType = 'pass' | 'fail' | 'skip' | 'suite' | 'stdout';
+export declare class MMF1 {
+    stack: string[];
+    currSuite: string;
+    failed: number;
+    passed: number;
+    skipped: number;
+    srategy: Strategy;
+    output: {
+        type: MessageType;
+        message: string;
+    }[];
+    constructor(srategy: Strategy);
+    _log(type: MessageType, ...args: string[]): void;
+    flush(messageType?: MessageType): void;
+    parseLine(line: string): void;
+    _testStart(name: string): void;
+    _testEnd(name: string): void;
+    _testSkip(name: string): void;
+    _status(name: string, status: TestStatus): void;
+    fail(stderr: string): void;
+    pass(): void;
+}
+export {};