ic-mops 0.42.0 → 0.42.1

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Mops CLI Changelog
 
 ## unreleased
+- Fix package requirements check from subdirectories
+- Fix local and global cache inconsistency
 
 ## 0.42.0
 - Package requirements support ([docs](https://docs.mops.one/mops.toml#requirements))

package/check-requirements.ts

@@ -2,7 +2,7 @@ import path from 'node:path';
 import {SemVer} from 'semver';
 import chalk from 'chalk';
 
-import {getDependencyType, readConfig} from './mops.js';
+import {getDependencyType, getRootDir, readConfig} from './mops.js';
 import {resolvePackages} from './resolve-packages.js';
 import {getMocVersion} from './helpers/get-moc-version.js';
 
@@ -18,12 +18,13 @@ export async function checkRequirements({verbose = false} = {}) {
 	let installedMoc = new SemVer(mocVersion);
 	let highestRequiredMoc = new SemVer('0.0.0');
 	let highestRequiredMocPkgId = '';
+	let rootDir = getRootDir();
 
 	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 depConfig = readConfig(path.join(rootDir, '.mops', pkgId, 'mops.toml'));
 			let moc = depConfig.requirements?.moc;
 
 			if (moc) {

package/cli.ts

@@ -110,8 +110,11 @@ program
 			await add(pkg, options);
 		}
 		else {
-			await installAll(options);
+			let ok = await installAll(options);
 			await toolchain.installAll(options);
+			if (!ok) {
+				process.exit(1);
+			}
 		}
 	});
 

package/commands/install/install-all.ts

@@ -15,9 +15,9 @@ type InstallAllOptions = {
 	threads ?: number;
 }
 
-export async function installAll({verbose = false, silent = false, threads, lock} : InstallAllOptions = {}) {
+export async function installAll({verbose = false, silent = false, threads, lock} : InstallAllOptions = {}) : Promise<boolean> {
 	if (!checkConfigFile()) {
-		return;
+		return false;
 	}
 
 	let config = readConfig();
@@ -25,9 +25,9 @@ export async function installAll({verbose = false, silent = false, threads, lock
 	let devDeps = Object.values(config['dev-dependencies'] || {});
 	let allDeps = [...deps, ...devDeps];
 
-	let res = await installDeps(allDeps, {silent, verbose, threads});
-	if (!res) {
-		return;
+	let ok = await installDeps(allDeps, {silent, verbose, threads});
+	if (!ok) {
+		return false;
 	}
 
 	let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
@@ -48,4 +48,6 @@ export async function installAll({verbose = false, silent = false, threads, lock
 		await checkRequirements();
 		console.log(chalk.green('Packages installed'));
 	}
+
+	return true;
 }

package/commands/install/install-dep.ts

@@ -13,10 +13,10 @@ type InstallDepOptions = {
 
 // install dependency
 // returns false if failed
-export async function installDep(dep : Dependency, {verbose, silent, threads} : InstallDepOptions = {}, parentPkgPath ?: string) : Promise<Record<string, string> | false> {
+export async function installDep(dep : Dependency, {verbose, silent, threads} : InstallDepOptions = {}, parentPkgPath ?: string) : Promise<boolean> {
 	if (dep.repo) {
 		await installFromGithub(dep.name, dep.repo, {silent, verbose});
-		return {};
+		return true;
 	}
 	else if (dep.path) {
 		let depPath = dep.path;
@@ -30,5 +30,5 @@ export async function installDep(dep : Dependency, {verbose, silent, threads} :
 		return installMopsDep(dep.name, dep.version, {silent, verbose, threads});
 	}
 
-	return {};
+	return true;
 }

package/commands/install/install-deps.ts

@@ -10,22 +10,15 @@ type InstallDepsOptions = {
 // 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 = {};
+export async function installDeps(deps : Dependency[], {verbose, silent, threads} : InstallDepsOptions = {}, parentPkgPath ?: string) : Promise<boolean> {
 	let ok = true;
+
 	for (const dep of deps) {
 		let res = await installDep(dep, {verbose, silent, threads}, parentPkgPath);
-		if (res) {
-			installedDeps = {...installedDeps, ...res};
-		}
-		else {
+		if (!res) {
 			ok = false;
 		}
 	}
 
-	if (!ok) {
-		return false;
-	}
-
-	return installedDeps;
+	return ok;
 }

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

@@ -11,7 +11,7 @@ type InstallLocalDepOptions = {
 
 // 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> {
+export async function installLocalDep(pkg : string, pkgPath = '', {verbose, silent} : InstallLocalDepOptions = {}) : Promise<boolean> {
 	if (!silent) {
 		let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
 		logUpdate(`Local dependency ${pkg} = "${pkgPath}"`);

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

@@ -5,7 +5,7 @@ import {Buffer} from 'node:buffer';
 import {createLogUpdate} from 'log-update';
 import chalk from 'chalk';
 import {deleteSync} from 'del';
-import {checkConfigFile, formatDir, progressBar, readConfig} from '../../mops.js';
+import {checkConfigFile, progressBar, readConfig} from '../../mops.js';
 import {getHighestVersion} from '../../api/getHighestVersion.js';
 import {storageActor} from '../../api/actors.js';
 import {parallel} from '../../parallel.js';
@@ -20,7 +20,7 @@ type InstallMopsDepOptions = {
 	threads ?: number;
 };
 
-export async function installMopsDep(pkg : string, version = '', {verbose, silent, dep, threads} : InstallMopsDepOptions = {}) : Promise<Record<string, string> | false> {
+export async function installMopsDep(pkg : string, version = '', {verbose, silent, dep, threads} : InstallMopsDepOptions = {}) : Promise<boolean> {
 	threads = threads || 12;
 
 	if (!checkConfigFile()) {
@@ -46,19 +46,12 @@ export async function installMopsDep(pkg : string, version = '', {verbose, silen
 		version = versionRes.ok;
 	}
 
-	let dir = formatDir(pkg, version);
 	let cacheName = getMopsDepCacheName(pkg, version);
 	let cacheDir = getDepCacheDir(cacheName);
-	let alreadyInstalled = false;
 
-	// already installed
-	if (fs.existsSync(dir)) {
-		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (local cache)`);
-		alreadyInstalled = true;
-	}
-	// copy from cache
-	else if (isDepCached(cacheName)) {
-		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (global cache)`);
+	// global cache hit
+	if (isDepCached(cacheName)) {
+		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (cache)`);
 	}
 	// download
 	else {
@@ -81,18 +74,26 @@ export async function installMopsDep(pkg : string, version = '', {verbose, silen
 				progress();
 			});
 
+			let onSigInt = () => {
+				deleteSync([cacheDir], {force: true});
+				process.exit();
+			};
+			process.on('SIGINT', onSigInt);
+
 			// 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));
-				}
+				await Promise.all(Array.from(filesData.entries()).map(async ([filePath, data]) => {
+					await fs.promises.mkdir(path.join(cacheDir, path.dirname(filePath)), {recursive: true});
+					await fs.promises.writeFile(path.join(cacheDir, filePath), Buffer.from(data));
+				}));
 			}
 			catch (err) {
 				console.error(chalk.red('Error: ') + err);
 				deleteSync([cacheDir], {force: true});
 				return false;
 			}
+
+			process.off('SIGINT', onSigInt);
 		}
 		catch (err) {
 			console.error(chalk.red('Error: ') + err);
@@ -116,11 +117,6 @@ export async function installMopsDep(pkg : string, version = '', {verbose, silen
 	if (!res) {
 		return false;
 	}
-	let installedDeps = res;
 
-	// add self to installed deps
-	if (!alreadyInstalled) {
-		installedDeps = {...installedDeps, [pkg]: version};
-	}
-	return installedDeps;
+	return true;
 }

package/dist/check-requirements.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { SemVer } from 'semver';
 import chalk from 'chalk';
-import { getDependencyType, readConfig } from './mops.js';
+import { getDependencyType, getRootDir, readConfig } from './mops.js';
 import { resolvePackages } from './resolve-packages.js';
 import { getMocVersion } from './helpers/get-moc-version.js';
 export async function checkRequirements({ verbose = false } = {}) {
@@ -16,11 +16,12 @@ export async function checkRequirements({ verbose = false } = {}) {
     let installedMoc = new SemVer(mocVersion);
     let highestRequiredMoc = new SemVer('0.0.0');
     let highestRequiredMocPkgId = '';
+    let rootDir = getRootDir();
     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 depConfig = readConfig(path.join(rootDir, '.mops', pkgId, 'mops.toml'));
             let moc = depConfig.requirements?.moc;
             if (moc) {
                 let requiredMoc = new SemVer(moc);

package/dist/cli.js

@@ -91,8 +91,11 @@ program
         await add(pkg, options);
     }
     else {
-        await installAll(options);
+        let ok = await installAll(options);
         await toolchain.installAll(options);
+        if (!ok) {
+            process.exit(1);
+        }
     }
 });
 // publish

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

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

package/dist/commands/install/install-all.js

@@ -9,15 +9,15 @@ import { syncLocalCache } from './sync-local-cache.js';
 import { notifyInstalls } from '../../notify-installs.js';
 export async function installAll({ verbose = false, silent = false, threads, lock } = {}) {
     if (!checkConfigFile()) {
-        return;
+        return false;
     }
     let config = readConfig();
     let deps = Object.values(config.dependencies || {});
     let devDeps = Object.values(config['dev-dependencies'] || {});
     let allDeps = [...deps, ...devDeps];
-    let res = await installDeps(allDeps, { silent, verbose, threads });
-    if (!res) {
-        return;
+    let ok = await installDeps(allDeps, { silent, verbose, threads });
+    if (!ok) {
+        return false;
     }
     let logUpdate = createLogUpdate(process.stdout, { showCursor: true });
     if (!silent && lock !== 'ignore') {
@@ -33,4 +33,5 @@ export async function installAll({ verbose = false, silent = false, threads, loc
         await checkRequirements();
         console.log(chalk.green('Packages installed'));
     }
+    return true;
 }

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

@@ -4,5 +4,5 @@ type InstallDepOptions = {
     silent?: boolean;
     threads?: number;
 };
-export declare function installDep(dep: Dependency, { verbose, silent, threads }?: InstallDepOptions, parentPkgPath?: string): Promise<Record<string, string> | false>;
+export declare function installDep(dep: Dependency, { verbose, silent, threads }?: InstallDepOptions, parentPkgPath?: string): Promise<boolean>;
 export {};

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

@@ -8,7 +8,7 @@ import { getRootDir } from '../../mops.js';
 export async function installDep(dep, { verbose, silent, threads } = {}, parentPkgPath) {
     if (dep.repo) {
         await installFromGithub(dep.name, dep.repo, { silent, verbose });
-        return {};
+        return true;
     }
     else if (dep.path) {
         let depPath = dep.path;
@@ -21,5 +21,5 @@ export async function installDep(dep, { verbose, silent, threads } = {}, parentP
     else if (dep.version) {
         return installMopsDep(dep.name, dep.version, { silent, verbose, threads });
     }
-    return {};
+    return true;
 }

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

@@ -4,5 +4,5 @@ type InstallDepsOptions = {
     silent?: boolean;
     threads?: number;
 };
-export declare function installDeps(deps: Dependency[], { verbose, silent, threads }?: InstallDepsOptions, parentPkgPath?: string): Promise<Record<string, string> | false>;
+export declare function installDeps(deps: Dependency[], { verbose, silent, threads }?: InstallDepsOptions, parentPkgPath?: string): Promise<boolean>;
 export {};

package/dist/commands/install/install-deps.js

@@ -3,19 +3,12 @@ import { installDep } from './install-dep.js';
 // returns actual installed dependencies
 // returns false if failed
 export async function installDeps(deps, { verbose, silent, threads } = {}, parentPkgPath) {
-    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 {
+        if (!res) {
             ok = false;
         }
     }
-    if (!ok) {
-        return false;
-    }
-    return installedDeps;
+    return ok;
 }

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

@@ -2,5 +2,5 @@ type InstallLocalDepOptions = {
     verbose?: boolean;
     silent?: boolean;
 };
-export declare function installLocalDep(pkg: string, pkgPath?: string, { verbose, silent }?: InstallLocalDepOptions): Promise<Record<string, string> | false>;
+export declare function installLocalDep(pkg: string, pkgPath?: string, { verbose, silent }?: InstallLocalDepOptions): Promise<boolean>;
 export {};

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

@@ -4,5 +4,5 @@ type InstallMopsDepOptions = {
     dep?: boolean;
     threads?: number;
 };
-export declare function installMopsDep(pkg: string, version?: string, { verbose, silent, dep, threads }?: InstallMopsDepOptions): Promise<Record<string, string> | false>;
+export declare function installMopsDep(pkg: string, version?: string, { verbose, silent, dep, threads }?: InstallMopsDepOptions): Promise<boolean>;
 export {};

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

@@ -5,7 +5,7 @@ import { Buffer } from 'node:buffer';
 import { createLogUpdate } from 'log-update';
 import chalk from 'chalk';
 import { deleteSync } from 'del';
-import { checkConfigFile, formatDir, progressBar, readConfig } from '../../mops.js';
+import { checkConfigFile, progressBar, readConfig } from '../../mops.js';
 import { getHighestVersion } from '../../api/getHighestVersion.js';
 import { storageActor } from '../../api/actors.js';
 import { parallel } from '../../parallel.js';
@@ -34,18 +34,11 @@ export async function installMopsDep(pkg, version = '', { verbose, silent, dep,
         }
         version = versionRes.ok;
     }
-    let dir = formatDir(pkg, version);
     let cacheName = getMopsDepCacheName(pkg, version);
     let cacheDir = getDepCacheDir(cacheName);
-    let alreadyInstalled = false;
-    // already installed
-    if (fs.existsSync(dir)) {
-        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (local cache)`);
-        alreadyInstalled = true;
-    }
-    // copy from cache
-    else if (isDepCached(cacheName)) {
-        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (global cache)`);
+    // global cache hit
+    if (isDepCached(cacheName)) {
+        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (cache)`);
     }
     // download
     else {
@@ -63,18 +56,24 @@ export async function installMopsDep(pkg, version = '', { verbose, silent, dep,
                 filesData.set(path, data);
                 progress();
             });
+            let onSigInt = () => {
+                deleteSync([cacheDir], { force: true });
+                process.exit();
+            };
+            process.on('SIGINT', onSigInt);
             // 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));
-                }
+                await Promise.all(Array.from(filesData.entries()).map(async ([filePath, data]) => {
+                    await fs.promises.mkdir(path.join(cacheDir, path.dirname(filePath)), { recursive: true });
+                    await fs.promises.writeFile(path.join(cacheDir, filePath), Buffer.from(data));
+                }));
             }
             catch (err) {
                 console.error(chalk.red('Error: ') + err);
                 deleteSync([cacheDir], { force: true });
                 return false;
             }
+            process.off('SIGINT', onSigInt);
         }
         catch (err) {
             console.error(chalk.red('Error: ') + err);
@@ -94,10 +93,5 @@ export async function installMopsDep(pkg, version = '', { verbose, silent, dep,
     if (!res) {
         return false;
     }
-    let installedDeps = res;
-    // add self to installed deps
-    if (!alreadyInstalled) {
-        installedDeps = { ...installedDeps, [pkg]: version };
-    }
-    return installedDeps;
+    return true;
 }

package/dist/package.json

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

package/dist/vessel.js

@@ -121,11 +121,8 @@ export const installFromGithub = async (name, repo, { verbose = false, dep = fal
     let cacheName = getGithubDepCacheName(name, repo);
     let cacheDir = getDepCacheDir(cacheName);
     let logUpdate = createLogUpdate(process.stdout, { showCursor: true });
-    if (existsSync(dir)) {
-        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (local cache)`);
-    }
-    else if (isDepCached(cacheName)) {
-        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (global cache)`);
+    if (isDepCached(cacheName)) {
+        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (cache)`);
     }
     else {
         let progress = (step, total) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.42.0",
+  "version": "0.42.1",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",

package/vessel.ts

@@ -156,14 +156,10 @@ export const installFromGithub = async (name : string, repo : string, {verbose =
 
 	let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
 
-	if (existsSync(dir)) {
-		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (local cache)`);
-	}
-	else if (isDepCached(cacheName)) {
-		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (global cache)`);
+	if (isDepCached(cacheName)) {
+		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (cache)`);
 	}
 	else {
-
 		let progress = (step : number, total : number) => {
 			silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} ${progressBar(step, total)}`);
 		};