ic-mops 0.40.0 → 0.41.0

package/dist/check-requirements.js

@@ -0,0 +1,39 @@
+import path from 'node:path';
+import { getDependencyType, readConfig } from './mops.js';
+import { resolvePackages } from './resolve-packages.js';
+import { SemVer } from 'semver';
+import chalk from 'chalk';
+export async function checkRequirements({ verbose = false } = {}) {
+    let config = readConfig();
+    if (!config.toolchain?.moc) {
+        return;
+    }
+    let installedMoc = new SemVer(config.toolchain.moc);
+    let highestRequiredMoc = new SemVer('0.0.0');
+    let highestRequiredMocPkgId = '';
+    let resolvedPackages = await resolvePackages();
+    for (let [name, version] of Object.entries(resolvedPackages)) {
+        if (getDependencyType(version) === 'mops') {
+            let pkgId = `${name}@${version}`;
+            let depConfig = readConfig(path.join('.mops', pkgId, 'mops.toml'));
+            let moc = depConfig.requirements?.moc;
+            if (moc) {
+                let requiredMoc = new SemVer(moc);
+                if (highestRequiredMoc.compare(requiredMoc) < 0) {
+                    highestRequiredMoc = requiredMoc;
+                    highestRequiredMocPkgId = pkgId;
+                }
+                verbose && _check(pkgId, installedMoc, requiredMoc);
+            }
+        }
+    }
+    verbose || _check(highestRequiredMocPkgId, installedMoc, highestRequiredMoc);
+}
+function _check(pkgId, installedMoc, requiredMoc) {
+    let comp = installedMoc.compare(requiredMoc);
+    if (comp < 0) {
+        console.log(chalk.yellow(`moc version does not meet the requirements of ${pkgId}`));
+        console.log(chalk.yellow(`  Required: >= ${requiredMoc.format()}`));
+        console.log(chalk.yellow(`  Installed:   ${installedMoc.format()}`));
+    }
+}

package/dist/cli.js

@@ -5,7 +5,7 @@ import { init } from './commands/init.js';
 import { publish } from './commands/publish.js';
 import { importPem } from './commands/import-identity.js';
 import { sources } from './commands/sources.js';
-import { checkApiCompatibility, setNetwork, apiVersion, checkConfigFile, getNetworkFile } from './mops.js';
+import { checkApiCompatibility, setNetwork, apiVersion, checkConfigFile, getNetworkFile, version } from './mops.js';
 import { getNetwork } from './api/network.js';
 import { whoami } from './commands/whoami.js';
 import { installAll } from './commands/install-all.js';
@@ -14,7 +14,6 @@ import { add } from './commands/add.js';
 import { cacheSize, cleanCache } from './cache.js';
 import { test } from './commands/test/test.js';
 import { template } from './commands/template.js';
-import { selfUpdate } from './commands/self-update.js';
 import { remove } from './commands/remove.js';
 import { getUserProp, setUserProp } from './commands/user.js';
 import { bump } from './commands/bump.js';
@@ -24,6 +23,7 @@ import { update } from './commands/update.js';
 import { bench } from './commands/bench.js';
 import { transferOwnership } from './commands/transfer-ownership.js';
 import { toolchain } from './commands/toolchain/index.js';
+import * as self from './commands/self.js';
 let networkFile = getNetworkFile();
 if (fs.existsSync(networkFile)) {
     globalThis.MOPS_NETWORK = fs.readFileSync(networkFile).toString() || 'ic';
@@ -31,8 +31,7 @@ if (fs.existsSync(networkFile)) {
 let program = new Command();
 program.name('mops');
 // --version
-let packageJson = JSON.parse(fs.readFileSync(new URL('package.json', import.meta.url)).toString());
-program.version(`CLI ${packageJson.version}\nAPI ${apiVersion}`, '-v --version');
+program.version(`CLI ${version()}\nAPI ${apiVersion}`, '-v --version');
 // init
 program
     .command('init')
@@ -225,20 +224,6 @@ program
 // 		}
 // 		await docs();
 // 	});
-// self update
-program
-    .command('self-update')
-    .description('Update mops CLI to the latest version')
-    .option('--detached')
-    .option('--force')
-    .action(async (options) => {
-    if (options.force) {
-        selfUpdate(options);
-    }
-    else {
-        console.log('Please run \'npm i -g ic-mops\'');
-    }
-});
 // user
 program
     .command('user')
@@ -340,4 +325,19 @@ toolchainCommand
     console.log(bin);
 });
 program.addCommand(toolchainCommand);
