ic-mops 0.31.1 → 0.32.0

package/dist/package.json

@@ -1,82 +1,83 @@
 {
-	"name": "ic-mops",
-	"version": "0.31.1",
-	"type": "module",
-	"bin": {
-		"mops": "dist/cli.js"
-	},
-	"files": [
-		"*",
-		"!network.txt",
-		"!.mops",
-		"/templates"
-	],
-	"homepage": "https://mops.one",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/ZenVoich/mops.git"
-	},
-	"author": "Zen Voich <zen.voich@gmail.com>",
-	"license": "MIT",
-	"engines": {
-		"node": ">=16.0.0"
-	},
-	"scripts": {
-		"build": "tsc",
-		"bundle": "esbuild --bundle --outfile=cli.js --platform=node --packages=external --target=node16 --format=esm ./dist/cli.js",
-		"copy": "cp -r declarations templates network.txt package.json dist | true",
-		"save-network": "cp -r dist/network.txt . | true",
-		"prepare": "npm run save-network && npm run build && npm run copy",
-		"check": "tsc --project tsconfig.json --noEmit",
-		"tsc": "tsc",
-		"esbuild": "esbuild"
-	},
-	"dependencies": {
-		"@dfinity/agent": "^0.18.1",
-		"@dfinity/candid": "^0.18.1",
-		"@dfinity/identity": "^0.18.1",
-		"@dfinity/identity-secp256k1": "^0.18.1",
-		"@dfinity/principal": "^0.18.1",
-		"@iarna/toml": "^2.2.5",
-		"as-table": "^1.0.55",
-		"cacheable-request": "10.2.12",
-		"camelcase": "^7.0.1",
-		"chalk": "^5.3.0",
-		"chokidar": "^3.5.3",
-		"commander": "^11.0.0",
-		"debounce": "^1.2.1",
-		"decompress": "^4.2.1",
-		"del": "^7.0.0",
-		"dhall-to-json-cli": "^1.7.6",
-		"eslint": "^8.45.0",
-		"execa": "7.1.1",
-		"get-folder-size": "^4.0.0",
-		"glob": "^10.3.3",
-		"globby": "^13.2.2",
-		"got": "13.0.0",
-		"log-update": "^5.0.1",
-		"mdast-util-from-markdown": "^2.0.0",
-		"mdast-util-to-markdown": "^2.1.0",
-		"minimatch": "^9.0.3",
-		"ncp": "^2.0.0",
-		"node-fetch": "^3.3.2",
-		"pem-file": "^1.0.1",
-		"prompts": "^2.4.2",
-		"stream-to-promise": "^3.0.0",
-		"tar": "^6.1.15"
-	},
-	"devDependencies": {
-		"@tsconfig/strictest": "^2.0.1",
-		"@types/debounce": "^1.2.1",
-		"@types/decompress": "^4.2.4",
-		"@types/glob": "^8.1.0",
-		"@types/ncp": "^2.0.5",
-		"@types/node": "^20.4.4",
-		"@types/prompts": "^2.4.4",
-		"@types/stream-to-promise": "^2.2.1",
-		"@types/tar": "^6.1.5",
-		"esbuild": "^0.18.16",
-		"tsx": "^3.12.7",
-		"typescript": "^5.1.6"
-	}
+  "name": "ic-mops",
+  "version": "0.32.0",
+  "type": "module",
+  "bin": {
+    "mops": "dist/cli.js"
+  },
+  "files": [
+    "*",
+    "!network.txt",
+    "!.mops",
+    "/templates"
+  ],
+  "homepage": "https://mops.one",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ZenVoich/mops.git"
+  },
+  "author": "Zen Voich <zen.voich@gmail.com>",
+  "license": "MIT",
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "scripts": {
+    "build": "tsc",
+    "bundle": "esbuild --bundle --outfile=cli.js --platform=node --packages=external --target=node16 --format=esm ./dist/cli.js",
+    "copy": "cp -r commands/bench dist/commands && cp -r declarations templates network.txt package.json dist | true",
+    "save-network": "cp -r dist/network.txt . | true",
+    "prepare": "npm run save-network && npm run build && npm run copy",
+    "check": "tsc --project tsconfig.json --noEmit",
+    "tsc": "tsc",
+    "esbuild": "esbuild"
+  },
+  "dependencies": {
+    "@dfinity/agent": "^0.18.1",
+    "@dfinity/candid": "^0.18.1",
+    "@dfinity/identity": "^0.18.1",
+    "@dfinity/identity-secp256k1": "^0.18.1",
+    "@dfinity/principal": "^0.18.1",
+    "@iarna/toml": "^2.2.5",
+    "as-table": "^1.0.55",
+    "cacheable-request": "10.2.12",
+    "camelcase": "^7.0.1",
+    "chalk": "^5.3.0",
+    "chokidar": "^3.5.3",
+    "commander": "^11.0.0",
+    "debounce": "^1.2.1",
+    "decompress": "^4.2.1",
+    "del": "^7.0.0",
+    "dhall-to-json-cli": "^1.7.6",
+    "eslint": "^8.45.0",
+    "execa": "7.1.1",
+    "get-folder-size": "^4.0.0",
+    "glob": "^10.3.3",
+    "globby": "^13.2.2",
+    "got": "13.0.0",
+    "log-update": "^5.0.1",
+    "markdown-table": "3.0.3",
+    "mdast-util-from-markdown": "^2.0.0",
+    "mdast-util-to-markdown": "^2.1.0",
+    "minimatch": "^9.0.3",
+    "ncp": "^2.0.0",
+    "node-fetch": "^3.3.2",
+    "pem-file": "^1.0.1",
+    "prompts": "^2.4.2",
+    "stream-to-promise": "^3.0.0",
+    "tar": "^6.1.15"
+  },
+  "devDependencies": {
+    "@tsconfig/strictest": "^2.0.1",
+    "@types/debounce": "^1.2.1",
+    "@types/decompress": "^4.2.4",
+    "@types/glob": "^8.1.0",
+    "@types/ncp": "^2.0.5",
+    "@types/node": "^20.4.4",
+    "@types/prompts": "^2.4.4",
+    "@types/stream-to-promise": "^2.2.1",
+    "@types/tar": "^6.1.5",
+    "esbuild": "^0.18.16",
+    "tsx": "^3.12.7",
+    "typescript": "^5.1.6"
+  }
 }

