mops watch

backend/main/registry/getDefaultPackages.mo

@@ -37,6 +37,7 @@ module {
 			case ("0.20.2") [("base", "0.11.1")];
 			case ("0.21.0") [("base", "0.11.1")];
 			case ("0.22.0") [("base", "0.11.2")];
+			case ("0.23.0") [("base", "0.11.2")];
 			case (_) {
 				switch (registry.getHighestVersion("base")) {
 					case (?ver) [("base", ver)];

cli/check-requirements.ts

@@ -11,7 +11,7 @@ export async function checkRequirements({verbose = false} = {}) {
 	let config = readConfig();
 	let mocVersion = config.toolchain?.moc;
 	if (!mocVersion) {
-		mocVersion = getMocVersion();
+		mocVersion = getMocVersion(false);
 	}
 	if (!mocVersion) {
 		return;

cli/cli.ts

@@ -1,5 +1,6 @@
 import process from 'node:process';
 import fs from 'node:fs';
+import events from 'node:events';
 import {Command, Argument, Option} from 'commander';
 
 import {init} from './commands/init.js';
@@ -25,6 +26,7 @@ import {toolchain} from './commands/toolchain/index.js';
 import {Tool} from './types.js';
 import * as self from './commands/self.js';
 import {resolvePackages} from './resolve-packages.js';
+import {watch} from './commands/watch/watch.js';
 
 declare global {
 	// eslint-disable-next-line no-var
@@ -33,6 +35,8 @@ declare global {
 	var mopsReplicaTestRunning : boolean;
 }
 
+events.setMaxListeners(20);
+
 let networkFile = getNetworkFile();
 if (fs.existsSync(networkFile)) {
 	globalThis.MOPS_NETWORK = fs.readFileSync(networkFile).toString() || 'ic';
@@ -392,4 +396,18 @@ selfCommand
 
 program.addCommand(selfCommand);
 
+// watch
+program
+	.command('watch')
+	.description('Watch *.mo files and check for syntax errors, warnings, run tests, generate declarations and deploy canisters')
+	.option('-e, --error', 'Check Motoko canisters or *.mo files for syntax errors')
+	.option('-w, --warning', 'Check Motoko canisters or *.mo files for warnings')
+	.option('-t, --test', 'Run tests')
+	.option('-g, --generate', 'Generate declarations for Motoko canisters')
+	.option('-d, --deploy', 'Deploy Motoko canisters')
+	.action(async (options) => {
+		checkConfigFile(true);
+		await watch(options);
+	});
+
 program.parse();

cli/commands/bench.ts

@@ -55,7 +55,7 @@ export async function bench(filter = '', optionsArg : Partial<BenchOptions> = {}
 		replica: config.toolchain?.['pocket-ic'] ? 'pocket-ic' : 'dfx',
 		replicaVersion: '',
 		compiler: 'moc',
-		compilerVersion: getMocVersion(),
+		compilerVersion: getMocVersion(true),
 		gc: 'copying',
 		forceGc: true,
 		save: false,

cli/commands/replica.ts

@@ -3,6 +3,7 @@ import {ChildProcessWithoutNullStreams, execSync, spawn} from 'node:child_proces
 import path from 'node:path';
 import fs from 'node:fs';
 import {PassThrough} from 'node:stream';
+import {promisify} from 'node:util';
 
 import {IDL} from '@dfinity/candid';
 import {Actor, HttpAgent} from '@dfinity/agent';
@@ -126,7 +127,7 @@ export class Replica {
 		}
 	}
 
-	async deploy(name : string, wasm : string, idlFactory : IDL.InterfaceFactory, cwd : string = process.cwd()) {
+	async deploy(name : string, wasm : string, idlFactory : IDL.InterfaceFactory, cwd : string = process.cwd(), signal ?: AbortSignal) {
 		if (this.type === 'dfx') {
 			// prepare dfx.json for current canister
 			let dfxJson = path.join(this.dir, 'dfx.json');
@@ -144,8 +145,27 @@ export class Replica {
 			fs.mkdirSync(this.dir, {recursive: true});
 			fs.writeFileSync(dfxJson, JSON.stringify(newDfxJsonData, null, 2));
 
-			execSync(`dfx deploy ${name} --mode reinstall --yes --identity anonymous`, {cwd: this.dir, stdio: this.verbose ? 'pipe' : ['pipe', 'ignore', 'pipe']});
-			execSync(`dfx ledger fabricate-cycles --canister ${name} --t 100`, {cwd: this.dir, stdio: this.verbose ? 'pipe' : ['pipe', 'ignore', 'pipe']});
+			await promisify(spawn)('dfx', ['deploy', name, '--mode', 'reinstall', '--yes', '--identity', 'anonymous'], {cwd: this.dir, signal, stdio: this.verbose ? 'pipe' : ['pipe', 'ignore', 'pipe']}).catch((error) => {
+				if (error.code === 'ABORT_ERR') {
+					return {stderr: ''};
+				}
+				throw error;
+			});
+
+			if (signal?.aborted) {
+				return;
+			}
+
+			await promisify(spawn)('dfx', ['ledger', 'fabricate-cycles', '--canister', name, '--t', '100'], {cwd: this.dir, signal, stdio: this.verbose ? 'pipe' : ['pipe', 'ignore', 'pipe']}).catch((error) => {
+				if (error.code === 'ABORT_ERR') {
+					return {stderr: ''};
+				}
+				throw error;
+			});
+
+			if (signal?.aborted) {
+				return;
+			}
 
 			let canisterId = execSync(`dfx canister id ${name}`, {cwd: this.dir}).toString().trim();
 
@@ -170,7 +190,17 @@ export class Replica {
 				idlFactory,
 				wasm,
 			});
+
+			if (signal?.aborted) {
+				return;
+			}
+
 			await this.pocketIc.addCycles(canisterId, 1_000_000_000_000);
+
+			if (signal?.aborted) {
+				return;
+			}
+
 			this.canisters[name] = {
 				cwd,
 				canisterId: canisterId.toText(),

cli/commands/sources.ts

@@ -45,5 +45,5 @@ export async function sources({conflicts = 'ignore' as 'warning' | 'error' | 'ig
 		}
 
 		return `--package ${name} ${pkgBaseDir}`;
-	});
+	}).filter(x => x != null);
 }

cli/commands/sync.ts

@@ -1,4 +1,3 @@
-import process from 'node:process';
 import path from 'node:path';
 import {execSync} from 'node:child_process';
 import {globSync} from 'glob';
@@ -7,6 +6,7 @@ import {checkConfigFile, getRootDir, readConfig} from '../mops.js';
 import {add} from './add.js';
 import {remove} from './remove.js';
 import {checkIntegrity} from '../integrity.js';
+import {getMocPath} from '../helpers/get-moc-path.js';
 
 type SyncOptions = {
 	lock ?: 'update' | 'ignore';
@@ -48,25 +48,10 @@ let ignore = [
 	'**/.mops/**',
 ];
 
-let mocPath = '';
-function getMocPath() : string {
-	if (!mocPath) {
-		mocPath = process.env.DFX_MOC_PATH || '';
-	}
-	if (!mocPath) {
-		try {
-			mocPath = execSync('dfx cache show').toString().trim() + '/moc';
-		}
-		catch {}
-	}
-	if (!mocPath) {
-		mocPath = 'moc';
-	}
-	return mocPath;
-}
-
 async function getUsedPackages() : Promise<string[]> {
 	let rootDir = getRootDir();
+	let mocPath = getMocPath();
+
 	let files = globSync('**/*.mo', {
 		cwd: rootDir,
 		nocase: true,
@@ -76,7 +61,7 @@ async function getUsedPackages() : Promise<string[]> {
 	let packages : Set<string> = new Set;
 
 	for (let file of files) {
-		let deps : string[] = execSync(`${getMocPath()} --print-deps ${path.join(rootDir, file)}`).toString().trim().split('\n');
+		let deps : string[] = execSync(`${mocPath} --print-deps ${path.join(rootDir, file)}`).toString().trim().split('\n');
 
 		for (let dep of deps) {
 			if (dep.startsWith('mo:') && !dep.startsWith('mo:prim') && !dep.startsWith('mo:⛔')) {

cli/commands/test/mmf1.ts

@@ -53,6 +53,10 @@ export class MMF1 {
 		this.output = [];
 	}
 
+	getErrorMessages() {
+		return this.output.filter(out => out.type === 'fail').map(out => out.message);
+	}
+
 	parseLine(line : string) {
 		if (line.startsWith('mops:1:start ')) {
 			this._testStart(line.split('mops:1:start ')[1] || '');

cli/commands/test/reporters/silent-reporter.ts

@@ -5,14 +5,25 @@ import {Reporter} from './reporter.js';
 import {TestMode} from '../../../types.js';
 
 export class SilentReporter implements Reporter {
+	total = 0;
 	passed = 0;
 	failed = 0;
 	skipped = 0;
 	passedFiles = 0;
 	failedFiles = 0;
 	passedNamesFlat : string[] = [];
+	flushOnError = true;
+	errorOutput = '';
+	onProgress = () => {};
 
-	addFiles(_files : string[]) {}
+	constructor(flushOnError = true, onProgress = () => {}) {
+		this.flushOnError = flushOnError;
+		this.onProgress = onProgress;
+	}
+
+	addFiles(files : string[]) {
+		this.total = files.length;
+	}
 
 	addRun(file : string, mmf : MMF1, state : Promise<void>, _mode : TestMode) {
 		state.then(() => {
@@ -30,10 +41,17 @@ export class SilentReporter implements Reporter {
 			this.failedFiles += Number(mmf.failed !== 0);
 
 			if (mmf.failed) {
-				console.log(chalk.red('✖'), absToRel(file));
-				mmf.flush('fail');
-				console.log('-'.repeat(50));
+				let output = `${chalk.red('✖')} ${absToRel(file)}\n${mmf.getErrorMessages().join('\n')}\n${'-'.repeat(50)}`;
+
+				if (this.flushOnError) {
+					console.log(output);
+				}
+				else {
+					this.errorOutput = `${this.errorOutput}\n${output}`.trim();
+				}
 			}
+
+			this.onProgress();
 		});
 	}