ic-mops 0.2.0 → 0.2.1

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

@@ -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/sources.js

@@ -1,7 +1,6 @@
 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';
 
@@ -63,12 +62,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;

package/package.json

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

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';
@@ -14,7 +12,13 @@ import {pipeline} from 'stream/promises';
 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 (e) {
+			return null;
+		}
 
 		if (res.exitCode === 0){
 			return JSON.parse(res.stdout);
@@ -125,7 +129,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);