ic-mops 0.2.4 → 0.3.1

package/cli.js

@@ -10,17 +10,22 @@ 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} from './mops.js';
+import {checkApiCompatibility, getHighestVersion, getNetwork, parseGithubURL, readConfig, setNetwork, writeConfig, apiVersion, mainActor} 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 {search} from './commands/search.js';
 
 let cwd = process.cwd();
 let configFile = path.join(cwd, 'mops.toml');
 
 program.name('mops');
 
+// --version
+let packageJson = JSON.parse(fs.readFileSync(new URL('package.json', import.meta.url)));
+program.version(`CLI ${packageJson.version}\nAPI ${apiVersion}`, '-v --version');
+
 // init
 program
 	.command('init [name]')
@@ -73,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,
 			};
 
 		}
@@ -107,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;
@@ -173,4 +187,13 @@ program
 		whoami();
 	});
 
+// search
+program
+	.command('search <text>')
+	.alias('find')
+	.description('Search for packages')
+	.action(async (text) => {
+		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),
+			DESCRIPTION: ellipsis(item.config.description, process.stdout.columns - 40 - maxNameLength),
+			VERSION: item.config.version,
+			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/declarations/main/index.js

@@ -2,7 +2,7 @@ import { Actor, HttpAgent } from "@dfinity/agent";
 
 // Imports and re-exports candid interface
 import { idlFactory } from './main.did.js';
-export { idlFactory} from './main.did.js';
+export { idlFactory } from './main.did.js';
 // CANISTER_ID is replaced by webpack based on node environment
 export const canisterId = process.env.MAIN_CANISTER_ID;
 
@@ -18,7 +18,7 @@ export const createActor = (canisterId, options = {}) => {
 
 See https://internetcomputer.org/docs/current/developer-docs/updates/release-notes/ for migration instructions`);
   const agent = options.agent || new HttpAgent({ ...options.agentOptions });
-
+  
   // Fetch root key for certificate validation during development
   if (process.env.DFX_NETWORK !== "ic") {
     agent.fetchRootKey().catch(err => {
@@ -34,7 +34,7 @@ See https://internetcomputer.org/docs/current/developer-docs/updates/release-not
     ...(options ? options.actorOptions : {}),
   });
 };
-
+  
 /**
  * A ready-to-use agent for the main canister
  * @type {import("@dfinity/agent").ActorSubclass<import("./main.did.js")._SERVICE>}

package/mops.js

@@ -13,7 +13,7 @@ import {decodeFile} from './pem.js';
 global.fetch = fetch;
 
 // (!) make changes in pair with backend
-let apiVersion = '1.2';
+export let apiVersion = '1.2';
 
 let networkFile = new URL('./network.txt', import.meta.url);
 
@@ -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.2.4",
+	"version": "0.3.1",
 	"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

@@ -32,10 +32,7 @@ const dhallFileToJson = async (filePath) => {
 	return null;
 };
 
-export const readVesselConfig = async (
-	configFile,
-	{cache = true} = {cache: true}
-) => {
+export const readVesselConfig = async (configFile, {cache = true} = {cache: true}) => {
 	const cachedFile = (configFile || process.cwd()) + '/vessel.json';
 
 	if (existsSync(cachedFile)) {
@@ -48,7 +45,9 @@ export const readVesselConfig = async (
 		dhallFileToJson((configFile || process.cwd()) + '/package-set.dhall')
 	]);
 
-	if (!vessel || !packageSetArray) return null;
+	if (!vessel || !packageSetArray) {
+		return null;
+	}
 
 	let repos = {};
 	for (const {name, repo, version} of packageSetArray) {
@@ -131,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);
@@ -148,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);
 		});