ic-mops 0.2.3 → 0.3.0

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 asTable from 'as-table';
 
 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]')
@@ -173,4 +178,42 @@ program
 		whoami();
 	});
 
+// search
+program
+	.command('search <text>')
+	.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('');
+	});
+
 program.parse();

package/commands/init.js

@@ -17,6 +17,7 @@ export async function init(name = '') {
 
 	let config = {};
 	let vesselConfig = {};
+	let vesselDeps;
 
 	const vesselFile = path.join(process.cwd(), 'vessel.dhall');
 
@@ -27,10 +28,10 @@ export async function init(name = '') {
 	}
 
 	if (vesselConfig.dependencies) {
-		config.dependencies = {};
+		vesselDeps = {};
 
 		for (const dep of (vesselConfig.dependencies || [])) {
-			config.dependencies[dep.name] = dep;
+			vesselDeps[dep.name] = dep;
 		}
 	}
 
@@ -43,10 +44,15 @@ export async function init(name = '') {
 			repository: '',
 		};
 
+		if (vesselDeps) {
+			config.dependencies = vesselDeps;
+		}
+
 		writeConfig(config);
 
-		if (Object.keys(config.dependencies || {}).length)
+		if (Object.keys(config.dependencies || {}).length) {
 			await installAll({verbose: true});
+		}
 	}
 
 	// project mode
@@ -62,8 +68,13 @@ export async function init(name = '') {
 		let actor = await mainActor();
 		let defaultPackages = await actor.getDefaultPackages(dfxVersion);
 
-		if (!config.dependencies)
+		if (!config.dependencies) {
 			config.dependencies = {};
+		}
+
+		if (vesselDeps) {
+			config.dependencies = vesselDeps;
+		}
 
 		defaultPackages.forEach(([name, version]) => {
 			config.dependencies[name] = {version};

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);
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.2.3",
+	"version": "0.3.0",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"

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) {