ic-mops 0.39.2 → 0.40.0

package/commands/install-all.ts

@@ -9,12 +9,12 @@ import {checkIntegrity} from '../integrity.js';
 import {installLocal} from './install-local.js';
 
 type InstallAllOptions = {
-	verbose?: boolean;
-	silent?: boolean;
-	lock?: 'check' | 'update' | 'ignore';
+	verbose ?: boolean;
+	silent ?: boolean;
+	lock ?: 'check' | 'update' | 'ignore';
 }
 
-export async function installAll({verbose = false, silent = false, lock}: InstallAllOptions = {}) {
+export async function installAll({verbose = false, silent = false, lock} : InstallAllOptions = {}) {
 	if (!checkConfigFile()) {
 		return;
 	}

package/commands/install-local.ts

@@ -6,7 +6,7 @@ import {install} from './install.js';
 
 // skip install and just find non-local dependencies to install
 // pkgPath should be relative to the current root dir or absolute
-export async function installLocal(pkg: string, pkgPath = '', {verbose = false, silent = false} = {}): Promise<Record<string, string> | false> {
+export async function installLocal(pkg : string, pkgPath = '', {verbose = false, silent = false} = {}) : Promise<Record<string, string> | false> {
 	if (!checkConfigFile()) {
 		return false;
 	}

package/commands/install.ts

@@ -11,7 +11,7 @@ import {addCache, copyCache, isCached} from '../cache.js';
 import {downloadFile, getPackageFilesInfo} from '../api/downloadPackageFiles.js';
 import {installLocal} from './install-local.js';
 
-export async function install(pkg: string, version = '', {verbose = false, silent = false, dep = false} = {}): Promise<Record<string, string> | false> {
+export async function install(pkg : string, version = '', {verbose = false, silent = false, dep = false} = {}) : Promise<Record<string, string> | false> {
 	if (!checkConfigFile()) {
 		return false;
 	}
@@ -65,7 +65,7 @@ export async function install(pkg: string, version = '', {verbose = false, silen
 			let filesData = new Map;
 			let storage = await storageActor(storageId);
 
-			await parallel(threads, fileIds, async (fileId: string) => {
+			await parallel(threads, fileIds, async (fileId : string) => {
 				let {path, data} = await downloadFile(storage, fileId);
 				filesData.set(path, data);
 				progress();

package/commands/publish.ts

@@ -12,12 +12,13 @@ import {checkConfigFile, getIdentity, getRootDir, progressBar, readConfig} from
 import {mainActor} from '../api/actors.js';
 import {parallel} from '../parallel.js';
 import {docs} from './docs.js';
-import {DependencyV2, PackageConfigV2} from '../declarations/main/main.did.js';
+import {Benchmarks, 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';
+import {bench} from './bench.js';
 
-export async function publish(options: {docs?: boolean, test?: boolean} = {}) {
+export async function publish(options : {docs ?: boolean, test ?: boolean, bench ?: boolean} = {}) {
 	if (!checkConfigFile()) {
 		return;
 	}
@@ -160,16 +161,16 @@ export async function publish(options: {docs?: boolean, test?: boolean} = {}) {
 		}
 	}
 
-	let toBackendDep = (dep: Dependency): DependencyV2 => {
+	let toBackendDep = (dep : Dependency) : DependencyV2 => {
 		return {
 			...dep,
 			version: dep.version || '',
-			repo: dep.repo || ''
+			repo: dep.repo || '',
 		};
 	};
 
 	// map fields
-	let backendPkgConfig: PackageConfigV2 = {
+	let backendPkgConfig : PackageConfigV2 = {
 		name: config.package.name,
 		version: config.package.version,
 		keywords: config.package.keywords || [],
@@ -258,6 +259,25 @@ export async function publish(options: {docs?: boolean, test?: boolean} = {}) {
 		}
 	}
 
+	// bench
+	let benchmarks : Benchmarks = [];
+	if (options.bench) {
+		console.log('Running benchmarks...');
+		try {
+			benchmarks = await bench('', {
+				replica: config.toolchain?.['pocket-ic'] ? 'pocket-ic' : 'dfx',
+				gc: 'copying',
+				forceGc: true,
+				silent: true,
+			});
+		}
+		catch (err) {
+			console.error(err);
+			console.log(chalk.red('Error: ') + 'benchmarks failed');
+			process.exit(1);
+		}
+	}
+
 	// progress
 	let total = files.length + 2;
 	let step = 0;
@@ -286,13 +306,18 @@ export async function publish(options: {docs?: boolean, test?: boolean} = {}) {
 		});
 	}
 
+	// upload benchmarks
+	if (options.bench) {
+		await actor.uploadBenchmarks(puiblishingId, benchmarks);
+	}
+
 	// upload changelog
 	if (changelog) {
 		await actor.uploadNotes(puiblishingId, changelog);
 	}
 
 	// upload files
-	await parallel(8, files, async (file: string) => {
+	await parallel(8, files, async (file : string) => {
 		progress();
 
 		let chunkSize = 1024 * 1024 + 512 * 1024; // 1.5mb
@@ -338,7 +363,7 @@ export async function publish(options: {docs?: boolean, test?: boolean} = {}) {
 	console.log(chalk.green('Published ') + `${config.package.name}@${config.package.version}`);
 }
 
-function parseChangelog(version: string): string {
+function parseChangelog(version : string) : string {
 	let rootDir = getRootDir();
 	let changelogFile = '';
 
@@ -365,7 +390,7 @@ function parseChangelog(version: string): string {
 	return changelog || '';
 }
 
-async function fetchGitHubReleaseNotes(repo: string, version: string): Promise<string> {
+async function fetchGitHubReleaseNotes(repo : string, version : string) : Promise<string> {
 	let repoPath = new URL(repo).pathname;
 	let res = await fetch(`https://api.github.com/repos${repoPath}/releases/tags/${version}`);
 	let release = await res.json();
@@ -383,7 +408,7 @@ async function fetchGitHubReleaseNotes(repo: string, version: string): Promise<s
 	return release.body;
 }
 
-function findChangelogEntry(changelog: string, version: string): string {
+function findChangelogEntry(changelog : string, version : string) : string {
 	let tree = fromMarkdown(changelog);
 	let found = false;
 	let nodes = [];

package/commands/remove.ts

@@ -6,19 +6,19 @@ import {Config, Dependency} from '../types.js';
 import {checkIntegrity} from '../integrity.js';
 
 type RemoveOptions = {
-	verbose?: boolean;
-	dev?: boolean;
-	dryRun?: boolean;
-	lock?: 'update' | 'ignore';
+	verbose ?: boolean;
+	dev ?: boolean;
+	dryRun ?: boolean;
+	lock ?: 'update' | 'ignore';
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export async function remove(name: string, {dev = false, verbose = false, dryRun = false, lock}: RemoveOptions = {}) {
+export async function remove(name : string, {dev = false, verbose = false, dryRun = false, lock} : RemoveOptions = {}) {
 	if (!checkConfigFile()) {
 		return;
 	}
 
-	function getTransitiveDependencies(config: Config, exceptPkgId: string) {
+	function getTransitiveDependencies(config : Config, exceptPkgId : string) {
 		let deps = Object.values(config.dependencies || {});
 		let devDeps = Object.values(config['dev-dependencies'] || {});
 		return [...deps, ...devDeps]
@@ -30,7 +30,7 @@ export async function remove(name: string, {dev = false, verbose = false, dryRun
 			}).flat();
 	}
 
-	function getTransitiveDependenciesOf(name: string, version: string | undefined, repo?: string) {
+	function getTransitiveDependenciesOf(name : string, version : string | undefined, repo ?: string) {
 		let pkgDir = '';
 		if (repo) {
 			pkgDir = formatGithubDir(name, repo);
@@ -44,7 +44,7 @@ export async function remove(name: string, {dev = false, verbose = false, dryRun
 			return [];
 		}
 		let config = readConfig(configFile);
-		let deps: Dependency[] = Object.values(config.dependencies || {}).map((dep) => {
+		let deps : Dependency[] = Object.values(config.dependencies || {}).map((dep) => {
 			return [dep, ...getTransitiveDependenciesOf(dep.name, dep.version)];
 		}).flat();
 		return deps;

package/commands/search.ts

@@ -2,7 +2,7 @@ import asTable from 'as-table';
 import chalk from 'chalk';
 import {mainActor} from '../api/actors.js';
 
-export async function search(text: string) {
+export async function search(text : string) {
 	let actor = await mainActor();
 	let [packages, _pageCount] = await actor.search(text, [], []);
 
@@ -11,7 +11,7 @@ export async function search(text: string) {
 		return;
 	}
 
-	let ellipsis = (text: string, max: number) => {
+	let ellipsis = (text : string, max : number) => {
 		if (text.length <= max) {
 			return text;
 		}

package/commands/sync.ts

@@ -8,10 +8,10 @@ import {remove} from './remove.js';
 import {checkIntegrity} from '../integrity.js';
 
 type SyncOptions = {
-	lock?: 'update' | 'ignore';
+	lock ?: 'update' | 'ignore';
 };
 
-export async function sync({lock}: SyncOptions = {}) {
+export async function sync({lock} : SyncOptions = {}) {
 	if (!checkConfigFile()) {
 		return;
 	}
@@ -48,7 +48,7 @@ let ignore = [
 ];
 
 let mocPath = '';
-function getMocPath(): string {
+function getMocPath() : string {
 	if (!mocPath) {
 		mocPath = process.env.DFX_MOC_PATH || '';
 	}
@@ -64,7 +64,7 @@ function getMocPath(): string {
 	return mocPath;
 }
 
-async function getUsedPackages(): Promise<string[]> {
+async function getUsedPackages() : Promise<string[]> {
 	let rootDir = getRootDir();
 	let files = globSync('**/*.mo', {
 		cwd: rootDir,
@@ -72,10 +72,10 @@ async function getUsedPackages(): Promise<string[]> {
 		ignore: ignore,
 	});
 
-	let packages: Set<string> = new Set;
+	let packages : Set<string> = new Set;
 
 	for (let file of files) {
-		let deps: string[] = execSync(`${getMocPath()} --print-deps ${path.join(rootDir, file)}`).toString().trim().split('\n');
+		let deps : string[] = execSync(`${getMocPath()} --print-deps ${path.join(rootDir, file)}`).toString().trim().split('\n');
 
 		for (let dep of deps) {
 			if (dep.startsWith('mo:') && !dep.startsWith('mo:prim') && !dep.startsWith('mo:⛔')) {
@@ -87,7 +87,7 @@ async function getUsedPackages(): Promise<string[]> {
 	return [...packages];
 }
 
-async function getMissingPackages(): Promise<string[]> {
+async function getMissingPackages() : Promise<string[]> {
 	let config = readConfig();
 	let allDeps = [...Object.keys(config.dependencies || {}), ...Object.keys(config['dev-dependencies'] || {})];
 	let missing = new Set(await getUsedPackages());
@@ -97,7 +97,7 @@ async function getMissingPackages(): Promise<string[]> {
 	return [...missing];
 }
 
-async function getUnusedPackages(): Promise<string[]> {
+async function getUnusedPackages() : Promise<string[]> {
 	let config = readConfig();
 	let allDeps = new Set([...Object.keys(config.dependencies || {}), ...Object.keys(config['dev-dependencies'] || {})]);
 	let used = await getUsedPackages();

package/commands/template.ts

@@ -5,7 +5,7 @@ import prompts from 'prompts';
 import camelCase from 'camelcase';
 import {getRootDir, readConfig} from '../mops.js';
 
-export async function template(templateName?: string, options: any = {}) {
+export async function template(templateName ?: string, options : any = {}) {
 	if (!templateName) {
 		let res = await prompts({
 			type: 'select',
@@ -55,7 +55,7 @@ export async function template(templateName?: string, options: any = {}) {
 			return;
 		}
 
-		let setYearAndOwner = (file: string) => {
+		let setYearAndOwner = (file : string) => {
 			let license = fs.readFileSync(file).toString();
 			license = license.replace(/<year>/g, new Date().getFullYear().toString());
 			if (options.copyrightOwner) {

package/commands/test/mmf1.ts

@@ -9,34 +9,34 @@ type TestStatus = 'pass' | 'fail' | 'skip';
 type MessageType = 'pass' | 'fail' | 'skip' | 'suite' | 'stdout';
 
 export class MMF1 {
-	file: string;
-	stack: string[] = [];
-	currSuite: string = '';
+	file : string;
+	stack : string[] = [];
+	currSuite : string = '';
 	failed = 0;
 	passed = 0;
 	skipped = 0;
-	srategy: Strategy;
-	output: {
-		type: MessageType;
-		message: string;
+	srategy : Strategy;
+	output : {
+		type : MessageType;
+		message : string;
 	}[] = [];
 	nestingSymbol = ' › ';
 	// or <file>
 	// or <file> › <test>
 	// or <file> › <suite> › <test>
 	// or <file> › <suite> › <test> › <nested-test>...
-	passedNamesFlat: string[] = [];
+	passedNamesFlat : string[] = [];
 
-	constructor(srategy: Strategy, file: string) {
+	constructor(srategy : Strategy, file : string) {
 		this.srategy = srategy;
 		this.file = file;
 	}
 
-	_log(type: MessageType,  ...args: string[]) {
+	_log(type : MessageType,  ...args : string[]) {
 		if (this.srategy === 'store') {
 			this.output.push({
 				type,
-				message: args.join(' ')
+				message: args.join(' '),
 			});
 		}
 		else if (this.srategy === 'print') {
@@ -44,7 +44,7 @@ export class MMF1 {
 		}
 	}
 
-	flush(messageType?: MessageType) {
+	flush(messageType ?: MessageType) {
 		for (let out of this.output) {
 			if (!messageType || out.type === messageType) {
 				console.log(out.message);
@@ -53,7 +53,7 @@ export class MMF1 {
 		this.output = [];
 	}
 
-	parseLine(line: string) {
+	parseLine(line : string) {
 		if (line.startsWith('mops:1:start ')) {
 			this._testStart(line.split('mops:1:start ')[1] || '');
 		}
@@ -71,7 +71,7 @@ export class MMF1 {
 		}
 	}
 
-	_testStart(name: string) {
+	_testStart(name : string) {
 		let suite = this.stack[this.stack.length - 1];
 		if (suite) {
 			if (this.currSuite !== suite) {
@@ -82,18 +82,18 @@ export class MMF1 {
 		this.stack.push(name);
 	}
 
-	_testEnd(name: string) {
+	_testEnd(name : string) {
 		if (name !== this.stack.pop()) {
 			throw 'mmf1._testEnd: start and end test mismatch';
 		}
 		this._status(name, 'pass');
 	}
 
-	_testSkip(name: string) {
+	_testSkip(name : string) {
 		this._status(name, 'skip');
 	}
 
-	_status(name: string, status: TestStatus) {
+	_status(name : string, status : TestStatus) {
 		if (status === 'pass') {
 			// do not print suite at the end
 			if (name === this.currSuite) {
@@ -113,7 +113,7 @@ export class MMF1 {
 		}
 	}
 
-	fail(stderr: string) {
+	fail(stderr : string) {
 		let name = this.stack.pop() || '';
 		this._status(name, 'fail');
 		this._log('fail', ' '.repeat(this.stack.length * 2), chalk.red('FAIL'), stderr);

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

@@ -17,13 +17,13 @@ export class CompactReporter implements Reporter {
 	#finishedFiles = new Set<string>();
 	#startTime = Date.now();
 
-	addFiles(files: string[]) {
+	addFiles(files : string[]) {
 		this.#allFiles = new Set(files);
 		this.#log();
 		this.#startTimer();
 	}
 
-	addRun(file: string, mmf: MMF1, state: Promise<void>, _wasiMode: boolean) {
+	addRun(file : string, mmf : MMF1, state : Promise<void>, _wasiMode : boolean) {
 		this.#runningFiles.add(file);
 		this.#log();
 
@@ -53,14 +53,14 @@ export class CompactReporter implements Reporter {
 		});
 	}
 
-	done(): boolean {
+	done() : boolean {
 		this.#log();
 		logUpdate.done();
 		this.#clearTimer();
 		return this.failed === 0;
 	}
 
-	#timerId: NodeJS.Timeout | null = null;
+	#timerId : NodeJS.Timeout | null = null;
 	#startTimer() {
 		this.#timerId = setInterval(() => this.#log(), 55);
 	}
@@ -72,7 +72,7 @@ export class CompactReporter implements Reporter {
 	}
 
 	#log() {
-		let res: string[] = [];
+		let res : string[] = [];
 		let i = 0;
 		for (let file of this.#allFiles) {
 			if (this.#runningFiles.has(file)) {

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

@@ -10,12 +10,12 @@ export class FilesReporter implements Reporter {
 
 	#startTime = Date.now();
 
-	addFiles(files: string[]) {
+	addFiles(files : string[]) {
 		console.log(`Test files: ${files.length}`);
 		console.log('='.repeat(50));
 	}
 
-	addRun(file: string, mmf: MMF1, state: Promise<void>, wasiMode: boolean) {
+	addRun(file : string, mmf : MMF1, state : Promise<void>, wasiMode : boolean) {
 		state.then(() => {
 			this.passed += Number(mmf.failed === 0);
 			this.failed += Number(mmf.failed !== 0);
@@ -32,7 +32,7 @@ export class FilesReporter implements Reporter {
 		});
 	}
 
-	done(): boolean {
+	done() : boolean {
 		console.log('='.repeat(50));
 		if (this.failed) {
 			console.log(chalk.redBright('Tests failed'));

package/commands/test/reporters/reporter.ts

@@ -1,7 +1,7 @@
 import {MMF1} from '../mmf1.js';
 
 export interface Reporter {
-	addFiles(files: string[]): void;
-	addRun(file: string, mmf: MMF1, state: Promise<void>, wasiMode: boolean): void;
-	done(): boolean;
+	addFiles(files : string[]) : void;
+	addRun(file : string, mmf : MMF1, state : Promise<void>, wasiMode : boolean) : void;
+	done() : boolean;
 }

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

@@ -9,11 +9,11 @@ export class SilentReporter implements Reporter {
 	skipped = 0;
 	passedFiles = 0;
 	failedFiles = 0;
-	passedNamesFlat: string[] = [];
+	passedNamesFlat : string[] = [];
 
-	addFiles(_files: string[]) {}
+	addFiles(_files : string[]) {}
 
-	addRun(file: string, mmf: MMF1, state: Promise<void>, _wasiMode: boolean) {
+	addRun(file : string, mmf : MMF1, state : Promise<void>, _wasiMode : boolean) {
 		state.then(() => {
 			this.passed += mmf.passed;
 			this.failed += mmf.failed;
@@ -36,7 +36,7 @@ export class SilentReporter implements Reporter {
 		});
 	}
 
-	done(): boolean {
+	done() : boolean {
 		return this.failed === 0;
 	}
 }

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

@@ -11,7 +11,7 @@ export class VerboseReporter implements Reporter {
 	#startTime = Date.now();
 	#curFileIndex = 0;
 
-	addFiles(files: string[]) {
+	addFiles(files : string[]) {
 		console.log('Test files:');
 		for (let file of files) {
 			console.log(chalk.gray(`• ${absToRel(file)}`));
@@ -19,7 +19,7 @@ export class VerboseReporter implements Reporter {
 		console.log('='.repeat(50));
 	}
 
-	addRun(file: string, mmf: MMF1, state: Promise<void>, wasiMode: boolean) {
+	addRun(file : string, mmf : MMF1, state : Promise<void>, wasiMode : boolean) {
 		state.then(() => {
 			this.passed += mmf.passed;
 			this.failed += mmf.failed;
@@ -35,7 +35,7 @@ export class VerboseReporter implements Reporter {
 		});
 	}
 
-	done(): boolean {
+	done() : boolean {
 		console.log('='.repeat(50));
 		if (this.failed) {
 			console.log(chalk.redBright('Tests failed'));

package/commands/test/test.ts

@@ -74,8 +74,8 @@ export async function test(filter = '', {watch = false, reporter = 'verbose' as
 let mocPath = '';
 let wasmtimePath = '';
 
-export async function runAll(reporterName: ReporterName = 'verbose', filter = '', mode: TestMode = 'interpreter'): Promise<boolean> {
-	let reporter: Reporter;
+export async function runAll(reporterName : ReporterName = 'verbose', filter = '', mode : TestMode = 'interpreter') : Promise<boolean> {
+	let reporter : Reporter;
 	if (reporterName == 'compact') {
 		reporter = new CompactReporter;
 	}
@@ -92,9 +92,9 @@ export async function runAll(reporterName: ReporterName = 'verbose', filter = ''
 	return done;
 }
 
-export async function testWithReporter(reporter: Reporter, filter = '', mode: TestMode = 'interpreter'): Promise<boolean> {
+export async function testWithReporter(reporter : Reporter, filter = '', mode : TestMode = 'interpreter') : Promise<boolean> {
 	let rootDir = getRootDir();
-	let files: string[] = [];
+	let files : string[] = [];
 	let libFiles = globSync('**/test?(s)/lib.mo', globConfig);
 	if (libFiles[0]) {
 		files = [libFiles[0]];
@@ -128,7 +128,7 @@ export async function testWithReporter(reporter: Reporter, filter = '', mode: Te
 	let wasmDir = `${getRootDir()}/.mops/.test/`;
 	fs.mkdirSync(wasmDir, {recursive: true});
 
-	await parallel(os.cpus().length, files, async (file: string) => {
+	await parallel(os.cpus().length, files, async (file : string) => {
 		let mmf = new MMF1('store', absToRel(file));
 		let wasiMode = mode === 'wasi' || fs.readFileSync(file, 'utf8').startsWith('// @testmode wasi');
 
@@ -166,14 +166,14 @@ export async function testWithReporter(reporter: Reporter, filter = '', mode: Te
 							'-C', 'cache=n',
 							'-W', 'bulk-memory',
 							'-W', 'multi-memory',
-							'-W', 'max-wasm-stack=2000000',
+							'-W', 'max-wasm-stack=4000000',
 							'-W', 'nan-canonicalization=y',
 							wasmFile,
 						];
 					}
 					else {
 						wasmtimeArgs = [
-							'--max-wasm-stack=2000000',
+							'--max-wasm-stack=4000000',
 							'--enable-cranelift-nan-canonicalization',
 							'--wasm-features',
 							'multi-memory,bulk-memory',
@@ -203,7 +203,7 @@ export async function testWithReporter(reporter: Reporter, filter = '', mode: Te
 	return reporter.done();
 }
 
-function pipeMMF(proc: ChildProcessWithoutNullStreams, mmf: MMF1) {
+function pipeMMF(proc : ChildProcessWithoutNullStreams, mmf : MMF1) {
 	return new Promise<void>((resolve) => {
 		// stdout
 		proc.stdout.on('data', (data) => {
@@ -217,9 +217,9 @@ function pipeMMF(proc: ChildProcessWithoutNullStreams, mmf: MMF1) {
 
 		// stderr
 		proc.stderr.on('data', (data) => {
-			let text: string = data.toString().trim();
+			let text : string = data.toString().trim();
 			let failedLine = '';
-			text = text.replace(/([\w+._/-]+):(\d+).(\d+)(-\d+.\d+)/g, (_m0, m1: string, m2: string, m3: string) => {
+			text = text.replace(/([\w+._/-]+):(\d+).(\d+)(-\d+.\d+)/g, (_m0, m1 : string, m2 : string, m3 : string) => {
 				// change absolute file path to relative
 				// change :line:col-line:col to :line:col to work in vscode
 				let res = `${absToRel(m1)}:${m2}:${m3}`;

package/commands/test/utils.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import {getRootDir} from '../../mops.js';
 
-export function absToRel(p: string) {
+export function absToRel(p : string) {
 	let rootDir = getRootDir();
 	return path.relative(rootDir, path.resolve(p));
 }