ic-mops 0.44.1 → 0.45.0

package/dist/cli.js

@@ -105,6 +105,7 @@ program
     .option('--no-docs', 'Do not generate docs')
     .option('--no-test', 'Do not run tests')
     .option('--no-bench', 'Do not run benchmarks')
+    .option('--verbose')
     .action(async (options) => {
     if (!checkConfigFile()) {
         process.exit(1);
@@ -144,12 +145,15 @@ program
 program
     .command('sources')
     .description('for dfx packtool')
+    .option('--no-install', 'Do not install dependencies before running sources')
     .option('--verbose')
     .action(async (options) => {
     if (!checkConfigFile()) {
         process.exit(1);
     }
-    await installAll({ silent: true, lock: 'ignore', threads: 6 });
+    if (options.install) {
+        await installAll({ silent: true, lock: 'ignore', threads: 6 });
+    }
     await toolchain.ensureToolchainInited({ strict: false });
     let sourcesArr = await sources(options);
     console.log(sourcesArr.join('\n'));

package/dist/commands/available-updates.js

@@ -1,12 +1,15 @@
 import process from 'node:process';
 import chalk from 'chalk';
 import { mainActor } from '../api/actors.js';
+import { getDepName } from '../helpers/get-dep-name.js';
 // [pkg, oldVersion, newVersion]
 export async function getAvailableUpdates(config, pkg) {
     let deps = Object.values(config.dependencies || {});
     let devDeps = Object.values(config['dev-dependencies'] || {});
     let allDeps = [...deps, ...devDeps].filter((dep) => dep.version);
     let depsToUpdate = pkg ? allDeps.filter((dep) => dep.name === pkg) : allDeps;
+    // skip pinned dependencies
+    depsToUpdate = depsToUpdate.filter((dep) => getDepName(dep.name) === dep.name);
     let getCurrentVersion = (pkg) => {
         for (let dep of allDeps) {
             if (dep.name === pkg && dep.version) {

package/dist/commands/install/install-mops-dep.js

@@ -12,8 +12,10 @@ import { parallel } from '../../parallel.js';
 import { getDepCacheDir, getMopsDepCacheName, isDepCached } from '../../cache.js';
 import { downloadFile, getPackageFilesInfo } from '../../api/downloadPackageFiles.js';
 import { installDeps } from './install-deps.js';
+import { getDepName } from '../../helpers/get-dep-name.js';
 export async function installMopsDep(pkg, version = '', { verbose, silent, dep, threads } = {}) {
     threads = threads || 12;
+    let depName = getDepName(pkg);
     if (!checkConfigFile()) {
         return false;
     }
@@ -23,22 +25,22 @@ export async function installMopsDep(pkg, version = '', { verbose, silent, dep,
     let step = 0;
     let progress = () => {
         step++;
-        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} ${progressBar(step, total)}`);
+        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${depName}@${version} ${progressBar(step, total)}`);
     };
     progress();
     if (!version) {
-        let versionRes = await getHighestVersion(pkg);
+        let versionRes = await getHighestVersion(depName);
         if ('err' in versionRes) {
             console.log(chalk.red('Error: ') + versionRes.err);
             return false;
         }
         version = versionRes.ok;
     }
-    let cacheName = getMopsDepCacheName(pkg, version);
+    let cacheName = getMopsDepCacheName(depName, version);
     let cacheDir = getDepCacheDir(cacheName);
     // global cache hit
     if (isDepCached(cacheName)) {
-        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (cache)`);
+        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${depName}@${version} (cache)`);
     }
     // download
     else {
@@ -47,7 +49,7 @@ export async function installMopsDep(pkg, version = '', { verbose, silent, dep,
             threads = 4;
         }
         try {
-            let { storageId, fileIds } = await getPackageFilesInfo(pkg, version);
+            let { storageId, fileIds } = await getPackageFilesInfo(depName, version);
             total = fileIds.length + 2;
             let filesData = new Map;
             let storage = await storageActor(storageId);

package/dist/commands/publish.d.ts

@@ -2,4 +2,5 @@ export declare function publish(options?: {
     docs?: boolean;
     test?: boolean;
     bench?: boolean;
+    verbose?: boolean;
 }): Promise<void>;

package/dist/commands/publish.js

@@ -198,6 +198,10 @@ export async function publish(options = {}) {
     let files = config.package.files || ['**/*.mo'];
     files = [...files, ...defaultFiles];
     files = globbySync([...files, ...defaultFiles]);
+    if (options.verbose) {
+        console.log('Files:');
+        console.log(files.map((file) => '  ' + file).join('\n'));
+    }
     // generate docs
     let docsFile = path.join(rootDir, '.mops/.docs/docs.tgz');
     if (options.docs) {
@@ -276,7 +280,7 @@ export async function publish(options = {}) {
     let publishing = await actor.startPublish(backendPkgConfig);
     if ('err' in publishing) {
         console.log(chalk.red('Error: ') + publishing.err);
-        return;
+        process.exit(1);
     }
     let puiblishingId = publishing.ok;
     // upload test stats
@@ -308,7 +312,7 @@ export async function publish(options = {}) {
         let res = await actor.startFileUpload(puiblishingId, file, BigInt(chunkCount), firstChunk);
         if ('err' in res) {
             console.log(chalk.red('Error: ') + res.err);
-            return;
+            process.exit(1);
         }
         let fileId = res.ok;
         for (let i = 1; i < chunkCount; i++) {
@@ -317,7 +321,7 @@ export async function publish(options = {}) {
             let res = await actor.uploadFileChunk(puiblishingId, fileId, BigInt(i), chunk);
             if ('err' in res) {
                 console.log(chalk.red('Error: ') + res.err);
-                return;
+                process.exit(1);
             }
         }
     });
@@ -328,7 +332,7 @@ export async function publish(options = {}) {
     let res = await actor.finishPublish(puiblishingId);
     if ('err' in res) {
         console.log(chalk.red('Error: ') + res.err);
-        return;
+        process.exit(1);
     }
     console.log(chalk.green('Published ') + `${config.package.name}@${config.package.version}`);
 }

package/dist/commands/remove.js

@@ -6,6 +6,7 @@ import { checkIntegrity } from '../integrity.js';
 import { getDepCacheDir, getDepCacheName } from '../cache.js';
 import path from 'node:path';
 import { syncLocalCache } from './install/sync-local-cache.js';
+import { getPackageId } from '../helpers/get-package-id.js';
 export async function remove(name, { dev = false, verbose = false, dryRun = false, lock } = {}) {
     if (!checkConfigFile()) {
         return;
@@ -15,7 +16,7 @@ export async function remove(name, { dev = false, verbose = false, dryRun = fals
         let devDeps = Object.values(config['dev-dependencies'] || {});
         return [...deps, ...devDeps]
             .filter((dep) => {
-            let depId = dep.name + '@' + dep.version;
+            let depId = getPackageId(dep.name, dep.version || '');
             return depId !== exceptPkgId;
         }).map((dep) => {
             return [dep, ...getTransitiveDependenciesOf(dep.name, dep.version, dep.repo)];
@@ -47,17 +48,17 @@ export async function remove(name, { dev = false, verbose = false, dryRun = fals
         return console.log(chalk.red('Error: ') + `No ${dev ? 'dev ' : ''}dependency to remove "${name}"`);
     }
     let version = pkgDetails.version;
-    let packageId = `${name}@${version}`;
+    let packageId = getPackageId(name, version || '');
     // transitive deps ignoring deps of this package
     let transitiveDeps = getTransitiveDependencies(config, packageId);
     let transitiveDepIds = new Set(transitiveDeps.map((dep) => {
-        return dep.name + '@' + dep.version;
+        return getPackageId(dep.name, dep.version || '');
     }));
     // transitive deps of this package (including itself)
     let transitiveDepsOfPackage = [pkgDetails, ...getTransitiveDependenciesOf(name, version)];
     // remove local cache
     for (let dep of transitiveDepsOfPackage) {
-        let depId = dep.name + '@' + dep.version;
+        let depId = getPackageId(dep.name, dep.version || '');
         if (transitiveDepIds.has(depId)) {
             verbose && console.log(`Ignored transitive dependency ${depId} (other deps depend on it)`);
             continue;

package/dist/declarations/bench/bench.did

@@ -1,4 +1,4 @@
-type anon_class_10_1 = 
+type _anon_class_10_1 = 
  service {
    getSchema: () -> (BenchSchema) query;
    getStats: () -> (BenchResult) query;
@@ -23,4 +23,4 @@ type BenchResult =
    rts_mutator_instructions: int;
    rts_total_allocation: int;
  };
-service : () -> anon_class_10_1
+service : () -> _anon_class_10_1

package/dist/declarations/bench/bench.did.d.ts

@@ -16,7 +16,7 @@ export interface BenchSchema {
   'rows' : Array<string>,
   'description' : string,
 }
-export interface anon_class_10_1 {
+export interface _anon_class_10_1 {
   'getSchema' : ActorMethod<[], BenchSchema>,
   'getStats' : ActorMethod<[], BenchResult>,
   'init' : ActorMethod<[], BenchSchema>,
@@ -24,6 +24,6 @@ export interface anon_class_10_1 {
   'runCellUpdate' : ActorMethod<[bigint, bigint], BenchResult>,
   'runCellUpdateAwait' : ActorMethod<[bigint, bigint], BenchResult>,
 }
-export interface _SERVICE extends anon_class_10_1 {}
+export interface _SERVICE extends _anon_class_10_1 {}
 export declare const idlFactory: IDL.InterfaceFactory;
 export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[];

package/dist/declarations/bench/bench.did.js

@@ -13,7 +13,7 @@ export const idlFactory = ({ IDL }) => {
     'rts_mutator_instructions' : IDL.Int,
     'rts_heap_size' : IDL.Int,
   });
-  const anon_class_10_1 = IDL.Service({
+  const _anon_class_10_1 = IDL.Service({
     'getSchema' : IDL.Func([], [BenchSchema], ['query']),
     'getStats' : IDL.Func([], [BenchResult], ['query']),
     'init' : IDL.Func([], [BenchSchema], []),
@@ -21,6 +21,6 @@ export const idlFactory = ({ IDL }) => {
     'runCellUpdate' : IDL.Func([IDL.Nat, IDL.Nat], [BenchResult], []),
     'runCellUpdateAwait' : IDL.Func([IDL.Nat, IDL.Nat], [BenchResult], []),
   });
-  return anon_class_10_1;
+  return _anon_class_10_1;
 };
 export const init = ({ IDL }) => { return []; };

package/dist/declarations/bench/index.js

@@ -4,6 +4,14 @@ import { Actor, HttpAgent } from "@dfinity/agent";
 import { idlFactory } from "./bench.did.js";
 export { idlFactory } from "./bench.did.js";
 
+/* CANISTER_ID is replaced by webpack based on node environment
+ * Note: canister environment variable will be standardized as
+ * process.env.CANISTER_ID_<CANISTER_NAME_UPPERCASE>
+ * beginning in dfx 0.15.0
+ */
+export const canisterId =
+  process.env.CANISTER_ID_BENCH;
+
 export const createActor = (canisterId, options = {}) => {
   const agent = options.agent || new HttpAgent({ ...options.agentOptions });
 

package/dist/declarations/main/main.did

@@ -151,6 +151,7 @@ type PackageVersion = text;
 type PackageSummary__1 = 
  record {
    config: PackageConfigV3;
+   depAlias: text;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -163,6 +164,7 @@ type PackageSummaryWithChanges__1 =
  record {
    changes: PackageChanges;
    config: PackageConfigV3;
+   depAlias: text;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -175,6 +177,7 @@ type PackageSummaryWithChanges =
  record {
    changes: PackageChanges;
    config: PackageConfigV3;
+   depAlias: text;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -186,6 +189,7 @@ type PackageSummaryWithChanges =
 type PackageSummary = 
  record {
    config: PackageConfigV3;
+   depAlias: text;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -224,6 +228,7 @@ type PackageDetails =
    benchmarks: Benchmarks__1;
    changes: PackageChanges;
    config: PackageConfigV3;
+   depAlias: text;
    dependents: vec PackageSummary__1;
    deps: vec PackageSummary__1;
    devDeps: vec PackageSummary__1;

package/dist/declarations/main/main.did.d.ts

@@ -178,6 +178,7 @@ export interface PackageDetails {
   'benchmarks' : Benchmarks__1,
   'ownerInfo' : User,
   'owner' : Principal,
+  'depAlias' : string,
   'deps' : Array<PackageSummary__1>,
   'quality' : PackageQuality,
   'testStats' : TestStats__1,
@@ -218,6 +219,7 @@ export interface PackageQuality {
 export interface PackageSummary {
   'ownerInfo' : User,
   'owner' : Principal,
+  'depAlias' : string,
   'quality' : PackageQuality,
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
@@ -228,6 +230,7 @@ export interface PackageSummary {
 export interface PackageSummaryWithChanges {
   'ownerInfo' : User,
   'owner' : Principal,
+  'depAlias' : string,
   'quality' : PackageQuality,
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
@@ -239,6 +242,7 @@ export interface PackageSummaryWithChanges {
 export interface PackageSummaryWithChanges__1 {
   'ownerInfo' : User,
   'owner' : Principal,
+  'depAlias' : string,
   'quality' : PackageQuality,
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
@@ -250,6 +254,7 @@ export interface PackageSummaryWithChanges__1 {
 export interface PackageSummary__1 {
   'ownerInfo' : User,
   'owner' : Principal,
+  'depAlias' : string,
   'quality' : PackageQuality,
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,

package/dist/declarations/main/main.did.js

@@ -90,6 +90,7 @@ export const idlFactory = ({ IDL }) => {
   const PackageSummary = IDL.Record({
     'ownerInfo' : User,
     'owner' : IDL.Principal,
+    'depAlias' : IDL.Text,
     'quality' : PackageQuality,
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
@@ -116,6 +117,7 @@ export const idlFactory = ({ IDL }) => {
   const PackageSummary__1 = IDL.Record({
     'ownerInfo' : User,
     'owner' : IDL.Principal,
+    'depAlias' : IDL.Text,
     'quality' : PackageQuality,
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
@@ -156,6 +158,7 @@ export const idlFactory = ({ IDL }) => {
   const PackageSummaryWithChanges__1 = IDL.Record({
     'ownerInfo' : User,
     'owner' : IDL.Principal,
+    'depAlias' : IDL.Text,
     'quality' : PackageQuality,
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
@@ -168,6 +171,7 @@ export const idlFactory = ({ IDL }) => {
     'benchmarks' : Benchmarks__1,
     'ownerInfo' : User,
     'owner' : IDL.Principal,
+    'depAlias' : IDL.Text,
     'deps' : IDL.Vec(PackageSummary__1),
     'quality' : PackageQuality,
     'testStats' : TestStats__1,
@@ -187,6 +191,7 @@ export const idlFactory = ({ IDL }) => {
   const PackageSummaryWithChanges = IDL.Record({
     'ownerInfo' : User,
     'owner' : IDL.Principal,
+    'depAlias' : IDL.Text,
     'quality' : PackageQuality,
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,

package/dist/helpers/get-dep-name.d.ts

@@ -0,0 +1 @@
+export declare function getDepName(name: string): string;

package/dist/helpers/get-dep-name.js

@@ -0,0 +1,3 @@
+export function getDepName(name) {
+    return name.split('@')[0] || '';
+}

package/dist/helpers/get-package-id.d.ts

@@ -0,0 +1 @@
+export declare function getPackageId(name: string, version: string): string;

package/dist/helpers/get-package-id.js

@@ -0,0 +1,4 @@
+import { getDepName } from './get-dep-name.js';
+export function getPackageId(name, version) {
+    return getDepName(name) + '@' + version;
+}

package/dist/integrity.js

@@ -6,6 +6,7 @@ import { bytesToHex } from '@noble/hashes/utils';
 import { getDependencyType, getRootDir, readConfig } from './mops.js';
 import { mainActor } from './api/actors.js';
 import { resolvePackages } from './resolve-packages.js';
+import { getPackageId } from './helpers/get-package-id.js';
 export async function checkIntegrity(lock) {
     let force = !!lock;
     if (!lock && !process.env['CI'] && fs.existsSync(path.join(getRootDir(), 'mops.lock'))) {
@@ -32,7 +33,7 @@ async function getResolvedMopsPackageIds() {
     let resolvedPackages = await resolvePackages();
     let packageIds = Object.entries(resolvedPackages)
         .filter(([_, version]) => getDependencyType(version) === 'mops')
-        .map(([name, version]) => `${name}@${version}`);
+        .map(([name, version]) => getPackageId(name, version));
     return packageIds;
 }
 // get hash of local file from '.mops' dir by fileId

package/dist/mops.js

@@ -10,11 +10,12 @@ import { decodeFile } from './pem.js';
 import { mainActor, storageActor } from './api/actors.js';
 import { getNetwork } from './api/network.js';
 import { getHighestVersion } from './api/getHighestVersion.js';
+import { getPackageId } from './helpers/get-package-id.js';
 if (!globalThis.fetch) {
     globalThis.fetch = fetch;
 }
 // (!) make changes in pair with backend
-export let apiVersion = '1.2';
+export let apiVersion = '1.3';
 export let globalConfigDir = '';
 export let globalCacheDir = '';
 // OS specific dirs
@@ -206,7 +207,7 @@ export function writeConfig(config, configFile = getClosestConfigFile()) {
     fs.writeFileSync(configFile, text);
 }
 export function formatDir(name, version) {
-    return path.join(getRootDir(), '.mops', `${name}@${version}`);
+    return path.join(getRootDir(), '.mops', getPackageId(name, version));
 }
 export function formatGithubDir(name, repo) {
     const { branch, commitHash } = parseGithubURL(repo);
@@ -232,13 +233,13 @@ export async function checkApiCompatibility() {
     let backendApiVer = await actor.getApiVersion();
     if (backendApiVer.split('.')[0] !== apiVersion.split('.')[0]) {
         console.log(chalk.red('ERR: ') + `CLI incompatible with backend. CLI v${apiVersion}, Backend v${backendApiVer}`);
-        console.log('Run ' + chalk.greenBright('npm i -g ic-mops') + ' to upgrade cli.');
+        console.log('Run ' + chalk.greenBright('mops self update') + ' to upgrade cli.');
         return false;
     }
     else if (backendApiVer.split('.')[1] !== apiVersion.split('.')[1]) {
         console.log('-'.repeat(50));
         console.log(chalk.yellow('WARN: ') + `CLI probably incompatible with backend. CLI v${apiVersion}, Backend v${backendApiVer}`);
-        console.log('Recommended to run ' + chalk.greenBright('npm i -g ic-mops') + ' to upgrade cli.');
+        console.log('Recommended to run ' + chalk.greenBright('mops self update') + ' to upgrade cli.');
         console.log('-'.repeat(50));
     }
     return true;

package/dist/notify-installs.js

@@ -1,14 +1,17 @@
 import { getDependencyType } from './mops.js';
 import { mainActor } from './api/actors.js';
+import { getDepName } from './helpers/get-dep-name.js';
 export async function notifyInstalls(installedDeps) {
-    let packages = Object.entries(installedDeps).filter(([_, version]) => getDependencyType(version) === 'mops');
+    let packages = Object.entries(installedDeps)
+        .filter(([_, version]) => getDependencyType(version) === 'mops')
+        .map(([name, version]) => [getDepName(name), version]);
     if (packages.length) {
         let actor = await mainActor();
         try {
             await actor.notifyInstalls(packages);
         }
         catch (err) {
-            // verbose && console.error('Failed to notify installs:', err);
+            // console.error('Failed to notify installs:', err);
         }
     }
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.44.1",
+  "version": "0.45.0",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",

package/dist/pem.js

@@ -22,7 +22,7 @@ function decode(rawKey) {
     if (buf.length != 85) {
         throw 'expecting byte length 85 but got ' + buf.length;
     }
-    let secretKey = Buffer.concat([buf.subarray(16, 48), buf.subarray(53, 85)]);
+    let secretKey = Buffer.concat([buf.subarray(16, 48)]);
     return Ed25519KeyIdentity.fromSecretKey(secretKey);
 }
 let algorithm = 'aes-256-ctr';

package/dist/vessel.js

@@ -133,7 +133,7 @@ export const installFromGithub = async (name, repo, { verbose = false, dep = fal
             await downloadFromGithub(repo, cacheDir, progress);
         }
         catch (err) {
-            deleteSync([cacheDir]);
+            deleteSync([cacheDir], { force: true });
             process.exit(1);
         }
     }

package/helpers/get-dep-name.ts

@@ -0,0 +1,3 @@
+export function getDepName(name : string) : string {
+	return name.split('@')[0] || '';
+}

package/helpers/get-package-id.ts

@@ -0,0 +1,5 @@
+import {getDepName} from './get-dep-name.js';
+
+export function getPackageId(name : string, version : string) : string {
+	return getDepName(name) + '@' + version;
+}

package/integrity.ts

@@ -6,6 +6,7 @@ import {bytesToHex} from '@noble/hashes/utils';
 import {getDependencyType, getRootDir, readConfig} from './mops.js';
 import {mainActor} from './api/actors.js';
 import {resolvePackages} from './resolve-packages.js';
+import {getPackageId} from './helpers/get-package-id.js';
 
 type LockFileGeneric = {
 	version : number;
@@ -56,7 +57,7 @@ async function getResolvedMopsPackageIds() : Promise<string[]> {
 	let resolvedPackages = await resolvePackages();
 	let packageIds = Object.entries(resolvedPackages)
 		.filter(([_, version]) => getDependencyType(version) === 'mops')
-		.map(([name, version]) => `${name}@${version}`);
+		.map(([name, version]) => getPackageId(name, version));
 	return packageIds;
 }
 

package/mops.ts

@@ -13,6 +13,7 @@ import {Config} from './types.js';
 import {mainActor, storageActor} from './api/actors.js';
 import {getNetwork} from './api/network.js';
 import {getHighestVersion} from './api/getHighestVersion.js';
+import {getPackageId} from './helpers/get-package-id.js';
 
 
 if (!globalThis.fetch) {
@@ -20,7 +21,7 @@ if (!globalThis.fetch) {
 }
 
 // (!) make changes in pair with backend
-export let apiVersion = '1.2';
+export let apiVersion = '1.3';
 
 export let globalConfigDir = '';
 export let globalCacheDir = '';
@@ -240,7 +241,7 @@ export function writeConfig(config : Config, configFile = getClosestConfigFile()
 }
 
 export function formatDir(name : string, version : string) {
-	return path.join(getRootDir(), '.mops', `${name}@${version}`);
+	return path.join(getRootDir(), '.mops', getPackageId(name, version));
 }
 
 export function formatGithubDir(name : string, repo : string) {
@@ -269,13 +270,13 @@ export async function checkApiCompatibility() {
 	let backendApiVer = await actor.getApiVersion();
 	if (backendApiVer.split('.')[0] !== apiVersion.split('.')[0]) {
 		console.log(chalk.red('ERR: ') + `CLI incompatible with backend. CLI v${apiVersion}, Backend v${backendApiVer}`);
-		console.log('Run ' + chalk.greenBright('npm i -g ic-mops') + ' to upgrade cli.');
+		console.log('Run ' + chalk.greenBright('mops self update') + ' to upgrade cli.');
 		return false;
 	}
 	else if (backendApiVer.split('.')[1] !== apiVersion.split('.')[1]) {
 		console.log('-'.repeat(50));
 		console.log(chalk.yellow('WARN: ') + `CLI probably incompatible with backend. CLI v${apiVersion}, Backend v${backendApiVer}`);
-		console.log('Recommended to run ' + chalk.greenBright('npm i -g ic-mops') + ' to upgrade cli.');
+		console.log('Recommended to run ' + chalk.greenBright('mops self update') + ' to upgrade cli.');
 		console.log('-'.repeat(50));
 	}
 	return true;

package/notify-installs.ts

@@ -1,8 +1,12 @@
 import {getDependencyType} from './mops.js';
 import {mainActor} from './api/actors.js';
+import {getDepName} from './helpers/get-dep-name.js';
 
 export async function notifyInstalls(installedDeps : Record<string, string>) {
-	let packages = Object.entries(installedDeps).filter(([_, version]) => getDependencyType(version) === 'mops');
+	let packages = Object.entries(installedDeps)
+		.filter(([_, version]) => getDependencyType(version) === 'mops')
+		.map(([name, version]) => [getDepName(name), version] as [string, string]);
+
 	if (packages.length) {
 		let actor = await mainActor();
 
@@ -10,7 +14,7 @@ export async function notifyInstalls(installedDeps : Record<string, string>) {
 			await actor.notifyInstalls(packages);
 		}
 		catch (err) {
-			// verbose && console.error('Failed to notify installs:', err);
+			// console.error('Failed to notify installs:', err);
 		}
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.44.1",
+  "version": "0.45.0",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",
@@ -29,7 +29,7 @@
     "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",
+    "bundle:tar": "tar --exclude bundle/cli.tgz -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 fix-dist",
     "fix-dist": "tsx ./fix-dist.ts",

package/pem.ts

@@ -24,7 +24,7 @@ function decode(rawKey : Buffer) {
 	if (buf.length != 85) {
 		throw 'expecting byte length 85 but got ' + buf.length;
 	}
-	let secretKey = Buffer.concat([buf.subarray(16, 48), buf.subarray(53, 85)]);
+	let secretKey = Buffer.concat([buf.subarray(16, 48)]);
 	return Ed25519KeyIdentity.fromSecretKey(secretKey);
 }
 

package/vessel.ts

@@ -171,7 +171,7 @@ export const installFromGithub = async (name : string, repo : string, {verbose =
 			await downloadFromGithub(repo, cacheDir, progress);
 		}
 		catch (err) {
-			deleteSync([cacheDir]);
+			deleteSync([cacheDir], {force: true});
 			process.exit(1);
 		}
 	}

package/.npmrc

@@ -1,2 +0,0 @@
-save-exact = true
-# omit = optional

package/dist/commands/install-all.d.ts

@@ -1,7 +0,0 @@
-type InstallAllOptions = {
-    verbose?: boolean;
-    silent?: boolean;
-    lock?: 'check' | 'update' | 'ignore';
-};
-export declare function installAll({ verbose, silent, lock }?: InstallAllOptions): Promise<void>;
-export {};