ic-mops 0.3.0 → 0.3.2

package/cli.js

@@ -10,12 +10,12 @@ import {install} from './commands/install.js';
 import {publish} from './commands/publish.js';
 import {importPem} from './commands/import-identity.js';
 import {sources} from './commands/sources.js';
-import {checkApiCompatibility, getHighestVersion, getNetwork, parseGithubURL, readConfig, setNetwork, writeConfig, apiVersion, mainActor} from './mops.js';
+import {checkApiCompatibility, getHighestVersion, getNetwork, parseGithubURL, readConfig, setNetwork, writeConfig, apiVersion} from './mops.js';
 import {whoami} from './commands/whoami.js';
 import {installAll} from './commands/install-all.js';
 import logUpdate from 'log-update';
 import {installFromGithub} from './vessel.js';
-import asTable from 'as-table';
+import {search} from './commands/search.js';
 
 let cwd = process.cwd();
 let configFile = path.join(cwd, 'mops.toml');
@@ -78,19 +78,25 @@ program
 			};
 
 			existingPkg = config.dependencies[pkgDetails.name];
-
 		}
 		else if (!existingPkg || !existingPkg.repo) {
-			let versionRes = await getHighestVersion(pkg);
-			if (versionRes.err) {
-				console.log(chalk.red('Error: ') + versionRes.err);
-				return;
+			let ver;
+			if (pkg.includes('@')) {
+				[pkg, ver] = pkg.split('@');
+			}
+			else {
+				let versionRes = await getHighestVersion(pkg);
+				if (versionRes.err) {
+					console.log(chalk.red('Error: ') + versionRes.err);
+					return;
+				}
+				ver = versionRes.ok;
 			}
 
 			pkgDetails = {
 				name: pkg,
 				repo: '',
-				version:  versionRes.ok
+				version:  ver,
 			};
 
 		}
@@ -112,7 +118,10 @@ program
 			await installFromGithub(name, repo, {verbose: options.verbose});
 		}
 		else {
-			await install(name, version, {verbose: options.verbose});
+			let ok = await install(name, version, {verbose: options.verbose});
+			if (!ok) {
+				return;
+			}
 		}
 
 		config.dependencies[name] = pkgDetails;
@@ -184,36 +193,7 @@ program
 	.alias('find')
 	.description('Search for packages')
 	.action(async (text) => {
-		let actor = await mainActor();
-		let res = await actor.search(text);
-
-		let ellipsis = (text, max) => {
-			if (text.length <= max) {
-				return text;
-			}
-			else {
-				return text.slice(0, max) + '…';
-			}
-		};
-
-		let maxNameLength = Math.max(...res.map(a => a.config.name.length));
-
-		let table = res.map((item) => {
-			return {
-				NAME: chalk.bold(item.config.name),
-				VERSION: item.config.version,
-				DESCRIPTION: ellipsis(item.config.description, process.stdout.columns - 40 - maxNameLength),
-				UPDATED: new Date(Number(item.publication.time / 1_000_000n)).toISOString().split('T')[0],
-			};
-		});
-
-		console.log('');
-		console.log(asTable.configure({
-			delimiter: chalk.gray(' | '),
-			dash: chalk.gray('─'),
-			title: t => chalk.gray.bold(t),
-		})(table));
-		console.log('');
+		await search(text);
 	});
 
 program.parse();

package/commands/install.js

@@ -8,14 +8,14 @@ import {installFromGithub} from '../vessel.js';
 
 export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	if (!checkConfigFile()) {
-		return;
+		return false;
 	}
 
 	if (!version) {
 		let versionRes = await getHighestVersion(pkg);
 		if (versionRes.err) {
 			console.log(chalk.red('Error: ') + versionRes.err);
-			return;
+			return false;
 		}
 		version = versionRes.ok;
 	}
@@ -29,26 +29,24 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	}
 	// no cache
 	else {
-		fs.mkdirSync(dir, {recursive: true});
-
-		actor.notifyInstall(pkg, version);
-
 		let packageDetailsRes = await actor.getPackageDetails(pkg, version);
 		if (packageDetailsRes.err) {
 			console.log(chalk.red('Error: ') + packageDetailsRes.err);
-			return;
+			return false;
 		}
 		let packageDetails = packageDetailsRes.ok;
 
 		let filesIdsRes = await actor.getFileIds(pkg, version);
 		if (filesIdsRes.err) {
 			console.log(chalk.red('Error: ') + filesIdsRes.err);
-			return;
+			return false;
 		}
 		let filesIds = filesIdsRes.ok;
 
 		let storage = await storageActor(packageDetails.publication.storage);
 
+		actor.notifyInstall(pkg, version);
+
 		// progress
 		let total = filesIds.length + 1;
 		let step = 0;
@@ -58,6 +56,7 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 		};
 
 		// download files
