ic-mops 0.41.1 → 0.42.1

package/vessel.ts

@@ -1,14 +1,15 @@
+import process from 'node:process';
 import {existsSync, mkdirSync, createWriteStream, readFileSync, writeFileSync} from 'node:fs';
 import path from 'node:path';
+import {pipeline} from 'node:stream';
 import {deleteSync} from 'del';
 import {execaCommand} from 'execa';
 import chalk from 'chalk';
 import {createLogUpdate} from 'log-update';
 import got from 'got';
 import decompress from 'decompress';
-import {pipeline} from 'stream';
 import {formatGithubDir, parseGithubURL, progressBar} from './mops.js';
-import {addCache, copyCache, isCached} from './cache.js';
+import {getDepCacheDir, getGithubDepCacheName, isDepCached} from './cache.js';
 
 const dhallFileToJson = async (filePath : string, silent : boolean) => {
 	if (existsSync(filePath)) {
@@ -149,38 +150,31 @@ export const downloadFromGithub = async (repo : string, dest : string, onProgres
 };
 
 export const installFromGithub = async (name : string, repo : string, {verbose = false, dep = false, silent = false} = {}) => {
-	let {branch, commitHash} = parseGithubURL(repo);
 	let dir = formatGithubDir(name, repo);
-	let cacheName = `_github/${name}#${branch}` + (commitHash ? `@${commitHash}` : '');
+	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 (isCached(cacheName)) {
-		await copyCache(cacheName, dir);
-		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (global cache)`);
+	if (isDepCached(cacheName)) {
+		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (cache)`);
 	}
 	else {
-		mkdirSync(dir, {recursive: true});
-
 		let progress = (step : number, total : number) => {
 			silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} ${progressBar(step, total)}`);
 		};
 
-		progress(0, 2 * (1024 ** 2));
+		progress(0, 1024 * 500);
+
+		mkdirSync(cacheDir, {recursive: true});
 
 		try {
-			await downloadFromGithub(repo, dir, progress);
+			await downloadFromGithub(repo, cacheDir, progress);
 		}
 		catch (err) {
-			deleteSync([dir]);
+			deleteSync([cacheDir]);
 			process.exit(1);
 		}
-
-		// add to cache
-		await addCache(cacheName, dir);
 	}
 
 	if (verbose) {

package/commands/install-all.ts

@@ -1,58 +0,0 @@
-import chalk from 'chalk';
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import {createLogUpdate} from 'log-update';
-import {checkConfigFile, readConfig} from '../mops.js';
-import {install} from './install.js';
-import {installFromGithub} from '../vessel.js';
-import {notifyInstalls} from '../notify-installs.js';
-import {checkIntegrity} from '../integrity.js';
-import {installLocal} from './install-local.js';
-import {checkRequirements} from '../check-requirements.js';
-
-type InstallAllOptions = {
-	verbose ?: boolean;
-	silent ?: boolean;
-	lock ?: 'check' | 'update' | 'ignore';
-}
-
-export async function installAll({verbose = false, silent = false, lock} : InstallAllOptions = {}) {
-	if (!checkConfigFile()) {
-		return;
-	}
-
-	let config = readConfig();
-	let deps = Object.values(config.dependencies || {});
-	let devDeps = Object.values(config['dev-dependencies'] || {});
-	let allDeps = [...deps, ...devDeps];
-	let installedPackages = {};
-
-	for (let {name, repo, path, version} of allDeps) {
-		if (repo) {
-			await installFromGithub(name, repo, {verbose, silent});
-		}
-		else {
-			let res = await (path ? installLocal(name, path, {silent, verbose}) : install(name, version, {silent, verbose}));
-			if (res === false) {
-				return;
-			}
-			installedPackages = {...installedPackages, ...res};
-		}
-	}
-
-	let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
-
-	if (!silent && lock !== 'ignore') {
-		logUpdate('Checking integrity...');
-	}
-
-	await Promise.all([
-		notifyInstalls(Object.keys(installedPackages)),
-		checkIntegrity(lock),
-	]);
-
-	if (!silent) {
-		logUpdate.clear();
-		await checkRequirements();
-		console.log(chalk.green('Packages installed'));
-	}
-}

package/commands/install-local.ts

@@ -1,52 +0,0 @@
-import path from 'node:path';
-import {createLogUpdate} from 'log-update';
-import {checkConfigFile, getRootDir, readConfig} from '../mops.js';
-import {installFromGithub} from '../vessel.js';
-import {install} from './install.js';
-
-// skip install and just find non-local dependencies to install
-// pkgPath should be relative to the current root dir or absolute
-export async function installLocal(pkg : string, pkgPath = '', {verbose = false, silent = false} = {}) : Promise<Record<string, string> | false> {
-	if (!checkConfigFile()) {
-		return 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 ok = true;
-	let rootDir = getRootDir();
-	let dir = path.resolve(rootDir, pkgPath);
-	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, path.resolve(pkgPath, depPath), {silent, verbose}) : install(name, version, {silent, verbose}));
-			if (res) {
-				installedDeps = {...installedDeps, ...res};
-			}
-			else {
-				ok = false;
-			}
-		}
-	}
-
-	if (!ok) {
-		return false;
-	}
-	return installedDeps;
-}

package/commands/install.ts

@@ -1,126 +0,0 @@
-import path from 'node:path';
-import fs from 'node:fs';
-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> {
-	if (!checkConfigFile()) {
-		return false;
-	}
-	let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
-
-	// progress
-	let total = Infinity;
-	let step = 0;
-	let progress = () => {
-		step++;
-		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} ${progressBar(step, total)}`);
-	};
-	progress();
-
-	if (!version) {
-		let versionRes = await getHighestVersion(pkg);
-		if ('err' in versionRes) {
-			console.log(chalk.red('Error: ') + versionRes.err);
-			return false;
-		}
-		version = versionRes.ok;
-	}
-
-	let dir = formatDir(pkg, version);
-	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 (isCached(`${pkg}@${version}`)) {
-		await copyCache(`${pkg}@${version}`, dir);
-		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;
-		}
-
-		try {
-			let {storageId, fileIds} = await getPackageFilesInfo(pkg, version);
-
-			total = fileIds.length + 2;
-
-			let filesData = new Map;
-			let storage = await storageActor(storageId);
-
-			await parallel(threads, fileIds, async (fileId : string) => {
-				let {path, data} = await downloadFile(storage, fileId);
-				filesData.set(path, data);
-				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));
-			}
-		}
-		catch (err) {
-			console.error(chalk.red('Error: ') + err);
-			return false;
-		}
-
-		// add to cache
-		await addCache(`${pkg}@${version}`, dir);
-
-		progress();
-	}
-
-	if (verbose) {
-		silent || logUpdate.done();
-	}
-	else {
-		logUpdate.clear();
-	}
-
-	// 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;
-			}
-		}
-	}
-
-	if (!alreadyInstalled) {
-		installedDeps = {...installedDeps, [pkg]: version};
-	}
-
-	if (!ok) {
-		return false;
-	}
-	return installedDeps;
-}