ic-mops 0.45.3 → 1.0.0-pre.0

package/dist/types.d.ts

@@ -36,3 +36,4 @@ export type Tool = 'moc' | 'wasmtime' | 'pocket-ic';
 export type Requirements = {
     moc?: string;
 };
+export type TestMode = 'interpreter' | 'wasi' | 'replica';

package/mops.ts

@@ -5,7 +5,6 @@ import {Identity} from '@dfinity/agent';
 import TOML from '@iarna/toml';
 import chalk from 'chalk';
 import prompts from 'prompts';
-import ncp from 'ncp';
 import fetch from 'node-fetch';
 
 import {decodeFile} from './pem.js';
@@ -47,35 +46,6 @@ if (process.env.XDG_CACHE_HOME) {
 	globalCacheDir = path.join(process.env.XDG_CACHE_HOME, 'mops');
 }
 
-// temp: move old config to new location
-let oldGlobalConfigDir = path.resolve(process.env.HOME || process.env.APPDATA || '/', 'mops');
-if (fs.existsSync(oldGlobalConfigDir) && !fs.existsSync(globalConfigDir)) {
-	fs.mkdirSync(globalConfigDir, {recursive: true});
-	if (fs.existsSync(path.join(oldGlobalConfigDir, 'identity.pem'))) {
-		fs.copyFileSync(path.join(oldGlobalConfigDir, 'identity.pem'), path.join(globalConfigDir, 'identity.pem'));
-	}
-	if (fs.existsSync(path.join(oldGlobalConfigDir, 'identity.pem.encrypted'))) {
-		fs.copyFileSync(path.join(oldGlobalConfigDir, 'identity.pem.encrypted'), path.join(globalConfigDir, 'identity.pem.encrypted'));
-	}
-	console.log('Moved config to ' + chalk.green(globalConfigDir));
-}
-
-// temp: move old cache to new location
-if (fs.existsSync(oldGlobalConfigDir) && !fs.existsSync(globalCacheDir)) {
-	fs.mkdirSync(globalCacheDir, {recursive: true});
-	ncp.ncp(path.join(oldGlobalConfigDir, 'packages'), path.join(globalCacheDir, 'packages'), {
-		stopOnErr: true,
-		clobber: false,
-	}, (err) => {
-		if (err) {
-			console.log('Error moving config: ', err);
-			fs.rmSync(globalCacheDir, {recursive: true, force: true});
-		}
-	});
-	console.log('Moved cache to ' + chalk.green(globalCacheDir));
-}
-
-
 export function getNetworkFile() : string | URL {
 	let networkFile : string | URL = '';
 	try {
@@ -127,10 +97,13 @@ export function getRootDir() {
 	return path.dirname(configFile);
 }
 
-export function checkConfigFile() {
+export function checkConfigFile(exit = false) {
 	let configFile = getClosestConfigFile();
 	if (!configFile) {
 		console.log(chalk.red('Error: ') + `Config file 'mops.toml' not found. Please run ${chalk.green('mops init')} first`);
+		if (exit) {
+			process.exit(1);
+		}
 		return false;
 	}
 	return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.45.3",
+  "version": "1.0.0-pre.0",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",
@@ -59,6 +59,7 @@
     "del": "7.1.0",
     "dhall-to-json-cli": "1.7.6",
     "execa": "9.3.0",
+    "filesize": "10.1.4",
     "fs-extra": "11.2.0",
     "get-folder-size": "5.0.0",
     "glob": "11.0.0",
@@ -73,7 +74,7 @@
     "node-fetch": "3.3.2",
     "octokit": "3.1.2",
     "pem-file": "1.0.1",
-    "pic-ic": "0.3.3",
+    "pic-ic": "0.5.1",
     "prompts": "2.4.2",
     "semver": "7.6.3",
     "stream-to-promise": "3.0.0",
@@ -92,9 +93,9 @@
     "@types/semver": "7.5.8",
     "@types/stream-to-promise": "2.2.4",
     "@types/tar": "6.1.13",
-    "eslint": "8.57.0",
     "bun": "1.0.35",
     "esbuild": "0.23.0",
+    "eslint": "8.57.0",
     "tsx": "4.16.5",
     "typescript": "5.5.4"
   },

package/resolve-packages.ts

@@ -5,15 +5,20 @@ import {checkConfigFile, getRootDir, parseGithubURL, readConfig} from './mops.js
 import {VesselConfig, readVesselConfig} from './vessel.js';
 import {Config, Dependency} from './types.js';
 import {getDepCacheDir, getDepCacheName} from './cache.js';
+import {getPackageId} from './helpers/get-package-id.js';
 
-export async function resolvePackages({verbose = false} = {}) : Promise<Record<string, string>> {
+export async function resolvePackages({conflicts = 'ignore' as 'warning' | 'error' | 'ignore'} = {}) : Promise<Record<string, string>> {
 	if (!checkConfigFile()) {
 		return {};
 	}
 
 	let rootDir = getRootDir();
 	let packages : Record<string, Dependency & {isRoot : boolean;}> = {};
-	let versions : Record<string, string[]> = {};
+	let versions : Record<string, Array<{
+		isMopsPackage : boolean;
+		version : string;
+		dependencyOf : string;
+	}>> = {};
 
 	let compareVersions = (a : string = '0.0.0', b : string = '0.0.0') => {
 		let ap = a.split('.').map((x : string) => parseInt(x)) as [number, number, number];
@@ -95,19 +100,32 @@ export async function resolvePackages({verbose = false} = {}) : Promise<Record<s
 
 			// collect nested deps
 			if (nestedConfig) {
-				await collectDeps(nestedConfig, localNestedDir);
+				await collectDeps(nestedConfig, localNestedDir, false);
 			}
 
 			if (!versions[name]) {
 				versions[name] = [];
 			}
 
+			let parentPkgId = isRoot ? '<root>' : '';
+			if ('package' in config) {
+				parentPkgId = getPackageId(config.package?.name || '', config.package?.version || '');
+			}
+
 			if (repo) {
 				const {branch} = parseGithubURL(repo);
-				versions[name]?.push(branch);
+				versions[name]?.push({
+					version: branch,
+					dependencyOf: parentPkgId,
+					isMopsPackage: false,
+				});
 			}
 			else if (version) {
-				versions[name]?.push(version);
+				versions[name]?.push({
+					version: version,
+					dependencyOf: parentPkgId,
+					isMopsPackage: true,
+				});
 			}
 		}
 	};
@@ -116,14 +134,27 @@ export async function resolvePackages({verbose = false} = {}) : Promise<Record<s
 	await collectDeps(config, rootDir, true);
 
 	// show conflicts
-	if (verbose) {
+	let hasConflicts = false;
+
+	if (conflicts !== 'ignore') {
 		for (let [dep, vers] of Object.entries(versions)) {
-			if (vers.length > 1) {
-				console.log(chalk.yellow('WARN:'), `Conflicting package versions "${dep}" - ${vers.join(', ')}`);
+			let majors = new Set(vers.filter(x => x.isMopsPackage).map(x => x.version.split('.')[0]));
+			if (majors.size > 1) {
+				console.error(chalk.reset('') + chalk.redBright(conflicts === 'error' ? 'Error!' : 'Warning!'), `Conflicting versions of dependency "${dep}"`);
+
+				for (let {version, dependencyOf} of vers.reverse()) {
+					console.error(chalk.reset('  ') + `${dep} ${chalk.bold.red(version.split('.')[0])}.${version.split('.').slice(1).join('.')} is dependency of ${chalk.bold(dependencyOf)}`);
+				}
+
+				hasConflicts = true;
 			}
 		}
 	}
 
+	if (conflicts === 'error' && hasConflicts) {
+		process.exit(1);
+	}
+
 	return Object.fromEntries(
 		Object.entries(packages).map(([name, pkg]) => {
 			let version : string;

package/types.ts

@@ -40,4 +40,6 @@ export type Tool = 'moc' | 'wasmtime' | 'pocket-ic';
 
 export type Requirements = {
 	moc ?: string;
-};
+};
+
+export type TestMode = 'interpreter' | 'wasi' | 'replica';

package/bundle/bench/bench-canister.mo

@@ -1,87 +0,0 @@
-import Nat64 "mo:base/Nat64";
-import Nat "mo:base/Nat";
-import Debug "mo:base/Debug";
-import ExperimentalInternetComputer "mo:base/ExperimentalInternetComputer";
-import Prim "mo:prim";
-import Bench "mo:bench";
-
-import UserBench "./user-bench"; // file path will be replaced with the *.bench.mo file path
-
-actor class() {
-	var benchOpt : ?Bench.Bench = null;
-
-	public func init() : async Bench.BenchSchema {
-		let bench = UserBench.init();
-		benchOpt := ?bench;
-		bench.getSchema();
-	};
-
-	public query func getSchema() : async Bench.BenchSchema {
-		let ?bench = benchOpt else Debug.trap("bench not initialized");
-		bench.getSchema();
-	};
-
-	func _getStats() : Bench.BenchResult {
-		{
-			instructions = 0;
-			rts_heap_size = Prim.rts_heap_size();
-			rts_memory_size = Prim.rts_memory_size();
-			rts_total_allocation = Prim.rts_total_allocation();
-			rts_mutator_instructions = Prim.rts_mutator_instructions();
-			rts_collector_instructions = Prim.rts_collector_instructions();
-		}
-	};
-
-	func _diffStats(before : Bench.BenchResult, after : Bench.BenchResult) : Bench.BenchResult {
-		{
-			instructions = after.instructions - before.instructions;
-			rts_heap_size = after.rts_heap_size - before.rts_heap_size;
-			rts_memory_size = after.rts_memory_size - before.rts_memory_size;
-			rts_total_allocation = after.rts_total_allocation - before.rts_total_allocation;
-			rts_mutator_instructions = after.rts_mutator_instructions - before.rts_mutator_instructions;
-			rts_collector_instructions = after.rts_collector_instructions - before.rts_collector_instructions;
-		}
-	};
-
-	func _runCell(rowIndex : Nat, colIndex : Nat) : Bench.BenchResult {
-		let ?bench = benchOpt else Debug.trap("bench not initialized");
-		let statsBefore = _getStats();
-
-		let instructions = Nat64.toNat(ExperimentalInternetComputer.countInstructions(func() {
-			bench.runCell(rowIndex, colIndex);
-		}));
-
-		let statsAfter = _getStats();
-		_diffStats(statsBefore, { statsAfter with instructions });
-	};
-
-	func _runCellAwait(rowIndex : Nat, colIndex : Nat) : async Bench.BenchResult {
-		let ?bench = benchOpt else Debug.trap("bench not initialized");
-		let statsBefore = _getStats();
-
-		let instructions = Nat64.toNat(ExperimentalInternetComputer.countInstructions(func() {
-			bench.runCell(rowIndex, colIndex);
-		}));
-
-		await (func() : async () {})();
-
-		let statsAfter = _getStats();
-		_diffStats(statsBefore, { statsAfter with instructions });
-	};
-
-	public query func getStats() : async Bench.BenchResult {
-		_getStats();
-	};
-
-	public query func runCellQuery(rowIndex : Nat, colIndex : Nat) : async Bench.BenchResult {
-		_runCell(rowIndex, colIndex);
-	};
-
-	public func runCellUpdate(rowIndex : Nat, colIndex : Nat) : async Bench.BenchResult {
-		_runCell(rowIndex, colIndex);
-	};
-
-	public func runCellUpdateAwait(rowIndex : Nat, colIndex : Nat) : async Bench.BenchResult {
-		await _runCellAwait(rowIndex, colIndex);
-	};
-};

package/bundle/bench/user-bench.mo

@@ -1,14 +0,0 @@
-import Nat "mo:base/Nat";
-import Iter "mo:base/Iter";
-import Buffer "mo:base/Buffer";
-import Vector "mo:vector/Class";
-import Bench "mo:bench";
-
-// placeholder file that will be replaced with the *.bench.mo file
-module {
-	public func init() : Bench.Bench {
-		let bench = Bench.Bench();
-		// benchmark code goes here...
-		bench;
-	};
-};

package/bundle/bin/moc-wrapper.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# set -e
-
-findRootDir() {
-  dir="$(pwd)"
-  while [[ "$dir" != "" && ! -e "$dir/mops.toml" ]]; do
-    dir=${dir%/*}
-  done
-  echo "$dir"
-}
-
-rootDir=$(findRootDir)
-mopsToml="$rootDir/mops.toml"
-
-if [[ $rootDir == "" ]] || [[ ! -f $mopsToml ]]; then
-  mocPath="$(mops toolchain bin moc --fallback)"
-else
-  if command -v openssl >/dev/null 2>&1; then
-    mopsTomlHash=$(openssl sha256 $mopsToml | awk -F'= ' '{print $2}')
-  else
-    mopsTomlHash=$(shasum $mopsToml -a 256 | awk -F' ' '{print $1}')
-  fi;
-
-  cached="$rootDir/.mops/moc-$mopsTomlHash"
-
-  if [ -f $cached ]; then
-    mocPath=$(cat $cached)
-    if [[ "$mocPath" != *"/moc" ]] ; then
-      mocPath="$(mops toolchain bin moc --fallback)"
-      echo -n $mocPath > "$cached"
-    fi;
-  else
-    mkdir -p "$(dirname $cached)"
-    mocPath="$(mops toolchain bin moc --fallback)"
-    echo -n $mocPath > "$cached"
-  fi;
-fi;
-
-$mocPath "$@"

package/bundle/bin/mops.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-import '../cli.js';