ic-mops 0.19.1 → 0.20.1

package/{vessel.js → vessel.ts}

@@ -1,16 +1,16 @@
-import {existsSync, mkdirSync, createWriteStream, readFileSync, writeFileSync} from 'fs';
-import del from 'del';
+import {existsSync, mkdirSync, createWriteStream, readFileSync, writeFileSync} from 'node:fs';
+import path from 'node:path';
+import {deleteSync} from 'del';
 import {execaCommand} from 'execa';
 import chalk from 'chalk';
 import logUpdate from 'log-update';
-import {formatGithubDir, parseGithubURL, progressBar} from './mops.js';
-import path from 'path';
 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';
 
-const dhallFileToJson = async (filePath) => {
+const dhallFileToJson = async (filePath: string) => {
 	if (existsSync(filePath)) {
 		let cwd = new URL(path.dirname(import.meta.url)).pathname;
 		let res;
@@ -33,34 +33,46 @@ const dhallFileToJson = async (filePath) => {
 	return null;
 };
 
-export const readVesselConfig = async (configFile, {cache = true} = {cache: true}) => {
-	const cachedFile = (configFile || process.cwd()) + '/vessel.json';
+export type VesselConfig = {
+	dependencies: VesselDependencies;
+	'dev-dependencies': VesselDependencies;
+};
+
+export type VesselDependencies = Array<{
+	name: string;
+	version?: string; // mops package
+	repo?: string; // github package
+	path?: string; // local package
+}>;
+
+export const readVesselConfig = async (dir: string, {cache = true} = {}): Promise<VesselConfig | null> => {
+	const cachedFile = (dir || process.cwd()) + '/vessel.json';
 
 	if (existsSync(cachedFile)) {
-		let cachedConfig = readFileSync(cachedFile);
+		let cachedConfig = readFileSync(cachedFile).toString();
 		return JSON.parse(cachedConfig);
 	}
 
 	const [vessel, packageSetArray] = await Promise.all([
-		dhallFileToJson((configFile || process.cwd()) + '/vessel.dhall'),
-		dhallFileToJson((configFile || process.cwd()) + '/package-set.dhall')
+		dhallFileToJson((dir || process.cwd()) + '/vessel.dhall'),
+		dhallFileToJson((dir || process.cwd()) + '/package-set.dhall')
 	]);
 
 	if (!vessel || !packageSetArray) {
 		return null;
 	}
 
-	let repos = {};
+	let repos: Record<string, string> = {};
 	for (const {name, repo, version} of packageSetArray) {
 		const {org, gitName} = parseGithubURL(repo);
 		repos[name] = `https://github.com/${org}/${gitName}#${version}`;
 	}
 
-	let config = {
-		compiler: vessel.compiler,
-		dependencies: vessel.dependencies.map((name) => {
+	let config: VesselConfig = {
+		dependencies: vessel.dependencies.map((name: string) => {
 			return {name, repo: repos[name], version: ''};
 		}),
+		'dev-dependencies': [],
 	};
 
 	if (cache === true) {
@@ -70,7 +82,7 @@ export const readVesselConfig = async (configFile, {cache = true} = {cache: true
 	return config;
 };
 
-export const downloadFromGithub = async (repo, dest, onProgress = null) => {
+export const downloadFromGithub = async (repo: string, dest: string, onProgress: any) => {
 	const {branch, org, gitName} = parseGithubURL(repo);
 
 	const zipFile = `https://github.com/${org}/${gitName}/archive/${branch}.zip`;
@@ -103,7 +115,7 @@ export const downloadFromGithub = async (repo, dest, onProgress = null) => {
 
 				pipeline(readStream, createWriteStream(tmpFile), (err) => {
 					if (err) {
-						del.sync([tmpDir]);
+						deleteSync([tmpDir]);
 						reject(err);
 					}
 					else {
@@ -115,17 +127,17 @@ export const downloadFromGithub = async (repo, dest, onProgress = null) => {
 							},
 						};
 						decompress(tmpFile, dest, options).then((unzippedFiles) => {
-							del.sync([tmpDir]);
+							deleteSync([tmpDir]);
 							resolve(unzippedFiles);
 						}).catch(err => {
-							del.sync([tmpDir]);
+							deleteSync([tmpDir]);
 							reject(err);
 						});
 					}
 				});
 			}
 			catch (err) {
-				del.sync([tmpDir]);
+				deleteSync([tmpDir]);
 				reject(err);
 			}
 		});
@@ -134,9 +146,7 @@ export const downloadFromGithub = async (repo, dest, onProgress = null) => {
 	return promise;
 };
 
-export const installFromGithub = async (name, repo, options = {}) => {
-	const {verbose, dep, silent} = options;
-
+export const installFromGithub = async (name: string, repo: string, {verbose = false, dep = false, silent = false} = {}) => {
 	const {branch} = parseGithubURL(repo);
 	const dir = formatGithubDir(name, repo);
 	const cacheName = `github_${name}@${branch}`;
@@ -151,7 +161,7 @@ export const installFromGithub = async (name, repo, options = {}) => {
 	else {
 		mkdirSync(dir, {recursive: true});
 
-		let progress = (step, total) => {
+		let progress = (step: number, total: number) => {
 			silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${name}@${branch} ${progressBar(step, total)}`);
 		};
 
@@ -161,7 +171,7 @@ export const installFromGithub = async (name, repo, options = {}) => {
 			await downloadFromGithub(repo, dir, progress);
 		}
 		catch (err) {
-			del.sync([dir]);
+			deleteSync([dir]);
 			throw err;
 		}
 
@@ -177,7 +187,9 @@ export const installFromGithub = async (name, repo, options = {}) => {
 
 	if (config) {
 		for (const {name, repo} of config.dependencies) {
-			await installFromGithub(name, repo, {verbose, silent, dep: true});
+			if (repo) {
+				await installFromGithub(name, repo, {verbose, silent, dep: true});
+			}
 		}
 	}
 };

package/commands/self-update.js

@@ -1,6 +0,0 @@
-import child_process from 'child_process';
-
-export function selfUpdate({detached = false} = {}) {
-	console.log('Updating mops CLI...');
-	child_process.execSync('npm i ic-mops -g', {stdio: 'inherit', detached});
-}