ic-mops 0.16.0 → 0.17.1

package/commands/mmf1.js

@@ -10,6 +10,28 @@ export class MMF1 {
 	failed = 0;
 	passed = 0;
 	skipped = 0;
+	srategy; // 'store' | 'print'
+	output = [];
+
+	constructor(srategy) {
+		this.srategy = srategy;
+	}
+
+	_log(...args) {
+		if (this.srategy === 'store') {
+			this.output.push(args.join(' '));
+		}
+		else if (this.srategy === 'print') {
+			console.log(...args);
+		}
+	}
+
+	flush() {
+		for (let out of this.output) {
+			console.log(out);
+		}
+		this.store = [];
+	}
 
 	parseLine(line) {
 		if (line.startsWith('mops:1:start ')) {
@@ -22,7 +44,7 @@ export class MMF1 {
 			this._testSkip(line.split('mops:1:skip ')[1]);
 		}
 		else {
-			console.log(' '.repeat(this.stack.length * 2), chalk.gray('stdout'), line);
+			this._log(' '.repeat(this.stack.length * 2), chalk.gray('stdout'), line);
 		}
 	}
 
@@ -31,7 +53,7 @@ export class MMF1 {
 			let suite = this.stack[this.stack.length - 1];
 			if (this.currSuite !== suite) {
 				this.currSuite = suite;
-				console.log(' '.repeat((this.stack.length - 1) * 2), (chalk.gray('•')) + '', suite);
+				this._log(' '.repeat((this.stack.length - 1) * 2), (chalk.gray('•')) + '', suite);
 			}
 		}
 		this.stack.push(name);
@@ -55,22 +77,22 @@ export class MMF1 {
 				return;
 			}
 			this.passed++;
-			console.log(' '.repeat(this.stack.length * 2), chalk.green('✓'), name);
+			this._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);
+			this._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);
+			this._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);
+		this._log(' '.repeat(this.stack.length * 2), chalk.red('FAIL'), stderr);
 	}
 
 	pass() {
@@ -78,6 +100,6 @@ export class MMF1 {
 		if (name) {
 			this._status(name, 'pass');
 		}
-		console.log(' '.repeat(this.stack.length * 2), chalk.green('PASS'));
+		this._log(' '.repeat(this.stack.length * 2), chalk.green('PASS'));
 	}
 }

package/commands/test.js

@@ -5,9 +5,12 @@ import chokidar from 'chokidar';
 import debounce from 'debounce';
 import path from 'path';
 import fs from 'fs';
+import os from 'os';
+
 import {MMF1} from './mmf1.js';
 import {sources} from './sources.js';
 import {getRootDir} from '../mops.js';
+import {parallel} from '../parallel.js';
 
 let ignore = [
 	'**/node_modules/**',
@@ -99,46 +102,51 @@ export async function runAll(filter = '') {
 	let wasmDir = `${getRootDir()}/.mops/.test/`;
 	fs.mkdirSync(wasmDir, {recursive: true});
 
-	for (let file of files) {
-		let mmf1 = new MMF1;
-
-		await new Promise((resolve) => {
-			let wasiMode = fs.readFileSync(file, 'utf8').startsWith('// @testmode wasi');
-
-			file !== files[0] && console.log('-'.repeat(50));
-			console.log(`Running ${chalk.gray(absToRel(file))} ${wasiMode ? chalk.gray('(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`;
-
-				// build
-				let buildProc = spawn(mocPath, [`-o=${wasmFile}`, '-wasi-system-api', ...mocArgs]);
-				pipeMMF(buildProc, mmf1).then(async () => {
-					if (mmf1.failed > 0) {
-						resolve();
-						return;
-					}
-					// run
-					let proc = spawn('wasmtime', [wasmFile]);
-					await pipeMMF(proc, mmf1);
-				}).finally(() => {
-					fs.rmSync(wasmFile);
-					resolve();
-				});
-			}
-			// interpret
-			else {
-				let proc = spawn(mocPath, ['-r', '-ref-system-api', ...mocArgs]);
-				pipeMMF(proc, mmf1).then(resolve);
-			}
-		});
+	let promises = [];
+
+	await parallel(os.cpus().length, files, async (file) => {
+		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`;
+
+			// 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);
+			});
+		}
+		// interpret
+		else {
+			let proc = spawn(mocPath, ['-r', '-ref-system-api', ...mocArgs]);
+			await pipeMMF(proc, mmf);
+		}
+
+		passed += mmf.passed;
+		failed += mmf.failed;
+		skipped += mmf.skipped;
+
+		promises.push([file, mmf]);
+	});
 
-		passed += mmf1.passed;
-		failed += mmf1.failed;
-		skipped += mmf1.skipped;
+	let i = 0;
+	for (let [file, mmf] of promises) {
+		i++ && console.log('-'.repeat(50));
+		let wasiMode = fs.readFileSync(file, 'utf8').startsWith('// @testmode wasi');
+		console.log(`Running ${chalk.gray(file)} ${wasiMode ? chalk.gray('(wasi)') : ''}`);
+		mmf.flush();
 	}
 
 	fs.rmSync(wasmDir, {recursive: true, force: true});
@@ -165,14 +173,14 @@ function absToRel(p) {
 	return path.relative(rootDir, path.resolve(p));
 }
 
-function pipeMMF(proc, mmf1) {
+function pipeMMF(proc, mmf) {
 	return new Promise((resolve) => {
 		// stdout
 		proc.stdout.on('data', (data) => {
 			for (let line of data.toString().split('\n')) {
 				line = line.trim();
 				if (line) {
-					mmf1.parseLine(line);
+					mmf.parseLine(line);
 				}
 			}
 		});
@@ -183,18 +191,18 @@ function pipeMMF(proc, mmf1) {
 			// change absolute file path to relative
 			// change :line:col-line:col to :line:col to work in vscode
 			text = text.replace(/([\w+._/-]+):(\d+).(\d+)(-\d+.\d+)/g, (m0, m1, m2, m3) => `${absToRel(m1)}:${m2}:${m3}`);
-			mmf1.fail(text);
+			mmf.fail(text);
 		});
 
 		// exit
-		proc.on('exit', (code) => {
+		proc.on('close', (code) => {
 			if (code === 0) {
-				mmf1.pass();
+				mmf.pass();
 			}
 			else if (code !== 1) {
-				console.log(chalk.red('unknown code:'), code);
+				mmf.fail(`unknown exit code: ${code}`);
 			}
-			resolve();
+			resolve(mmf);
 		});
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.16.0",
+	"version": "0.17.1",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"

package/templates/mops-test.yml

@@ -16,15 +16,12 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-      - uses: aviate-labs/setup-dfx@v0.2.5
-        with:
-          dfx-version: 0.14.1
 
-      - name: install dfx
-        run: dfx cache install
+      - name: install moc
+        run: npx mocv use 0.9.3
 
       - name: install mops
-        run: npm i ic-mops -g --yes
+        run: npm i ic-mops -g
 
       - name: install mops packages
         run: mops install