ic-mops 0.40.0 → 0.41.1

package/dist/mops.d.ts

@@ -27,4 +27,5 @@ export declare function formatDir(name: string, version: string): string;
 export declare function formatGithubDir(name: string, repo: string): string;
 export declare function readDfxJson(): any;
 export declare function checkApiCompatibility(): Promise<boolean>;
+export declare function version(): any;
 export { getNetwork, mainActor, storageActor, getHighestVersion, };

package/dist/mops.js

@@ -179,7 +179,14 @@ export function readConfig(configFile = getClosestConfigFile()) {
     };
     processDeps(toml.dependencies || {});
     processDeps(toml['dev-dependencies'] || {});
-    return toml;
+    let config = { ...toml };
+    Object.entries(config.requirements || {}).forEach(([name, value]) => {
+        if (name === 'moc') {
+            config.requirements = config.requirements || {};
+            config.requirements.moc = value;
+        }
+    });
+    return config;
 }
 export function writeConfig(config, configFile = getClosestConfigFile()) {
     let resConfig = JSON.parse(JSON.stringify(config));
@@ -235,5 +242,9 @@ export async function checkApiCompatibility() {
     }
     return true;
 }
+export function version() {
+    let packageJson = JSON.parse(fs.readFileSync(new URL('./package.json', import.meta.url)).toString());
+    return packageJson.version;
+}
 // compatibility with older versions
 export { getNetwork, mainActor, storageActor, getHighestVersion, };

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.40.0",
+  "version": "0.41.1",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",
@@ -23,16 +23,6 @@
   "engines": {
     "node": ">=18.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.19.3",
     "@dfinity/candid": "^0.19.3",
@@ -42,18 +32,19 @@
     "@iarna/toml": "^2.2.5",
     "@noble/hashes": "1.3.2",
     "as-table": "^1.0.55",
+    "buffer": "6.0.3",
     "cacheable-request": "10.2.12",
     "camelcase": "^7.0.1",
     "chalk": "^5.3.0",
-    "chokidar": "^3.5.3",
-    "commander": "11.1.0",
+    "chokidar": "3.6.0",
+    "commander": "12.0.0",
     "debounce": "^1.2.1",
     "decomp-tarxz": "0.1.1",
     "decompress": "^4.2.1",
-    "del": "^7.0.0",
+    "del": "7.1.0",
     "dhall-to-json-cli": "^1.7.6",
-    "eslint": "^8.45.0",
-    "execa": "7.1.1",
+    "eslint": "8.57.0",
+    "execa": "8.0.1",
     "fs-extra": "11.2.0",
     "get-folder-size": "^4.0.0",
     "glob": "^10.3.3",
@@ -70,24 +61,27 @@
     "pem-file": "^1.0.1",
     "pic-ic": "0.3.2",
     "prompts": "^2.4.2",
+    "semver": "7.6.0",
     "stream-to-promise": "^3.0.0",
-    "string-width": "7.0.0",
-    "tar": "^6.1.15"
+    "string-width": "7.1.0",
+    "tar": "6.2.0"
   },
   "devDependencies": {
-    "@tsconfig/strictest": "^2.0.1",
+    "@tsconfig/strictest": "2.0.2",
     "@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",
+    "@types/node": "20.11.24",
     "@types/prompts": "^2.4.4",
+    "@types/semver": "7.5.8",
     "@types/stream-to-promise": "^2.2.1",
     "@types/tar": "^6.1.5",
-    "esbuild": "^0.18.16",
-    "tsx": "4.6.2",
-    "typescript": "^5.1.6"
+    "bun": "1.0.35",
+    "esbuild": "0.20.1",
+    "tsx": "4.7.1",
+    "typescript": "5.3.2"
   },
   "overrides": {
     "@dfinity/agent": "^0.19.3",
@@ -95,4 +89,4 @@
     "@dfinity/principal": "^0.19.3",
     "@dfinity/candid": "^0.19.3"
   }
-}
+}

package/dist/release-cli.js

@@ -10,16 +10,20 @@ import { findChangelogEntry } from './helpers/find-changelog-entry.js';
 let __dirname = new URL('.', import.meta.url).pathname;
 execSync('npm run prepare', { stdio: 'inherit', cwd: __dirname });
 execSync('npm run bundle', { stdio: 'inherit', cwd: __dirname });
+// fix package.json paths
+// let packageJson = fs.readFileSync(path.resolve(__dirname, 'bundle/package.json'), 'utf8');
+// packageJson = packageJson.replaceAll('dist/', '');
+// fs.writeFileSync(path.resolve(__dirname, 'bundle/package.json'), packageJson);
 let version = JSON.parse(fs.readFileSync(path.resolve(__dirname, 'package.json'), 'utf8')).version;
 let major = semver.parse(version)?.major;
 let tag = semver.parse(version)?.prerelease[0] || 'latest';
 let releaseNotes = findChangelogEntry(fs.readFileSync(path.resolve(__dirname, 'CHANGELOG.md'), 'utf8'), version);
