ic-mops 0.25.3 → 0.26.0

package/README.md

@@ -17,7 +17,20 @@ npm i -g ic-mops
 
 ## Install Packages
 
-### 1. Initialize
+### 1. Configure dfx.json
+Add `mops` as a packtool to your `dfx.json`
+
+```json
+{
+  "defaults": {
+    "build": {
+      "packtool": "mops sources"
+    }
+  }
+}
+```
+
+### 2. Initialize
 Run this command in the root directory of your project (where is `dfx.json` placed)
 
 If there are Vessel config files, mops will migrate packages from `vessel.dhall` to `mops.toml`
@@ -26,7 +39,7 @@ If there are Vessel config files, mops will migrate packages from `vessel.dhall`
 mops init
 ```
 
-### 2. Install Motoko Packages
+### 3. Install Motoko Packages
 Use `mops add <package_name>` to install a specific package and save it to `mops.toml`
 
 ```
@@ -53,7 +66,7 @@ Use `mops install` to install all packages specified in `mops.toml`
 mops install
 ```
 
-### 3. Import Package
+### 4. Import Package
 Now you can import installed packages in your Motoko code
 
 ```motoko

package/cli.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import fs from 'node:fs';
-import {program, Argument} from 'commander';
+import {program, Argument, Option} from 'commander';
 import chalk from 'chalk';
 import {Principal} from '@dfinity/principal';
 
@@ -100,6 +100,7 @@ program
 	.command('publish')
 	.description('Publish package to the mops registry')
 	.option('--no-docs', 'Do not generate docs')