package/dist/resolve-packages.js

@@ -57,7 +57,7 @@ export async function resolvePackages({ verbose = false } = {}) {
             let nestedConfig;
             if (repo) {
                 const dir = formatGithubDir(name, repo);
-                nestedConfig = await readVesselConfig(dir) || {};
+                nestedConfig = await readVesselConfig(dir, { silent: true }) || {};
             }
             else if (!pkgDetails.path && version) {
                 const file = formatDir(name, version) + '/mops.toml';

package/dist/vessel.d.ts

@@ -8,8 +8,9 @@ export type VesselDependencies = Array<{
     repo?: string;
     path?: string;
 }>;
-export declare const readVesselConfig: (dir: string, { cache }?: {
+export declare const readVesselConfig: (dir: string, { cache, silent }?: {
     cache?: boolean | undefined;
+    silent?: boolean | undefined;
 }) => Promise<VesselConfig | null>;
 export declare const downloadFromGithub: (repo: string, dest: string, onProgress: any) => Promise<unknown>;
 export declare const installFromGithub: (name: string, repo: string, { verbose, dep, silent }?: {

package/dist/vessel.js

@@ -9,7 +9,7 @@ import decompress from 'decompress';
 import { pipeline } from 'stream';
 import { formatGithubDir, parseGithubURL, progressBar } from './mops.js';
 import { addCache, copyCache, isCached } from './cache.js';
-const dhallFileToJson = async (filePath) => {
+const dhallFileToJson = async (filePath, silent) => {
     if (existsSync(filePath)) {
         let cwd = new URL(path.dirname(import.meta.url)).pathname;
         let res;
@@ -17,7 +17,7 @@ const dhallFileToJson = async (filePath) => {
             res = await execaCommand(`dhall-to-json --file ${filePath}`, { preferLocal: true, cwd });
         }
         catch (err) {
-            console.error('dhall-to-json error:', err);
+            silent || console.error('dhall-to-json error:', err.message?.split('Message:')[0]);
             return null;
         }
         if (res.exitCode === 0) {
@@ -29,15 +29,15 @@ const dhallFileToJson = async (filePath) => {
     }
     return null;
 };
-export const readVesselConfig = async (dir, { cache = true } = {}) => {
+export const readVesselConfig = async (dir, { cache = true, silent = false } = {}) => {
     const cachedFile = (dir || process.cwd()) + '/vessel.json';
     if (existsSync(cachedFile)) {
         let cachedConfig = readFileSync(cachedFile).toString();
         return JSON.parse(cachedConfig);
     }
     const [vessel, packageSetArray] = await Promise.all([
-        dhallFileToJson((dir || process.cwd()) + '/vessel.dhall'),
-        dhallFileToJson((dir || process.cwd()) + '/package-set.dhall')
+        dhallFileToJson((dir || process.cwd()) + '/vessel.dhall', silent),
+        dhallFileToJson((dir || process.cwd()) + '/package-set.dhall', silent)
     ]);
     if (!vessel || !packageSetArray) {
         return null;
@@ -64,6 +64,8 @@ export const downloadFromGithub = async (repo, dest, onProgress) => {
     const readStream = got.stream(zipFile);
     const promise = new Promise((resolve, reject) => {
         readStream.on('error', (err) => {
+            console.error(chalk.red(`Error: failed to download from GitHub: ${zipFile}`));
+            console.error(err.message);
             reject(err);
         });
         readStream.on('downloadProgress', ({ transferred, total }) => {
@@ -135,7 +137,7 @@ export const installFromGithub = async (name, repo, { verbose = false, dep = fal
         }
         catch (err) {
             deleteSync([dir]);
-            throw err;
+            process.exit(1);
         }
         // add to cache
         await addCache(cacheName, dir);
@@ -143,7 +145,7 @@ export const installFromGithub = async (name, repo, { verbose = false, dep = fal
     if (verbose) {
         silent || logUpdate.done();
     }
-    const config = await readVesselConfig(dir);
+    const config = await readVesselConfig(dir, { silent });
     if (config) {
         for (const { name, repo } of config.dependencies) {
             if (repo) {

package/helpers/get-dfx-version.ts

@@ -0,0 +1,10 @@
+import {execSync} from 'node:child_process';
+
+export function getDfxVersion(): string {
+	try {
+		let res = execSync('dfx --version').toString();
+		return res.trim().split('dfx ')[1] || '';
+	}
+	catch {}
+	return '';
+}

package/helpers/get-moc-path.ts

@@ -0,0 +1,12 @@
+import {execSync} from 'node:child_process';
+
+export function getMocPath(): string {
+	let mocPath = process.env.DFX_MOC_PATH;
+	if (!mocPath) {
+		mocPath = execSync('dfx cache show').toString().trim() + '/moc';
+	}
+	if (!mocPath) {
+		mocPath = 'moc';
+	}
+	return mocPath;
+}

package/helpers/get-moc-version.ts

@@ -0,0 +1,8 @@
+import {execSync} from 'node:child_process';
+import {getMocPath} from './get-moc-path.js';
+
+export function getMocVersion(): string {
+	let mocPath = getMocPath();
+	let match = execSync(mocPath).toString().trim().match(/Motoko compiler ([^\s]+) .*/);
+	return match?.[1] || '';
+}

package/package.json

@@ -1,82 +1,83 @@
 {
-	"name": "ic-mops",
-	"version": "0.31.1",
-	"type": "module",
-	"bin": {
-		"mops": "dist/cli.js"
-	},
-	"files": [
-		"*",
-		"!network.txt",
-		"!.mops",
-		"/templates"
-	],
-	"homepage": "https://mops.one",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/ZenVoich/mops.git"
-	},
-	"author": "Zen Voich <zen.voich@gmail.com>",
-	"license": "MIT",
-	"engines": {
-		"node": ">=16.0.0"
-	},
-	"scripts": {
-		"build": "tsc",
-		"bundle": "esbuild --bundle --outfile=cli.js --platform=node --packages=external --target=node16 --format=esm ./dist/cli.js",
-		"copy": "cp -r declarations templates network.txt package.json dist | true",
-		"save-network": "cp -r dist/network.txt . | true",
-		"prepare": "npm run save-network && npm run build && npm run copy",
-		"check": "tsc --project tsconfig.json --noEmit",
-		"tsc": "tsc",
-		"esbuild": "esbuild"
-	},
-	"dependencies": {
-		"@dfinity/agent": "^0.18.1",
-		"@dfinity/candid": "^0.18.1",
-		"@dfinity/identity": "^0.18.1",
-		"@dfinity/identity-secp256k1": "^0.18.1",
-		"@dfinity/principal": "^0.18.1",
-		"@iarna/toml": "^2.2.5",
-		"as-table": "^1.0.55",
-		"cacheable-request": "10.2.12",
-		"camelcase": "^7.0.1",
-		"chalk": "^5.3.0",
-		"chokidar": "^3.5.3",
-		"commander": "^11.0.0",
-		"debounce": "^1.2.1",
-		"decompress": "^4.2.1",
-		"del": "^7.0.0",
-		"dhall-to-json-cli": "^1.7.6",
-		"eslint": "^8.45.0",
-		"execa": "7.1.1",
-		"get-folder-size": "^4.0.0",
-		"glob": "^10.3.3",
-		"globby": "^13.2.2",
-		"got": "13.0.0",
-		"log-update": "^5.0.1",
-		"mdast-util-from-markdown": "^2.0.0",
-		"mdast-util-to-markdown": "^2.1.0",
-		"minimatch": "^9.0.3",
-		"ncp": "^2.0.0",
-		"node-fetch": "^3.3.2",
-		"pem-file": "^1.0.1",
-		"prompts": "^2.4.2",
-		"stream-to-promise": "^3.0.0",
-		"tar": "^6.1.15"
-	},
-	"devDependencies": {
-		"@tsconfig/strictest": "^2.0.1",
-		"@types/debounce": "^1.2.1",
-		"@types/decompress": "^4.2.4",
-		"@types/glob": "^8.1.0",
-		"@types/ncp": "^2.0.5",
-		"@types/node": "^20.4.4",
-		"@types/prompts": "^2.4.4",
-		"@types/stream-to-promise": "^2.2.1",
-		"@types/tar": "^6.1.5",
-		"esbuild": "^0.18.16",
-		"tsx": "^3.12.7",
-		"typescript": "^5.1.6"
-	}
+  "name": "ic-mops",
+  "version": "0.32.0",
+  "type": "module",
+  "bin": {
+    "mops": "dist/cli.js"
+  },
+  "files": [
+    "*",
+    "!network.txt",
+    "!.mops",
+    "/templates"
+  ],
+  "homepage": "https://mops.one",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ZenVoich/mops.git"
+  },
+  "author": "Zen Voich <zen.voich@gmail.com>",
+  "license": "MIT",
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "scripts": {
+    "build": "tsc",
+    "bundle": "esbuild --bundle --outfile=cli.js --platform=node --packages=external --target=node16 --format=esm ./dist/cli.js",
+    "copy": "cp -r commands/bench dist/commands && cp -r declarations templates network.txt package.json dist | true",
+    "save-network": "cp -r dist/network.txt . | true",
+    "prepare": "npm run save-network && npm run build && npm run copy",
+    "check": "tsc --project tsconfig.json --noEmit",
+    "tsc": "tsc",
+    "esbuild": "esbuild"
+  },
+  "dependencies": {
+    "@dfinity/agent": "^0.18.1",
+    "@dfinity/candid": "^0.18.1",
+    "@dfinity/identity": "^0.18.1",
+    "@dfinity/identity-secp256k1": "^0.18.1",
+    "@dfinity/principal": "^0.18.1",
+    "@iarna/toml": "^2.2.5",
+    "as-table": "^1.0.55",
+    "cacheable-request": "10.2.12",
+    "camelcase": "^7.0.1",
+    "chalk": "^5.3.0",
+    "chokidar": "^3.5.3",
+    "commander": "^11.0.0",
+    "debounce": "^1.2.1",
+    "decompress": "^4.2.1",
+    "del": "^7.0.0",
+    "dhall-to-json-cli": "^1.7.6",
+    "eslint": "^8.45.0",
+    "execa": "7.1.1",
+    "get-folder-size": "^4.0.0",
+    "glob": "^10.3.3",
+    "globby": "^13.2.2",
+    "got": "13.0.0",
+    "log-update": "^5.0.1",
+    "markdown-table": "3.0.3",
+    "mdast-util-from-markdown": "^2.0.0",
+    "mdast-util-to-markdown": "^2.1.0",
+    "minimatch": "^9.0.3",
+    "ncp": "^2.0.0",
+    "node-fetch": "^3.3.2",
+    "pem-file": "^1.0.1",
+    "prompts": "^2.4.2",
+    "stream-to-promise": "^3.0.0",
+    "tar": "^6.1.15"
+  },
+  "devDependencies": {
+    "@tsconfig/strictest": "^2.0.1",
+    "@types/debounce": "^1.2.1",
+    "@types/decompress": "^4.2.4",
+    "@types/glob": "^8.1.0",
+    "@types/ncp": "^2.0.5",
+    "@types/node": "^20.4.4",
+    "@types/prompts": "^2.4.4",
+    "@types/stream-to-promise": "^2.2.1",
+    "@types/tar": "^6.1.5",
+    "esbuild": "^0.18.16",
+    "tsx": "^3.12.7",
+    "typescript": "^5.1.6"
+  }
 }

package/resolve-packages.ts

@@ -71,7 +71,7 @@ export async function resolvePackages({verbose = false} = {}): Promise<Record<st
 
 			if (repo) {
 				const dir = formatGithubDir(name, repo);
-				nestedConfig = await readVesselConfig(dir) || {};
+				nestedConfig = await readVesselConfig(dir, {silent: true}) || {};
 			}
 			else if (!pkgDetails.path && version) {
 				const file = formatDir(name, version) + '/mops.toml';

package/tsconfig.json

@@ -10,6 +10,8 @@
 		"module": "nodenext",
 		"moduleResolution": "nodenext",
 		"noEmitOnError": false,
+		"noUnusedLocals": false,
+		"noUnusedParameters": false,
 		"noPropertyAccessFromIndexSignature": false,
 		"declaration": true
 	}

package/vessel.ts

@@ -10,15 +10,15 @@ import {pipeline} from 'stream';
 import {formatGithubDir, parseGithubURL, progressBar} from './mops.js';
 import {addCache, copyCache, isCached} from './cache.js';
 
-const dhallFileToJson = async (filePath: string) => {
+const dhallFileToJson = async (filePath: string, silent: boolean) => {
 	if (existsSync(filePath)) {
 		let cwd = new URL(path.dirname(import.meta.url)).pathname;
 		let res;
 		try {
 			res = await execaCommand(`dhall-to-json --file ${filePath}`, {preferLocal:true, cwd});
 		}
-		catch (err) {
-			console.error('dhall-to-json error:', err);
+		catch (err: any) {
+			silent || console.error('dhall-to-json error:', err.message?.split('Message:')[0]);
 			return null;
 		}
 
@@ -45,7 +45,7 @@ export type VesselDependencies = Array<{
 	path?: string; // local package
 }>;
 
-export const readVesselConfig = async (dir: string, {cache = true} = {}): Promise<VesselConfig | null> => {
+export const readVesselConfig = async (dir: string, {cache = true, silent = false} = {}): Promise<VesselConfig | null> => {
 	const cachedFile = (dir || process.cwd()) + '/vessel.json';
 
 	if (existsSync(cachedFile)) {
@@ -54,8 +54,8 @@ export const readVesselConfig = async (dir: string, {cache = true} = {}): Promis
 	}
 
 	const [vessel, packageSetArray] = await Promise.all([
-		dhallFileToJson((dir || process.cwd()) + '/vessel.dhall'),
-		dhallFileToJson((dir || process.cwd()) + '/package-set.dhall')
+		dhallFileToJson((dir || process.cwd()) + '/vessel.dhall', silent),
+		dhallFileToJson((dir || process.cwd()) + '/package-set.dhall', silent)
 	]);
 
 	if (!vessel || !packageSetArray) {
@@ -90,6 +90,8 @@ export const downloadFromGithub = async (repo: string, dest: string, onProgress:
 
 	const promise = new Promise((resolve, reject) => {
 		readStream.on('error', (err) => {
+			console.error(chalk.red(`Error: failed to download from GitHub: ${zipFile}`));
+			console.error(err.message);
 			reject(err);
 		});
 
@@ -172,7 +174,7 @@ export const installFromGithub = async (name: string, repo: string, {verbose = f
 		}
 		catch (err) {
 			deleteSync([dir]);
-			throw err;
+			process.exit(1);
 		}
 
 		// add to cache
@@ -183,7 +185,7 @@ export const installFromGithub = async (name: string, repo: string, {verbose = f
 		silent || logUpdate.done();
 	}
 
-	const config = await readVesselConfig(dir);
+	const config = await readVesselConfig(dir, {silent});
 
 	if (config) {
 		for (const {name, repo} of config.dependencies) {