-let hash = bytesToHex(sha256(fs.readFileSync(path.resolve(__dirname, 'bundle/cli.tgz'))));
-fs.cpSync(path.resolve(__dirname, 'bundle/cli.tgz'), path.resolve(__dirname, `../cli-releases/versions/${version}/cli.tgz`), { force: false, errorOnExist: true });
-fs.writeFileSync(path.resolve(__dirname, `../cli-releases/versions/${version}/RELEASE_NOTES.md`), releaseNotes);
-fs.writeFileSync(path.resolve(__dirname, `../cli-releases/versions/${version}/cli.tgz.sha256`), hash);
-fs.cpSync(path.resolve(__dirname, `../cli-releases/versions/${version}`), path.resolve(__dirname, `../cli-releases/versions/${tag}`), { force: true, errorOnExist: false, recursive: true });
-fs.cpSync(path.resolve(__dirname, `../cli-releases/versions/${version}`), path.resolve(__dirname, `../cli-releases/versions/${major}`), { force: true, errorOnExist: false, recursive: true });
+let data = fs.readFileSync(path.resolve(__dirname, 'bundle/cli.tgz'));
+let hash = bytesToHex(sha256(data));
+let size = data.byteLength;
+fs.cpSync(path.resolve(__dirname, 'bundle/cli.tgz'), path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), { force: false, errorOnExist: true });
+fs.cpSync(path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), path.resolve(__dirname, `../cli-releases/versions/${tag}.tgz`), { force: true, errorOnExist: false, recursive: true });
+fs.cpSync(path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), path.resolve(__dirname, `../cli-releases/versions/${major}.tgz`), { force: true, errorOnExist: false, recursive: true });
 fs.writeFileSync(path.resolve(__dirname, `../cli-releases/tags/${tag}`), version);
 console.log(`Release '${version}' created with tag '${tag}'`);
 if (!fs.existsSync(path.resolve(__dirname, '../cli-releases/releases.json'))) {
@@ -28,8 +32,10 @@ if (!fs.existsSync(path.resolve(__dirname, '../cli-releases/releases.json'))) {
 let releases = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../cli-releases/releases.json'), 'utf8'));
 releases.tags[tag] = version;
 releases.versions[version] = {
+    time: new Date().getTime(),
+    size,
     relseaseNotes: releaseNotes,
+    url: `https://cli.mops.one/versions/${version}.tgz`,
     hash,
-    url: `https://cli.mops.one/versions/${version}/cli.tgz`,
 };
 fs.writeFileSync(path.resolve(__dirname, '../cli-releases/releases.json'), JSON.stringify(releases, null, 2));

package/dist/templates.d.ts

@@ -0,0 +1 @@
+export declare function copyTemplateFileSync(file: string, dest: string): void;

package/dist/templates.js

@@ -0,0 +1,4 @@
+import fs from 'node:fs';
+export function copyTemplateFileSync(file, dest) {
+    fs.copyFileSync(new URL(`./templates/${file}`, import.meta.url), dest);
+}

package/dist/types.d.ts

@@ -18,6 +18,7 @@ export type Config = {
     dependencies?: Dependencies;
     'dev-dependencies'?: Dependencies;
     toolchain?: Toolchain;
+    requirements?: Requirements;
 };
 export type Dependencies = Record<string, Dependency>;
 export type Dependency = {
@@ -32,3 +33,6 @@ export type Toolchain = {
     'pocket-ic'?: string;
 };
 export type Tool = 'moc' | 'wasmtime' | 'pocket-ic';
+export type Requirements = {
+    moc?: string;
+};

package/helpers/find-changelog-entry.ts

@@ -0,0 +1,27 @@
+import {fromMarkdown} from 'mdast-util-from-markdown';
+import {toMarkdown} from 'mdast-util-to-markdown';
+
+export function findChangelogEntry(changelog : string, version : string) : string {
+	let tree = fromMarkdown(changelog);
+	let found = false;
+	let nodes = [];
+
+	for (let node of tree.children) {
+		if (found) {
+			if (node.type === 'heading') {
+				break;
+			}
+			else {
+				nodes.push(node);
+			}
+		}
+		else if (node.type === 'heading' && toMarkdown(node).match(new RegExp(`\\b${version}\\b`))) {
+			found = true;
+		}
+	}
+
+	return toMarkdown({
+		type: 'root',
+		children: nodes,
+	});
+}

package/mops.ts

@@ -206,7 +206,16 @@ export function readConfig(configFile = getClosestConfigFile()) : Config {
 	processDeps(toml.dependencies || {});
 	processDeps(toml['dev-dependencies'] || {});
 
-	return toml;
+	let config : Config = {...toml};
+
+	Object.entries(config.requirements || {}).forEach(([name, value]) => {
+		if (name === 'moc') {
+			config.requirements = config.requirements || {};
+			config.requirements.moc = value;
+		}
+	});
+
+	return config;
 }
 
 export function writeConfig(config : Config, configFile = getClosestConfigFile()) {
@@ -271,6 +280,11 @@ export async function checkApiCompatibility() {
 	return true;
 }
 
+export function version() {
+	let packageJson = JSON.parse(fs.readFileSync(new URL('./package.json', import.meta.url)).toString());
+	return packageJson.version;
+}
+
 // compatibility with older versions
 export {
 	getNetwork,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.40.0",
+  "version": "0.41.1",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",
@@ -25,10 +25,15 @@
   },
   "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",
+    "bundle": "rm -rf ./bundle && bun build ./cli.ts --outdir ./bundle --target node --minify --external @napi-rs/lzma --external fsevents --format esm --define '__dirname=import.meta.dirname' && npm run bundle:fix && npm run bundle:copy && npm run bundle:package-json && npm run bundle:tar",
+    "bundle:fix": "npx -y rexreplace 'new URL\\(\"\\.\\./templates' 'new URL(\"./templates' bundle/cli.js",
+    "bundle:copy": "cp -r commands/bench bundle && cp -r bin declarations templates package.json bundle",
+    "bundle:package-json": "tsx bundle-package-json.ts",
+    "bundle:tar": "tar -czvf bundle/cli.tgz bundle",
+    "copy": "cp -r commands/bench dist/commands && cp -r declarations templates package.json bin dist | true",
+    "prepare": "npm run build && npm run copy && npm run remove-scripts",
+    "remove-scripts": "tsx ./remove-scripts.ts",
+    "release": "tsx release-cli.ts",
     "check": "tsc --project tsconfig.json --noEmit",
     "tsc": "tsc",
     "esbuild": "esbuild"
@@ -42,18 +47,19 @@
     "@iarna/toml": "^2.2.5",
     "@noble/hashes": "1.3.2",
     "as-table": "^1.0.55",
+    "buffer": "6.0.3",
     "cacheable-request": "10.2.12",
     "camelcase": "^7.0.1",
     "chalk": "^5.3.0",
-    "chokidar": "^3.5.3",
-    "commander": "11.1.0",
+    "chokidar": "3.6.0",
+    "commander": "12.0.0",
     "debounce": "^1.2.1",
     "decomp-tarxz": "0.1.1",
     "decompress": "^4.2.1",
-    "del": "^7.0.0",
+    "del": "7.1.0",
     "dhall-to-json-cli": "^1.7.6",
-    "eslint": "^8.45.0",
-    "execa": "7.1.1",
+    "eslint": "8.57.0",
+    "execa": "8.0.1",
     "fs-extra": "11.2.0",
     "get-folder-size": "^4.0.0",
     "glob": "^10.3.3",
@@ -70,24 +76,27 @@
     "pem-file": "^1.0.1",
     "pic-ic": "0.3.2",
     "prompts": "^2.4.2",
+    "semver": "7.6.0",
     "stream-to-promise": "^3.0.0",
-    "string-width": "7.0.0",
-    "tar": "^6.1.15"
+    "string-width": "7.1.0",
+    "tar": "6.2.0"
   },
   "devDependencies": {
-    "@tsconfig/strictest": "^2.0.1",
+    "@tsconfig/strictest": "2.0.2",
     "@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",
+    "@types/node": "20.11.24",
     "@types/prompts": "^2.4.4",
+    "@types/semver": "7.5.8",
     "@types/stream-to-promise": "^2.2.1",
     "@types/tar": "^6.1.5",
-    "esbuild": "^0.18.16",
-    "tsx": "4.6.2",
-    "typescript": "^5.1.6"
+    "bun": "1.0.35",
+    "esbuild": "0.20.1",
+    "tsx": "4.7.1",
+    "typescript": "5.3.2"
   },
   "overrides": {
     "@dfinity/agent": "^0.19.3",

package/release-cli.ts

@@ -0,0 +1,67 @@
+/* eslint-disable no-undef */
+import fs from 'node:fs';
+import path from 'node:path';
+import {URL} from 'node:url';
+import {execSync} from 'node:child_process';
+import semver from 'semver';
+import {sha256} from '@noble/hashes/sha256';
+import {bytesToHex} from '@noble/hashes/utils';
+
+import {findChangelogEntry} from './helpers/find-changelog-entry.js';
+
+let __dirname = new URL('.', import.meta.url).pathname;
+
+execSync('npm run prepare', {stdio: 'inherit', cwd: __dirname});
+execSync('npm run bundle', {stdio: 'inherit', cwd: __dirname});
+
+// fix package.json paths
+// let packageJson = fs.readFileSync(path.resolve(__dirname, 'bundle/package.json'), 'utf8');
+// packageJson = packageJson.replaceAll('dist/', '');
+// fs.writeFileSync(path.resolve(__dirname, 'bundle/package.json'), packageJson);
+
+let version = JSON.parse(fs.readFileSync(path.resolve(__dirname, 'package.json'), 'utf8')).version;
+let major = semver.parse(version)?.major;
+let tag = semver.parse(version)?.prerelease[0] || 'latest';
+let releaseNotes = findChangelogEntry(fs.readFileSync(path.resolve(__dirname, 'CHANGELOG.md'), 'utf8'), version);
+let data = fs.readFileSync(path.resolve(__dirname, 'bundle/cli.tgz'));
+let hash = bytesToHex(sha256(data));
+let size = data.byteLength;
+
+fs.cpSync(path.resolve(__dirname, 'bundle/cli.tgz'), path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), {force: false, errorOnExist: true});
+
+fs.cpSync(path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), path.resolve(__dirname, `../cli-releases/versions/${tag}.tgz`), {force: true, errorOnExist: false, recursive: true});
+fs.cpSync(path.resolve(__dirname, `../cli-releases/versions/${version}.tgz`), path.resolve(__dirname, `../cli-releases/versions/${major}.tgz`), {force: true, errorOnExist: false, recursive: true});
+
+fs.writeFileSync(path.resolve(__dirname, `../cli-releases/tags/${tag}`), version);
+
+console.log(`Release '${version}' created with tag '${tag}'`);
+
+
+// releases.json
+type Releases = {
+	tags : Record<string, string>;
+	versions : Record<string, {
+		time : number;
+		size : number;
+		hash : string;
+		url : string;
+		relseaseNotes : string;
+	}>;
+};
+
+if (!fs.existsSync(path.resolve(__dirname, '../cli-releases/releases.json'))) {
+	fs.writeFileSync(path.resolve(__dirname, '../cli-releases/releases.json'), JSON.stringify({tags: {}, versions: {}}, null, 2));
+}
+
+let releases : Releases = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../cli-releases/releases.json'), 'utf8'));
+
+releases.tags[tag] = version;
+releases.versions[version] = {
+	time: new Date().getTime(),
+	size,
+	relseaseNotes: releaseNotes,
+	url: `https://cli.mops.one/versions/${version}.tgz`,
+	hash,
+};
+
+fs.writeFileSync(path.resolve(__dirname, '../cli-releases/releases.json'), JSON.stringify(releases, null, 2));

package/remove-scripts.ts

@@ -0,0 +1,6 @@
+import {readFileSync, writeFileSync} from 'node:fs';
+
+let text = readFileSync('dist/package.json', 'utf8');
+let json = JSON.parse(text);
+delete json.scripts;
+writeFileSync('dist/package.json', JSON.stringify(json, null, 2));

package/templates.ts

@@ -0,0 +1,5 @@
+import fs from 'node:fs';
+
+export function copyTemplateFileSync(file : string, dest : string) {
+	fs.copyFileSync(new URL(`./templates/${file}`, import.meta.url), dest);
+}

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"extends": ["@tsconfig/strictest/tsconfig.json"],
 	"include": ["**/*.ts", "**/*.js"],
-	"exclude": ["node_modules", "dist", "dist.js", "declarations/**/*.js"],
+	"exclude": ["node_modules", "dist", "bundle", "dist.js", "declarations/**/*.js"],
 	"compilerOptions": {
 		"types": ["node"],
 		"target": "ES2021",

package/types.ts

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

package/commands/self-update.ts

@@ -1,6 +0,0 @@
-import child_process from 'node:child_process';
-
-export function selfUpdate({detached = false} = {}) {
-	console.log('Updating mops CLI...');
-	child_process.spawn('npm', ['install', 'ic-mops', '-g'], {stdio: 'inherit', detached});
-}

package/dist/commands/self-update.d.ts

@@ -1,3 +0,0 @@
-export declare function selfUpdate({ detached }?: {
-    detached?: boolean | undefined;
-}): void;

package/dist/commands/self-update.js

@@ -1,5 +0,0 @@
-import child_process from 'node:child_process';
-export function selfUpdate({ detached = false } = {}) {
-    console.log('Updating mops CLI...');
-    child_process.spawn('npm', ['install', 'ic-mops', '-g'], { stdio: 'inherit', detached });
-}