+	.option('--no-test', 'Do not run tests')
 	.action(async (options) => {
 		if (!checkConfigFile()) {
 			process.exit(1);
@@ -188,14 +189,10 @@ program
 program
 	.command('test [filter]')
 	.description('Run tests')
-	.option('-r, --reporter <reporter>', 'Choose reporter: verbose, compact, files')
+	.addOption(new Option('-r, --reporter <reporter>', 'Test reporter').choices(['verbose', 'compact', 'files', 'silent']).default('verbose'))
+	.addOption(new Option('--mode <mode>', 'Test mode').choices(['interpreter', 'wasi']).default('interpreter'))
 	.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/publish.ts

@@ -10,8 +10,10 @@ import {parallel} from '../parallel.js';
 import {docs} from './docs.js';
 import {DependencyV2, PackageConfigV2} from '../declarations/main/main.did.js';
 import {Dependency} from '../types.js';
+import {testWithReporter} from './test/test.js';
+import {SilentReporter} from './test/reporters/silent-reporter.js';
 
-export async function publish({noDocs = false} = {}) {
+export async function publish(options: {docs?: boolean, test?: boolean} = {}) {
 	if (!checkConfigFile()) {
 		return;
 	}
@@ -19,24 +21,26 @@ export async function publish({noDocs = false} = {}) {
 	let rootDir = getRootDir();
 	let config = readConfig();
 
+	console.log(`Publishing ${config.package?.name}@${config.package?.version}`);
+
 	// validate
 	for (let key of Object.keys(config)) {
 		if (!['package', 'dependencies', 'dev-dependencies', 'scripts'].includes(key)) {
 			console.log(chalk.red('Error: ') + `Unknown config section [${key}]`);
-			return;
+			process.exit(1);
 		}
 	}
 
 	// required fields
 	if (!config.package) {
 		console.log(chalk.red('Error: ') + 'Please specify [package] section in your mops.toml');
-		return;
+		process.exit(1);
 	}
 	for (let key of ['name', 'version']) {
 		// @ts-ignore
 		if (!config.package[key]) {
 			console.log(chalk.red('Error: ') + `Please specify "${key}" in [config] section in your mops.toml`);
-			return;
+			process.exit(1);
 		}
 	}
 
@@ -74,7 +78,7 @@ export async function publish({noDocs = false} = {}) {
 	for (let key of Object.keys(config.package)) {
 		if (!packageKeys.includes(key)) {
 			console.log(chalk.red('Error: ') + `Unknown config key 'package.${key}'`);
-			return;
+			process.exit(1);
 		}
 	}
 
@@ -100,20 +104,20 @@ export async function publish({noDocs = false} = {}) {
 		// @ts-ignore
 		if (config.package[key] && config.package[key].length > max) {
 			console.log(chalk.red('Error: ') + `package.${key} value max length is ${max}`);
-			return;
+			process.exit(1);
 		}
 	}
 
 	if (config.dependencies) {
 		if (Object.keys(config.dependencies).length > 100) {
 			console.log(chalk.red('Error: ') + 'max dependencies is 100');
-			return;
+			process.exit(1);
 		}
 
 		for (let dep of Object.values(config.dependencies)) {
 			if (dep.path) {
 				console.log(chalk.red('Error: ') + 'you can\'t publish packages with local dependencies');
-				return;
+				process.exit(1);
 			}
 			delete dep.path;
 		}
@@ -122,13 +126,13 @@ export async function publish({noDocs = false} = {}) {
 	if (config['dev-dependencies']) {
 		if (Object.keys(config['dev-dependencies']).length > 100) {
 			console.log(chalk.red('Error: ') + 'max dev-dependencies is 100');
-			return;
+			process.exit(1);
 		}
 
 		for (let dep of Object.values(config['dev-dependencies'])) {
 			if (dep.path) {
 				console.log(chalk.red('Error: ') + 'you can\'t publish packages with local dev-dependencies');
-				return;
+				process.exit(1);
 			}
 			delete dep.path;
 		}
@@ -197,7 +201,8 @@ export async function publish({noDocs = false} = {}) {
 
 	// generate docs
 	let docsFile = path.join(rootDir, '.mops/.docs/docs.tgz');
-	if (!noDocs) {
+	if (options.docs) {
+		console.log('Generating documentation...');
 		await docs({silent: true});
 		if (fs.existsSync(docsFile)) {
 			files.unshift(docsFile);
@@ -207,18 +212,29 @@ export async function publish({noDocs = false} = {}) {
 	// check required files
 	if (!files.includes('mops.toml')) {
 		console.log(chalk.red('Error: ') + ' please add mops.toml file');
-		return;
+		process.exit(1);
 	}
 	if (!files.includes('README.md')) {
 		console.log(chalk.red('Error: ') + ' please add README.md file');
-		return;
+		process.exit(1);
 	}
 
 	// check allowed exts
 	for (let file of files) {
 		if (!minimatch(file, '**/*.{mo,did,md,toml}') && !file.toLowerCase().endsWith('license') && !file.toLowerCase().endsWith('notice') && file !== docsFile) {
 			console.log(chalk.red('Error: ') + `file ${file} has unsupported extension. Allowed: .mo, .did, .md, .toml`);
-			return;
+			process.exit(1);
+		}
+	}
+
+	// test
+	let reporter = new SilentReporter;
+	if (options.test) {
+		console.log('Running tests...');
+		await testWithReporter(reporter);
+		if (reporter.failed > 0) {
+			console.log(chalk.red('Error: ') + 'tests failed');
+			process.exit(1);
 		}
 	}
 
@@ -227,7 +243,7 @@ export async function publish({noDocs = false} = {}) {
 	let step = 0;
 	function progress() {
 		step++;
-		logUpdate(`Publishing ${config.package?.name}@${config.package?.version} ${progressBar(step, total)}`);
+		logUpdate(`Uploading files ${progressBar(step, total)}`);
 	}
 
 	// upload config
@@ -241,6 +257,14 @@ export async function publish({noDocs = false} = {}) {
 	}
 	let puiblishingId = publishing.ok;
 
+	// upload test stats
+	if (options.test) {
+		await actor.uploadTestStats(puiblishingId, {
+			passed: BigInt(reporter.passed),
+			passedNames: reporter.passedNamesFlat,
+		});
+	}
+
 	// upload files
 	await parallel(8, files, async (file: string) => {
 		progress();

package/commands/test/mmf1.ts

@@ -9,6 +9,7 @@ type TestStatus = 'pass' | 'fail' | 'skip';
 type MessageType = 'pass' | 'fail' | 'skip' | 'suite' | 'stdout';
 
 export class MMF1 {
+	file: string;
 	stack: string[] = [];
 	currSuite: string = '';
 	failed = 0;
@@ -19,9 +20,16 @@ export class MMF1 {
 		type: MessageType;
 		message: string;
 	}[] = [];
+	nestingSymbol = ' › ';
+	// or <file>
+	// or <file> › <test>
+	// or <file> › <suite> › <test>
+	// or <file> › <suite> › <test> › <nested-test>...
+	passedNamesFlat: string[] = [];
 
-	constructor(srategy: Strategy) {
+	constructor(srategy: Strategy, file: string) {
 		this.srategy = srategy;
+		this.file = file;
 	}
 
 	_log(type: MessageType,  ...args: string[]) {
@@ -90,6 +98,7 @@ export class MMF1 {
 			}
 			this.passed++;
 			this._log(status, ' '.repeat(this.stack.length * 2), chalk.green('✓'), name);
+			this.passedNamesFlat.push([this.file, ...this.stack, name].join(this.nestingSymbol));
 		}
 		else if (status === 'fail') {
 			this.failed++;

package/commands/test/reporters/compact-reporter.ts

@@ -32,6 +32,10 @@ export class CompactReporter implements Reporter {
 			this.failed += mmf.failed;
 			this.skipped += mmf.skipped;
 
+			if (mmf.passed === 0 && mmf.failed === 0) {
+				this.passed++;
+			}
+
 			this.passedFiles += Number(mmf.failed === 0);
 			this.failedFiles += Number(mmf.failed !== 0);
 

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

@@ -0,0 +1,42 @@
+import chalk from 'chalk';
+import {absToRel} from '../utils.js';
+import {MMF1} from '../mmf1.js';
+import {Reporter} from './reporter.js';
+
+export class SilentReporter implements Reporter {
+	passed = 0;
+	failed = 0;
+	skipped = 0;
+	passedFiles = 0;
+	failedFiles = 0;
+	passedNamesFlat: string[] = [];
+
+	addFiles(_files: string[]) {}
+
+	addRun(file: string, mmf: MMF1, state: Promise<void>, _wasiMode: boolean) {
+		state.then(() => {
+			this.passed += mmf.passed;
+			this.failed += mmf.failed;
+			this.skipped += mmf.skipped;
+			this.passedNamesFlat = [...this.passedNamesFlat, ...mmf.passedNamesFlat];
+
+			if (mmf.passed === 0 && mmf.failed === 0) {
+				this.passed++;
+				this.passedNamesFlat.push(absToRel(file));
+			}
+
+			this.passedFiles += Number(mmf.failed === 0);
+			this.failedFiles += Number(mmf.failed !== 0);
+
+			if (mmf.failed) {
+				console.log(chalk.red('✖'), absToRel(file));
+				mmf.flush('fail');
+				console.log('-'.repeat(50));
+			}
+		});
+	}
+
+	done(): boolean {
+		return this.failed === 0;
+	}
+}

package/commands/test/reporters/verbose-reporter.ts

@@ -25,6 +25,10 @@ export class VerboseReporter implements Reporter {
 			this.failed += mmf.failed;
 			this.skipped += mmf.skipped;
 
+			if (mmf.passed === 0 && mmf.failed === 0) {
+				this.passed++;
+			}
+
 			this.#curFileIndex++ && console.log('-'.repeat(50));
 			console.log(`Running ${chalk.gray(absToRel(file))} ${wasiMode ? chalk.gray('(wasi)') : ''}`);
 			mmf.flush();

package/commands/test/test.ts

@@ -13,10 +13,11 @@ import {parallel} from '../../parallel.js';
 
 import {MMF1} from './mmf1.js';
 import {absToRel} from './utils.js';
+import {Reporter} from './reporters/reporter.js';
 import {VerboseReporter} from './reporters/verbose-reporter.js';
 import {FilesReporter} from './reporters/files-reporter.js';
 import {CompactReporter} from './reporters/compact-reporter.js';
-import {Reporter} from './reporters/reporter.js';
+import {SilentReporter} from './reporters/silent-reporter.js';
 
 let ignore = [
 	'**/node_modules/**',
@@ -30,9 +31,10 @@ let globConfig = {
 	ignore: ignore,
 };
 
+type ReporterName = 'verbose' | 'files' | 'compact' | 'silent';
 type TestMode = 'interpreter' | 'wasi';
 
-export async function test(filter = '', {watch = false, reporter = 'verbose', mode = 'interpreter' as TestMode} = {}) {
+export async function test(filter = '', {watch = false, reporter = 'verbose' as ReporterName, mode = 'interpreter' as TestMode} = {}) {
 	let rootDir = getRootDir();
 
 	if (watch) {
@@ -41,7 +43,7 @@ export async function test(filter = '', {watch = false, reporter = 'verbose', mo
 		let run = debounce(async () => {
 			console.clear();
 			process.stdout.write('\x1Bc');
-			await runAll(filter, reporter);
+			await runAll(reporter, filter, mode);
 			console.log('-'.repeat(50));
 			console.log('Waiting for file changes...');
 			console.log(chalk.gray((`Press ${chalk.gray('Ctrl+C')} to exit.`)));
@@ -61,7 +63,7 @@ export async function test(filter = '', {watch = false, reporter = 'verbose', mo
 		run();
 	}
 	else {
-		let passed = await runAll(filter, reporter, mode);
+		let passed = await runAll(reporter, filter, mode);
 		if (!passed) {
 			process.exit(1);
 		}
@@ -70,7 +72,7 @@ export async function test(filter = '', {watch = false, reporter = 'verbose', mo
 
 let mocPath = process.env.DFX_MOC_PATH;
 
-export async function runAll(filter = '', reporterName = 'verbose', mode: TestMode = 'interpreter') {
+export async function runAll(reporterName: ReporterName = 'verbose', filter = '', mode: TestMode = 'interpreter'): Promise<boolean> {
 	let reporter: Reporter;
 	if (reporterName == 'compact') {
 		reporter = new CompactReporter;
@@ -78,10 +80,17 @@ export async function runAll(filter = '', reporterName = 'verbose', mode: TestMo
 	else if (reporterName == 'files') {
 		reporter = new FilesReporter;
 	}
+	else if (reporterName == 'silent') {
+		reporter = new SilentReporter;
+	}
 	else {
 		reporter = new VerboseReporter;
 	}
+	let done = await testWithReporter(reporter, filter, mode);
+	return done;
+}
 
+export async function testWithReporter(reporter: Reporter, filter = '', mode: TestMode = 'interpreter'): Promise<boolean> {
 	let rootDir = getRootDir();
 	let files: string[] = [];
 	let libFiles = globSync('**/test?(s)/lib.mo', globConfig);
@@ -98,11 +107,11 @@ export async function runAll(filter = '', reporterName = 'verbose', mode: TestMo
 	if (!files.length) {
 		if (filter) {
 			console.log(`No test files found for filter '${filter}'`);
-			return;
+			return false;
 		}
 		console.log('No test files found');
 		console.log('Put your tests in \'test\' directory in *.test.mo files');
-		return;
+		return false;
 	}
 
 	reporter.addFiles(files);
@@ -117,7 +126,7 @@ export async function runAll(filter = '', reporterName = 'verbose', mode: TestMo
 	fs.mkdirSync(wasmDir, {recursive: true});
 
 	await parallel(os.cpus().length, files, async (file: string) => {
-		let mmf = new MMF1('store');
+		let mmf = new MMF1('store', absToRel(file));
 		let wasiMode = mode === 'wasi' || fs.readFileSync(file, 'utf8').startsWith('// @testmode wasi');
 
 		let promise = new Promise<void>((resolve) => {

package/declarations/main/main.did

@@ -26,6 +26,16 @@ type User =
  };
 type Time = int;
 type Text = text;
+type TestStats__1 = 
+ record {
+   passed: nat;
+   passedNames: vec text;
+ };
+type TestStats = 
+ record {
+   passed: nat;
+   passedNames: vec text;
+ };
 type StorageStats = 
  record {
    cyclesBalance: nat;
@@ -133,6 +143,7 @@ type PackageDetails =
    owner: principal;
    ownerInfo: User;
    publication: PackagePublication;
+   testStats: TestStats__1;
    versionHistory: vec PackageSummary__1;
  };
 type PackageConfigV2__1 = 
@@ -242,4 +253,5 @@ service : {
   startPublish: (PackageConfigV2) -> (Result_1);
   takeAirdropSnapshot: () -> () oneway;
   uploadFileChunk: (PublishingId, FileId, nat, blob) -> (Result);
+  uploadTestStats: (PublishingId, TestStats) -> (Result);
 }

package/declarations/main/main.did.d.ts

@@ -58,6 +58,7 @@ export interface PackageDetails {
   'ownerInfo' : User,
   'owner' : Principal,
   'deps' : Array<PackageSummary__1>,
+  'testStats' : TestStats__1,
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
   'downloadTrend' : Array<DownloadsSnapshot>,
@@ -124,6 +125,11 @@ export interface StorageStats {
   'cyclesBalance' : bigint,
   'memorySize' : bigint,
 }
+export interface TestStats { 'passedNames' : Array<string>, 'passed' : bigint }
+export interface TestStats__1 {
+  'passedNames' : Array<string>,
+  'passed' : bigint,
+}
 export type Text = string;
 export type Time = bigint;
 export interface User {
@@ -206,4 +212,5 @@ export interface _SERVICE {
     [PublishingId, FileId, bigint, Uint8Array | number[]],
     Result
   >,
+  'uploadTestStats' : ActorMethod<[PublishingId, TestStats], Result>,
 }

package/declarations/main/main.did.js

@@ -84,6 +84,10 @@ export const idlFactory = ({ IDL }) => {
     'config' : PackageConfigV2__1,
     'publication' : PackagePublication,
   });
+  const TestStats__1 = IDL.Record({
+    'passedNames' : IDL.Vec(IDL.Text),
+    'passed' : IDL.Nat,
+  });
   const DownloadsSnapshot = IDL.Record({
     'startTime' : Time,
     'endTime' : Time,
@@ -93,6 +97,7 @@ export const idlFactory = ({ IDL }) => {
     'ownerInfo' : User,
     'owner' : IDL.Principal,
     'deps' : IDL.Vec(PackageSummary__1),
+    'testStats' : TestStats__1,
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
     'downloadTrend' : IDL.Vec(DownloadsSnapshot),
@@ -145,6 +150,10 @@ export const idlFactory = ({ IDL }) => {
   });
   const PublishingErr = IDL.Text;
   const Result_1 = IDL.Variant({ 'ok' : PublishingId, 'err' : PublishingErr });
+  const TestStats = IDL.Record({
+    'passedNames' : IDL.Vec(IDL.Text),
+    'passed' : IDL.Nat,
+  });
   return IDL.Service({
     'backup' : IDL.Func([], [], []),
     'claimAirdrop' : IDL.Func([IDL.Principal], [IDL.Text], []),
@@ -237,6 +246,7 @@ export const idlFactory = ({ IDL }) => {
         [Result],
         [],
       ),
+    'uploadTestStats' : IDL.Func([PublishingId, TestStats], [Result], []),
   });
 };
 export const init = ({ IDL }) => { return []; };

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-import { program, Argument } from 'commander';
+import { program, Argument, Option } from 'commander';
 import chalk from 'chalk';
 import { Principal } from '@dfinity/principal';
 import { init } from './commands/init.js';
@@ -89,6 +89,7 @@ program
     .command('publish')
     .description('Publish package to the mops registry')
     .option('--no-docs', 'Do not generate docs')
+    .option('--no-test', 'Do not run tests')
     .action(async (options) => {
     if (!checkConfigFile()) {
         process.exit(1);
@@ -169,14 +170,10 @@ program
 program
     .command('test [filter]')
     .description('Run tests')
-    .option('-r, --reporter <reporter>', 'Choose reporter: verbose, compact, files')
+    .addOption(new Option('-r, --reporter <reporter>', 'Test reporter').choices(['verbose', 'compact', 'files', 'silent']).default('verbose'))
+    .addOption(new Option('--mode <mode>', 'Test mode').choices(['interpreter', 'wasi']).default('interpreter'))
     .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/publish.d.ts

@@ -1,3 +1,4 @@
-export declare function publish({ noDocs }?: {
-    noDocs?: boolean | undefined;
+export declare function publish(options?: {
+    docs?: boolean;
+    test?: boolean;
 }): Promise<void>;

package/dist/commands/publish.js

@@ -8,29 +8,32 @@ import prompts from 'prompts';
 import { checkConfigFile, getRootDir, mainActor, progressBar, readConfig } from '../mops.js';
 import { parallel } from '../parallel.js';
 import { docs } from './docs.js';
-export async function publish({ noDocs = false } = {}) {
+import { testWithReporter } from './test/test.js';
+import { SilentReporter } from './test/reporters/silent-reporter.js';
+export async function publish(options = {}) {
     if (!checkConfigFile()) {
         return;
     }
     let rootDir = getRootDir();
     let config = readConfig();
+    console.log(`Publishing ${config.package?.name}@${config.package?.version}`);
     // validate
     for (let key of Object.keys(config)) {
         if (!['package', 'dependencies', 'dev-dependencies', 'scripts'].includes(key)) {
             console.log(chalk.red('Error: ') + `Unknown config section [${key}]`);
-            return;
+            process.exit(1);
         }
     }
     // required fields
     if (!config.package) {
         console.log(chalk.red('Error: ') + 'Please specify [package] section in your mops.toml');
-        return;
+        process.exit(1);
     }
     for (let key of ['name', 'version']) {
         // @ts-ignore
         if (!config.package[key]) {
             console.log(chalk.red('Error: ') + `Please specify "${key}" in [config] section in your mops.toml`);
-            return;
+            process.exit(1);
         }
     }
     // desired fields
@@ -66,7 +69,7 @@ export async function publish({ noDocs = false } = {}) {
     for (let key of Object.keys(config.package)) {
         if (!packageKeys.includes(key)) {
             console.log(chalk.red('Error: ') + `Unknown config key 'package.${key}'`);
-            return;
+            process.exit(1);
         }
     }
     // check lengths
@@ -90,18 +93,18 @@ export async function publish({ noDocs = false } = {}) {
         // @ts-ignore
         if (config.package[key] && config.package[key].length > max) {
             console.log(chalk.red('Error: ') + `package.${key} value max length is ${max}`);
-            return;
+            process.exit(1);
         }
     }
     if (config.dependencies) {
         if (Object.keys(config.dependencies).length > 100) {
             console.log(chalk.red('Error: ') + 'max dependencies is 100');
-            return;
+            process.exit(1);
         }
         for (let dep of Object.values(config.dependencies)) {
             if (dep.path) {
                 console.log(chalk.red('Error: ') + 'you can\'t publish packages with local dependencies');
-                return;
+                process.exit(1);
             }
             delete dep.path;
         }
@@ -109,12 +112,12 @@ export async function publish({ noDocs = false } = {}) {
     if (config['dev-dependencies']) {
         if (Object.keys(config['dev-dependencies']).length > 100) {
             console.log(chalk.red('Error: ') + 'max dev-dependencies is 100');
-            return;
+            process.exit(1);
         }
         for (let dep of Object.values(config['dev-dependencies'])) {
             if (dep.path) {
                 console.log(chalk.red('Error: ') + 'you can\'t publish packages with local dev-dependencies');
-                return;
+                process.exit(1);
             }
             delete dep.path;
         }
@@ -177,7 +180,8 @@ export async function publish({ noDocs = false } = {}) {
     files = globbySync([...files, ...defaultFiles]);
     // generate docs
     let docsFile = path.join(rootDir, '.mops/.docs/docs.tgz');
-    if (!noDocs) {
+    if (options.docs) {
+        console.log('Generating documentation...');
         await docs({ silent: true });
         if (fs.existsSync(docsFile)) {
             files.unshift(docsFile);
@@ -186,17 +190,27 @@ export async function publish({ noDocs = false } = {}) {
     // check required files
     if (!files.includes('mops.toml')) {
         console.log(chalk.red('Error: ') + ' please add mops.toml file');
-        return;
+        process.exit(1);
     }
     if (!files.includes('README.md')) {
         console.log(chalk.red('Error: ') + ' please add README.md file');
-        return;
+        process.exit(1);
     }
     // check allowed exts
     for (let file of files) {
         if (!minimatch(file, '**/*.{mo,did,md,toml}') && !file.toLowerCase().endsWith('license') && !file.toLowerCase().endsWith('notice') && file !== docsFile) {
             console.log(chalk.red('Error: ') + `file ${file} has unsupported extension. Allowed: .mo, .did, .md, .toml`);
-            return;
+            process.exit(1);
+        }
+    }
+    // test
+    let reporter = new SilentReporter;
+    if (options.test) {
+        console.log('Running tests...');
+        await testWithReporter(reporter);
+        if (reporter.failed > 0) {
+            console.log(chalk.red('Error: ') + 'tests failed');
+            process.exit(1);
         }
     }
     // progress
@@ -204,7 +218,7 @@ export async function publish({ noDocs = false } = {}) {
     let step = 0;
     function progress() {
         step++;
-        logUpdate(`Publishing ${config.package?.name}@${config.package?.version} ${progressBar(step, total)}`);
+        logUpdate(`Uploading files ${progressBar(step, total)}`);
     }
     // upload config
     let actor = await mainActor(true);
@@ -215,6 +229,13 @@ export async function publish({ noDocs = false } = {}) {
         return;
     }
     let puiblishingId = publishing.ok;
+    // upload test stats
+    if (options.test) {
+        await actor.uploadTestStats(puiblishingId, {
+            passed: BigInt(reporter.passed),
+            passedNames: reporter.passedNamesFlat,
+        });
+    }
     // upload files
     await parallel(8, files, async (file) => {
         progress();

package/dist/commands/test/mmf1.d.ts

@@ -2,6 +2,7 @@ type Strategy = 'store' | 'print';
 type TestStatus = 'pass' | 'fail' | 'skip';
 type MessageType = 'pass' | 'fail' | 'skip' | 'suite' | 'stdout';
 export declare class MMF1 {
+    file: string;
     stack: string[];
     currSuite: string;
     failed: number;
@@ -12,7 +13,9 @@ export declare class MMF1 {
         type: MessageType;
         message: string;
     }[];
-    constructor(srategy: Strategy);
+    nestingSymbol: string;
+    passedNamesFlat: string[];
+    constructor(srategy: Strategy, file: string);
     _log(type: MessageType, ...args: string[]): void;
     flush(messageType?: MessageType): void;
     parseLine(line: string): void;

package/dist/commands/test/mmf1.js

@@ -4,14 +4,21 @@
 // mops:1:skip
 import chalk from 'chalk';
 export class MMF1 {
-    constructor(srategy) {
+    constructor(srategy, file) {
         this.stack = [];
         this.currSuite = '';
         this.failed = 0;
         this.passed = 0;
         this.skipped = 0;
         this.output = [];
+        this.nestingSymbol = ' › ';
+        // or <file>
+        // or <file> › <test>
+        // or <file> › <suite> › <test>
+        // or <file> › <suite> › <test> › <nested-test>...
+        this.passedNamesFlat = [];
         this.srategy = srategy;
+        this.file = file;
     }
     _log(type, ...args) {
         if (this.srategy === 'store') {
@@ -73,6 +80,7 @@ export class MMF1 {
             }
             this.passed++;
             this._log(status, ' '.repeat(this.stack.length * 2), chalk.green('✓'), name);
+            this.passedNamesFlat.push([this.file, ...this.stack, name].join(this.nestingSymbol));
         }
         else if (status === 'fail') {
             this.failed++;

package/dist/commands/test/reporters/compact-reporter.js

@@ -40,6 +40,9 @@ export class CompactReporter {
             this.passed += mmf.passed;
             this.failed += mmf.failed;
             this.skipped += mmf.skipped;
+            if (mmf.passed === 0 && mmf.failed === 0) {
+                this.passed++;
+            }
             this.passedFiles += Number(mmf.failed === 0);
             this.failedFiles += Number(mmf.failed !== 0);
             if (mmf.failed) {

package/dist/commands/test/reporters/silent-reporter.d.ts

@@ -0,0 +1,13 @@
+import { MMF1 } from '../mmf1.js';
+import { Reporter } from './reporter.js';
+export declare class SilentReporter implements Reporter {
+    passed: number;
+    failed: number;
+    skipped: number;
+    passedFiles: number;
+    failedFiles: number;
+    passedNamesFlat: string[];
+    addFiles(_files: string[]): void;
+    addRun(file: string, mmf: MMF1, state: Promise<void>, _wasiMode: boolean): void;
+    done(): boolean;
+}

package/dist/commands/test/reporters/silent-reporter.js

@@ -0,0 +1,35 @@
+import chalk from 'chalk';
+import { absToRel } from '../utils.js';
+export class SilentReporter {
+    constructor() {
+        this.passed = 0;
+        this.failed = 0;
+        this.skipped = 0;
+        this.passedFiles = 0;
+        this.failedFiles = 0;
+        this.passedNamesFlat = [];
+    }
+    addFiles(_files) { }
+    addRun(file, mmf, state, _wasiMode) {
+        state.then(() => {
+            this.passed += mmf.passed;
+            this.failed += mmf.failed;
+            this.skipped += mmf.skipped;
+            this.passedNamesFlat = [...this.passedNamesFlat, ...mmf.passedNamesFlat];
+            if (mmf.passed === 0 && mmf.failed === 0) {
+                this.passed++;
+                this.passedNamesFlat.push(absToRel(file));
+            }
+            this.passedFiles += Number(mmf.failed === 0);
+            this.failedFiles += Number(mmf.failed !== 0);
+            if (mmf.failed) {
+                console.log(chalk.red('✖'), absToRel(file));
+                mmf.flush('fail');
+                console.log('-'.repeat(50));
+            }
+        });
+    }
+    done() {
+        return this.failed === 0;
+    }
+}

package/dist/commands/test/reporters/verbose-reporter.js

@@ -33,6 +33,9 @@ export class VerboseReporter {
             this.passed += mmf.passed;
             this.failed += mmf.failed;
             this.skipped += mmf.skipped;
+            if (mmf.passed === 0 && mmf.failed === 0) {
+                this.passed++;
+            }
             (__classPrivateFieldSet(this, _VerboseReporter_curFileIndex, (_b = __classPrivateFieldGet(this, _VerboseReporter_curFileIndex, "f"), _a = _b++, _b), "f"), _a) && console.log('-'.repeat(50));
             console.log(`Running ${chalk.gray(absToRel(file))} ${wasiMode ? chalk.gray('(wasi)') : ''}`);
             mmf.flush();

package/dist/commands/test/test.d.ts

@@ -1,8 +1,11 @@
+import { Reporter } from './reporters/reporter.js';
+type ReporterName = 'verbose' | 'files' | 'compact' | 'silent';
 type TestMode = 'interpreter' | 'wasi';
 export declare function test(filter?: string, { watch, reporter, mode }?: {
     watch?: boolean | undefined;
-    reporter?: string | undefined;
+    reporter?: ReporterName | undefined;
     mode?: TestMode | undefined;
 }): Promise<void>;
-export declare function runAll(filter?: string, reporterName?: string, mode?: TestMode): Promise<boolean | undefined>;
+export declare function runAll(reporterName?: ReporterName, filter?: string, mode?: TestMode): Promise<boolean>;
+export declare function testWithReporter(reporter: Reporter, filter?: string, mode?: TestMode): Promise<boolean>;
 export {};

package/dist/commands/test/test.js

@@ -14,6 +14,7 @@ import { absToRel } from './utils.js';
 import { VerboseReporter } from './reporters/verbose-reporter.js';
 import { FilesReporter } from './reporters/files-reporter.js';
 import { CompactReporter } from './reporters/compact-reporter.js';
+import { SilentReporter } from './reporters/silent-reporter.js';
 let ignore = [
     '**/node_modules/**',
     '**/.mops/**',
@@ -32,7 +33,7 @@ export async function test(filter = '', { watch = false, reporter = 'verbose', m
         let run = debounce(async () => {
             console.clear();
             process.stdout.write('\x1Bc');
-            await runAll(filter, reporter);
+            await runAll(reporter, filter, mode);
             console.log('-'.repeat(50));
             console.log('Waiting for file changes...');
             console.log(chalk.gray((`Press ${chalk.gray('Ctrl+C')} to exit.`)));
@@ -50,14 +51,14 @@ export async function test(filter = '', { watch = false, reporter = 'verbose', m
         run();
     }
     else {
-        let passed = await runAll(filter, reporter, mode);
+        let passed = await runAll(reporter, filter, mode);
         if (!passed) {
             process.exit(1);
         }
     }
 }
 let mocPath = process.env.DFX_MOC_PATH;
-export async function runAll(filter = '', reporterName = 'verbose', mode = 'interpreter') {
+export async function runAll(reporterName = 'verbose', filter = '', mode = 'interpreter') {
     let reporter;
     if (reporterName == 'compact') {
         reporter = new CompactReporter;
@@ -65,9 +66,16 @@ export async function runAll(filter = '', reporterName = 'verbose', mode = 'inte
     else if (reporterName == 'files') {
         reporter = new FilesReporter;
     }
+    else if (reporterName == 'silent') {
+        reporter = new SilentReporter;
+    }
     else {
         reporter = new VerboseReporter;
     }
+    let done = await testWithReporter(reporter, filter, mode);
+    return done;
+}
+export async function testWithReporter(reporter, filter = '', mode = 'interpreter') {
     let rootDir = getRootDir();
     let files = [];
     let libFiles = globSync('**/test?(s)/lib.mo', globConfig);
@@ -84,11 +92,11 @@ export async function runAll(filter = '', reporterName = 'verbose', mode = 'inte
     if (!files.length) {
         if (filter) {
             console.log(`No test files found for filter '${filter}'`);
-            return;
+            return false;
         }
         console.log('No test files found');
         console.log('Put your tests in \'test\' directory in *.test.mo files');
-        return;
+        return false;
     }
     reporter.addFiles(files);
     let sourcesArr = await sources();
@@ -98,7 +106,7 @@ export async function runAll(filter = '', reporterName = 'verbose', mode = 'inte
     let wasmDir = `${getRootDir()}/.mops/.test/`;
     fs.mkdirSync(wasmDir, { recursive: true });
     await parallel(os.cpus().length, files, async (file) => {
-        let mmf = new MMF1('store');
+        let mmf = new MMF1('store', absToRel(file));
         let wasiMode = mode === 'wasi' || fs.readFileSync(file, 'utf8').startsWith('// @testmode wasi');
         let promise = new Promise((resolve) => {
             if (!mocPath) {

package/dist/declarations/main/main.did

@@ -26,6 +26,16 @@ type User =
  };
 type Time = int;
 type Text = text;
+type TestStats__1 = 
+ record {
+   passed: nat;
+   passedNames: vec text;
+ };
+type TestStats = 
+ record {
+   passed: nat;
+   passedNames: vec text;
+ };
 type StorageStats = 
  record {
    cyclesBalance: nat;
@@ -133,6 +143,7 @@ type PackageDetails =
    owner: principal;
    ownerInfo: User;
    publication: PackagePublication;
+   testStats: TestStats__1;
    versionHistory: vec PackageSummary__1;
  };
 type PackageConfigV2__1 = 
@@ -242,4 +253,5 @@ service : {
   startPublish: (PackageConfigV2) -> (Result_1);
   takeAirdropSnapshot: () -> () oneway;
   uploadFileChunk: (PublishingId, FileId, nat, blob) -> (Result);
+  uploadTestStats: (PublishingId, TestStats) -> (Result);
 }

package/dist/declarations/main/main.did.d.ts

@@ -58,6 +58,7 @@ export interface PackageDetails {
   'ownerInfo' : User,
   'owner' : Principal,
   'deps' : Array<PackageSummary__1>,
+  'testStats' : TestStats__1,
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
   'downloadTrend' : Array<DownloadsSnapshot>,
@@ -124,6 +125,11 @@ export interface StorageStats {
   'cyclesBalance' : bigint,
   'memorySize' : bigint,
 }
+export interface TestStats { 'passedNames' : Array<string>, 'passed' : bigint }
+export interface TestStats__1 {
+  'passedNames' : Array<string>,
+  'passed' : bigint,
+}
 export type Text = string;
 export type Time = bigint;
 export interface User {
@@ -206,4 +212,5 @@ export interface _SERVICE {
     [PublishingId, FileId, bigint, Uint8Array | number[]],
     Result
   >,
+  'uploadTestStats' : ActorMethod<[PublishingId, TestStats], Result>,
 }

package/dist/declarations/main/main.did.js

@@ -84,6 +84,10 @@ export const idlFactory = ({ IDL }) => {
     'config' : PackageConfigV2__1,
     'publication' : PackagePublication,
   });
+  const TestStats__1 = IDL.Record({
+    'passedNames' : IDL.Vec(IDL.Text),
+    'passed' : IDL.Nat,
+  });
   const DownloadsSnapshot = IDL.Record({
     'startTime' : Time,
     'endTime' : Time,
@@ -93,6 +97,7 @@ export const idlFactory = ({ IDL }) => {
     'ownerInfo' : User,
     'owner' : IDL.Principal,
     'deps' : IDL.Vec(PackageSummary__1),
+    'testStats' : TestStats__1,
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
     'downloadTrend' : IDL.Vec(DownloadsSnapshot),
@@ -145,6 +150,10 @@ export const idlFactory = ({ IDL }) => {
   });
   const PublishingErr = IDL.Text;
   const Result_1 = IDL.Variant({ 'ok' : PublishingId, 'err' : PublishingErr });
+  const TestStats = IDL.Record({
+    'passedNames' : IDL.Vec(IDL.Text),
+    'passed' : IDL.Nat,
+  });
   return IDL.Service({
     'backup' : IDL.Func([], [], []),
     'claimAirdrop' : IDL.Func([IDL.Principal], [IDL.Text], []),
@@ -237,6 +246,7 @@ export const idlFactory = ({ IDL }) => {
         [Result],
         [],
       ),
+    'uploadTestStats' : IDL.Func([PublishingId, TestStats], [Result], []),
   });
 };
 export const init = ({ IDL }) => { return []; };

package/dist/package.json

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

package/dist/templates/src/lib.mo

@@ -7,7 +7,7 @@ module {
 	/// Example:
 	/// ```motoko
 	/// assert add(1, 2) == 3;
-	/// assert add(-5, 5) == 0;
+	/// assert add(7, 3) == 10;
 	/// ```
 	public func add(x : Nat, y : Nat) : Nat {
 		return x + y;

package/package.json

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

package/templates/src/lib.mo

@@ -7,7 +7,7 @@ module {
 	/// Example:
 	/// ```motoko
 	/// assert add(1, 2) == 3;
-	/// assert add(-5, 5) == 0;
+	/// assert add(7, 3) == 10;
 	/// ```
 	public func add(x : Nat, y : Nat) : Nat {
 		return x + y;