ic-mops 0.36.1 → 0.37.0

package/dist/pic-js/packages/pic/src/util/poll.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.poll = void 0;
+const DEFAULT_POLL_INTERVAL_MS = 20;
+const DEFAULT_POLL_TIMEOUT_MS = 5000;
+async function poll(cb, options) {
+    const intervalMs = options?.intervalMs ?? DEFAULT_POLL_INTERVAL_MS;
+    const timeoutMs = options?.timeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
+    const startTimeMs = Date.now();
+    return new Promise((resolve, reject) => {
+        async function runPoll() {
+            const currentTimeMs = Date.now();
+            try {
+                const result = await cb();
+                clearInterval(interval);
+                return resolve(result);
+            }
+            catch (e) {
+                if (currentTimeMs - startTimeMs >= timeoutMs) {
+                    clearInterval(interval);
+                    return reject(e);
+                }
+            }
+        }
+        const interval = setInterval(runPoll, intervalMs);
+    });
+}
+exports.poll = poll;

package/dist/templates/mops-test.yml

@@ -15,10 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
-
-      - name: install moc
-        run: npx mocv use latest
+          node-version: 20
 
       - name: install mops
         run: npm i ic-mops -g
@@ -26,5 +23,8 @@ jobs:
       - name: install mops packages
         run: mops install
 
+      - name: install moc
+        run: mops toolchain use moc latest
+
       - name: run tests
         run: mops test

package/dist/types.d.ts

@@ -17,6 +17,7 @@ export type Config = {
     };
     dependencies?: Dependencies;
     'dev-dependencies'?: Dependencies;
