ic-mops 0.41.0 → 0.42.0

package/commands/install/install-dep.ts

@@ -0,0 +1,34 @@
+import path from 'node:path';
+import {installFromGithub} from '../../vessel.js';
+import {installMopsDep} from './install-mops-dep.js';
+import {Dependency} from '../../types.js';
+import {installLocalDep} from './install-local-dep.js';
+import {getRootDir} from '../../mops.js';
+
+type InstallDepOptions = {
+	verbose ?: boolean;
+	silent ?: boolean;
+	threads ?: number;
+};
+
+// install dependency
+// returns false if failed
+export async function installDep(dep : Dependency, {verbose, silent, threads} : InstallDepOptions = {}, parentPkgPath ?: string) : Promise<Record<string, string> | false> {
+	if (dep.repo) {
+		await installFromGithub(dep.name, dep.repo, {silent, verbose});
+		return {};
+	}
+	else if (dep.path) {
+		let depPath = dep.path;
+		parentPkgPath = parentPkgPath || getRootDir();
+		if (parentPkgPath) {
+			depPath = path.resolve(parentPkgPath, dep.path);
+		}
+		return installLocalDep(dep.name, depPath, {silent, verbose});
+	}
+	else if (dep.version) {
+		return installMopsDep(dep.name, dep.version, {silent, verbose, threads});
+	}
+
+	return {};
+}

package/commands/install/install-deps.ts

@@ -0,0 +1,31 @@
+import {Dependency} from '../../types.js';
+import {installDep} from './install-dep.js';
+
+type InstallDepsOptions = {
+	verbose ?: boolean;
+	silent ?: boolean;
+	threads ?: number;
+};
+
+// install all dependencies
+// returns actual installed dependencies
+// returns false if failed
+export async function installDeps(deps : Dependency[], {verbose, silent, threads} : InstallDepsOptions = {}, parentPkgPath ?: string) : Promise<Record<string, string> | false> {
+	let installedDeps = {};
+	let ok = true;
+	for (const dep of deps) {
+		let res = await installDep(dep, {verbose, silent, threads}, parentPkgPath);
+		if (res) {
+			installedDeps = {...installedDeps, ...res};
+		}
+		else {
+			ok = false;
+		}
+	}
+
+	if (!ok) {
+		return false;
+	}
+
+	return installedDeps;
+}

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

@@ -0,0 +1,31 @@
+import process from 'node:process';
+import path from 'node:path';
+import {createLogUpdate} from 'log-update';
+import {getRootDir, readConfig} from '../../mops.js';
+import {installDeps} from './install-deps.js';
+
+type InstallLocalDepOptions = {
+	verbose ?: boolean;
+	silent ?: boolean;
+};
+
+// skip install and just find non-local dependencies to install
+// pkgPath should be relative to the current root dir or absolute
+export async function installLocalDep(pkg : string, pkgPath = '', {verbose, silent} : InstallLocalDepOptions = {}) : Promise<Record<string, string> | false> {
+	if (!silent) {
+		let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
+		logUpdate(`Local dependency ${pkg} = "${pkgPath}"`);
+
+		if (verbose) {
+			silent || logUpdate.done();
+		}
+		else {
+			logUpdate.clear();
+		}
+	}
+
+	// install dependencies
+	let dir = path.resolve(getRootDir(), pkgPath);
+	let config = readConfig(path.join(dir, 'mops.toml'));
+	return installDeps(Object.values(config.dependencies || {}), {silent, verbose}, pkgPath);
+}

package/commands/{install.ts → install/install-mops-dep.ts}

@@ -1,17 +1,28 @@
-import path from 'node:path';
+import process from 'node:process';
 import fs from 'node:fs';
+import path from 'node:path';
+import {Buffer} from 'node:buffer';
 import {createLogUpdate} from 'log-update';
 import chalk from 'chalk';
