ic-mops 1.5.0 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Mops CLI Changelog
 
+## 1.6.0
+- Add support for `.bash_profile` and `.zprofile` files to `mops toolchain init` command
+
+## 1.5.1
+- Collapsible output of `mops bench` in a CI environment
+- Fix regression in `mops bench` without `dfx.json` file (by @rvanasa)
+
 ## 1.5.0
 - Compile benchmarks with `--release` flag by default
 - Respect `profile` field in `dfx.json` for benchmarks

package/commands/bench.ts

@@ -67,7 +67,7 @@ export async function bench(filter = '', optionsArg : Partial<BenchOptions> = {}
 		compare: false,
 		verbose: false,
 		silent: false,
-		profile: dfxJson.profile || 'Release',
+		profile: dfxJson?.profile || 'Release',
 	};
 
 	let options : BenchOptions = {...defaultOptions, ...optionsArg};
@@ -125,7 +125,7 @@ export async function bench(filter = '', optionsArg : Partial<BenchOptions> = {}
 	fs.rmSync(benchDir, {recursive: true, force: true});
 	fs.mkdirSync(benchDir, {recursive: true});
 
-	if (!options.silent) {
+	if (!options.silent && !process.env.CI) {
 		console.log('Benchmark files:');
 		for (let file of files) {
 			console.log(chalk.gray(`• ${absToRel(file)}`));
@@ -183,6 +183,57 @@ export async function bench(filter = '', optionsArg : Partial<BenchOptions> = {}
 	return benchResults;
 }
 
+function computeDiff(
+	results : Map<string, BenchResult>,
+	prevResults : Map<string, BenchResult> | undefined,
+	rows : string[],
+	cols : string[],
+	metric : keyof BenchResult,
+) : number {
+	let diff = 0;
+	let count = 0;
+
+	for (let [_rowIndex, row] of rows.entries()) {
+		for (let [_colIndex, col] of cols.entries()) {
+			let res = results.get(`${row}:${col}`);
+			if (res && prevResults) {
+				let prevRes = prevResults.get(`${row}:${col}`);
+				if (prevRes) {
+					let denom = Number(prevRes[metric]);
+					let numerator = Number(res[metric]) - denom;
+					let percent = 0;
+					if (denom !== 0) {
+						percent = (numerator / denom) * 100;
+					}
+					if (!Number.isFinite(percent)) {
+						percent = 0;
+					}
+					diff += percent;
+					count++;
+				}
+			}
+		}
+	}
+
+	return count > 0 ? diff / count : 0;
+}
+
+function computeDiffAll(
+	currentResults : Map<string, BenchResult>,
+	prevResults : Map<string, BenchResult> | undefined,
+	rows : string[],
+	cols : string[],
+) : number {
+	let metrics : (keyof BenchResult)[] = ['instructions', 'rts_heap_size', 'rts_logical_stable_memory_size', 'rts_reclaimed'];
+	let diff = 0;
+
+	for (let metric of metrics) {
+		diff += computeDiff(currentResults, prevResults, rows, cols, metric);
+	}
+
+	return diff;
+}
+
 function getMocArgs(options : BenchOptions) : string {
 	let args = '';
 
@@ -273,6 +324,19 @@ async function runBenchFile(file : string, options : BenchOptions, replica : Ben
 		return filesize(n, {standard: 'iec', round: 2});
 	};
 
+	let colorizePercent = (percent : number, wrapInParens = false) : string => {
+		let sign = percent > 0 ? '+' : '';
+		let percentText = percent == 0 ? '0%' : sign + percent.toFixed(2) + '%';
+		let color : keyof typeof chalk = percent == 0 ? 'gray' : (percent > 0 ? 'red' : 'green');
+		let parens = wrapInParens ? ['(', ')'] : ['', ''];
+		if (process.env.CI) {
+			return `$${parens[0]}{\\color{${color}}${percentText.replace('%', '\\\\%')}}${parens[1]}$`;
+		}
+		else {
+			return `${parens[0]}${chalk[color](percentText)}${parens[1]}`;
+		}
+	};
+
 	let getTable = (prop : keyof BenchResult) : string => {
 		let resArr = [['', ...schema.cols]];
 		let allZero = true;
@@ -296,15 +360,7 @@ async function runBenchFile(file : string, options : BenchOptions, replica : Ben
 							if (Object.is(percent, NaN)) {
 								percent = 0;
 							}
-							let sign = percent > 0 ? '+' : '';
-							let percentText = percent == 0 ? '0%' : sign + percent.toFixed(2) + '%';
-							let color : keyof typeof chalk = percent == 0 ? 'gray' : (percent > 0 ? 'red' : 'green');
-							if (process.env.CI) {
-								diff = ` $({\\color{${color}}${percentText.replace('%', '\\\\%')}})$`;
-							}
-							else {
-								diff = ` (${chalk[color](percentText)})`;
-							}
+							diff = ' ' + colorizePercent(percent, true);
 						}
 						else {
 							diff = chalk.yellow(' (no previous results)');
@@ -345,14 +401,33 @@ async function runBenchFile(file : string, options : BenchOptions, replica : Ben
 	let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
 
 	let getOutput = () => {
-		return `
-			\n${process.env.CI ? `## ${schema.name}` : chalk.bold(schema.name)}
-			${schema.description ? '\n' + (process.env.CI ? `_${schema.description}_` : chalk.gray(schema.description)) : ''}
-			\n\n${chalk.blue('Instructions')}\n\n${getTable('instructions')}
-			\n\n${chalk.blue('Heap')}\n\n${getTable('rts_heap_size')}
-			\n\n${chalk.blue('Garbage Collection')}\n\n${getTable('rts_reclaimed')}
-			${getTable('rts_logical_stable_memory_size') ? `\n\n${chalk.blue('Stable Memory')}\n\n${getTable('rts_logical_stable_memory_size')}` : ''}
-		`;
+		if (process.env.CI) {
+			return [
+				'\n<details>',
+				`\n<summary>${absToRel(file)} ${colorizePercent(computeDiffAll(results, prevResults, schema.rows, schema.cols), true).replace('\\\\%', '\\%')}</summary>`,
+				`\n${process.env.CI ? `### ${schema.name}` : chalk.bold(schema.name)}`,
+				`${schema.description ? '\n' + (process.env.CI ? `_${schema.description}_` : chalk.gray(schema.description)) : ''}`,
+				`\n\nInstructions: ${colorizePercent(computeDiff(results, prevResults, schema.rows, schema.cols, 'instructions'), false)}`,
+				`Heap: ${colorizePercent(computeDiff(results, prevResults, schema.rows, schema.cols, 'rts_heap_size'), false)}`,
+				`Stable Memory: ${colorizePercent(computeDiff(results, prevResults, schema.rows, schema.cols, 'rts_logical_stable_memory_size'), false)}`,
+				`Garbage Collection: ${colorizePercent(computeDiff(results, prevResults, schema.rows, schema.cols, 'rts_reclaimed'), false)}`,
+				`\n\n**Instructions**\n\n${getTable('instructions')}`,
+				`\n\n**Heap**\n\n${getTable('rts_heap_size')}`,
+				`\n\n**Garbage Collection**\n\n${getTable('rts_reclaimed')}`,
+				`${getTable('rts_logical_stable_memory_size') ? `\n\n**Stable Memory**\n\n${getTable('rts_logical_stable_memory_size')}` : ''}`,
+				'\n</details>',
+			].join('\n');
+		}
+		else {
+			return `
+				\n${chalk.bold(schema.name)}
+				${schema.description ? '\n' + chalk.gray(schema.description) : ''}
+				\n\n${chalk.blue('Instructions')}\n\n${getTable('instructions')}
+				\n\n${chalk.blue('Heap')}\n\n${getTable('rts_heap_size')}
+				\n\n${chalk.blue('Garbage Collection')}\n\n${getTable('rts_reclaimed')}
+				${getTable('rts_logical_stable_memory_size') ? `\n\n${chalk.blue('Stable Memory')}\n\n${getTable('rts_logical_stable_memory_size')}` : ''}
+			`;
+		}
 	};
 
 	let canUpdateLog = !process.env.CI && !options.silent && terminalSize().rows > getOutput().split('\n').length;
@@ -445,4 +520,4 @@ async function runBenchFile(file : string, options : BenchOptions, replica : Ben
 			['rts_reclaimed', reclaimedCells],
 		],
 	};
-}
+}

package/commands/toolchain/index.ts

@@ -79,13 +79,16 @@ async function init({reset = false, silent = false} = {}) {
 
 	let zshrc = path.join(os.homedir(), '.zshrc');
 	let bashrc = path.join(os.homedir(), '.bashrc');
+	let bashProfile = path.join(os.homedir(), '.bash_profile');
+	let zprofile = path.join(os.homedir(), '.zprofile');
 
-	let shellConfigFiles = [bashrc, zshrc, process.env.GITHUB_ENV || ''].map(x => x).filter((file) => {
+	let shellConfigFiles = [bashrc, zshrc, bashProfile, zprofile, process.env.GITHUB_ENV || ''].map(x => x).filter((file) => {
 		return fs.existsSync(file);
 	});
 
 	if (shellConfigFiles.length === 0) {
-		console.error('Shell config files not found: ".bashrc" or ".zshrc"');
+		console.error('Shell config files not found: .bashrc, .zshrc, .bash_profile, .zprofile');
+		console.log('TIP: You can add "export DFX_MOC_PATH=moc-wrapper" to your shell config file manually to initialize Mops toolchain');
 		process.exit(1);
 	}
 

package/dist/commands/bench.js

@@ -43,7 +43,7 @@ export async function bench(filter = '', optionsArg = {}) {
         compare: false,
         verbose: false,
         silent: false,
-        profile: dfxJson.profile || 'Release',
+        profile: dfxJson?.profile || 'Release',
     };
     let options = { ...defaultOptions, ...optionsArg };
     let replicaType = options.replica ?? (config.toolchain?.['pocket-ic'] ? 'pocket-ic' : 'dfx');
@@ -90,7 +90,7 @@ export async function bench(filter = '', optionsArg = {}) {
     let benchDir = `${getRootDir()}/.mops/.bench/`;
     fs.rmSync(benchDir, { recursive: true, force: true });
     fs.mkdirSync(benchDir, { recursive: true });
-    if (!options.silent) {
+    if (!options.silent && !process.env.CI) {
         console.log('Benchmark files:');
         for (let file of files) {
             console.log(chalk.gray(`• ${absToRel(file)}`));
@@ -139,6 +139,40 @@ export async function bench(filter = '', optionsArg = {}) {
     fs.rmSync(benchDir, { recursive: true, force: true });
     return benchResults;
 }
+function computeDiff(results, prevResults, rows, cols, metric) {
+    let diff = 0;
+    let count = 0;
+    for (let [_rowIndex, row] of rows.entries()) {
+        for (let [_colIndex, col] of cols.entries()) {
+            let res = results.get(`${row}:${col}`);
+            if (res && prevResults) {
+                let prevRes = prevResults.get(`${row}:${col}`);
+                if (prevRes) {
+                    let denom = Number(prevRes[metric]);
+                    let numerator = Number(res[metric]) - denom;
+                    let percent = 0;
+                    if (denom !== 0) {
+                        percent = (numerator / denom) * 100;
+                    }
+                    if (!Number.isFinite(percent)) {
+                        percent = 0;
+                    }
+                    diff += percent;
+                    count++;
+                }
+            }
+        }
+    }
+    return count > 0 ? diff / count : 0;
+}
+function computeDiffAll(currentResults, prevResults, rows, cols) {
+    let metrics = ['instructions', 'rts_heap_size', 'rts_logical_stable_memory_size', 'rts_reclaimed'];
+    let diff = 0;
+    for (let metric of metrics) {
+        diff += computeDiff(currentResults, prevResults, rows, cols, metric);
+    }
+    return diff;
+}
 function getMocArgs(options) {
     let args = '';
     if (options.forceGc) {
@@ -211,6 +245,18 @@ async function runBenchFile(file, options, replica) {
     let formatSize = (n) => {
         return filesize(n, { standard: 'iec', round: 2 });
     };
+    let colorizePercent = (percent, wrapInParens = false) => {
+        let sign = percent > 0 ? '+' : '';
+        let percentText = percent == 0 ? '0%' : sign + percent.toFixed(2) + '%';
+        let color = percent == 0 ? 'gray' : (percent > 0 ? 'red' : 'green');
+        let parens = wrapInParens ? ['(', ')'] : ['', ''];
+        if (process.env.CI) {
+            return `$${parens[0]}{\\color{${color}}${percentText.replace('%', '\\\\%')}}${parens[1]}$`;
+        }
+        else {
+            return `${parens[0]}${chalk[color](percentText)}${parens[1]}`;
+        }
+    };
     let getTable = (prop) => {
         let resArr = [['', ...schema.cols]];
         let allZero = true;
@@ -231,15 +277,7 @@ async function runBenchFile(file, options, replica) {
                             if (Object.is(percent, NaN)) {
                                 percent = 0;
                             }
-                            let sign = percent > 0 ? '+' : '';
-                            let percentText = percent == 0 ? '0%' : sign + percent.toFixed(2) + '%';
-                            let color = percent == 0 ? 'gray' : (percent > 0 ? 'red' : 'green');
-                            if (process.env.CI) {
-                                diff = ` $({\\color{${color}}${percentText.replace('%', '\\\\%')}})$`;
-                            }
-                            else {
-                                diff = ` (${chalk[color](percentText)})`;
-                            }
+                            diff = ' ' + colorizePercent(percent, true);
                         }
                         else {
                             diff = chalk.yellow(' (no previous results)');
@@ -275,14 +313,33 @@ async function runBenchFile(file, options, replica) {
     };
     let logUpdate = createLogUpdate(process.stdout, { showCursor: true });
     let getOutput = () => {
-        return `
-			\n${process.env.CI ? `## ${schema.name}` : chalk.bold(schema.name)}
-			${schema.description ? '\n' + (process.env.CI ? `_${schema.description}_` : chalk.gray(schema.description)) : ''}
-			\n\n${chalk.blue('Instructions')}\n\n${getTable('instructions')}
-			\n\n${chalk.blue('Heap')}\n\n${getTable('rts_heap_size')}
-			\n\n${chalk.blue('Garbage Collection')}\n\n${getTable('rts_reclaimed')}
-			${getTable('rts_logical_stable_memory_size') ? `\n\n${chalk.blue('Stable Memory')}\n\n${getTable('rts_logical_stable_memory_size')}` : ''}
-		`;
+        if (process.env.CI) {
+            return [
+                '\n<details>',
+                `\n<summary>${absToRel(file)} ${colorizePercent(computeDiffAll(results, prevResults, schema.rows, schema.cols), true).replace('\\\\%', '\\%')}</summary>`,
+                `\n${process.env.CI ? `### ${schema.name}` : chalk.bold(schema.name)}`,
+                `${schema.description ? '\n' + (process.env.CI ? `_${schema.description}_` : chalk.gray(schema.description)) : ''}`,
+                `\n\nInstructions: ${colorizePercent(computeDiff(results, prevResults, schema.rows, schema.cols, 'instructions'), false)}`,
+                `Heap: ${colorizePercent(computeDiff(results, prevResults, schema.rows, schema.cols, 'rts_heap_size'), false)}`,
+                `Stable Memory: ${colorizePercent(computeDiff(results, prevResults, schema.rows, schema.cols, 'rts_logical_stable_memory_size'), false)}`,
+                `Garbage Collection: ${colorizePercent(computeDiff(results, prevResults, schema.rows, schema.cols, 'rts_reclaimed'), false)}`,
+                `\n\n**Instructions**\n\n${getTable('instructions')}`,
+                `\n\n**Heap**\n\n${getTable('rts_heap_size')}`,
+                `\n\n**Garbage Collection**\n\n${getTable('rts_reclaimed')}`,
+                `${getTable('rts_logical_stable_memory_size') ? `\n\n**Stable Memory**\n\n${getTable('rts_logical_stable_memory_size')}` : ''}`,
+                '\n</details>',
+            ].join('\n');
+        }
+        else {
+            return `
+				\n${chalk.bold(schema.name)}
+				${schema.description ? '\n' + chalk.gray(schema.description) : ''}
+				\n\n${chalk.blue('Instructions')}\n\n${getTable('instructions')}
+				\n\n${chalk.blue('Heap')}\n\n${getTable('rts_heap_size')}
+				\n\n${chalk.blue('Garbage Collection')}\n\n${getTable('rts_reclaimed')}
+				${getTable('rts_logical_stable_memory_size') ? `\n\n${chalk.blue('Stable Memory')}\n\n${getTable('rts_logical_stable_memory_size')}` : ''}
+			`;
+        }
     };
     let canUpdateLog = !process.env.CI && !options.silent && terminalSize().rows > getOutput().split('\n').length;
     let log = () => {

package/dist/commands/toolchain/index.js

@@ -71,11 +71,14 @@ async function init({ reset = false, silent = false } = {}) {
     catch { }
     let zshrc = path.join(os.homedir(), '.zshrc');
     let bashrc = path.join(os.homedir(), '.bashrc');
-    let shellConfigFiles = [bashrc, zshrc, process.env.GITHUB_ENV || ''].map(x => x).filter((file) => {
+    let bashProfile = path.join(os.homedir(), '.bash_profile');
+    let zprofile = path.join(os.homedir(), '.zprofile');
+    let shellConfigFiles = [bashrc, zshrc, bashProfile, zprofile, process.env.GITHUB_ENV || ''].map(x => x).filter((file) => {
         return fs.existsSync(file);
     });
     if (shellConfigFiles.length === 0) {
-        console.error('Shell config files not found: ".bashrc" or ".zshrc"');
+        console.error('Shell config files not found: .bashrc, .zshrc, .bash_profile, .zprofile');
+        console.log('TIP: You can add "export DFX_MOC_PATH=moc-wrapper" to your shell config file manually to initialize Mops toolchain');
         process.exit(1);
     }
     // update all existing shell config files

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",

package/package.json

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