+    toolchain?: Toolchain;
 };
 export type Dependencies = Record<string, Dependency>;
 export type Dependency = {
@@ -25,3 +26,9 @@ export type Dependency = {
     repo?: string;
     path?: string;
 };
+export type Toolchain = {
+    moc?: string;
+    wasmtime?: string;
+    'pocket-ic'?: string;
+};
+export type Tool = 'moc' | 'wasmtime' | 'pocket-ic';

package/dist/vessel.js

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { deleteSync } from 'del';
 import { execaCommand } from 'execa';
 import chalk from 'chalk';
-import logUpdate from 'log-update';
+import { createLogUpdate } from 'log-update';
 import got from 'got';
 import decompress from 'decompress';
 import { pipeline } from 'stream';
@@ -119,6 +119,7 @@ export const installFromGithub = async (name, repo, { verbose = false, dep = fal
     let { branch, commitHash } = parseGithubURL(repo);
     let dir = formatGithubDir(name, repo);
     let cacheName = `_github/${name}#${branch}` + (commitHash ? `@${commitHash}` : '');
+    let logUpdate = createLogUpdate(process.stdout, { showCursor: true });
     if (existsSync(dir)) {
         silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (local cache)`);
     }
@@ -145,6 +146,9 @@ export const installFromGithub = async (name, repo, { verbose = false, dep = fal
     if (verbose) {
         silent || logUpdate.done();
     }
+    else {
+        logUpdate.clear();
+    }
     const config = await readVesselConfig(dir, { silent });
     if (config) {
         for (const { name, repo } of config.dependencies) {

package/global.d.ts

@@ -1,2 +1,3 @@
 declare module 'pem-file';
-declare module 'get-folder-size';
+declare module 'get-folder-size';
+declare module 'decomp-tarxz';

package/integrity.ts

@@ -2,16 +2,28 @@ import fs from 'node:fs';
 import path from 'node:path';
 import {sha256} from '@noble/hashes/sha256';
 import {bytesToHex} from '@noble/hashes/utils';
-import {getDependencyType, getRootDir} from './mops.js';
+import {getDependencyType, getRootDir, readConfig} from './mops.js';
 import {mainActor} from './api/actors.js';
 import {resolvePackages} from './resolve-packages.js';
 
+type LockFileGeneric = {
+	version: number;
+};
+
 type LockFileV1 = {
 	version: 1;
 	mopsTomlHash: string;
 	hashes: Record<string, Record<string, string>>;
 };
 
+type LockFileV2 = {
+	version: 2;
+	mopsTomlDepsHash: string;
+	hashes: Record<string, Record<string, string>>;
+};
+
+type LockFile = LockFileV1 | LockFileV2;
+
 export async function checkIntegrity(lock?: 'check' | 'update' | 'ignore') {
 	let force = !!lock;
 
@@ -63,6 +75,19 @@ function getMopsTomlHash(): string {
 	return bytesToHex(sha256(fs.readFileSync(getRootDir() + '/mops.toml')));
 }
 
+function getMopsTomlDepsHash(): string {
+	let config = readConfig();
+	let deps = config.dependencies || {};
+	let devDeps = config['dev-dependencies'] || {};
+	let allDeps = {...deps, ...devDeps};
+	// sort allDeps by key
+	let sortedDeps = Object.keys(allDeps).sort().reduce((acc, key) => {
+		acc[key] = allDeps[key]?.version || allDeps[key]?.repo || allDeps[key]?.path || '';
+		return acc;
+	}, {} as Record<string, string>);
+	return bytesToHex(sha256(JSON.stringify(sortedDeps)));
+}
+
 // compare hashes of local files with hashes from the registry
 export async function checkRemote() {
 	let fileHashesFromRegistry = await getFileHashesFromRegistry();
@@ -88,18 +113,18 @@ export async function updateLockFile() {
 
 	// if lock file exists and mops.toml hasn't changed, don't update it
 	if (fs.existsSync(lockFile)) {
-		let lockFileJson: LockFileV1 = JSON.parse(fs.readFileSync(lockFile).toString());
-		let mopsTomlHash = getMopsTomlHash();
-		if (mopsTomlHash === lockFileJson.mopsTomlHash) {
+		let lockFileJson: LockFileV2 = JSON.parse(fs.readFileSync(lockFile).toString());
+		let mopsTomlDepsHash = getMopsTomlDepsHash();
+		if (mopsTomlDepsHash === lockFileJson.mopsTomlDepsHash) {
 			return;
 		}
 	}
 
 	let fileHashes = await getFileHashesFromRegistry();
 
-	let lockFileJson: LockFileV1 = {
-		version: 1,
-		mopsTomlHash: getMopsTomlHash(),
+	let lockFileJson: LockFileV2 = {
+		version: 2,
+		mopsTomlDepsHash: getMopsTomlDepsHash(),
 		hashes: fileHashes.reduce((acc, [packageId, fileHashes]) => {
 			acc[packageId] = fileHashes.reduce((acc, [fileId, hash]) => {
 				acc[fileId] = bytesToHex(new Uint8Array(hash));
@@ -126,23 +151,38 @@ export async function checkLockFile(force = false) {
 		return;
 	}
 
-	let lockFileJson: LockFileV1 = JSON.parse(fs.readFileSync(lockFile).toString());
+	let lockFileJsonGeneric: LockFileGeneric = JSON.parse(fs.readFileSync(lockFile).toString());
 	let packageIds = await getResolvedMopsPackageIds();
 
 	// check lock file version
-	if (lockFileJson.version !== 1) {
+	if (lockFileJsonGeneric.version !== 1 && lockFileJsonGeneric.version !== 2) {
 		console.error('Integrity check failed');
-		console.error(`Invalid lock file version: ${lockFileJson.version}. Supported versions: 1`);
+		console.error(`Invalid lock file version: ${lockFileJsonGeneric.version}. Supported versions: 1`);
 		process.exit(1);
 	}
 
-	// check mops.toml hash
-	if (lockFileJson.mopsTomlHash !== getMopsTomlHash()) {
-		console.error('Integrity check failed');
-		console.error('Mismatched mops.toml hash');
-		console.error(`Locked hash: ${lockFileJson.mopsTomlHash}`);
-		console.error(`Actual hash: ${getMopsTomlHash()}`);
-		process.exit(1);
+	let lockFileJson = lockFileJsonGeneric as LockFile;
+
+	// V1: check mops.toml hash
+	if (lockFileJson.version === 1) {
+		if (lockFileJson.mopsTomlHash !== getMopsTomlHash()) {
+			console.error('Integrity check failed');
+			console.error('Mismatched mops.toml hash');
+			console.error(`Locked hash: ${lockFileJson.mopsTomlHash}`);
+			console.error(`Actual hash: ${getMopsTomlHash()}`);
+			process.exit(1);
+		}
+	}
+
+	// V2: check mops.toml deps hash
+	if (lockFileJson.version === 2) {
+		if (lockFileJson.mopsTomlDepsHash !== getMopsTomlDepsHash()) {
+			console.error('Integrity check failed');
+			console.error('Mismatched mops.toml dependencies hash');
+			console.error(`Locked hash: ${lockFileJson.mopsTomlDepsHash}`);
+			console.error(`Actual hash: ${getMopsTomlDepsHash()}`);
+			process.exit(1);
+		}
 	}
 
 	// check number of packages

package/mops.ts

@@ -106,9 +106,9 @@ export let getIdentity = async (): Promise<Identity | undefined> => {
 	return undefined;
 };
 
-export function getClosestConfigFile(dir = process.cwd()) {
+export function getClosestConfigFile(dir = process.cwd()) : string {
 	if (!path.basename(dir)) {
-		throw '';
+		return '';
 	}
 	let configFile = path.join(dir, 'mops.toml');
 	if (fs.existsSync(configFile)) {
@@ -210,7 +210,7 @@ export function readConfig(configFile = getClosestConfigFile()): Config {
 }
 
 export function writeConfig(config: Config, configFile = getClosestConfigFile()) {
-	let resConfig: any = {...config};
+	let resConfig: any = JSON.parse(JSON.stringify(config));
 
 	let deps = resConfig.dependencies || {};
 	Object.entries(config.dependencies || {}).forEach(([name, {repo, path, version}]) => {

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "ic-mops",
-  "version": "0.36.1",
+  "version": "0.37.0",
   "type": "module",
   "bin": {
-    "mops": "dist/cli.js"
+    "mops": "dist/bin/mops.js",
+    "moc-wrapper": "bin/moc-wrapper.sh"
   },
   "files": [
     "*",
@@ -37,7 +38,6 @@
     "@dfinity/identity": "^0.19.3",
     "@dfinity/identity-secp256k1": "^0.19.3",
     "@dfinity/principal": "^0.19.3",
-    "@hadronous/pic": "0.2.0",
     "@iarna/toml": "^2.2.5",
     "@noble/hashes": "1.3.2",
     "as-table": "^1.0.55",
@@ -45,13 +45,15 @@
     "camelcase": "^7.0.1",
     "chalk": "^5.3.0",
     "chokidar": "^3.5.3",
-    "commander": "^11.0.0",
+    "commander": "11.1.0",
     "debounce": "^1.2.1",
+    "decomp-tarxz": "0.1.1",
     "decompress": "^4.2.1",
     "del": "^7.0.0",
     "dhall-to-json-cli": "^1.7.6",
     "eslint": "^8.45.0",
     "execa": "7.1.1",
+    "fs-extra": "11.2.0",
     "get-folder-size": "^4.0.0",
     "glob": "^10.3.3",
     "globby": "^13.2.2",
@@ -63,7 +65,9 @@
     "minimatch": "^9.0.3",
     "ncp": "^2.0.0",
     "node-fetch": "^3.3.2",
+    "octokit": "3.1.2",
     "pem-file": "^1.0.1",
+    "pic-ic": "0.3.2",
     "prompts": "^2.4.2",
     "stream-to-promise": "^3.0.0",
     "string-width": "7.0.0",
@@ -73,6 +77,7 @@
     "@tsconfig/strictest": "^2.0.1",
     "@types/debounce": "^1.2.1",
     "@types/decompress": "^4.2.4",
+    "@types/fs-extra": "11.0.4",
     "@types/glob": "^8.1.0",
     "@types/ncp": "^2.0.5",
     "@types/node": "^20.4.4",

package/templates/mops-test.yml

@@ -15,10 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
-
-      - name: install moc
-        run: npx mocv use latest
+          node-version: 20
 
       - name: install mops
         run: npm i ic-mops -g
@@ -26,5 +23,8 @@ jobs:
       - name: install mops packages
         run: mops install
 
+      - name: install moc
+        run: mops toolchain use moc latest
+
       - name: run tests
         run: mops test

package/types.ts

@@ -17,6 +17,7 @@ export type Config = {
 	};
 	dependencies?: Dependencies;
 	'dev-dependencies'?: Dependencies;
+	toolchain?: Toolchain;
 };
 
 export type Dependencies = Record<string, Dependency>;
@@ -26,4 +27,12 @@ export type Dependency = {
 	version?: string; // mops package
 	repo?: string; // github package
 	path?: string; // local package
-}
+}
+
+export type Toolchain = {
+	moc?: string;
+	wasmtime?: string;
+	'pocket-ic'?: string;
+};
+
+export type Tool = 'moc' | 'wasmtime' | 'pocket-ic';

package/vessel.ts

@@ -3,7 +3,7 @@ import path from 'node:path';
 import {deleteSync} from 'del';
 import {execaCommand} from 'execa';
 import chalk from 'chalk';
-import logUpdate from 'log-update';
+import {createLogUpdate} from 'log-update';
 import got from 'got';
 import decompress from 'decompress';
 import {pipeline} from 'stream';
@@ -153,6 +153,8 @@ export const installFromGithub = async (name: string, repo: string, {verbose = f
 	let dir = formatGithubDir(name, repo);
 	let cacheName = `_github/${name}#${branch}` + (commitHash ? `@${commitHash}` : '');
 
+	let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
+
 	if (existsSync(dir)) {
 		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (local cache)`);
 	}
@@ -184,6 +186,9 @@ export const installFromGithub = async (name: string, repo: string, {verbose = f
 	if (verbose) {
 		silent || logUpdate.done();
 	}
+	else {
+		logUpdate.clear();
+	}
 
 	const config = await readVesselConfig(dir, {silent});
 

package/cli-local.ts

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