ic-mops 0.2.1 → 0.2.3

package/cli.js

@@ -14,7 +14,7 @@ import {checkApiCompatibility, getHighestVersion, getNetwork, parseGithubURL, re
 import {whoami} from './commands/whoami.js';
 import {installAll} from './commands/install-all.js';
 import logUpdate from 'log-update';
-import { installFromGithub } from './vessel.js';
+import {installFromGithub} from './vessel.js';
 
 let cwd = process.cwd();
 let configFile = path.join(cwd, 'mops.toml');
@@ -63,7 +63,7 @@ program
 		let pkgDetails;
 		let existingPkg = config.dependencies[pkg];
 
-		if (pkg.startsWith('https://github.com') || pkg.split('/') > 1){
+		if (pkg.startsWith('https://github.com') || pkg.split('/') > 1) {
 			const {org, gitName, branch} = parseGithubURL(pkg);
 
 			pkgDetails = {
@@ -74,7 +74,8 @@ program
 
 			existingPkg = config.dependencies[pkgDetails.name];
 
-		}else if (!existingPkg || !existingPkg.repo){
+		}
+		else if (!existingPkg || !existingPkg.repo) {
 			let versionRes = await getHighestVersion(pkg);
 			if (versionRes.err) {
 				console.log(chalk.red('Error: ') + versionRes.err);
@@ -87,23 +88,25 @@ program
 				version:  versionRes.ok
 			};
 
-		}else{
+		}
+		else {
 			options.silent || logUpdate(`Installing ${existingPkg.name}@${existingPkg.version} (cache) from Github`);
 			return;
 		}
 
 		const {name, repo, version} = pkgDetails;
 
-		if (repo){
+		if (repo) {
 			// pkg name conflict with an installed mops pkg
-			if (existingPkg && !existingPkg.repo){
+			if (existingPkg && !existingPkg.repo) {
 				console.log(chalk.red('Error: ') + `Conflicting Package Name '${name}`);
 				console.log('Consider entering the repo url and assigning a new name in the \'mops.toml\' file');
 				return;
 			}
 
 			await installFromGithub(name, repo, {verbose: options.verbose});
-		}else{
+		}
+		else {
 			await install(name, version, {verbose: options.verbose});
 		}
 

package/commands/init.js

@@ -3,7 +3,7 @@ import path from 'path';
 import fs from 'fs';
 import {checkApiCompatibility, mainActor, readDfxJson, writeConfig} from '../mops.js';
 import {installAll} from './install-all.js';
-import { readVesselConfig } from '../vessel.js';
+import {readVesselConfig} from '../vessel.js';
 
 export async function init(name = '') {
 	let configFile = path.join(process.cwd(), 'mops.toml');
@@ -20,16 +20,16 @@ export async function init(name = '') {
 
 	const vesselFile = path.join(process.cwd(), 'vessel.dhall');
 
-	if (fs.existsSync(vesselFile)){
+	if (fs.existsSync(vesselFile)) {
 		console.log('Reading vessel.dhall file');
-		const res = await readVesselConfig(process.cwd(), { cache: false });
+		const res = await readVesselConfig(process.cwd(), {cache: false});
 		vesselConfig = {...res};
 	}
 
-	if (vesselConfig.dependencies){
+	if (vesselConfig.dependencies) {
 		config.dependencies = {};
 
-		for (const dep of (vesselConfig.dependencies || [])){
+		for (const dep of (vesselConfig.dependencies || [])) {
 			config.dependencies[dep.name] = dep;
 		}
 	}

package/commands/install-all.js

@@ -13,9 +13,10 @@ export async function installAll({verbose} = {}) {
 	const deps = Object.values(config.dependencies || {});
 
 	for (let {name, repo, version} of deps) {
-		if (repo){
+		if (repo) {
 			await installFromGithub(name, repo, {verbose});
-		}else{
+		}
+		else {
 			await install(name, version, {verbose});
 		}
 	}

package/commands/install.js

@@ -4,7 +4,7 @@ import logUpdate from 'log-update';
 import {checkConfigFile, formatDir, getHighestVersion, mainActor, progressBar, readConfig, storageActor} from '../mops.js';
 import {parallel} from '../parallel.js';
 import chalk from 'chalk';
-import { installFromGithub } from '../vessel.js';
+import {installFromGithub} from '../vessel.js';
 
 export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	if (!checkConfigFile()) {
@@ -91,9 +91,10 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	// install dependencies
 	let config = readConfig(path.join(dir, 'mops.toml'));
 	for (const {name, repo, version} of Object.values(config.dependencies || {})) {
-		if (repo){
+		if (repo) {
 			await installFromGithub(name, repo, {verbose});
-		}else{
+		}
+		else {
 			await install(name, version, {verbose});
 		}
 	}

package/commands/sources.js

@@ -1,8 +1,8 @@
 import path from 'path';
 import fs from 'fs';
 import chalk from 'chalk';
-import {formatDir, formatGithubDir, getHighestVersion, parseGithubURL, readConfig} from '../mops.js';
-import { readVesselConfig } from '../vessel.js';
+import {formatDir, formatGithubDir, parseGithubURL, readConfig} from '../mops.js';
+import {readVesselConfig} from '../vessel.js';
 
 function rootDir(cwd = process.cwd()) {
 	let configFile = path.join(cwd, 'mops.toml');
@@ -47,11 +47,13 @@ export async function sources({verbose} = {}) {
 		const {branch: a} = parseGithubURL(repoA);
 		const {branch: b} = parseGithubURL(repoB);
 
-		if (gitVerRegex.test(a) && gitVerRegex.test(b)){
+		if (gitVerRegex.test(a) && gitVerRegex.test(b)) {
 			return compareVersions(a.substring(1) , b.substring(1));
-		}else if (!gitVerRegex.test(a)){
+		}
+		else if (!gitVerRegex.test(a)) {
 			return -1;
-		}else{
+		}
+		else {
 			return 1;
 		}
 	};
@@ -75,11 +77,11 @@ export async function sources({verbose} = {}) {
 
 			let nestedConfig;
 
-			if (repo){
+			if (repo) {
 				const dir = formatGithubDir(name, repo);
 				nestedConfig = await readVesselConfig(dir) || {};
 			}
-			else{
+			else {
 				const dir = formatDir(name, version) + '/mops.toml';
 				nestedConfig = readConfig(dir);
 			}
@@ -90,10 +92,11 @@ export async function sources({verbose} = {}) {
 				versions[name] = [];
 			}
 
-			if (repo){
+			if (repo) {
 				const {branch} = parseGithubURL(repo);
 				versions[name].push(branch);
-			}else{
+			}
+			else {
 				versions[name].push(version);
 			}
 		}
@@ -114,9 +117,10 @@ export async function sources({verbose} = {}) {
 	// sources
 	for (let [name, {repo, version}] of Object.entries(packages)) {
 		let pkgDir;
-		if (repo){
+		if (repo) {
 			pkgDir =  path.relative(process.cwd(), formatGithubDir(name, repo)) + '/src';
-		}else{
+		}
+		else {
 			pkgDir = path.relative(process.cwd(), formatDir(name, version)) + '/src';
 		}
 

package/commands/uninstall.js

@@ -2,7 +2,7 @@ import {checkConfigFile, readConfig} from '../mops.js';
 import fs from 'fs';
 import del from 'del';
 import chalk from 'chalk';
-import { formatDir, formatGithubDir } from '../mops.js';
+import {formatDir, formatGithubDir} from '../mops.js';
 
 export async function uninstall(pkg, version) {
 	if (!checkConfigFile()) {
@@ -14,7 +14,7 @@ export async function uninstall(pkg, version) {
 
 	const pkgDetails = config.dependencies[pkg];
 
-	if (!pkgDetails){
+	if (!pkgDetails) {
 		console.log(`No dependency to remove ${pkg} = "${version}"`);
 		return;
 	}
@@ -22,9 +22,10 @@ export async function uninstall(pkg, version) {
 	const {repo} = pkgDetails;
 	let pkgDir;
 
-	if (repo){
+	if (repo) {
 		pkgDir = formatGithubDir(pkg, repo);
-	}else{
+	}
+	else {
 		pkgDir = formatDir(pkg, 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/declarations/main/main.did

@@ -124,8 +124,8 @@ service : {
                                  StorageId;
                                  StorageStats;
                                }) query;
-  getTotalDownloads: () -> (nat);
-  getTotalPackages: () -> (nat);
+  getTotalDownloads: () -> (nat) query;
+  getTotalPackages: () -> (nat) query;
   notifyInstall: (PackageName__1, Ver) -> () oneway;
   search: (Text) -> (vec PackageDetails) query;
   startFileUpload: (PublishingId, Text, nat, blob) -> (Result_2);

package/declarations/main/main.did.js

@@ -105,8 +105,8 @@ export const idlFactory = ({ IDL }) => {
         [IDL.Vec(IDL.Tuple(StorageId, StorageStats))],
         ['query'],
       ),
-    'getTotalDownloads' : IDL.Func([], [IDL.Nat], []),
-    'getTotalPackages' : IDL.Func([], [IDL.Nat], []),
+    'getTotalDownloads' : IDL.Func([], [IDL.Nat], ['query']),
+    'getTotalPackages' : IDL.Func([], [IDL.Nat], ['query']),
     'notifyInstall' : IDL.Func([PackageName__1, Ver], [], ['oneway']),
     'search' : IDL.Func([Text], [IDL.Vec(PackageDetails)], ['query']),
     'startFileUpload' : IDL.Func(

package/mops.js

@@ -107,17 +107,17 @@ export async function getHighestVersion(pkgName) {
 	return actor.getHighestVersion(pkgName);
 }
 
-export function parseGithubURL(href){
+export function parseGithubURL(href) {
 	const url = new URL(href);
 	const branch =  url.hash?.substring(1) || 'master';
 
 	let [org, gitName] = url.pathname.split('/').filter(path => !!path);
 
-	if (gitName.endsWith('.git')){
+	if (gitName.endsWith('.git')) {
 		gitName = gitName.substring(0, gitName.length - 4);
 	}
 
-	return { org, gitName, branch };
+	return {org, gitName, branch};
 }
 
 export function readConfig(configFile = path.join(process.cwd(), 'mops.toml')) {
@@ -127,9 +127,13 @@ export function readConfig(configFile = path.join(process.cwd(), 'mops.toml')) {
 	const deps = toml.dependencies || {};
 
 	Object.entries(deps).forEach(([name, data])=>{
-		if (data.startsWith('https://github.com/')){
+		if (!data || typeof data !== 'string') {
+			throw Error(`Invalid dependency value ${name} = "${data}"`);
+		}
+		if (data.startsWith('https://github.com/')) {
 			deps[name] = {name, repo: data, version: ''};
-		}else{
+		}
+		else {
 			deps[name] = {name, repo: '', version: data};
 		}
 	});
@@ -141,9 +145,10 @@ export function writeConfig(config, configFile = path.join(process.cwd(), 'mops.
 	const deps = config.dependencies || {};
 
 	Object.entries(deps).forEach(([name, {repo, version}])=>{
-		if (repo){
+		if (repo) {
 			deps[name] = repo;
-		}else{
+		}
+		else {
 			deps[name] = version;
 		}
 	});
@@ -151,12 +156,12 @@ export function writeConfig(config, configFile = path.join(process.cwd(), 'mops.
 	fs.writeFileSync(configFile, TOML.stringify(config).trim());
 }
 
-export function formatDir(name, version){
+export function formatDir(name, version) {
 	return path.join(process.cwd(), '.mops', `${name}@${version}`);
 }
 
-export function formatGithubDir(name, repo){
-	const { branch } = parseGithubURL(repo);
+export function formatGithubDir(name, repo) {
+	const {branch} = parseGithubURL(repo);
 	return path.join(process.cwd(), '.mops/_github', `${name}@${branch}`);
 }
 

package/package.json

@@ -1,10 +1,15 @@
 {
 	"name": "ic-mops",
-	"version": "0.2.1",
+	"version": "0.2.3",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"
 	},
+	"homepage": "https://mops.one",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/ZenVoich/mops.git"
+	},
 	"dependencies": {
 		"@dfinity/agent": "^0.11.0",
 		"@dfinity/candid": "^0.11.0",

package/vessel.js

@@ -1,13 +1,13 @@
 import {existsSync, mkdirSync, createWriteStream, readFileSync, writeFileSync} from 'fs';
 import del from 'del';
-import { execaCommand} from 'execa';
+import {execaCommand} from 'execa';
 import chalk from 'chalk';
 import logUpdate from 'log-update';
-import { formatGithubDir, parseGithubURL, progressBar } from './mops.js';
+import {formatGithubDir, parseGithubURL, progressBar} from './mops.js';
 import path from 'path';
 import got from 'got';
 import decompress from 'decompress';
-import {pipeline} from 'stream/promises';
+import {pipeline} from 'stream';
 
 const dhallFileToJson = async (filePath) => {
 	if (existsSync(filePath)) {
@@ -16,11 +16,12 @@ const dhallFileToJson = async (filePath) => {
 		try {
 			res = await execaCommand(`dhall-to-json --file ${filePath}`, {preferLocal:true, cwd});
 		}
-		catch (e) {
+		catch (err) {
+			console.error('dhall-to-json error:', err);
 			return null;
 		}
 
-		if (res.exitCode === 0){
+		if (res.exitCode === 0) {
 			return JSON.parse(res.stdout);
 		}
 		else {
@@ -33,7 +34,7 @@ const dhallFileToJson = async (filePath) => {
 
 export const readVesselConfig = async (
 	configFile,
-	{ cache = true } = { cache: true }
+	{cache = true} = {cache: true}
 ) => {
 	const cachedFile = (configFile || process.cwd()) + '/vessel.json';
 
@@ -50,15 +51,15 @@ export const readVesselConfig = async (
 	if (!vessel || !packageSetArray) return null;
 
 	let repos = {};
-	for (const { name, repo, version } of packageSetArray) {
-		const { org, gitName } = parseGithubURL(repo);
+	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) => {
-			return { name, repo: repos[name], version: '' };
+			return {name, repo: repos[name], version: ''};
 		}),
 	};
 
@@ -77,8 +78,8 @@ export const downloadFromGithub = async (repo, dest, onProgress = null) => {
 
 	const promise = new Promise((resolve, reject) => {
 
-		readStream.on('downloadProgress', ({ transferred, total}) => {
-			onProgress?.(transferred, total || 2 * (1024 ** 2) );
+		readStream.on('downloadProgress', ({transferred, total}) => {
+			onProgress?.(transferred, total || 2 * (1024 ** 2));
 		});
 
 		readStream.on('response', (response) => {
@@ -97,28 +98,30 @@ export const downloadFromGithub = async (repo, dest, onProgress = null) => {
 			try {
 				mkdirSync(tmpDir, {recursive: true});
 
-				pipeline(readStream, createWriteStream(tmpFile))
-					.then(() => {
+				pipeline(readStream, createWriteStream(tmpFile), (err) => {
+					if (err) {
+						del.sync([tmpDir]);
+						reject(err);
+					}
+					else {
 						let options = {
 							extract: true,
 							strip: 1,
 							headers: {
-								accept: 'application/zip'
-							}
+								accept: 'application/zip',
+							},
 						};
-
-						return decompress(tmpFile, dest, options);
-
-					}).then((unzippedFiles) => {
-						del.sync([tmpDir]);
-						resolve(unzippedFiles);
-
-					}).catch(err => {
-						del.sync([tmpDir]);
-						reject(err);
-					});
-
-			} catch (err) {
+						decompress(tmpFile, dest, options).then((unzippedFiles) => {
+							del.sync([tmpDir]);
+							resolve(unzippedFiles);
+						}).catch(err => {
+							del.sync([tmpDir]);
+							reject(err);
+						});
+					}
+				});
+			}
+			catch (err) {
 				del.sync([tmpDir]);
 				reject(err);
 			}
@@ -134,7 +137,7 @@ export const installFromGithub = async (name, repo, options = {})=>{
 	const {branch} = parseGithubURL(repo);
 	const dir = formatGithubDir(name, repo);
 
-	if (existsSync(dir)){
+	if (existsSync(dir)) {
 		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${name}@${branch} (cache) from Github`);
 	}
 	else {
@@ -157,9 +160,9 @@ export const installFromGithub = async (name, repo, options = {})=>{
 
 	const config = await readVesselConfig(dir);
 
-	if (config){
-		for (const {name, repo} of config.dependencies){
-			await installFromGithub(name, repo, {verbose, silent, dep: true });
+	if (config) {
+		for (const {name, repo} of config.dependencies) {
+			await installFromGithub(name, repo, {verbose, silent, dep: true});
 		}
 	}
 };