ic-mops 0.17.3 → 0.18.1

package/cli.js

@@ -186,7 +186,7 @@ program
 program
 	.command('test [filter]')
 	.description('Run tests')
-	.option('--watch', 'Enable watch mode')
+	.option('-w, --watch', 'Enable watch mode')
 	.action(async (filter, options) => {
 		await test(filter, options);
 	});

package/commands/docs.js

@@ -13,8 +13,8 @@ let moDoc;
 
 export async function docs({silent} = {}) {
 	let rootDir = getRootDir();
-	let docsDir = path.join(rootDir, '.mops/_docs');
-	let docsDirRelative = path.relative(process.cwd(), path.join(rootDir, '.mops/_docs'));
+	let docsDir = path.join(rootDir, '.mops/.docs');
+	let docsDirRelative = path.relative(process.cwd(), docsDir);
 
 	del.sync([docsDir], {force: true});
 

package/commands/mmf1.js

@@ -81,7 +81,7 @@ export class MMF1 {
 		}
 		else if (status === 'fail') {
 			this.failed++;
-			this._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++;

package/commands/publish.js

@@ -183,7 +183,7 @@ export async function publish({noDocs} = {}) {
 	files = globbySync([...files, ...defaultFiles]);
 
 	// generate docs
-	let docsFile = path.join(rootDir, '.mops/_docs/docs.tgz');
+	let docsFile = path.join(rootDir, '.mops/.docs/docs.tgz');
 	if (!noDocs) {
 		await docs({silent: true});
 		if (fs.existsSync(docsFile)) {
@@ -260,6 +260,8 @@ export async function publish({noDocs} = {}) {
 		}
 	});
 
+	fs.rmSync(path.join(rootDir, '.mops/.docs'), {force: true, recursive: true});
+
 	// finish
 	progress();
 	let res = await actor.finishPublish(puiblishingId);

package/commands/test.js

@@ -39,7 +39,10 @@ export async function test(filter = '', {watch = false} = {}) {
 			console.log(chalk.gray((`Press ${chalk.gray('Ctrl+C')} to exit.`)));
 		}, 200);
 
-		let watcher = chokidar.watch(path.join(rootDir, '**/*.mo'), {
+		let watcher = chokidar.watch([
+			path.join(rootDir, '**/*.mo'),
+			path.join(rootDir, 'mops.toml'),
+		], {
 			ignored: ignore,
 			ignoreInitial: true,
 		});
@@ -139,7 +142,7 @@ export async function runAll(filter = '') {
 		skipped += mmf.skipped;
 
 		i++ && console.log('-'.repeat(50));
-		console.log(`Running ${chalk.gray(file)} ${wasiMode ? chalk.gray('(wasi)') : ''}`);
+		console.log(`Running ${chalk.gray(path.relative(rootDir, file))} ${wasiMode ? chalk.gray('(wasi)') : ''}`);
 		mmf.flush();
 	});
 
@@ -182,9 +185,28 @@ function pipeMMF(proc, mmf) {
 		// 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}`);
+			let failedLine = '';
+			text = text.replace(/([\w+._/-]+):(\d+).(\d+)(-\d+.\d+)/g, (m0, m1, m2, m3) => {
+				// change absolute file path to relative
+				// change :line:col-line:col to :line:col to work in vscode
+				let res = `${absToRel(m1)}:${m2}:${m3}`;
+				// show failed line
+				let content = fs.readFileSync(m1);
+				let lines = content.toString().split('\n');
+				failedLine += chalk.dim`\n   ...`;
+				if (m2 - 2 >= 0) {
+					failedLine += chalk.dim`\n   ${+m2 - 1}\t| ${lines[m2 - 2].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   ...`;
+				return res;
+			});
+			if (failedLine) {
+				text += failedLine;
+			}
 			mmf.fail(text);
 		});
 

package/package.json

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