ic-mops 0.37.0-pre.0 → 0.37.1

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/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/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

@@ -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.37.0-pre.0",
+  "version": "0.37.1",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",
+    "ic-mops": "dist/bin/mops.js",
     "moc-wrapper": "bin/moc-wrapper.sh"
   },
   "files": [
@@ -38,7 +39,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",
@@ -68,6 +68,7 @@
     "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",

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/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/commands/toolchain/mocv.ts

@@ -1,313 +0,0 @@
-// @ts-nocheck
-import fs from 'fs-extra';
-import os from 'os';
-import path from 'path';
-import tar from 'tar';
-import {program} from 'commander';
-import prompts from 'prompts';
-import {Octokit} from 'octokit';
-import chalk from 'chalk';
-import fetch from 'node-fetch';
-
-if (process.platform == 'win32') {
-	console.log('Windows is not supported. Please use WSL');
-	process.exit(1);
-}
-
-let zshrc = path.join(os.homedir(), '.zshrc');
-let bashrc = path.join(os.homedir(), '.bashrc');
-let cacheDir = path.join(os.homedir(), '.cache/mocv');
-let curVersionFile = path.join(cacheDir, 'versions/current/version.txt');
-let tmpDir = path.join(cacheDir, '.tmp');
-let file = path.join(tmpDir, 'moc.tar.gz');
-
-let download = async (version: string, {silent = false} = {}) => {
-	if (!version) {
-		console.log('version is not defined');
-		process.exit(1);
-	}
-	if (isCached(version)) {
-		return;
-	}
-
-
-	let url;
-	if (parseInt(version.replaceAll('.', '')) >= parseInt('0.9.5'.replaceAll('.', ''))) {
-		let platfrom = process.platform == 'darwin' ? 'Darwin' : 'Linux';
-		let arch = process.arch.startsWith('arm') ? 'arm64' : 'x86_64';
-		// currently only x64 binaries are available
-		arch = 'x86_64';
-		url = `https://github.com/dfinity/motoko/releases/download/${version}/motoko-${platfrom}-${arch}-${version}.tar.gz`;
-	}
-	else {
-		let platfrom = process.platform == 'darwin' ? 'macos' : 'linux64';
-		url = `https://github.com/dfinity/motoko/releases/download/${version}/motoko-${platfrom}-${version}.tar.gz`;
-	}
-
-	silent || console.log(`Downloading ${url}`);
-
-	let res = await fetch(url);
-
-	if (res.status !== 200) {
-		console.log(`ERR ${res.status} ${url}`);
-		console.log(`moc version '${version}' not found`);
-		process.exit(1);
-	}
-
-	let arrayBuffer = await res.arrayBuffer();
-	let buffer = Buffer.from(arrayBuffer);
-
-	fs.mkdirSync(tmpDir, {recursive: true});
-	fs.writeFileSync(file, buffer);
-
-	let verDir = path.join(cacheDir, 'versions', version);
-	fs.mkdirSync(verDir, {recursive: true});
-	await tar.extract({
-		file,
-		cwd: verDir,
-	});
-
-	fs.rmSync(file);
-};
-
-let isCached = (version: string) => {
-	let dir = path.join(cacheDir, 'versions', version);
-	return fs.existsSync(path.join(dir, 'moc'))
-		&& fs.existsSync(path.join(dir, 'mo-doc'))
-		&& fs.existsSync(path.join(dir, 'mo-ide'));
-};
-
-let setCurrent = (version: string) => {
-	fs.copySync(path.join(cacheDir, 'versions', version), path.join(cacheDir, 'versions/current'), {recursive: true});
-	fs.writeFileSync(curVersionFile, version);
-};
-
-let getCurrent = () => {
-	if (fs.existsSync(curVersionFile)) {
-		return fs.readFileSync(curVersionFile).toString();
-	}
-};
-
-let getLatest = async () => {
-	let releases = await getReleases();
-	return releases[0].tag_name;
-};
-
-let getReleases = async () => {
-	let octokit = new Octokit;
-	let res = await octokit.request('GET /repos/dfinity/motoko/releases', {
-		per_page: 10,
-		headers: {
-			'X-GitHub-Api-Version': '2022-11-28'
-		}
-	});
-	if (res.status !== 200) {
-		console.log('Releases fetch error');
-		process.exit(1);
-	}
-	return res.data;
-};
-
-let use = async (version: string) => {
-	if (version === 'latest') {
-		version = await getLatest();
-	}
-	await download(version);
-	setCurrent(version);
-	console.log(`Selected moc ${version}`);
-
-	// update github env
-	if (process.env.GITHUB_ENV) {
-		fs.appendFileSync(process.env.GITHUB_ENV, `DFX_MOC_PATH=${path.join(cacheDir, 'versions', version)}/moc\n`);
-	}
-};
-
-program.name('mocv')
-	.action(async (_, config) => {
-		if (config.args.length) {
-			console.log(`unknown command '${config.args.join(' ')}'`);
-			process.exit(1);
-		}
-		let releases = await getReleases();
-		let versions = releases.map((item: {tag_name: any;}) => item.tag_name);
-		let current = getCurrent();
-		let currentIndex = versions.indexOf(current);
-
-		let res = await prompts({
-			type: 'select',
-			name: 'version',
-			message: 'Select moc version',
-			choices: releases.map((release: {published_at: string | number | Date; tag_name: string;}, i: any) => {
-				let date = new Date(release.published_at).toLocaleDateString(undefined, {year: 'numeric', month: 'short', day: 'numeric'});
-				return {
-					title: release.tag_name + chalk.gray(`  ${date}${currentIndex === i ? chalk.italic(' (current)') : ''}`),
-					value: release.tag_name,
-				};
-			}),
-			initial: currentIndex == -1 ? 0 : currentIndex,
-		});
-
-		if (!res.version) {
-			return;
-		}
-
-		await use(res.version);
-	});
-
-let updateShellConfig = async ({reset = false, yes = false} = {}) => {
-	let setDfxMocPath = reset || yes;
-	let updatePath = reset || yes;
-
-	if (!setDfxMocPath) {
-		let res = await prompts({
-			type: 'select',
-			name: 'setDfxMocPath',
-			message: 'Do you want to set DFX_MOC_PATH, so `dfx` will use the current `moc` version?',
-			choices: [
-				{
-					title: 'Yes',
-					value: true,
-				},
-				{
-					title: 'No',
-					value: false,
-				},
-			],
-		});
-		setDfxMocPath = res.setDfxMocPath;
-	}
-
-	if (!updatePath) {
-		let res = await prompts({
-			type: 'select',
-			name: 'updatePath',
-			message: 'Do you want to update PATH, so you can call `moc`, `mo-doc` and `mo-ide` from the terminal?',
-			choices: [
-				{
-					title: 'Yes',
-					value: true,
-				},
-				{
-					title: 'No',
-					value: false,
-				},
-			],
-		});
-		updatePath = res.updatePath;
-	}
-
-	if (!setDfxMocPath && !updatePath) {
-		console.log('Nothing to do');
-		return;
-	}
-
-	let configFiles = [];
-	if (reset || yes) {
-		configFiles = [bashrc, zshrc];
-	}
-	else {
-		let {configFile} = await prompts({
-			type: 'select',
-			name: 'configFile',
-			message: 'Select your shell config file',
-			choices: [
-				{
-					title: bashrc,
-					value: bashrc,
-				},
-				{
-					title: zshrc,
-					value: zshrc,
-				},
-			],
-		});
-		configFiles = [configFile];
-	}
-
-	for (let configFile of configFiles) {
-		if (!fs.existsSync(configFile)) {
-			console.log(`${configFile} not found`);
-			process.exit(1);
-		}
-
-		let data = fs.readFileSync(configFile).toString();
-		let setDfxLine = '\nexport DFX_MOC_PATH="$HOME/.cache/mocv/versions/current/moc"';
-		let updatePathLine = '\nPATH="$HOME/.cache/mocv/versions/current:$PATH"';
-
-		let newLines = [];
-		setDfxMocPath && newLines.push(setDfxLine);
-		updatePath && newLines.push(updatePathLine);
-
-		let oldLines = [
-			`\nexport DFX_MOC_PATH=${path.join(cacheDir, 'versions/current')}/moc\n`,
-			setDfxLine,
-			updatePathLine,
-		];
-		for (let oldLine of oldLines) {
-			data = data.replace(oldLine, '');
-		}
-
-		if (data.endsWith('\n\n')) {
-			data = data.trimEnd() + '\n';
-		}
-
-		if (!reset) {
-			if (!data.endsWith('\n')) {
-				data += '\n';
-			}
-			for (let newLine of newLines) {
-				data += newLine;
-			}
-			data += '\n';
-		}
-
-		fs.writeFileSync(configFile, data);
-	};
-
-	console.log('Success!');
-	// console.log(`Run "source ${configFile}" to apply changes`);
-	console.log('Restart terminal to apply changes');
-};
-
-program.command('init')
-	.description('mocv one time initialization')
-	.option('-y, --yes', 'Skip prompts')
-	.action(async (options) => {
-		updateShellConfig(options);
-	});
-
-program.command('reset')
-	.description('Reset changes made by `mocv init`')
-	.action(async () => {
-		updateShellConfig({reset: true});
-	});
-
-program.command('use <version>')
-	.description('Set current moc version.\nExample 1: "mocv use 0.8.4"\nExample 2: "mocv use latest"')
-	.action(async (version) => {
-		await use(version);
-	});
-
-program.command('current')
-	.description('Print current moc version')
-	.action(async () => {
-		console.log(getCurrent());
-	});
-
-program.command('bin [version]')
-	.description('Print bin directory')
-	.action(async (version = getCurrent()) => {
-		if (version === 'latest') {
-			version = await getLatest();
-		}
-		if (!version) {
-			console.log('No version selected. Please pass a version arg or run `mocv` or `mocv use <version>`');
-			process.exit(1);
-		}
-		if (!isCached(version)) {
-			await download(version, {silent: true});
-		}
-		console.log(path.join(cacheDir, 'versions', version));
-	});
-
-program.parse();

package/moc-wrapper.ts

@@ -1,10 +0,0 @@
-#!/usr/bin/env tsx
-
-import {ExecException, execSync} from 'child_process';
-
-try {
-	execSync('/home/zen/.cache/mocv/versions/current/moc ' + process.argv.slice(2).join(' '), {cwd: process.cwd(), stdio: 'inherit'});
-}
-catch (err: unknown) {
-	process.exit((err as ExecException).code || 1);
-}