ic-mops 1.11.1 → 1.12.0

package/commands/replica.ts

@@ -5,9 +5,10 @@ import fs from 'node:fs';
 import {PassThrough} from 'node:stream';
 import {spawn as spawnAsync} from 'promisify-child-process';
 
-import {IDL} from '@dfinity/candid';
-import {Actor, HttpAgent} from '@dfinity/agent';
+import {IDL} from '@icp-sdk/core/candid';
+import {Actor, HttpAgent} from '@icp-sdk/core/agent';
 import {PocketIc, PocketIcServer} from 'pic-ic';
+import {PocketIc as PocketIcMops, PocketIcServer as PocketIcServerMops} from 'pic-js-mops';
 import chalk from 'chalk';
 
 import {readConfig} from '../mops.js';
@@ -25,8 +26,8 @@ export class Replica {
 	type : 'dfx' | 'pocket-ic' | 'dfx-pocket-ic' = 'dfx';
 	verbose = false;
 	canisters : Record<string, {cwd : string; canisterId : string; actor : any; stream : PassThrough;}> = {};
-	pocketIcServer ?: PocketIcServer;
-	pocketIc ?: PocketIc;
+	pocketIcServer ?: PocketIcServer | PocketIcServerMops;
+	pocketIc ?: PocketIc | PocketIcMops;
 	dfxProcess ?: ChildProcessWithoutNullStreams;
 	dir : string = ''; // absolute path (/.../.mops/.test/)
 	ttl = 60;
@@ -85,20 +86,32 @@ export class Replica {
 		else {
 			let pocketIcBin = await toolchain.bin('pocket-ic');
 
-			// eslint-disable-next-line
 			let config = readConfig();
-			if (config.toolchain?.['pocket-ic'] !== '4.0.0') {
-				console.error('Current Mops CLI only supports pocket-ic 4.0.0');
+			if (config.toolchain?.['pocket-ic'] !== '4.0.0' && !config.toolchain?.['pocket-ic']?.startsWith('9.')) {
+				console.error('Current Mops CLI only supports pocket-ic 9.x.x and 4.0.0');
 				process.exit(1);
 			}
 
-			this.pocketIcServer = await PocketIcServer.start({
-				showRuntimeLogs: false,
-				showCanisterLogs: false,
-				binPath: pocketIcBin,
-				ttl: this.ttl,
-			});
-			this.pocketIc = await PocketIc.create(this.pocketIcServer.getUrl());
+			// pocket-ic 9.x.x
+			if (config.toolchain?.['pocket-ic']?.startsWith('9.')) {
+				this.pocketIcServer = await PocketIcServerMops.start({
+					showRuntimeLogs: false,
+					showCanisterLogs: false,
+					binPath: pocketIcBin,
+					ttl: this.ttl,
+				});
+				this.pocketIc = await PocketIcMops.create(this.pocketIcServer.getUrl());
+			}
+			// pocket-ic 4.0.0
+			else {
+				this.pocketIcServer = await PocketIcServer.start({
+					showRuntimeLogs: false,
+					showCanisterLogs: false,
+					binPath: pocketIcBin,
+					ttl: this.ttl,
+				});
+				this.pocketIc = await PocketIc.create(this.pocketIcServer.getUrl());
+			}
 
 			// process canister logs
 			this._attachCanisterLogHandler(this.pocketIcServer.serverProcess as ChildProcessWithoutNullStreams);
@@ -224,17 +237,17 @@ export class Replica {
 			};
 		}
 		else if (this.pocketIc) {
-			// let {canisterId, actor} = await this.pocketIc.setupCanister(idlFactory, wasm);
-			let {canisterId, actor} = await this.pocketIc.setupCanister({
-				idlFactory,
+			type PocketIcSetupCanister = PocketIcMops['setupCanister'] & PocketIc['setupCanister'];
+			let {canisterId, actor} = await (this.pocketIc.setupCanister as PocketIcSetupCanister)({
 				wasm,
+				idlFactory,
 			});
 
 			if (signal?.aborted) {
 				return;
 			}
 
-			await this.pocketIc.addCycles(canisterId, 1_000_000_000_000);
+			await this.pocketIc.addCycles(canisterId as any, 1_000_000_000_000);
 
 			if (signal?.aborted) {
 				return;

package/commands/test/test.ts

@@ -1,21 +1,23 @@
 import process from 'node:process';
-import {spawn, ChildProcessWithoutNullStreams} from 'node:child_process';
+import {spawn} from 'node:child_process';
 import path from 'node:path';
 import fs from 'node:fs';
 import os from 'node:os';
+import {PassThrough} from 'node:stream';
 
 import chalk from 'chalk';
 import {globSync} from 'glob';
 import chokidar from 'chokidar';
 import debounce from 'debounce';
 import {SemVer} from 'semver';
+import {ActorMethod} from '@icp-sdk/core/agent';
 
 import {sources} from '../sources.js';
 import {getRootDir, readConfig} from '../../mops.js';
 import {parallel} from '../../parallel.js';
 
 import {MMF1} from './mmf1.js';
-import {absToRel} from './utils.js';
+import {absToRel, pipeMMF, pipeStderrToMMF, pipeStdoutToMMF} from './utils.js';
 import {Reporter} from './reporters/reporter.js';
 import {VerboseReporter} from './reporters/verbose-reporter.js';
 import {FilesReporter} from './reporters/files-reporter.js';
@@ -23,8 +25,6 @@ import {CompactReporter} from './reporters/compact-reporter.js';
 import {SilentReporter} from './reporters/silent-reporter.js';
 import {toolchain} from '../toolchain/index.js';
 import {Replica} from '../replica.js';
-import {ActorMethod} from '@dfinity/agent';
-import {PassThrough, Readable} from 'node:stream';
 import {TestMode} from '../../types.js';
 import {getDfxVersion} from '../../helpers/get-dfx-version.js';
 
@@ -221,14 +221,7 @@ export async function testWithReporter(reporterName : ReporterName | Reporter |
 	fs.rmSync(testTempDir, {recursive: true, force: true});
 	fs.mkdirSync(testTempDir, {recursive: true});
 
-	await parallel(os.cpus().length, files, async (file : string) => {
-		if (signal?.aborted) {
-			return;
-		}
-
-		let mmf = new MMF1('store', absToRel(file));
-
-		// mode overrides
+	let filesWithMode = files.map((file) => {
 		let lines = fs.readFileSync(file, 'utf8').split('\n');
 		let mode = defaultMode;
 		if (lines.includes('// @testmode wasi')) {
@@ -237,19 +230,33 @@ export async function testWithReporter(reporterName : ReporterName | Reporter |
 		else if (lines.includes('// @testmode replica') || lines.find(line => line.match(/^(persistent )?actor( class)?/))) {
 			mode = 'replica';
 		}
+		return {file, mode};
+	});
 
-		if (mode === 'wasi' && !wasmtimePath) {
-			// ensure wasmtime is installed or specified in config
-			if (config.toolchain?.wasmtime) {
-				wasmtimePath = await toolchain.bin('wasmtime');
-			}
-			// fallback wasmtime to global binary if not specified in config (legacy)
-			else {
-				wasmtimePath = 'wasmtime';
-				console.log(chalk.yellow('Warning:'), 'Wasmtime is not specified in config. Using global binary "wasmtime". This will be removed in the future.');
-				console.log(`Run ${chalk.green('mops toolchain use wasmtime')} or add ${chalk.green('wasmtime = "<version>"')} in mops.toml to avoid breaking changes with future versions of mops.`);
-			}
+	let hasWasiTests = filesWithMode.some(({mode}) => mode === 'wasi');
+	let hasReplicaTests = filesWithMode.some(({mode}) => mode === 'replica');
+
+	// prepare wasmtime path
+	if (hasWasiTests && !wasmtimePath) {
+		// ensure wasmtime is installed or specified in config
+		if (config.toolchain?.wasmtime) {
+			wasmtimePath = await toolchain.bin('wasmtime');
+		}
+		// fallback wasmtime to global binary if not specified in config (legacy)
+		else {
+			wasmtimePath = 'wasmtime';
+			console.log(chalk.yellow('Warning:'), 'Wasmtime is not specified in config. Using global binary "wasmtime". This will be removed in the future.');
+			console.log(`Run ${chalk.green('mops toolchain use wasmtime')} or add ${chalk.green('wasmtime = "<version>"')} in mops.toml to avoid breaking changes with future versions of mops.`);
 		}
+	}
+
+	let runTestFile = async ({file, mode} : {file : string, mode : TestMode}) => {
+		if (signal?.aborted) {
+			return;
+		}
+
+		// print logs immediately for replica tests because we run them one-by-one
+		let mmf = new MMF1(mode === 'replica' ? 'print' : 'store', absToRel(file));
 
 		let promise = new Promise<void>((resolve) => {
 			let mocArgs = ['--hide-warnings', '--error-detail=2', ...sourcesArr.join(' ').split(' '), file].filter(x => x);
@@ -315,8 +322,6 @@ export async function testWithReporter(reporterName : ReporterName | Reporter |
 			}
 			// build and execute in replica
 			else if (mode === 'replica') {
-				// mmf.strategy = 'print'; // because we run replica tests one-by-one
-
 				let wasmFile = `${path.join(testTempDir, path.parse(file).name)}.wasm`;
 
 				// build
@@ -363,7 +368,7 @@ export async function testWithReporter(reporterName : ReporterName | Reporter |
 										resolve();
 										clearInterval(timerId);
 									}
-								}, Math.random() * 1000 |0);
+								}, Math.random() * 1000 | 0);
 							});
 						}
 
@@ -396,9 +401,12 @@ export async function testWithReporter(reporterName : ReporterName | Reporter |
 		reporter.addRun(file, mmf, promise, mode);
 
 		await promise;
-	});
+	};
+
+	await parallel(os.cpus().length, filesWithMode.filter(({mode}) => mode !== 'replica'), runTestFile);
+	await parallel(1, filesWithMode.filter(({mode}) => mode === 'replica'), runTestFile);
 
-	if (replicaStartPromise && !watch) {
+	if (hasReplicaTests && !watch) {
 		await replica.stop();
 		fs.rmSync(testTempDir, {recursive: true, force: true});
 	}
@@ -408,72 +416,4 @@ export async function testWithReporter(reporterName : ReporterName | Reporter |
 	}
 
 	return reporter.done();
-}
-
-function pipeStdoutToMMF(stdout : Readable, mmf : MMF1) {
-	stdout.on('data', (data) => {
-		for (let line of data.toString().split('\n')) {
-			line = line.trim();
-			if (line) {
-				mmf.parseLine(line);
-			}
-		}
-	});
-}
-
-function pipeStderrToMMF(stderr : Readable, mmf : MMF1, dir = '') {
-	stderr.on('data', (data) => {
-		let text : string = data.toString().trim();
-		let failedLine = '';
-
-		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}`;
-			let file = path.join(dir, m1);
-
-			if (!fs.existsSync(file)) {
-				return res;
-			}
-
-			// show failed line
-			let content = fs.readFileSync(file);
-			let lines = content.toString().split('\n') || [];
-
-			failedLine += chalk.dim('\n   ...');
-
-			let lineBefore = lines[+m2 - 2];
-			if (lineBefore) {
-				failedLine += chalk.dim(`\n   ${+m2 - 1}\t| ${lineBefore.replaceAll('\t', '  ')}`);
-			}
-			failedLine += `\n${chalk.redBright`->`} ${m2}\t| ${lines[+m2 - 1]?.replaceAll('\t', '  ')}`;
-			if (lines.length > +m2) {
-				failedLine += chalk.dim(`\n   ${+m2 + 1}\t| ${lines[+m2]?.replaceAll('\t', '  ')}`);
-			}
-			failedLine += chalk.dim('\n   ...');
-			return res;
-		});
-		if (failedLine) {
-			text += failedLine;
-		}
-		mmf.fail(text);
-	});
-}
-
-function pipeMMF(proc : ChildProcessWithoutNullStreams, mmf : MMF1) {
-	return new Promise<void>((resolve) => {
-		pipeStdoutToMMF(proc.stdout, mmf);
-		pipeStderrToMMF(proc.stderr, mmf);
-
-		// exit
-		proc.on('close', (code) => {
-			if (code === 0) {
-				mmf.strategy !== 'print' && mmf.pass();
-			}
-			else if (code !== 1) {
-				mmf.fail(`unknown exit code: ${code}`);
-			}
-			resolve();
-		});
-	});
-}
+}

package/commands/test/utils.ts

@@ -1,7 +1,81 @@
 import path from 'node:path';
+import fs from 'node:fs';
+import {ChildProcessWithoutNullStreams} from 'node:child_process';
+import {Readable} from 'node:stream';
+import chalk from 'chalk';
 import {getRootDir} from '../../mops.js';
+import {MMF1} from './mmf1.js';
 
 export function absToRel(p : string) {
 	let rootDir = getRootDir();
 	return path.relative(rootDir, path.resolve(p));
-}
+}
+
+export function pipeStdoutToMMF(stdout : Readable, mmf : MMF1) {
+	stdout.on('data', (data) => {
+		for (let line of data.toString().split('\n')) {
+			line = line.trim();
+			if (line) {
+				mmf.parseLine(line);
+			}
+		}
+	});
+}
+
+export function pipeStderrToMMF(stderr : Readable, mmf : MMF1, dir = '') {
+	stderr.on('data', (data) => {
+		let text : string = data.toString().trim();
+		let failedLine = '';
+
+		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}`;
+			let file = path.join(dir, m1);
+
+			if (!fs.existsSync(file)) {
+				return res;
+			}
+
+			// show failed line
+			let content = fs.readFileSync(file);
+			let lines = content.toString().split('\n') || [];
+
+			failedLine += chalk.dim('\n   ...');
+
+			let lineBefore = lines[+m2 - 2];
+			if (lineBefore) {
+				failedLine += chalk.dim(`\n   ${+m2 - 1}\t| ${lineBefore.replaceAll('\t', '  ')}`);
+			}
+			failedLine += `\n${chalk.redBright`->`} ${m2}\t| ${lines[+m2 - 1]?.replaceAll('\t', '  ')}`;
+			if (lines.length > +m2) {
+				failedLine += chalk.dim(`\n   ${+m2 + 1}\t| ${lines[+m2]?.replaceAll('\t', '  ')}`);
+			}
+			failedLine += chalk.dim('\n   ...');
+			return res;
+		});
+		if (failedLine) {
+			text += failedLine;
+		}
+		mmf.fail(text);
+	});
+}
+
+export function pipeMMF(proc : ChildProcessWithoutNullStreams, mmf : MMF1) {
+	return new Promise<void>((resolve) => {
+		pipeStdoutToMMF(proc.stdout, mmf);
+		pipeStderrToMMF(proc.stderr, mmf);
+
+		// exit
+		proc.on('close', (code) => {
+			if (code === 0) {
+				mmf.strategy !== 'print' && mmf.pass();
+			}
+			else if (code !== 1) {
+				mmf.fail(`unknown exit code: ${code}`);
+			}
+			resolve();
+		});
+	});
+}
+

package/commands/update.ts

@@ -3,6 +3,7 @@ import {checkConfigFile, getGithubCommit, parseGithubURL, readConfig} from '../m
 import {add} from './add.js';
 import {getAvailableUpdates} from './available-updates.js';
 import {checkIntegrity} from '../integrity.js';
+import {getDepName, getDepPinnedVersion} from '../helpers/get-dep-name.js';
 
 type UpdateOptions = {
 	verbose ?: boolean;
@@ -51,8 +52,24 @@ export async function update(pkg ?: string, {lock} : UpdateOptions = {}) {
 	}
 	else {
 		for (let dep of available) {
-			let dev = !!config['dev-dependencies']?.[dep[0]];
-			await add(`${dep[0]}@${dep[2]}`, {dev});
+			let devDeps = Object.keys(config['dev-dependencies'] || {});
+			let allDeps = [...Object.keys(config.dependencies || {}), ...devDeps];
+
+			let dev = false;
+			for (let d of devDeps) {
+				let pinnedVersion = getDepPinnedVersion(d);
+				if (getDepName(d) === dep[0] && (!pinnedVersion || dep[1].startsWith(pinnedVersion))) {
+					dev = true;
+					break;
+				}
+			}
+
+			let asName = allDeps.find((d) => {
+				let pinnedVersion = getDepPinnedVersion(d);
+				return getDepName(d) === dep[0] && (!pinnedVersion || dep[1].startsWith(pinnedVersion));
+			}) || dep[0];
+
+			await add(`${dep[0]}@${dep[2]}`, {dev}, asName);
 		}
 	}
 

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

@@ -1,6 +1,6 @@
-import type { Principal } from '@dfinity/principal';
-import type { ActorMethod } from '@dfinity/agent';
-import type { IDL } from '@dfinity/candid';
+import type { Principal } from '@icp-sdk/core/principal';
+import type { ActorMethod } from '@icp-sdk/core/agent';
+import type { IDL } from '@icp-sdk/core/candid';
 
 export interface BenchResult {
   'rts_stable_memory_size' : bigint,

package/declarations/bench/index.d.ts

@@ -3,9 +3,9 @@ import type {
   HttpAgentOptions,
   ActorConfig,
   Agent,
-} from "@dfinity/agent";
-import type { Principal } from "@dfinity/principal";
-import type { IDL } from "@dfinity/candid";
+} from "@icp-sdk/core/agent";
+import type { Principal } from "@icp-sdk/core/principal";
+import type { IDL } from "@icp-sdk/core/candid";
 
 import { _SERVICE } from './bench.did';
 

package/declarations/bench/index.js

@@ -1,4 +1,4 @@
-import { Actor, HttpAgent } from "@dfinity/agent";
+import { Actor, HttpAgent } from "@icp-sdk/core/agent";
 
 // Imports and re-exports candid interface
 import { idlFactory } from "./bench.did.js";

package/declarations/main/index.d.ts

@@ -3,9 +3,9 @@ import type {
   HttpAgentOptions,
   ActorConfig,
   Agent,
-} from "@dfinity/agent";
-import type { Principal } from "@dfinity/principal";
-import type { IDL } from "@dfinity/candid";
+} from "@icp-sdk/core/agent";
+import type { Principal } from "@icp-sdk/core/principal";
+import type { IDL } from "@icp-sdk/core/candid";
 
 import { _SERVICE } from './main.did';
 

package/declarations/main/index.js

@@ -1,4 +1,4 @@
-import { Actor, HttpAgent } from "@dfinity/agent";
+import { Actor, HttpAgent } from "@icp-sdk/core/agent";
 
 // Imports and re-exports candid interface
 import { idlFactory } from "./main.did.js";

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

@@ -1,6 +1,6 @@
-import type { Principal } from '@dfinity/principal';
-import type { ActorMethod } from '@dfinity/agent';
-import type { IDL } from '@dfinity/candid';
+import type { Principal } from '@icp-sdk/core/principal';
+import type { ActorMethod } from '@icp-sdk/core/agent';
+import type { IDL } from '@icp-sdk/core/candid';
 
 export interface Benchmark {
   'gc' : string,

package/declarations/storage/index.d.ts

@@ -3,9 +3,9 @@ import type {
   HttpAgentOptions,
   ActorConfig,
   Agent,
-} from "@dfinity/agent";
-import type { Principal } from "@dfinity/principal";
-import type { IDL } from "@dfinity/candid";
+} from "@icp-sdk/core/agent";
+import type { Principal } from "@icp-sdk/core/principal";
+import type { IDL } from "@icp-sdk/core/candid";
 
 import { _SERVICE } from './storage.did';
 

package/declarations/storage/index.js

@@ -1,4 +1,4 @@
-import { Actor, HttpAgent } from "@dfinity/agent";
+import { Actor, HttpAgent } from "@icp-sdk/core/agent";
 
 // Imports and re-exports candid interface
 import { idlFactory } from './storage.did.js';
@@ -6,9 +6,9 @@ export { idlFactory } from './storage.did.js';
 
 /**
  *
- * @param {string | import("@dfinity/principal").Principal} canisterId Canister ID of Agent
- * @param {{agentOptions?: import("@dfinity/agent").HttpAgentOptions; actorOptions?: import("@dfinity/agent").ActorConfig}} [options]
- * @return {import("@dfinity/agent").ActorSubclass<import("./storage.did.js")._SERVICE>}
+ * @param {string | import("@icp-sdk/core/principal").Principal} canisterId Canister ID of Agent
+ * @param {{agentOptions?: import("@icp-sdk/core/agent").HttpAgentOptions; actorOptions?: import("@icp-sdk/core/agent").ActorConfig}} [options]
+ * @return {import("@icp-sdk/core/agent").ActorSubclass<import("./storage.did.js")._SERVICE>}
  */
  export const createActor = (canisterId, options) => {
   const agent = new HttpAgent({ ...options?.agentOptions });

package/declarations/storage/storage.did.d.ts

@@ -1,6 +1,6 @@
-import type { Principal } from '@dfinity/principal';
-import type { ActorMethod } from '@dfinity/agent';
-import type { IDL } from '@dfinity/candid';
+import type { Principal } from '@icp-sdk/core/principal';
+import type { ActorMethod } from '@icp-sdk/core/agent';
+import type { IDL } from '@icp-sdk/core/candid';
 
 export type Chunk = Array<number>;
 export type Err = string;

package/dist/api/actors.d.ts

@@ -1,5 +1,5 @@
-import { Identity } from '@dfinity/agent';
-import { Principal } from '@dfinity/principal';
+import { Identity } from '@icp-sdk/core/agent';
+import { Principal } from '@icp-sdk/core/principal';
 import { _SERVICE } from '../declarations/main/main.did.js';
 import { _SERVICE as _STORAGE_SERVICE } from '../declarations/storage/storage.did.js';
 export declare let mainActor: (identity?: Identity) => Promise<_SERVICE>;

package/dist/api/actors.js

@@ -1,4 +1,4 @@
-import { Actor, HttpAgent } from '@dfinity/agent';
+import { Actor, HttpAgent } from '@icp-sdk/core/agent';
 import { idlFactory } from '../declarations/main/main.did.js';
 import { idlFactory as storageIdlFactory } from '../declarations/storage/storage.did.js';
 import { getEndpoint } from './network.js';

package/dist/api/downloadPackageFiles.d.ts

@@ -1,4 +1,4 @@
-import { Principal } from '@dfinity/principal';
+import { Principal } from '@icp-sdk/core/principal';
 import { Storage } from '../declarations/storage/storage.did.js';
 export declare function downloadPackageFiles(pkg: string, version?: string, threads?: number, onLoad?: (_fileIds: string[], _fileId: string) => void): Promise<Map<string, Array<number>>>;
 export declare function getPackageFilesInfo(pkg: string, version: string): Promise<{

package/dist/api/downloadPackageFiles.js

@@ -1,4 +1,4 @@
-import { Principal } from '@dfinity/principal';
+import { Principal } from '@icp-sdk/core/principal';
 import { mainActor, storageActor } from './actors.js';
 import { resolveVersion } from './resolveVersion.js';
 import { parallel } from '../parallel.js';

package/dist/commands/add.js

@@ -70,7 +70,7 @@ export async function add(name, { verbose = false, dev = false, lock } = {}, asN
             ver = versionRes.ok;
         }
         pkgDetails = {
-            name: name,
+            name: asName || name,
             repo: '',
             version: ver,
         };

package/dist/commands/available-updates.js

@@ -1,28 +1,40 @@
 import process from 'node:process';
 import chalk from 'chalk';
 import { mainActor } from '../api/actors.js';
-import { getDepName } from '../helpers/get-dep-name.js';
+import { getDepName, getDepPinnedVersion } from '../helpers/get-dep-name.js';
 // [pkg, oldVersion, newVersion]
 export async function getAvailableUpdates(config, pkg) {
     let deps = Object.values(config.dependencies || {});
     let devDeps = Object.values(config['dev-dependencies'] || {});
     let allDeps = [...deps, ...devDeps].filter((dep) => dep.version);
     let depsToUpdate = pkg ? allDeps.filter((dep) => dep.name === pkg) : allDeps;
-    // skip pinned dependencies
-    depsToUpdate = depsToUpdate.filter((dep) => getDepName(dep.name) === dep.name);
-    let getCurrentVersion = (pkg) => {
+    // skip hard pinned dependencies (e.g. "base@X.Y.Z")
+    depsToUpdate = depsToUpdate.filter((dep) => getDepName(dep.name) === dep.name || getDepPinnedVersion(dep.name).split('.').length !== 3);
+    let getCurrentVersion = (pkg, updateVersion) => {
         for (let dep of allDeps) {
-            if (dep.name === pkg && dep.version) {
+            if (getDepName(dep.name) === pkg && dep.version) {
+                let pinnedVersion = getDepPinnedVersion(dep.name);
+                if (pinnedVersion && !updateVersion.startsWith(pinnedVersion)) {
+                    continue;
+                }
                 return dep.version;
             }
         }
         return '';
     };
     let actor = await mainActor();
-    let res = await actor.getHighestSemverBatch(depsToUpdate.map((dep) => [dep.name, dep.version || '', { major: null }]));
+    let res = await actor.getHighestSemverBatch(depsToUpdate.map((dep) => {
+        let semverPart = { major: null };
+        let name = getDepName(dep.name);
+        let pinnedVersion = getDepPinnedVersion(dep.name);
+        if (pinnedVersion) {
+            semverPart = pinnedVersion.split('.').length === 1 ? { minor: null } : { patch: null };
+        }
+        return [name, dep.version || '', semverPart];
+    }));
     if ('err' in res) {
         console.log(chalk.red('Error:'), res.err);
         process.exit(1);
     }
-    return res.ok.filter((dep) => dep[1] !== getCurrentVersion(dep[0])).map((dep) => [dep[0], getCurrentVersion(dep[0]), dep[1]]);
+    return res.ok.filter((dep) => dep[1] !== getCurrentVersion(dep[0], dep[1])).map((dep) => [dep[0], getCurrentVersion(dep[0], dep[1]), dep[1]]);
 }

package/dist/commands/bench-replica.d.ts

@@ -1,4 +1,5 @@
 import { PocketIc, PocketIcServer } from 'pic-ic';
+import { PocketIc as PocketIcMops, PocketIcServer as PocketIcServerMops } from 'pic-js-mops';
 export declare class BenchReplica {
     type: 'dfx' | 'pocket-ic' | 'dfx-pocket-ic';
     verbose: boolean;
@@ -7,8 +8,8 @@ export declare class BenchReplica {
         canisterId: string;
         actor: any;
     }>;
-    pocketIcServer?: PocketIcServer;
-    pocketIc?: PocketIc;
+    pocketIcServer?: PocketIcServer | PocketIcServerMops;
+    pocketIc?: PocketIc | PocketIcMops;
     constructor(type: 'dfx' | 'pocket-ic' | 'dfx-pocket-ic', verbose?: boolean);
     start({ silent }?: {
         silent?: boolean | undefined;