ic-mops 0.2.0 → 0.2.2

package/.eslintrc.json

@@ -1,28 +1,8 @@
 {
     "env": {
-        "node": true,
-        "es2021": true
+        "node": true
     },
-    "extends": "eslint:recommended",
     "parserOptions": {
         "sourceType": "module"
-    },
-    "rules": {
-        "indent": [
-            "error",
-            "tab"
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "error",
-            "single"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ]
     }
 }

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');
@@ -22,7 +22,7 @@ export async function init(name = '') {
 
 	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};
 	}
 
@@ -66,7 +66,7 @@ export async function init(name = '') {
 			config.dependencies = {};
 
 		defaultPackages.forEach(([name, version]) => {
-			config.dependencies[name] =  version;
+			config.dependencies[name] = {version};
 		});
 
 		writeConfig(config);

package/commands/install-all.js

@@ -15,7 +15,8 @@ export async function installAll({verbose} = {}) {
 	for (let {name, repo, version} of deps) {
 		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()) {
@@ -93,7 +93,8 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	for (const {name, repo, version} of Object.values(config.dependencies || {})) {
 		if (repo){
 			await installFromGithub(name, repo, {verbose});
-		}else{
+		}
+		else {
 			await install(name, version, {verbose});
 		}
 	}

package/commands/sources.js

@@ -1,9 +1,8 @@
 import path from 'path';
 import fs from 'fs';
 import chalk from 'chalk';
-import {install} from './install.js';
-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');
@@ -50,9 +49,11 @@ export async function sources({verbose} = {}) {
 
 		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;
 		}
 	};
@@ -63,12 +64,15 @@ export async function sources({verbose} = {}) {
 
 			// take root dep version or bigger one
 			if (
-				isRoot ||
-				!packages[name] ||
-				repo && compareGitVersions(packages[name].repo, repo) === -1 ||
-				compareVersions(packages[name].version, version) === -1
+				isRoot
+				|| !packages[name]
+				|| !packages[name].isRoot
+				&& (
+					repo && packages[name].repo && compareGitVersions(packages[name].repo, repo) === -1
+					|| compareVersions(packages[name].version, version) === -1)
 			) {
 				packages[name] = pkgDetails;
+				packages[name].isRoot = isRoot;
 			}
 
 			let nestedConfig;
@@ -77,7 +81,7 @@ export async function sources({verbose} = {}) {
 				const dir = formatGithubDir(name, repo);
 				nestedConfig = await readVesselConfig(dir) || {};
 			}
-			else{
+			else {
 				const dir = formatDir(name, version) + '/mops.toml';
 				nestedConfig = readConfig(dir);
 			}
@@ -91,7 +95,8 @@ export async function sources({verbose} = {}) {
 			if (repo){
 				const {branch} = parseGithubURL(repo);
 				versions[name].push(branch);
-			}else{
+			}
+			else {
 				versions[name].push(version);
 			}
 		}
@@ -114,7 +119,8 @@ export async function sources({verbose} = {}) {
 		let pkgDir;
 		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()) {
@@ -24,7 +24,8 @@ export async function uninstall(pkg, version) {
 
 	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/package.json

@@ -1,10 +1,15 @@
 {
 	"name": "ic-mops",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"
 	},
+	"homepage": "http://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,6 +1,4 @@
-import {
-	existsSync, mkdirSync, createWriteStream, readFileSync, writeFileSync
-} from 'fs';
+import {existsSync, mkdirSync, createWriteStream, readFileSync, writeFileSync} from 'fs';
 import del from 'del';
 import { execaCommand} from 'execa';
 import chalk from 'chalk';
@@ -9,12 +7,19 @@ 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)) {
 		let cwd = new URL(path.dirname(import.meta.url)).pathname;
-		const res = await execaCommand(`dhall-to-json --file ${filePath}`, {preferLocal:true, cwd});
+		let res;
+		try {
+			res = await execaCommand(`dhall-to-json --file ${filePath}`, {preferLocal:true, cwd});
+		}
+		catch (err) {
+			console.error('dhall-to-json error:', err);
+			return null;
+		}
 
 		if (res.exitCode === 0){
 			return JSON.parse(res.stdout);
@@ -93,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);
 			}
@@ -125,7 +132,6 @@ export const downloadFromGithub = async (repo, dest, onProgress = null) => {
 };
 
 export const installFromGithub = async (name, repo, options = {})=>{
-
 	const {verbose, dep, silent} = options;
 
 	const {branch} = parseGithubURL(repo);