ic-mops 0.21.0 → 0.22.0

package/cli.ts

@@ -188,7 +188,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);
 	});
 

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/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

@@ -169,7 +169,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

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/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.0",
+	"version": "0.22.0",
 	"type": "module",
 	"bin": {
 		"mops": "dist/cli.js"

package/package.json

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