ic-mops 0.44.1 → 0.45.0

package/bundle/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/bundle/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/bundle/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/bundle/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/bundle/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/bundle/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/bundle/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/bundle/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/cache.ts

@@ -4,6 +4,7 @@ import ncp from 'ncp';
 import getFolderSize from 'get-folder-size';
 
 import {getDependencyType, globalCacheDir, parseGithubURL} from './mops.js';
+import {getPackageId} from './helpers/get-package-id.js';
 
 export let show = () => {
 	return globalCacheDir;
@@ -24,7 +25,7 @@ export function getDepCacheName(name : string, version : string) {
 }
 
 export function getMopsDepCacheName(name : string, version : string) {
-	return `${name}@${version}`;
+	return getPackageId(name, version);
 }
 
 export function getGithubDepCacheName(name : string, repo : string) {

package/check-requirements.ts

@@ -5,6 +5,7 @@ import chalk from 'chalk';
 import {getDependencyType, getRootDir, readConfig} from './mops.js';
 import {resolvePackages} from './resolve-packages.js';
 import {getMocVersion} from './helpers/get-moc-version.js';
+import {getPackageId} from './helpers/get-package-id.js';
 
 export async function checkRequirements({verbose = false} = {}) {
 	let config = readConfig();
@@ -23,7 +24,7 @@ export async function checkRequirements({verbose = false} = {}) {
 	let resolvedPackages = await resolvePackages();
 	for (let [name, version] of Object.entries(resolvedPackages)) {
 		if (getDependencyType(version) === 'mops') {
-			let pkgId = `${name}@${version}`;
+			let pkgId = getPackageId(name, version);
 			let depConfig = readConfig(path.join(rootDir, '.mops', pkgId, 'mops.toml'));
 			let moc = depConfig.requirements?.moc;
 

package/cli.ts

@@ -125,6 +125,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);
@@ -168,12 +169,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/commands/available-updates.ts

@@ -2,6 +2,7 @@ import process from 'node:process';
 import chalk from 'chalk';
 import {mainActor} from '../api/actors.js';
 import {Config} from '../types.js';
+import {getDepName} from '../helpers/get-dep-name.js';
 
 // [pkg, oldVersion, newVersion]
 export async function getAvailableUpdates(config : Config, pkg ?: string) : Promise<Array<[string, string, string]>> {
@@ -10,6 +11,9 @@ export async function getAvailableUpdates(config : Config, pkg ?: string) : Prom
 	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 : string) => {
 		for (let dep of allDeps) {
 			if (dep.name === pkg && dep.version) {

package/commands/install/install-mops-dep.ts

@@ -12,6 +12,7 @@ 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';
 
 type InstallMopsDepOptions = {
 	verbose ?: boolean;
@@ -22,6 +23,7 @@ type InstallMopsDepOptions = {
 
 export async function installMopsDep(pkg : string, version = '', {verbose, silent, dep, threads} : InstallMopsDepOptions = {}) : Promise<boolean> {
 	threads = threads || 12;
+	let depName = getDepName(pkg);
 
 	if (!checkConfigFile()) {
 		return false;
@@ -33,12 +35,12 @@ export async function installMopsDep(pkg : string, version = '', {verbose, silen
 	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;
@@ -46,12 +48,12 @@ export async function installMopsDep(pkg : string, version = '', {verbose, silen
 		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 {
@@ -61,7 +63,7 @@ export async function installMopsDep(pkg : string, version = '', {verbose, silen
 		}
 
 		try {
-			let {storageId, fileIds} = await getPackageFilesInfo(pkg, version);
+			let {storageId, fileIds} = await getPackageFilesInfo(depName, version);
 
 			total = fileIds.length + 2;
 

package/commands/publish.ts

@@ -18,7 +18,7 @@ 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 : {docs ?: boolean, test ?: boolean, bench ?: boolean} = {}) {
+export async function publish(options : {docs ?: boolean, test ?: boolean, bench ?: boolean, verbose ?: boolean} = {}) {
 	if (!checkConfigFile()) {
 		return;
 	}
@@ -222,6 +222,11 @@ export async function publish(options : {docs ?: boolean, test ?: boolean, bench
 	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) {
@@ -308,7 +313,7 @@ export async function publish(options : {docs ?: boolean, test ?: boolean, bench
 	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;
 
@@ -347,7 +352,7 @@ export async function publish(options : {docs ?: boolean, test ?: boolean, bench
 		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;
 
@@ -357,7 +362,7 @@ export async function publish(options : {docs ?: boolean, test ?: boolean, bench
 			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);
 			}
 		}
 	});
@@ -371,7 +376,7 @@ export async function publish(options : {docs ?: boolean, test ?: boolean, bench
 	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/commands/remove.ts

@@ -7,6 +7,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';
 
 type RemoveOptions = {
 	verbose ?: boolean;
@@ -25,7 +26,7 @@ export async function remove(name : string, {dev = false, verbose = false, dryRu
 		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)];
@@ -61,12 +62,12 @@ export async function remove(name : string, {dev = false, verbose = false, dryRu
 	}
 
 	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)
@@ -74,7 +75,7 @@ export async function remove(name : string, {dev = false, verbose = false, dryRu
 
 	// 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/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/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/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/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/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/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/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/bin/moc-wrapper.sh

@@ -16,7 +16,7 @@ mopsToml="$rootDir/mops.toml"
 if [[ $rootDir == "" ]] || [[ ! -f $mopsToml ]]; then
   mocPath="$(mops toolchain bin moc --fallback)"
 else
-  if command -v openssl &> /dev/null; then
+  if command -v openssl >/dev/null 2>&1; then
     mopsTomlHash=$(openssl sha256 $mopsToml | awk -F'= ' '{print $2}')
   else
     mopsTomlHash=$(shasum $mopsToml -a 256 | awk -F' ' '{print $1}')
@@ -31,6 +31,7 @@ else
       echo -n $mocPath > "$cached"
     fi;
   else
+    mkdir -p "$(dirname $cached)"
     mocPath="$(mops toolchain bin moc --fallback)"
     echo -n $mocPath > "$cached"
   fi;

package/dist/cache.js

@@ -3,6 +3,7 @@ import path from 'node:path';
 import ncp from 'ncp';
 import getFolderSize from 'get-folder-size';
 import { getDependencyType, globalCacheDir, parseGithubURL } from './mops.js';
+import { getPackageId } from './helpers/get-package-id.js';
 export let show = () => {
     return globalCacheDir;
 };
@@ -18,7 +19,7 @@ export function getDepCacheName(name, version) {
     return depType === 'mops' ? getMopsDepCacheName(name, version) : getGithubDepCacheName(name, version);
 }
 export function getMopsDepCacheName(name, version) {
-    return `${name}@${version}`;
+    return getPackageId(name, version);
 }
 export function getGithubDepCacheName(name, repo) {
     const { branch, commitHash } = parseGithubURL(repo);

package/dist/check-requirements.js

@@ -4,6 +4,7 @@ import chalk from 'chalk';
 import { getDependencyType, getRootDir, readConfig } from './mops.js';
 import { resolvePackages } from './resolve-packages.js';
 import { getMocVersion } from './helpers/get-moc-version.js';
+import { getPackageId } from './helpers/get-package-id.js';
 export async function checkRequirements({ verbose = false } = {}) {
     let config = readConfig();
     let mocVersion = config.toolchain?.moc;
@@ -20,7 +21,7 @@ export async function checkRequirements({ verbose = false } = {}) {
     let resolvedPackages = await resolvePackages();
     for (let [name, version] of Object.entries(resolvedPackages)) {
         if (getDependencyType(version) === 'mops') {
-            let pkgId = `${name}@${version}`;
+            let pkgId = getPackageId(name, version);
             let depConfig = readConfig(path.join(rootDir, '.mops', pkgId, 'mops.toml'));
             let moc = depConfig.requirements?.moc;
             if (moc) {