ic-mops 1.0.0-pre.0 → 1.0.1

package/CHANGELOG.md

@@ -1,21 +1,28 @@
 # Mops CLI Changelog
 
-## unreleased
+## 1.0.1
+- Fixed `mops user *` commands
+
+## 1.0.0
 - `mops cache clean` now cleans local cache too (`.mops` folder)
 - Conflicting dependencies are now reported on `mops add/install/sources`
 - New `--conflicts <action>` option in `mops sources` command ([docs](https://docs.mops.one/cli/mops-sources#--conflicts))
 - New "Stable Memory" and "Garbage Collection" metrics are now reported in the `mops bench` command
 - `mops test` command now supports `replica` mode for running actor tests ([docs](https://docs.mops.one/cli/mops-test#--mode))
 - New `--replica` option in `mops test` command
+- Updated npm dependencies
+- Fixed bug with GitHub dependency with branch name containing `/`
 
 **Breaking changes**:
-- Default replica in `mops bench` commands now is `pocket-ic` if `pocket-ic` is specified in `mops.toml` in `[toolchain]` section
+- Default replica in `mops bench` and `mops test` commands now is `pocket-ic` if `pocket-ic` is specified in `mops.toml` in `[toolchain]` section and `dfx` otherwise
 - The only supported version of `pocket-ic` is `4.0.0`
-- Removed the ability to install a specific package with `mops install <pkg>` command. Use `mops add <pkg>` instead.
-- Default reporter in `mops test` command is now `verbose` if there is only one file to test and `files` otherwise.
-- Removed legacy folders migration code. If you are using Mops CLI  `<= 0.21.0`, you need first to run `npm i -g ic-mops@0.45.3` to migrate your legacy folders. After that, you can run `mops self update` to update your Mops CLI to the latest version.
+- Dropped support for `wasmtime` version `< 14.0.0`
+- Default reporter in `mops test` command is now `files` if test file count is > 1 and `verbose` otherwise.
 - Renamed `mops import-identity` command to `mops user import`
 - Renamed `mops whoami` command to `mops user get-principal`
+- Removed the ability to install a specific package with `mops install <pkg>` command. Use `mops add <pkg>` instead.
+- Removed legacy folders migration code. If you are using Mops CLI  `<= 0.21.0`, you need first to run `npm i -g ic-mops@0.45.3` to migrate your legacy folders. After that, you can run `mops self update` to update your Mops CLI to the latest version.
+- Removed `--verbose` flag from `mops sources` command
 
 ## 0.45.3
 - Fixed bug with missing `tar` package

package/cache.ts

@@ -35,7 +35,7 @@ export function getMopsDepCacheName(name : string, version : string) {
 
 export function getGithubDepCacheName(name : string, repo : string) {
 	const {branch, commitHash} = parseGithubURL(repo);
-	return `_github/${name}#${branch}` + (commitHash ? `@${commitHash}` : '');
+	return `_github/${name}#${branch.replaceAll('/', '___')}` + (commitHash ? `@${commitHash}` : '');
 }
 
 export let addCache = (cacheName : string, source : string) => {

package/cli.ts

@@ -25,7 +25,6 @@ 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 {docs} from './commands/docs.js';
 
 declare global {
 	// eslint-disable-next-line no-var
@@ -152,23 +151,12 @@ program
 		console.log(getNetwork());
 	});
 
-// user import
-program
-	.command('mops user import <data>')
-	.description('Import .pem file data to use as identity')
-	.addOption(new Option('--no-encrypt', 'Do not ask for a password to encrypt identity'))
-	.action(async (data, options) => {
-		await importPem(data, options);
-		await getPrincipal();
-	});
-
 // sources
 program
 	.command('sources')
 	.description('for dfx packtool')
 	.option('--no-install', 'Do not install dependencies before running sources')
 	.addOption(new Option('--conflicts <action>', 'What to do with dependency version conflicts').choices(['ignore', 'warning', 'error']).default('warning'))
-	.option('--verbose', 'Show more information') // for backcompat
 	.action(async (options) => {
 		if (!checkConfigFile()) {
 			process.exit(1);
@@ -181,14 +169,6 @@ program
 		console.log(sourcesArr.join('\n'));
 	});
 
-// get-principal
-program
-	.command('get-principal')
-	.description('Print your principal')
-	.action(async () => {
-		await getPrincipal();
-	});
-
 // search
 program
 	.command('search <text>')
@@ -257,37 +237,48 @@ program
 		await template();
 	});
 
-// docs
-// program
-// 	.command('docs')
-// 	.description('Generate documentation (experimental)')
-// 	.action(async () => {
-// 		if (!checkConfigFile()) {
-// 			process.exit(1);
-// 		}
-// 		await docs();
-// 	});
-
-// user
-program
-	.command('user')
-	.addArgument(new Argument('<sub>').choices(['set', 'get']))
+// mops user *
+const userCommand = new Command('user').description('User management');
+
+// user get-principal
+userCommand
+	.command('get-principal')
+	.description('Print your principal')
+	.action(async () => {
+		await getPrincipal();
+	});
+
+// user import
+userCommand
+	.command('import <data>')
+	.description('Import .pem file data to use as identity')
+	.addOption(new Option('--no-encrypt', 'Do not ask for a password to encrypt identity'))
+	.action(async (data, options) => {
+		await importPem(data, options);
+		await getPrincipal();
+	});
+
+// user set <prop> <value>
+userCommand
+	.command('set')
 	.addArgument(new Argument('<prop>').choices(['name', 'site', 'email', 'github', 'twitter']))
-	.addArgument(new Argument('[value]'))
-	.description('User settings')
-	.action(async (sub, prop, value) => {
-		if (sub == 'get') {
-			await getUserProp(prop);
-		}
-		else if (sub == 'set') {
-			if (!value) {
-				console.log('error: missing required argument "value"');
-				return;
-			}
-			await setUserProp(prop, value);
-		}
+	.addArgument(new Argument('<value>'))
+	.description('Set user property')
+	.action(async (prop, value) => {
+		await setUserProp(prop, value);
 	});
 
+// user get <prop>
+userCommand
+	.command('get')
+	.addArgument(new Argument('<prop>').choices(['name', 'site', 'email', 'github', 'twitter']))
+	.description('Get user property')
+	.action(async (prop) => {
+		await getUserProp(prop);
+	});
+
+program.addCommand(userCommand);
+
 // bump
 program
 	.command('bump [major|minor|patch]')

package/commands/bench.ts

@@ -98,7 +98,7 @@ export async function bench(filter = '', optionsArg : Partial<BenchOptions> = {}
 	files.sort();
 
 	let benchDir = `${getRootDir()}/.mops/.bench/`;
-	// fs.rmSync(benchDir, {recursive: true, force: true});
+	fs.rmSync(benchDir, {recursive: true, force: true});
 	fs.mkdirSync(benchDir, {recursive: true});
 
 	if (!options.silent) {
@@ -147,7 +147,7 @@ export async function bench(filter = '', optionsArg : Partial<BenchOptions> = {}
 	options.silent || console.log('Stopping replica...');
 	await replica.stop();
 
-	// fs.rmSync(benchDir, {recursive: true, force: true});
+	fs.rmSync(benchDir, {recursive: true, force: true});
 
 	return benchResults;
 }

package/commands/replica.ts

@@ -95,18 +95,20 @@ export class Replica {
 			curData = curData + data.toString();
 
 			if (curData.includes('\n')) {
-				let m = curData.match(/\[Canister ([a-z0-9-]+)\] (.*)/);
-				if (!m) {
-					return;
+				let chunk = curData.split('\n').slice(0, -1).join('\n');
+				let matches = [...chunk.matchAll(/\[Canister ([a-z0-9-]+)\] (.*)/g)];
+
+				for (let match of matches) {
+					let [, canisterId, msg] = match;
+					let stream = this.getCanisterStream(canisterId || '');
+					if (stream) {
+						stream.write(msg);
+					}
 				}
-				let [, canisterId, msg] = m;
 
-				let stream = this.getCanisterStream(canisterId || '');
-				if (stream) {
-					stream.write(msg);
+				if (matches.length) {
+					curData = curData.split('\n').slice(-1).join('\n');
 				}
-
-				curData = '';
 			}
 		});
 	}

package/commands/test/mmf1.ts

@@ -83,7 +83,11 @@ export class MMF1 {
 	}
 
 	_testEnd(name : string) {
-		if (name !== this.stack.pop()) {
+		let last = this.stack.pop();
+		if (name !== last) {
+			console.error(`Expected test name "${last}" but got "${name}"`);
+			console.error(`Stack: ${this.stack.join(' › ')}`);
+			console.error(`File: ${this.file}`);
 			throw 'mmf1._testEnd: start and end test mismatch';
 		}
 		this._status(name, 'pass');

package/commands/test/test.ts

@@ -247,15 +247,9 @@ export async function testWithReporter(reporterName : ReporterName | Reporter |
 							wasmFile,
 						];
 					}
-					// backcompat
 					else {
-						wasmtimeArgs = [
-							'--max-wasm-stack=4000000',
-							'--enable-cranelift-nan-canonicalization',
-							'--wasm-features',
-							'multi-memory,bulk-memory',
-							wasmFile,
-						];
+						console.error(chalk.red('Minimum wasmtime version is 14.0.0. Please update wasmtime to the latest version'));
+						process.exit(1);
 					}
 
 					let proc = spawn(wasmtimePath, wasmtimeArgs);

package/declarations/bench/bench.did

@@ -1,4 +1,4 @@
-type _anon_class_10_1 =
+type _anon_class_13_1 = 
  service {
    getSchema: () -> (BenchSchema) query;
    getStats: () -> (BenchResult) query;
@@ -7,24 +7,24 @@ type _anon_class_10_1 =
    runCellUpdate: (nat, nat) -> (BenchResult);
    runCellUpdateAwait: (nat, nat) -> (BenchResult);
  };
-type BenchSchema =
+type BenchSchema = 
  record {
    cols: vec text;
    description: text;
    name: text;
    rows: vec text;
  };
-type BenchResult =
+type BenchResult = 
  record {
    instructions: int;
-   rts_heap_size: int;
-   stable_memory_size: int;
-   rts_stable_memory_size: int;
    rts_collector_instructions: int;
+   rts_heap_size: int;
+   rts_logical_stable_memory_size: int;
    rts_memory_size: int;
    rts_mutator_instructions: int;
-   rts_total_allocation: int;
-   rts_logical_stable_memory_size: int;
    rts_reclaimed: int;
+   rts_stable_memory_size: int;
+   rts_total_allocation: int;
+   stable_memory_size: int;
  };
-service : () -> _anon_class_10_1
+service : () -> _anon_class_13_1

package/declarations/bench/bench.did.d.ts

@@ -3,14 +3,14 @@ import type { ActorMethod } from '@dfinity/agent';
 import type { IDL } from '@dfinity/candid';
 
 export interface BenchResult {
+  'rts_stable_memory_size' : bigint,
+  'stable_memory_size' : bigint,
   'instructions' : bigint,
   'rts_memory_size' : bigint,
-  'stable_memory_size' : bigint,
-  'rts_stable_memory_size' : bigint,
-  'rts_logical_stable_memory_size' : bigint,
   'rts_total_allocation' : bigint,
   'rts_collector_instructions' : bigint,
   'rts_mutator_instructions' : bigint,
+  'rts_logical_stable_memory_size' : bigint,
   'rts_heap_size' : bigint,
   'rts_reclaimed' : bigint,
 }
@@ -20,7 +20,7 @@ export interface BenchSchema {
   'rows' : Array<string>,
   'description' : string,
 }
-export interface _anon_class_10_1 {
+export interface _anon_class_13_1 {
   'getSchema' : ActorMethod<[], BenchSchema>,
   'getStats' : ActorMethod<[], BenchResult>,
   'init' : ActorMethod<[], BenchSchema>,
@@ -28,6 +28,6 @@ export interface _anon_class_10_1 {
   'runCellUpdate' : ActorMethod<[bigint, bigint], BenchResult>,
   'runCellUpdateAwait' : ActorMethod<[bigint, bigint], BenchResult>,
 }
-export interface _SERVICE extends _anon_class_10_1 {}
+export interface _SERVICE extends _anon_class_13_1 {}
 export declare const idlFactory: IDL.InterfaceFactory;
 export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[];

package/declarations/bench/bench.did.js

@@ -6,18 +6,18 @@ export const idlFactory = ({ IDL }) => {
     'description' : IDL.Text,
   });
   const BenchResult = IDL.Record({
-    'instructions' : IDL.Int,
-    'stable_memory_size' : IDL.Int,
     'rts_stable_memory_size' : IDL.Int,
-    'rts_logical_stable_memory_size' : IDL.Int,
+    'stable_memory_size' : IDL.Int,
+    'instructions' : IDL.Int,
     'rts_memory_size' : IDL.Int,
     'rts_total_allocation' : IDL.Int,
     'rts_collector_instructions' : IDL.Int,
     'rts_mutator_instructions' : IDL.Int,
+    'rts_logical_stable_memory_size' : IDL.Int,
     'rts_heap_size' : IDL.Int,
     'rts_reclaimed' : IDL.Int,
   });
-  const _anon_class_10_1 = IDL.Service({
+  const _anon_class_13_1 = IDL.Service({
     'getSchema' : IDL.Func([], [BenchSchema], ['query']),
     'getStats' : IDL.Func([], [BenchResult], ['query']),
     'init' : IDL.Func([], [BenchSchema], []),
@@ -25,6 +25,6 @@ export const idlFactory = ({ IDL }) => {
     'runCellUpdate' : IDL.Func([IDL.Nat, IDL.Nat], [BenchResult], []),
     'runCellUpdateAwait' : IDL.Func([IDL.Nat, IDL.Nat], [BenchResult], []),
   });
-  return _anon_class_10_1;
+  return _anon_class_13_1;
 };
 export const init = ({ IDL }) => { return []; };

package/dist/cache.js

@@ -27,7 +27,7 @@ export function getMopsDepCacheName(name, version) {
 }
 export function getGithubDepCacheName(name, repo) {
     const { branch, commitHash } = parseGithubURL(repo);
-    return `_github/${name}#${branch}` + (commitHash ? `@${commitHash}` : '');
+    return `_github/${name}#${branch.replaceAll('/', '___')}` + (commitHash ? `@${commitHash}` : '');
 }
 export let addCache = (cacheName, source) => {
     let dest = path.join(getGlobalCacheDir(), 'packages', cacheName);

package/dist/cli.js

@@ -125,22 +125,12 @@ program
     .action(async () => {
     console.log(getNetwork());
 });
-// user import
-program
-    .command('mops user import <data>')
-    .description('Import .pem file data to use as identity')
-    .addOption(new Option('--no-encrypt', 'Do not ask for a password to encrypt identity'))
-    .action(async (data, options) => {
-    await importPem(data, options);
-    await getPrincipal();
-});
 // sources
 program
     .command('sources')
     .description('for dfx packtool')
     .option('--no-install', 'Do not install dependencies before running sources')
     .addOption(new Option('--conflicts <action>', 'What to do with dependency version conflicts').choices(['ignore', 'warning', 'error']).default('warning'))
-    .option('--verbose', 'Show more information') // for backcompat
     .action(async (options) => {
     if (!checkConfigFile()) {
         process.exit(1);
@@ -152,13 +142,6 @@ program
     let sourcesArr = await sources(options);
     console.log(sourcesArr.join('\n'));
 });
-// get-principal
-program
-    .command('get-principal')
-    .description('Print your principal')
-    .action(async () => {
-    await getPrincipal();
-});
 // search
 program
     .command('search <text>')
@@ -222,35 +205,42 @@ program
     }
     await template();
 });
-// docs
-// program
-// 	.command('docs')
-// 	.description('Generate documentation (experimental)')
-// 	.action(async () => {
-// 		if (!checkConfigFile()) {
-// 			process.exit(1);
-// 		}
-// 		await docs();
-// 	});
-// user
-program
-    .command('user')
-    .addArgument(new Argument('<sub>').choices(['set', 'get']))
+// mops user *
+const userCommand = new Command('user').description('User management');
+// user get-principal
+userCommand
+    .command('get-principal')
+    .description('Print your principal')
+    .action(async () => {
+    await getPrincipal();
+});
+// user import
+userCommand
+    .command('import <data>')
+    .description('Import .pem file data to use as identity')
+    .addOption(new Option('--no-encrypt', 'Do not ask for a password to encrypt identity'))
+    .action(async (data, options) => {
+    await importPem(data, options);
+    await getPrincipal();
+});
+// user set <prop> <value>
+userCommand
+    .command('set')
     .addArgument(new Argument('<prop>').choices(['name', 'site', 'email', 'github', 'twitter']))
-    .addArgument(new Argument('[value]'))
-    .description('User settings')
-    .action(async (sub, prop, value) => {
-    if (sub == 'get') {
-        await getUserProp(prop);
-    }
-    else if (sub == 'set') {
-        if (!value) {
-            console.log('error: missing required argument "value"');
-            return;
-        }
-        await setUserProp(prop, value);
-    }
+    .addArgument(new Argument('<value>'))
+    .description('Set user property')
+    .action(async (prop, value) => {
+    await setUserProp(prop, value);
+});
+// user get <prop>
+userCommand
+    .command('get')
+    .addArgument(new Argument('<prop>').choices(['name', 'site', 'email', 'github', 'twitter']))
+    .description('Get user property')
+    .action(async (prop) => {
+    await getUserProp(prop);
 });
+program.addCommand(userCommand);
 // bump
 program
     .command('bump [major|minor|patch]')

package/dist/commands/bench.js

@@ -69,7 +69,7 @@ export async function bench(filter = '', optionsArg = {}) {
     }
     files.sort();
     let benchDir = `${getRootDir()}/.mops/.bench/`;
-    // fs.rmSync(benchDir, {recursive: true, force: true});
+    fs.rmSync(benchDir, { recursive: true, force: true });
     fs.mkdirSync(benchDir, { recursive: true });
     if (!options.silent) {
         console.log('Benchmark files:');
@@ -111,7 +111,7 @@ export async function bench(filter = '', optionsArg = {}) {
     });
     options.silent || console.log('Stopping replica...');
     await replica.stop();
-    // fs.rmSync(benchDir, {recursive: true, force: true});
+    fs.rmSync(benchDir, { recursive: true, force: true });
     return benchResults;
 }
 function getMocArgs(options) {

package/dist/commands/replica.js

@@ -70,16 +70,18 @@ export class Replica {
         proc.stderr.on('data', (data) => {
             curData = curData + data.toString();
             if (curData.includes('\n')) {
-                let m = curData.match(/\[Canister ([a-z0-9-]+)\] (.*)/);
-                if (!m) {
-                    return;
+                let chunk = curData.split('\n').slice(0, -1).join('\n');
+                let matches = [...chunk.matchAll(/\[Canister ([a-z0-9-]+)\] (.*)/g)];
+                for (let match of matches) {
+                    let [, canisterId, msg] = match;
+                    let stream = this.getCanisterStream(canisterId || '');
+                    if (stream) {
+                        stream.write(msg);
+                    }
                 }
-                let [, canisterId, msg] = m;
-                let stream = this.getCanisterStream(canisterId || '');
-                if (stream) {
-                    stream.write(msg);
+                if (matches.length) {
+                    curData = curData.split('\n').slice(-1).join('\n');
                 }
-                curData = '';
             }
         });
     }

package/dist/commands/test/mmf1.js

@@ -67,7 +67,11 @@ export class MMF1 {
         this.stack.push(name);
     }
     _testEnd(name) {
-        if (name !== this.stack.pop()) {
+        let last = this.stack.pop();
+        if (name !== last) {
+            console.error(`Expected test name "${last}" but got "${name}"`);
+            console.error(`Stack: ${this.stack.join(' › ')}`);
+            console.error(`File: ${this.file}`);
             throw 'mmf1._testEnd: start and end test mismatch';
         }
         this._status(name, 'pass');

package/dist/commands/test/test.js

@@ -200,15 +200,9 @@ export async function testWithReporter(reporterName, filter = '', defaultMode =
                             wasmFile,
                         ];
                     }
-                    // backcompat
                     else {
-                        wasmtimeArgs = [
-                            '--max-wasm-stack=4000000',
-                            '--enable-cranelift-nan-canonicalization',
-                            '--wasm-features',
-                            'multi-memory,bulk-memory',
-                            wasmFile,
-                        ];
+                        console.error(chalk.red('Minimum wasmtime version is 14.0.0. Please update wasmtime to the latest version'));
+                        process.exit(1);
                     }
                     let proc = spawn(wasmtimePath, wasmtimeArgs);
                     await pipeMMF(proc, mmf);

package/dist/declarations/bench/bench.did

@@ -1,4 +1,4 @@
-type _anon_class_10_1 =
+type _anon_class_13_1 = 
  service {
    getSchema: () -> (BenchSchema) query;
    getStats: () -> (BenchResult) query;
@@ -7,24 +7,24 @@ type _anon_class_10_1 =
    runCellUpdate: (nat, nat) -> (BenchResult);
    runCellUpdateAwait: (nat, nat) -> (BenchResult);
  };
-type BenchSchema =
+type BenchSchema = 
  record {
    cols: vec text;
    description: text;
    name: text;
    rows: vec text;
  };
-type BenchResult =
+type BenchResult = 
  record {
    instructions: int;
-   rts_heap_size: int;
-   stable_memory_size: int;
-   rts_stable_memory_size: int;
    rts_collector_instructions: int;
+   rts_heap_size: int;
+   rts_logical_stable_memory_size: int;
    rts_memory_size: int;
    rts_mutator_instructions: int;
-   rts_total_allocation: int;
-   rts_logical_stable_memory_size: int;
    rts_reclaimed: int;
+   rts_stable_memory_size: int;
+   rts_total_allocation: int;
+   stable_memory_size: int;
  };
-service : () -> _anon_class_10_1
+service : () -> _anon_class_13_1

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

@@ -3,14 +3,14 @@ import type { ActorMethod } from '@dfinity/agent';
 import type { IDL } from '@dfinity/candid';
 
 export interface BenchResult {
+  'rts_stable_memory_size' : bigint,
+  'stable_memory_size' : bigint,
   'instructions' : bigint,
   'rts_memory_size' : bigint,
-  'stable_memory_size' : bigint,
-  'rts_stable_memory_size' : bigint,
-  'rts_logical_stable_memory_size' : bigint,
   'rts_total_allocation' : bigint,
   'rts_collector_instructions' : bigint,
   'rts_mutator_instructions' : bigint,
+  'rts_logical_stable_memory_size' : bigint,
   'rts_heap_size' : bigint,
   'rts_reclaimed' : bigint,
 }
@@ -20,7 +20,7 @@ export interface BenchSchema {
   'rows' : Array<string>,
   'description' : string,
 }
-export interface _anon_class_10_1 {
+export interface _anon_class_13_1 {
   'getSchema' : ActorMethod<[], BenchSchema>,
   'getStats' : ActorMethod<[], BenchResult>,
   'init' : ActorMethod<[], BenchSchema>,
@@ -28,6 +28,6 @@ export interface _anon_class_10_1 {
   'runCellUpdate' : ActorMethod<[bigint, bigint], BenchResult>,
   'runCellUpdateAwait' : ActorMethod<[bigint, bigint], BenchResult>,
 }
-export interface _SERVICE extends _anon_class_10_1 {}
+export interface _SERVICE extends _anon_class_13_1 {}
 export declare const idlFactory: IDL.InterfaceFactory;
 export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[];

package/dist/declarations/bench/bench.did.js

@@ -6,18 +6,18 @@ export const idlFactory = ({ IDL }) => {
     'description' : IDL.Text,
   });
   const BenchResult = IDL.Record({
-    'instructions' : IDL.Int,
-    'stable_memory_size' : IDL.Int,
     'rts_stable_memory_size' : IDL.Int,
-    'rts_logical_stable_memory_size' : IDL.Int,
+    'stable_memory_size' : IDL.Int,
+    'instructions' : IDL.Int,
     'rts_memory_size' : IDL.Int,
     'rts_total_allocation' : IDL.Int,
     'rts_collector_instructions' : IDL.Int,
     'rts_mutator_instructions' : IDL.Int,
+    'rts_logical_stable_memory_size' : IDL.Int,
     'rts_heap_size' : IDL.Int,
     'rts_reclaimed' : IDL.Int,
   });
-  const _anon_class_10_1 = IDL.Service({
+  const _anon_class_13_1 = IDL.Service({
     'getSchema' : IDL.Func([], [BenchSchema], ['query']),
     'getStats' : IDL.Func([], [BenchResult], ['query']),
     'init' : IDL.Func([], [BenchSchema], []),
@@ -25,6 +25,6 @@ export const idlFactory = ({ IDL }) => {
     'runCellUpdate' : IDL.Func([IDL.Nat, IDL.Nat], [BenchResult], []),
     'runCellUpdateAwait' : IDL.Func([IDL.Nat, IDL.Nat], [BenchResult], []),
   });
-  return _anon_class_10_1;
+  return _anon_class_13_1;
 };
 export const init = ({ IDL }) => { return []; };

package/dist/mops.js

@@ -187,7 +187,7 @@ export function formatDir(name, version) {
 }
 export function formatGithubDir(name, repo) {
     const { branch, commitHash } = parseGithubURL(repo);
-    return path.join(getRootDir(), '.mops/_github', `${name}#${branch}` + (commitHash ? `@${commitHash}` : ''));
+    return path.join(getRootDir(), '.mops/_github', `${name}#${branch.replaceAll('/', '___')}` + (commitHash ? `@${commitHash}` : ''));
 }
 export function readDfxJson() {
     let dir = process.cwd();

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.0.0-pre.0",
+  "version": "1.0.1",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",
@@ -10,6 +10,10 @@
   "files": [
     "*",
     "!network.txt",
+    "!Dockerfile",
+    "!verify.sh",
+    "!build.sh",
+    "!DEVELOPMENT.md",
     "!.mops",
     "/templates"
   ],
@@ -24,13 +28,13 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@dfinity/agent": "2.0.0",
-    "@dfinity/candid": "2.0.0",
-    "@dfinity/identity": "2.0.0",
-    "@dfinity/identity-secp256k1": "2.0.0",
-    "@dfinity/principal": "2.0.0",
+    "@dfinity/agent": "2.1.0",
+    "@dfinity/candid": "2.1.0",
+    "@dfinity/identity": "2.1.0",
+    "@dfinity/identity-secp256k1": "2.1.0",
+    "@dfinity/principal": "2.1.0",
     "@iarna/toml": "2.2.5",
-    "@noble/hashes": "1.4.0",
+    "@noble/hashes": "1.5.0",
     "as-table": "1.0.55",
     "buffer": "6.0.3",
     "cacheable-request": "12.0.1",
@@ -38,13 +42,13 @@
     "chalk": "5.3.0",
     "chokidar": "3.6.0",
     "commander": "12.1.0",
-    "debounce": "2.1.0",
+    "debounce": "2.1.1",
     "decomp-tarxz": "0.1.1",
     "decompress": "4.2.1",
     "del": "7.1.0",
     "dhall-to-json-cli": "1.7.6",
-    "execa": "9.3.0",
-    "filesize": "10.1.4",
+    "execa": "9.3.1",
+    "filesize": "10.1.6",
     "fs-extra": "11.2.0",
     "get-folder-size": "5.0.0",
     "glob": "11.0.0",
@@ -59,7 +63,7 @@
     "node-fetch": "3.3.2",
     "octokit": "3.1.2",
     "pem-file": "1.0.1",
-    "pic-ic": "0.5.1",
+    "pic-ic": "0.5.3",
     "prompts": "2.4.2",
     "semver": "7.6.3",
     "stream-to-promise": "3.0.0",
@@ -73,21 +77,15 @@
     "@types/fs-extra": "11.0.4",
     "@types/glob": "8.1.0",
     "@types/ncp": "2.0.8",
-    "@types/node": "22.0.2",
+    "@types/node": "22.5.4",
     "@types/prompts": "2.4.9",
     "@types/semver": "7.5.8",
     "@types/stream-to-promise": "2.2.4",
     "@types/tar": "6.1.13",
-    "bun": "1.0.35",
-    "esbuild": "0.23.0",
+    "bun": "1.1.27",
+    "esbuild": "0.23.1",
     "eslint": "8.57.0",
-    "tsx": "4.16.5",
-    "typescript": "5.5.4"
-  },
-  "overrides": {
-    "@dfinity/agent": "2.0.0",
-    "@dfinity/identity": "2.0.0",
-    "@dfinity/principal": "2.0.0",
-    "@dfinity/candid": "2.0.0"
+    "tsx": "4.19.1",
+    "typescript": "5.6.2"
   }
 }

package/dist/release-cli.js

@@ -8,8 +8,9 @@ import { sha256 } from '@noble/hashes/sha256';
 import { bytesToHex } from '@noble/hashes/utils';
 import { findChangelogEntry } from './helpers/find-changelog-entry.js';
 let __dirname = new URL('.', import.meta.url).pathname;
-execSync('npm run prepare', { stdio: 'inherit', cwd: __dirname });
-execSync('npm run bundle', { stdio: 'inherit', cwd: __dirname });
+// build using Docker
+execSync('./build.sh', { stdio: 'inherit', cwd: __dirname });
+let commitHash = process.env.COMMIT_HASH || execSync('git rev-parse HEAD').toString().trim();
 let version = JSON.parse(fs.readFileSync(path.resolve(__dirname, 'package.json'), 'utf8')).version;
 let major = semver.parse(version)?.major;
 let tag = semver.parse(version)?.prerelease[0] || 'latest';
@@ -17,6 +18,7 @@ let releaseNotes = findChangelogEntry(fs.readFileSync(path.resolve(__dirname, 'C
 let data = fs.readFileSync(path.resolve(__dirname, 'bundle/cli.tgz'));
 let hash = bytesToHex(sha256(data));
 let size = data.byteLength;
+console.log(`Commit hash of release: ${commitHash}`);
 fs.cpSync(path.resolve(__dirname, 'bundle/cli.tgz'), path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), { force: false, errorOnExist: true });
 fs.cpSync(path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), path.resolve(__dirname, `../cli-releases/versions/${tag}.tgz`), { force: true, errorOnExist: false, recursive: true });
 fs.cpSync(path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), path.resolve(__dirname, `../cli-releases/versions/${major}.tgz`), { force: true, errorOnExist: false, recursive: true });
@@ -31,6 +33,7 @@ releases.versions[version] = {
     time: new Date().getTime(),
     size,
     relseaseNotes: releaseNotes,
+    commitHash: commitHash,
     url: `https://cli.mops.one/versions/${version}.tgz`,
     hash,
 };

package/dist/vessel.js

@@ -82,7 +82,7 @@ export const downloadFromGithub = async (repo, dest, onProgress) => {
             // Prevent `onError` being called twice.
             readStream.off('error', reject);
             const tmpDir = path.resolve(process.cwd(), '.mops/_tmp/');
-            const tmpFile = path.resolve(tmpDir, `${gitName}@${commitHash || branch}.zip`);
+            const tmpFile = path.resolve(tmpDir, `${gitName}@${(commitHash || branch).replaceAll('/', '___')}.zip`);
             try {
                 mkdirSync(tmpDir, { recursive: true });
                 pipeline(readStream, createWriteStream(tmpFile), (err) => {

package/mops.ts

@@ -219,7 +219,7 @@ export function formatDir(name : string, version : string) {
 
 export function formatGithubDir(name : string, repo : string) {
 	const {branch, commitHash} = parseGithubURL(repo);
-	return path.join(getRootDir(), '.mops/_github', `${name}#${branch}` + (commitHash ? `@${commitHash}` : ''));
+	return path.join(getRootDir(), '.mops/_github', `${name}#${branch.replaceAll('/', '___')}` + (commitHash ? `@${commitHash}` : ''));
 }
 
 export function readDfxJson() : any {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.0.0-pre.0",
+  "version": "1.0.1",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",
@@ -10,6 +10,10 @@
   "files": [
     "*",
     "!network.txt",
+    "!Dockerfile",
+    "!verify.sh",
+    "!build.sh",
+    "!DEVELOPMENT.md",
     "!.mops",
     "/templates"
   ],
@@ -24,14 +28,15 @@
     "node": ">=18.0.0"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "npm run prepare && npm run bundle",
+    "dist": "tsc",
     "bundle": "rm -rf ./bundle && bun build ./cli.ts --outdir ./bundle --target node --minify --external @napi-rs/lzma --external fsevents --format esm --define '__dirname=import.meta.dirname' && npm run bundle:fix && npm run bundle:copy && npm run bundle:package-json && npm run bundle:tar",
     "bundle:fix": "npx -y rexreplace 'new URL\\(\"\\.\\./templates' 'new URL(\"./templates' bundle/cli.js",
     "bundle:copy": "cp -r commands/bench bundle && cp -r bin declarations templates package.json bundle",
     "bundle:package-json": "tsx bundle-package-json.ts",
-    "bundle:tar": "touch bundle/cli.tgz && tar --exclude bundle/cli.tgz -czvf bundle/cli.tgz bundle",
+    "bundle:tar": "rm -f bundle/cli.tgz && touch -t 200101010101 bundle/cli.tgz && find bundle -exec touch -d '1970-01-01 00:00:00' {} + && tar --sort name --exclude bundle/cli.tgz -cvf - bundle | gzip -n > bundle/cli.tgz",
     "copy": "cp -r commands/bench dist/commands && cp -r declarations templates package.json bin dist | true",
-    "prepare": "npm run build && npm run copy && npm run fix-dist",
+    "prepare": "rm -rf dist && npm run dist && npm run copy && npm run fix-dist",
     "fix-dist": "tsx ./fix-dist.ts",
     "release": "tsx release-cli.ts",
     "check": "tsc --project tsconfig.json --noEmit",
@@ -39,13 +44,13 @@
     "esbuild": "esbuild"
   },
   "dependencies": {
-    "@dfinity/agent": "2.0.0",
-    "@dfinity/candid": "2.0.0",
-    "@dfinity/identity": "2.0.0",
-    "@dfinity/identity-secp256k1": "2.0.0",
-    "@dfinity/principal": "2.0.0",
+    "@dfinity/agent": "2.1.0",
+    "@dfinity/candid": "2.1.0",
+    "@dfinity/identity": "2.1.0",
+    "@dfinity/identity-secp256k1": "2.1.0",
+    "@dfinity/principal": "2.1.0",
     "@iarna/toml": "2.2.5",
-    "@noble/hashes": "1.4.0",
+    "@noble/hashes": "1.5.0",
     "as-table": "1.0.55",
     "buffer": "6.0.3",
     "cacheable-request": "12.0.1",
@@ -53,13 +58,13 @@
     "chalk": "5.3.0",
     "chokidar": "3.6.0",
     "commander": "12.1.0",
-    "debounce": "2.1.0",
+    "debounce": "2.1.1",
     "decomp-tarxz": "0.1.1",
     "decompress": "4.2.1",
     "del": "7.1.0",
     "dhall-to-json-cli": "1.7.6",
-    "execa": "9.3.0",
-    "filesize": "10.1.4",
+    "execa": "9.3.1",
+    "filesize": "10.1.6",
     "fs-extra": "11.2.0",
     "get-folder-size": "5.0.0",
     "glob": "11.0.0",
@@ -74,7 +79,7 @@
     "node-fetch": "3.3.2",
     "octokit": "3.1.2",
     "pem-file": "1.0.1",
-    "pic-ic": "0.5.1",
+    "pic-ic": "0.5.3",
     "prompts": "2.4.2",
     "semver": "7.6.3",
     "stream-to-promise": "3.0.0",
@@ -88,21 +93,15 @@
     "@types/fs-extra": "11.0.4",
     "@types/glob": "8.1.0",
     "@types/ncp": "2.0.8",
-    "@types/node": "22.0.2",
+    "@types/node": "22.5.4",
     "@types/prompts": "2.4.9",
     "@types/semver": "7.5.8",
     "@types/stream-to-promise": "2.2.4",
     "@types/tar": "6.1.13",
-    "bun": "1.0.35",
-    "esbuild": "0.23.0",
+    "bun": "1.1.27",
+    "esbuild": "0.23.1",
     "eslint": "8.57.0",
-    "tsx": "4.16.5",
-    "typescript": "5.5.4"
-  },
-  "overrides": {
-    "@dfinity/agent": "2.0.0",
-    "@dfinity/identity": "2.0.0",
-    "@dfinity/principal": "2.0.0",
-    "@dfinity/candid": "2.0.0"
+    "tsx": "4.19.1",
+    "typescript": "5.6.2"
   }
 }

package/release-cli.ts

@@ -11,9 +11,10 @@ import {findChangelogEntry} from './helpers/find-changelog-entry.js';
 
 let __dirname = new URL('.', import.meta.url).pathname;
 
-execSync('npm run prepare', {stdio: 'inherit', cwd: __dirname});
-execSync('npm run bundle', {stdio: 'inherit', cwd: __dirname});
+// build using Docker
+execSync('./build.sh', {stdio: 'inherit', cwd: __dirname});
 
+let commitHash = process.env.COMMIT_HASH || execSync('git rev-parse HEAD').toString().trim();
 let version = JSON.parse(fs.readFileSync(path.resolve(__dirname, 'package.json'), 'utf8')).version;
 let major = semver.parse(version)?.major;
 let tag = semver.parse(version)?.prerelease[0] || 'latest';
@@ -22,6 +23,8 @@ let data = fs.readFileSync(path.resolve(__dirname, 'bundle/cli.tgz'));
 let hash = bytesToHex(sha256(data));
 let size = data.byteLength;
 
+console.log(`Commit hash of release: ${commitHash}`);
+
 fs.cpSync(path.resolve(__dirname, 'bundle/cli.tgz'), path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), {force: false, errorOnExist: true});
 
 fs.cpSync(path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), path.resolve(__dirname, `../cli-releases/versions/${tag}.tgz`), {force: true, errorOnExist: false, recursive: true});
@@ -39,6 +42,7 @@ type Releases = {
 		time : number;
 		size : number;
 		hash : string;
+		commitHash ?: string;
 		url : string;
 		relseaseNotes : string;
 	}>;
@@ -55,6 +59,7 @@ releases.versions[version] = {
 	time: new Date().getTime(),
 	size,
 	relseaseNotes: releaseNotes,
+	commitHash: commitHash,
 	url: `https://cli.mops.one/versions/${version}.tgz`,
 	hash,
 };

package/vessel.ts

@@ -111,7 +111,7 @@ export const downloadFromGithub = async (repo : string, dest : string, onProgres
 			// Prevent `onError` being called twice.
 			readStream.off('error', reject);
 			const tmpDir = path.resolve(process.cwd(), '.mops/_tmp/');
-			const tmpFile = path.resolve(tmpDir, `${gitName}@${commitHash || branch}.zip`);
+			const tmpFile = path.resolve(tmpDir, `${gitName}@${(commitHash || branch).replaceAll('/', '___')}.zip`);
 
 			try {
 				mkdirSync(tmpDir, {recursive: true});

package/DEVELOPMENT.md

@@ -1,25 +0,0 @@
-# Mops CLI
-
-1. Update the version in `package.json` using `npm version` command.
-
-2. Update changelog in `CHANGELOG.md` file.
-
-3. Publish.
-
-## Publish to npm
-```
-npm publish
-```
-
-## Publish on chain
-
-1. Prepeare release
-```
-npm run release
-```
-
-2. Deploy canister
-(from root of the project)
-```
-dfx deploy --network ic --no-wallet cli
-```

package/dist/commands/import-identity.d.ts

@@ -1,5 +0,0 @@
-type ImportIdentityOptions = {
-    encrypt: boolean;
-};
-export declare function importPem(data: string, options?: ImportIdentityOptions): Promise<void>;
-export {};

package/dist/commands/import-identity.js

@@ -1,51 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { Buffer } from 'node:buffer';
-import chalk from 'chalk';
-import prompts from 'prompts';
-import { deleteSync } from 'del';
-import { globalConfigDir } from '../mops.js';
-import { encrypt } from '../pem.js';
-export async function importPem(data, options = { encrypt: true }) {
-    try {
-        if (!fs.existsSync(globalConfigDir)) {
-            fs.mkdirSync(globalConfigDir);
-        }
-        let password = '';
-        if (options.encrypt) {
-            let res = await prompts({
-                type: 'invisible',
-                name: 'password',
-                message: 'Enter password to encrypt identity.pem',
-            });
-            password = res.password;
-            if (!password) {
-                let res = await prompts({
-                    type: 'confirm',
-                    name: 'ok',
-                    message: 'Are you sure you don\'t want to protect your identity.pem with a password?',
-                });
-                if (!res.ok) {
-                    console.log('aborted');
-                    return;
-                }
-            }
-        }
-        let identityPem = path.resolve(globalConfigDir, 'identity.pem');
-        let identityPemEncrypted = path.resolve(globalConfigDir, 'identity.pem.encrypted');
-        deleteSync([identityPem, identityPemEncrypted], { force: true });
-        // encrypted
-        if (password) {
-            let encrypted = await encrypt(Buffer.from(data), password);
-            fs.writeFileSync(identityPemEncrypted, encrypted);
-        }
-        // unencrypted
-        else {
-            fs.writeFileSync(identityPem, data);
-        }
-        console.log(chalk.green('Success'));
-    }
-    catch (err) {
-        console.log(chalk.red('Error: ') + err);
-    }
-}

package/dist/commands/whoami.d.ts

@@ -1 +0,0 @@
-export declare function whoami(): Promise<void>;

package/dist/commands/whoami.js

@@ -1,11 +0,0 @@
-import chalk from 'chalk';
-import { getIdentity } from '../mops.js';
-export async function whoami() {
-    let identity = await getIdentity();
-    if (identity) {
-        console.log(identity.getPrincipal().toText());
-    }
-    else {
-        console.log(chalk.red('Error: ') + 'identity not found. Run ' + chalk.greenBright('mops import-identity') + ' command.');
-    }
-}