+// self
+const selfCommand = new Command('self').description('Mops CLI management');
+selfCommand
+    .command('update')
+    .description('Update mops CLI to the latest version')
+    .action(async () => {
+    await self.update();
+});
+selfCommand
+    .command('uninstall')
+    .description('Uninstall mops CLI')
+    .action(async () => {
+    await self.uninstall();
+});
+program.addCommand(selfCommand);
 program.parse();

package/dist/commands/publish.js

@@ -5,14 +5,13 @@ import logUpdate from 'log-update';
 import { globbySync } from 'globby';
 import { minimatch } from 'minimatch';
 import prompts from 'prompts';
-import { fromMarkdown } from 'mdast-util-from-markdown';
-import { toMarkdown } from 'mdast-util-to-markdown';
 import { checkConfigFile, getIdentity, getRootDir, progressBar, readConfig } from '../mops.js';
 import { mainActor } from '../api/actors.js';
 import { parallel } from '../parallel.js';
 import { docs } from './docs.js';
 import { testWithReporter } from './test/test.js';
 import { SilentReporter } from './test/reporters/silent-reporter.js';
+import { findChangelogEntry } from '../helpers/find-changelog-entry.js';
 import { bench } from './bench.js';
 export async function publish(options = {}) {
     if (!checkConfigFile()) {
@@ -355,25 +354,3 @@ async function fetchGitHubReleaseNotes(repo, version) {
     }
     return release.body;
 }
-function findChangelogEntry(changelog, version) {
-    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/dist/commands/self.js

@@ -39,7 +39,7 @@ export async function update() {
         console.log('Updating to version: ' + chalk.green(latest));
         let pm = detectPackageManager();
         let npmArgs = pm === 'npm' ? ['--no-fund', '--silent'] : [];
-        let proc = child_process.spawn(pm, ['add', '-g', ...npmArgs, `${url}/versions/${latest}/cli.tgz`], { stdio: 'inherit', detached: false });
+        let proc = child_process.spawn(pm, ['add', '-g', ...npmArgs, `${url}/versions/${latest}.tgz`], { stdio: 'inherit', detached: false });
         proc.on('exit', (res) => {
             if (res !== 0) {
                 console.log(chalk.red('Failed to update.'));

package/dist/commands/template.js

@@ -4,6 +4,7 @@ import chalk from 'chalk';
 import prompts from 'prompts';
 import camelCase from 'camelcase';
 import { getRootDir, readConfig } from '../mops.js';
+import { copyTemplateFileSync } from '../templates.js';
 export async function template(templateName, options = {}) {
     if (!templateName) {
         let res = await prompts({
@@ -30,9 +31,8 @@ export async function template(templateName, options = {}) {
             console.log(chalk.yellow('Workflow already exists:'), path.relative(getRootDir(), dest));
             return;
         }
-        let mopsTestYml = new URL('../templates/mops-test.yml', import.meta.url);
         fs.mkdirSync(path.resolve(getRootDir(), '.github/workflows'), { recursive: true });
-        fs.copyFileSync(mopsTestYml, dest);
+        copyTemplateFileSync('mops-test.yml', dest);
         console.log(chalk.green('Created'), path.relative(getRootDir(), dest));
     }
     else if (templateName === 'github-workflow:mops-publish') {
@@ -41,9 +41,8 @@ export async function template(templateName, options = {}) {
             console.log(chalk.yellow('Workflow already exists:'), path.relative(getRootDir(), dest));
             return;
         }
-        let mopsPublishYml = new URL('../templates/mops-publish.yml', import.meta.url);
         fs.mkdirSync(path.resolve(getRootDir(), '.github/workflows'), { recursive: true });
-        fs.copyFileSync(mopsPublishYml, dest);
+        copyTemplateFileSync('mops-publish.yml', dest);
         console.log(chalk.green('Created'), path.relative(getRootDir(), dest));
     }
     else if (templateName?.startsWith('license:')) {
@@ -61,13 +60,13 @@ export async function template(templateName, options = {}) {
             fs.writeFileSync(file, license);
         };
         if (templateName === 'license:MIT') {
-            fs.copyFileSync(new URL('../templates/licenses/MIT', import.meta.url), path.resolve(getRootDir(), 'LICENSE'));
+            copyTemplateFileSync('licenses/MIT', path.resolve(getRootDir(), 'LICENSE'));
             setYearAndOwner(path.resolve(getRootDir(), 'LICENSE'));
             console.log(chalk.green('Created'), path.relative(getRootDir(), 'LICENSE'));
         }
         else if (templateName === 'license:Apache-2.0') {
-            fs.copyFileSync(new URL('../templates/licenses/Apache-2.0', import.meta.url), path.resolve(getRootDir(), 'LICENSE'));
-            fs.copyFileSync(new URL('../templates/licenses/Apache-2.0-NOTICE', import.meta.url), path.resolve(getRootDir(), 'NOTICE'));
+            copyTemplateFileSync('licenses/Apache-2.0', path.resolve(getRootDir(), 'LICENSE'));
+            copyTemplateFileSync('licenses/Apache-2.0-NOTICE', path.resolve(getRootDir(), 'NOTICE'));
             setYearAndOwner(path.resolve(getRootDir(), 'NOTICE'));
             console.log(chalk.green('Created'), path.relative(getRootDir(), 'LICENSE'));
             console.log(chalk.green('Created'), path.relative(getRootDir(), 'NOTICE'));
@@ -75,12 +74,12 @@ export async function template(templateName, options = {}) {
     }
     else if (templateName === 'lib.mo') {
         fs.mkdirSync(path.join(getRootDir(), 'src'), { recursive: true });
-        fs.copyFileSync(new URL('../templates/src/lib.mo', import.meta.url), path.resolve(getRootDir(), 'src/lib.mo'));
+        copyTemplateFileSync('src/lib.mo', path.resolve(getRootDir(), 'src/lib.mo'));
         console.log(chalk.green('Created'), path.relative(getRootDir(), 'src/lib.mo'));
     }
     else if (templateName === 'lib.test.mo') {
         fs.mkdirSync(path.join(getRootDir(), 'test'), { recursive: true });
-        fs.copyFileSync(new URL('../templates/test/lib.test.mo', import.meta.url), path.resolve(getRootDir(), 'test/lib.test.mo'));
+        copyTemplateFileSync('test/lib.test.mo', path.resolve(getRootDir(), 'test/lib.test.mo'));
         console.log(chalk.green('Created'), path.relative(getRootDir(), 'test/lib.test.mo'));
     }
     else if (templateName === 'readme') {
@@ -89,7 +88,7 @@ export async function template(templateName, options = {}) {
             console.log(chalk.yellow('README.md already exists'));
             return;
         }
-        fs.copyFileSync(new URL('../templates/README.md', import.meta.url), dest);
+        copyTemplateFileSync('README.md', dest);
         let config = readConfig();
         let data = fs.readFileSync(dest).toString();
         data = data.replace(/<year>/g, new Date().getFullYear().toString());

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

@@ -235,5 +235,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,10 +1,10 @@
 {
   "name": "ic-mops",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "type": "module",
   "bin": {
-    "mops": "dist/bin/mops.js",
-    "ic-mops": "dist/bin/mops.js",
+    "mops": "bin/mops.js",
+    "ic-mops": "bin/mops.js",
     "moc-wrapper": "bin/moc-wrapper.sh"
   },
   "files": [
@@ -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"
   }
-}
+}