-import {checkConfigFile, formatDir, progressBar, readConfig} from '../mops.js';
-import {getHighestVersion} from '../api/getHighestVersion.js';
-import {storageActor} from '../api/actors.js';
-import {parallel} from '../parallel.js';
-import {installFromGithub} from '../vessel.js';
-import {addCache, copyCache, isCached} from '../cache.js';
-import {downloadFile, getPackageFilesInfo} from '../api/downloadPackageFiles.js';
-import {installLocal} from './install-local.js';
-
-export async function install(pkg : string, version = '', {verbose = false, silent = false, dep = false} = {}) : Promise<Record<string, string> | false> {
+import {deleteSync} from 'del';
+import {checkConfigFile, formatDir, progressBar, readConfig} from '../../mops.js';
+import {getHighestVersion} from '../../api/getHighestVersion.js';
+import {storageActor} from '../../api/actors.js';
+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';
+
+type InstallMopsDepOptions = {
+	verbose ?: boolean;
+	silent ?: boolean;
+	dep ?: boolean;
+	threads ?: number;
+};
+
+export async function installMopsDep(pkg : string, version = '', {verbose, silent, dep, threads} : InstallMopsDepOptions = {}) : Promise<Record<string, string> | false> {
+	threads = threads || 12;
+
 	if (!checkConfigFile()) {
 		return false;
 	}
@@ -36,6 +47,8 @@ export async function install(pkg : string, version = '', {verbose = false, sile
 	}
 
 	let dir = formatDir(pkg, version);
+	let cacheName = getMopsDepCacheName(pkg, version);
+	let cacheDir = getDepCacheDir(cacheName);
 	let alreadyInstalled = false;
 
 	// already installed
@@ -44,14 +57,11 @@ export async function install(pkg : string, version = '', {verbose = false, sile
 		alreadyInstalled = true;
 	}
 	// copy from cache
-	else if (isCached(`${pkg}@${version}`)) {
-		await copyCache(`${pkg}@${version}`, dir);
+	else if (isDepCached(cacheName)) {
 		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (global cache)`);
 	}
 	// download
 	else {
-		let threads = 16;
-
 		// GitHub Actions fails with "fetch failed" if there are multiple concurrent actions
 		if (process.env.GITHUB_ENV) {
 			threads = 4;
@@ -71,10 +81,17 @@ export async function install(pkg : string, version = '', {verbose = false, sile
 				progress();
 			});
 
-			// write files to disk
-			for (let [filePath, data] of filesData.entries()) {
-				fs.mkdirSync(path.join(dir, path.dirname(filePath)), {recursive: true});
-				fs.writeFileSync(path.join(dir, filePath), Buffer.from(data));
+			// write files to global cache
+			try {
+				for (let [filePath, data] of filesData.entries()) {
+					fs.mkdirSync(path.join(cacheDir, path.dirname(filePath)), {recursive: true});
+					fs.writeFileSync(path.join(cacheDir, filePath), Buffer.from(data));
+				}
+			}
+			catch (err) {
+				console.error(chalk.red('Error: ') + err);
+				deleteSync([cacheDir], {force: true});
+				return false;
 			}
 		}
 		catch (err) {
@@ -82,9 +99,6 @@ export async function install(pkg : string, version = '', {verbose = false, sile
 			return false;
 		}
 
-		// add to cache
-		await addCache(`${pkg}@${version}`, dir);
-
 		progress();
 	}
 
@@ -96,31 +110,17 @@ export async function install(pkg : string, version = '', {verbose = false, sile
 	}
 
 	// install dependencies
-	let ok = true;
-	let config = readConfig(path.join(dir, 'mops.toml'));
-	let deps = Object.values(config.dependencies || {});
-	let installedDeps = {};
-	for (const {name, repo, version, path: depPath} of deps) {
-		if (repo) {
-			await installFromGithub(name, repo, {silent, verbose});
-		}
-		else {
-			let res = await (depPath ? installLocal(name, depPath, {silent, verbose}) : install(name, version, {silent, verbose}));
-			if (res) {
-				installedDeps = {...installedDeps, ...res};
-			}
-			else {
-				ok = false;
-			}
-		}
+	let config = readConfig(path.join(cacheDir, 'mops.toml'));
+	let res = await installDeps(Object.values(config.dependencies || {}), {silent, verbose});
+
+	if (!res) {
+		return false;
 	}
+	let installedDeps = res;
 
+	// add self to installed deps
 	if (!alreadyInstalled) {
 		installedDeps = {...installedDeps, [pkg]: version};
 	}
-
-	if (!ok) {
-		return false;
-	}
 	return installedDeps;
 }

package/commands/install/sync-local-cache.ts

@@ -0,0 +1,34 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import {copyCache, getDepCacheName} from '../../cache.js';
+import {getDependencyType, getRootDir} from '../../mops.js';
+import {resolvePackages} from '../../resolve-packages.js';
+
+export async function syncLocalCache({verbose = false} = {}) : Promise<Record<string, string>> {
+	let resolvedPackages = await resolvePackages();
+	let rootDir = getRootDir();
+
+	verbose && console.log('Syncing local cache...');
+
+	let installedDeps : Record<string, string> = {};
+
+	await Promise.all(Object.entries(resolvedPackages).map(([name, value]) => {
+		let depType = getDependencyType(value);
+
+		if (depType === 'mops' || depType === 'github') {
+			let cacheName = getDepCacheName(name, value);
+			let dest = path.join(rootDir, '.mops', cacheName);
+
+			if (!fs.existsSync(dest)) {
+				if (depType === 'mops') {
+					installedDeps[name] = value;
+				}
+				return copyCache(cacheName, path.join(rootDir, '.mops', cacheName));
+			}
+		}
+
+		return Promise.resolve();
+	}));
+
+	return installedDeps;
+}

package/commands/publish.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import fs from 'node:fs';
 import path from 'node:path';
 import chalk from 'chalk';
@@ -10,7 +11,7 @@ import {checkConfigFile, getIdentity, getRootDir, progressBar, readConfig} from
 import {mainActor} from '../api/actors.js';
 import {parallel} from '../parallel.js';
 import {docs} from './docs.js';
-import {Benchmarks, DependencyV2, PackageConfigV2} from '../declarations/main/main.did.js';
+import {Benchmarks, DependencyV2, PackageConfigV3_Publishing, Requirement} from '../declarations/main/main.did.js';
 import {Dependency} from '../types.js';
 import {testWithReporter} from './test/test.js';
 import {SilentReporter} from './test/reporters/silent-reporter.js';
@@ -29,7 +30,7 @@ export async function publish(options : {docs ?: boolean, test ?: boolean, bench
 
 	// validate
 	for (let key of Object.keys(config)) {
-		if (!['package', 'dependencies', 'dev-dependencies', 'toolchain'].includes(key)) {
+		if (!['package', 'dependencies', 'dev-dependencies', 'toolchain', 'requirements'].includes(key)) {
 			console.log(chalk.red('Error: ') + `Unknown config section [${key}]`);
 			process.exit(1);
 		}
@@ -160,6 +161,15 @@ export async function publish(options : {docs ?: boolean, test ?: boolean, bench
 		}
 	}
 
+	if (config.requirements) {
+		Object.keys(config.requirements).forEach((name) => {
+			if (name !== 'moc') {
+				console.log(chalk.red('Error: ') + `Unknown requirement "${name}"`);
+				return;
+			}
+		});
+	}
+
 	let toBackendDep = (dep : Dependency) : DependencyV2 => {
 		return {
 			...dep,
@@ -168,8 +178,12 @@ export async function publish(options : {docs ?: boolean, test ?: boolean, bench
 		};
 	};
 
+	let toBackendReq = ([name, value] : [string, string]) : Requirement => {
+		return {name, value};
+	};
+
 	// map fields
-	let backendPkgConfig : PackageConfigV2 = {
+	let backendPkgConfig : PackageConfigV3_Publishing = {
 		name: config.package.name,
 		version: config.package.version,
 		keywords: config.package.keywords || [],
@@ -186,6 +200,7 @@ export async function publish(options : {docs ?: boolean, test ?: boolean, bench
 		dependencies: Object.values(config.dependencies || {}).map(toBackendDep),
 		devDependencies: Object.values(config['dev-dependencies'] || {}).map(toBackendDep),
 		scripts: [],
+		requirements: [Object.entries(config.requirements || {}).map((req) => toBackendReq(req))],
 	};
 
 	let defaultFiles = [

package/commands/remove.ts

@@ -1,9 +1,12 @@
 import fs from 'node:fs';
 import {deleteSync} from 'del';
 import chalk from 'chalk';
-import {formatDir, formatGithubDir, checkConfigFile, readConfig, writeConfig} from '../mops.js';
+import {checkConfigFile, getRootDir, readConfig, writeConfig} from '../mops.js';
 import {Config, Dependency} from '../types.js';
 import {checkIntegrity} from '../integrity.js';
+import {getDepCacheDir, getDepCacheName} from '../cache.js';
+import path from 'node:path';
+import {syncLocalCache} from './install/sync-local-cache.js';
 
 type RemoveOptions = {
 	verbose ?: boolean;
@@ -12,7 +15,6 @@ type RemoveOptions = {
 	lock ?: 'update' | 'ignore';
 };
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function remove(name : string, {dev = false, verbose = false, dryRun = false, lock} : RemoveOptions = {}) {
 	if (!checkConfigFile()) {
 		return;
@@ -31,13 +33,12 @@ export async function remove(name : string, {dev = false, verbose = false, dryRu
 	}
 
 	function getTransitiveDependenciesOf(name : string, version : string | undefined, repo ?: string) {
-		let pkgDir = '';
-		if (repo) {
-			pkgDir = formatGithubDir(name, repo);
-		}
-		else if (version) {
-			pkgDir = formatDir(name, version);
+		let value = version || repo;
+		if (!value) {
+			return [];
 		}
+		let cacheName = getDepCacheName(name, value);
+		let pkgDir = getDepCacheDir(cacheName);
 		let configFile = pkgDir + '/mops.toml';
 		if (!fs.existsSync(configFile)) {
 			verbose && console.log('no config', configFile);
@@ -78,16 +79,11 @@ export async function remove(name : string, {dev = false, verbose = false, dryRu
 			verbose && console.log(`Ignored transitive dependency ${depId} (other deps depend on it)`);
 			continue;
 		}
-		let pkgDir;
-		if (dep.repo) {
-			pkgDir = formatGithubDir(dep.name, dep.repo);
-		}
-		else if (dep.version) {
-			pkgDir = formatDir(dep.name, dep.version);
-		}
-		if (pkgDir && fs.existsSync(pkgDir)) {
-			dryRun || deleteSync([`${pkgDir}`], {force: true});
-			verbose && console.log(`Removed local cache ${pkgDir}`);
+		let cacheName = getDepCacheName(dep.name, dep.version || dep.repo || '');
+		let localCacheDir = path.join(getRootDir(), '.mops', cacheName);
+		if (localCacheDir && fs.existsSync(localCacheDir)) {
+			dryRun || deleteSync([localCacheDir], {force: true});
+			verbose && console.log(`Removed local cache ${localCacheDir}`);
 		}
 	}
 
@@ -100,6 +96,7 @@ export async function remove(name : string, {dev = false, verbose = false, dryRu
 	}
 	dryRun || writeConfig(config);
 
+	await syncLocalCache();
 	await checkIntegrity(lock);
 
 	console.log(chalk.green('Package removed ') + `${name} = "${version}"`);

package/commands/search.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import asTable from 'as-table';
 import chalk from 'chalk';
 import {mainActor} from '../api/actors.js';

package/commands/self.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import child_process, {execSync} from 'node:child_process';
 import chalk from 'chalk';
 import {version, globalConfigDir} from '../mops.js';

package/commands/sources.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'node:fs';
 import {checkConfigFile, formatDir, formatGithubDir, getDependencyType, readConfig} from '../mops.js';

package/commands/sync.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import {execSync} from 'node:child_process';
 import {globSync} from 'glob';

package/commands/test/test.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import {spawn, ChildProcessWithoutNullStreams} from 'node:child_process';
 import path from 'node:path';
 import fs from 'node:fs';

package/commands/toolchain/index.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'node:fs';
 import os from 'node:os';
@@ -7,6 +8,7 @@ import prompts from 'prompts';
 import {createLogUpdate} from 'log-update';
 import {checkConfigFile, getClosestConfigFile, getRootDir, globalCacheDir, readConfig, writeConfig} from '../../mops.js';
 import {Tool} from '../../types.js';
+import {checkRequirements} from '../../check-requirements.js';
 import * as moc from './moc.js';
 import * as pocketIc from './pocket-ic.js';
 import * as wasmtime from './wasmtime.js';
@@ -243,6 +245,8 @@ async function use(tool : Tool, version ?: string) {
 	config.toolchain[tool] = version;
 	writeConfig(config);
 
+	await checkRequirements();
+
 	if (oldVersion === version) {
 		console.log((`${tool} ${version} is already installed`));
 	}
@@ -277,6 +281,10 @@ async function update(tool ?: Tool) {
 		config.toolchain[tool] = version;
 		writeConfig(config);
 
+		if (tool === 'moc') {
+			await checkRequirements();
+		}
+
 		if (oldVersion === version) {
 			console.log((`Latest ${tool} ${version} is already installed`));
 		}

package/commands/toolchain/moc.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'fs-extra';
 

package/commands/toolchain/pocket-ic.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'node:fs';
 

package/commands/toolchain/toolchain-utils.ts

@@ -1,4 +1,6 @@
+import process from 'node:process';
 import path from 'node:path';
+import {Buffer} from 'node:buffer';
 import {unzipSync} from 'node:zlib';
 import {chmodSync} from 'node:fs';
 import fs from 'fs-extra';

package/commands/toolchain/wasmtime.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'fs-extra';
 

package/commands/transfer-ownership.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import chalk from 'chalk';
 import {checkConfigFile, getIdentity, readConfig} from '../mops.js';
 import {mainActor} from '../api/actors.js';

package/commands/user.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import chalk from 'chalk';
 import {getIdentity} from '../mops.js';
 import {mainActor} from '../api/actors.js';

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

@@ -26,4 +26,4 @@ export interface anon_class_10_1 {
 }
 export interface _SERVICE extends anon_class_10_1 {}
 export declare const idlFactory: IDL.InterfaceFactory;
-export declare const init: ({ IDL }: { IDL: IDL }) => IDL.Type[];
+export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[];

package/declarations/bench/index.js

@@ -4,15 +4,6 @@ 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 ||
-  process.env.BENCH_CANISTER_ID;
-
 export const createActor = (canisterId, options = {}) => {
   const agent = options.agent || new HttpAgent({ ...options.agentOptions });
 

package/declarations/main/index.js

@@ -10,8 +10,7 @@ export { idlFactory } from "./main.did.js";
  * beginning in dfx 0.15.0
  */
 export const canisterId =
-  process.env.CANISTER_ID_MAIN ||
-  process.env.MAIN_CANISTER_ID;
+  process.env.CANISTER_ID_MAIN;
 
 export const createActor = (canisterId, options = {}) => {
   const agent = options.agent || new HttpAgent({ ...options.agentOptions });

package/declarations/main/main.did

@@ -132,6 +132,11 @@ type Response =
    streaming_strategy: opt StreamingStrategy;
    upgrade: opt bool;
  };
+type Requirement = 
+ record {
+   name: text;
+   value: text;
+ };
 type Request = 
  record {
    body: blob;
@@ -145,7 +150,7 @@ type PageCount = nat;
 type PackageVersion = text;
 type PackageSummary__1 = 
  record {
-   config: PackageConfigV2__1;
+   config: PackageConfigV3;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -157,7 +162,7 @@ type PackageSummary__1 =
 type PackageSummaryWithChanges__1 = 
  record {
    changes: PackageChanges;
-   config: PackageConfigV2__1;
+   config: PackageConfigV3;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -169,7 +174,7 @@ type PackageSummaryWithChanges__1 =
 type PackageSummaryWithChanges = 
  record {
    changes: PackageChanges;
-   config: PackageConfigV2__1;
+   config: PackageConfigV3;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -180,7 +185,7 @@ type PackageSummaryWithChanges =
  };
 type PackageSummary = 
  record {
-   config: PackageConfigV2__1;
+   config: PackageConfigV3;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -218,7 +223,7 @@ type PackageDetails =
  record {
    benchmarks: Benchmarks__1;
    changes: PackageChanges;
-   config: PackageConfigV2__1;
+   config: PackageConfigV3;
    dependents: vec PackageSummary__1;
    deps: vec PackageSummary__1;
    devDeps: vec PackageSummary__1;
@@ -234,7 +239,7 @@ type PackageDetails =
    testStats: TestStats__1;
    versionHistory: vec PackageSummaryWithChanges__1;
  };
-type PackageConfigV2__1 = 
+type PackageConfigV3_Publishing = 
  record {
    baseDir: text;
    dependencies: vec DependencyV2;
@@ -250,10 +255,11 @@ type PackageConfigV2__1 =
    name: PackageName__1;
    readme: text;
    repository: text;
+   requirements: opt vec Requirement;
    scripts: vec Script;
    version: text;
  };
-type PackageConfigV2 = 
+type PackageConfigV3 = 
  record {
    baseDir: text;
    dependencies: vec DependencyV2;
@@ -269,6 +275,7 @@ type PackageConfigV2 =
    name: PackageName__1;
    readme: text;
    repository: text;
+   requirements: vec Requirement;
    scripts: vec Script;
    version: text;
  };
@@ -341,7 +348,7 @@ type Main =
    search: (Text, opt nat, opt nat) -> (vec PackageSummary, PageCount) query;
    setUserProp: (text, text) -> (Result_1);
    startFileUpload: (PublishingId, Text, nat, blob) -> (Result_3);
-   startPublish: (PackageConfigV2) -> (Result_2);
+   startPublish: (PackageConfigV3_Publishing) -> (Result_2);
    transferOwnership: (PackageName, principal) -> (Result_1);
    transformRequest: (HttpTransformArg) -> (HttpResponse) query;
    uploadBenchmarks: (PublishingId, Benchmarks) -> (Result);