ic-mops 0.15.0 → 0.16.0

package/commands/test.js

@@ -4,6 +4,7 @@ import glob from 'glob';
 import chokidar from 'chokidar';
 import debounce from 'debounce';
 import path from 'path';
+import fs from 'fs';
 import {MMF1} from './mmf1.js';
 import {sources} from './sources.js';
 import {getRootDir} from '../mops.js';
@@ -58,7 +59,6 @@ let mocPath = process.env.DFX_MOC_PATH;
 export async function runAll(filter = '') {
 	let start = Date.now();
 	let rootDir = getRootDir();
-
 	let files = [];
 	let libFiles = glob.sync('**/test?(s)/lib.mo', globConfig);
 	if (libFiles.length) {
@@ -81,8 +81,6 @@ export async function runAll(filter = '') {
 		return;
 	}
 
-	let absToRel = (p) => path.relative(rootDir, path.resolve(p));
-
 	console.log('Test files:');
 	for (let file of files) {
 		console.log(chalk.gray(`• ${absToRel(file)}`));
@@ -98,44 +96,44 @@ export async function runAll(filter = '') {
 		mocPath = execSync('dfx cache show').toString().trim() + '/moc';
 	}
 
+	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))}`);
+			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);
 
-			let proc = spawn(mocPath, ['-r', '-wasi-system-api', '-ref-system-api', '--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`;
 
-			// stdout
-			proc.stdout.on('data', (data) => {
-				for (let line of data.toString().split('\n')) {
-					line = line.trim();
-					if (line) {
-						mmf1.parseLine(line);
+				// build
+				let buildProc = spawn(mocPath, [`-o=${wasmFile}`, '-wasi-system-api', ...mocArgs]);
+				pipeMMF(buildProc, mmf1).then(async () => {
+					if (mmf1.failed > 0) {
+						resolve();
+						return;
 					}
-				}
-			});
-
-			// stderr
-			proc.stderr.on('data', (data) => {
-				let text = data.toString().trim();
-				// 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);
-			});
-
-			// exit
-			proc.on('exit', (code) => {
-				if (code === 0) {
-					mmf1.pass();
-				}
-				else if (code !== 1) {
-					console.log(chalk.red('unknown code:'), code);
-				}
-				resolve();
-			});
+					// 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);
+			}
 		});
 
 		passed += mmf1.passed;
@@ -143,6 +141,8 @@ export async function runAll(filter = '') {
 		skipped += mmf1.skipped;
 	}
 
+	fs.rmSync(wasmDir, {recursive: true, force: true});
+
 	console.log('='.repeat(50));
 	if (failed) {
 		console.log(chalk.redBright('Tests failed'));
@@ -158,4 +158,43 @@ export async function runAll(filter = '') {
 	);
 
 	return failed === 0;
+}
+
+function absToRel(p) {
+	let rootDir = getRootDir();
+	return path.relative(rootDir, path.resolve(p));
+}
+
+function pipeMMF(proc, mmf1) {
+	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);
+				}
+			}
+		});
+
+		// stderr
+		proc.stderr.on('data', (data) => {
+			let text = data.toString().trim();
+			// 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);
+		});
+
+		// exit
+		proc.on('exit', (code) => {
+			if (code === 0) {
+				mmf1.pass();
+			}
+			else if (code !== 1) {
+				console.log(chalk.red('unknown code:'), code);
+			}
+			resolve();
+		});
+	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.15.0",
+	"version": "0.16.0",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"
@@ -28,6 +28,7 @@
 		"@dfinity/principal": "^0.11.1",
 		"@iarna/toml": "^2.2.5",
 		"as-table": "^1.0.55",
+		"cacheable-request": "10.2.10",
 		"chalk": "^4.1.2",
 		"chokidar": "^3.5.3",
 		"commander": "^9.2.0",
@@ -36,11 +37,11 @@
 		"del": "^6.0.0",
 		"dhall-to-json-cli": "^1.7.6",
 		"eslint": "^8.15.0",
-		"execa": "^6.1.0",
+		"execa": "6.1.0",
 		"get-folder-size": "^4.0.0",
 		"glob": "^8.1.0",
 		"globby": "^13.1.1",
-		"got": "^12.5.3",
+		"got": "12.5.3",
 		"log-update": "^5.0.1",
 		"minimatch": "^5.0.1",
 		"ncp": "^2.0.0",

package/templates/mops-test.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-      - uses: aviate-labs/setup-dfx@v0.2.3
+      - uses: aviate-labs/setup-dfx@v0.2.5
         with:
           dfx-version: 0.14.1