+		fs.mkdirSync(dir, {recursive: true});
 		progress();
 		await parallel(8, filesIds, async (fileId) => {
 			let fileMetaRes = await storage.getFileMeta(fileId);
@@ -89,13 +88,19 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	}
 
 	// install dependencies
+	let ok = true;
 	let config = readConfig(path.join(dir, 'mops.toml'));
 	for (const {name, repo, version} of Object.values(config.dependencies || {})) {
 		if (repo) {
 			await installFromGithub(name, repo, {verbose});
 		}
 		else {
-			await install(name, version, {verbose});
+			let res = await install(name, version, {verbose});
+			if (!res) {
+				ok = false;
+			}
 		}
 	}
+
+	return ok;
 }

package/commands/search.js

@@ -0,0 +1,41 @@
+import asTable from 'as-table';
+import chalk from 'chalk';
+import {mainActor} from '../mops.js';
+
+export async function search(text) {
+	let actor = await mainActor();
+	let res = await actor.search(text);
+
+	if (!res.length) {
+		console.log('Packages not found');
+		return;
+	}
+
+	let ellipsis = (text, max) => {
+		if (text.length <= max) {
+			return text;
+		}
+		else {
+			return text.slice(0, max) + '…';
+		}
+	};
+
+	let maxNameLength = Math.max(...res.map(a => a.config.name.length));
+
+	let table = res.map((item) => {
+		return {
+			NAME: chalk.bold(item.config.name),
+			VERSION: item.config.version,
+			DESCRIPTION: ellipsis(item.config.description, process.stdout.columns - 40 - maxNameLength),
+			UPDATED: new Date(Number(item.publication.time / 1_000_000n)).toISOString().split('T')[0],
+		};
+	});
+
+	console.log('');
+	console.log(asTable.configure({
+		delimiter: chalk.gray(' | '),
+		dash: chalk.gray('─'),
+		title: t => chalk.gray.bold(t),
+	})(table));
+	console.log('');
+}

package/mops.js

@@ -126,7 +126,7 @@ export function readConfig(configFile = path.join(process.cwd(), 'mops.toml')) {
 
 	const deps = toml.dependencies || {};
 
-	Object.entries(deps).forEach(([name, data])=>{
+	Object.entries(deps).forEach(([name, data]) => {
 		if (!data || typeof data !== 'string') {
 			throw Error(`Invalid dependency value ${name} = "${data}"`);
 		}
@@ -144,7 +144,7 @@ export function readConfig(configFile = path.join(process.cwd(), 'mops.toml')) {
 export function writeConfig(config, configFile = path.join(process.cwd(), 'mops.toml')) {
 	const deps = config.dependencies || {};
 
-	Object.entries(deps).forEach(([name, {repo, version}])=>{
+	Object.entries(deps).forEach(([name, {repo, version}]) => {
 		if (repo) {
 			deps[name] = repo;
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.3.0",
+	"version": "0.3.2",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"
@@ -16,6 +16,7 @@
 		"@dfinity/identity": "^0.11.0",
 		"@dfinity/principal": "^0.11.1",
 		"@iarna/toml": "^2.2.5",
+		"as-table": "^1.0.55",
 		"chalk": "^4.1.2",
 		"commander": "^9.2.0",
 		"decompress": "^4.2.1",

package/vessel.js

@@ -130,7 +130,7 @@ export const downloadFromGithub = async (repo, dest, onProgress = null) => {
 	return promise;
 };
 
-export const installFromGithub = async (name, repo, options = {})=>{
+export const installFromGithub = async (name, repo, options = {}) => {
 	const {verbose, dep, silent} = options;
 
 	const {branch} = parseGithubURL(repo);
@@ -147,7 +147,7 @@ export const installFromGithub = async (name, repo, options = {})=>{
 		};
 
 		progress(0, 2 * (1024 ** 2));
-		await downloadFromGithub(repo, dir, progress).catch((err)=> {
+		await downloadFromGithub(repo, dir, progress).catch((err) => {
 			del.sync([dir]);
 			console.log(chalk.red('Error: ') + err);
 		});