ic-mops 0.2.2 → 0.2.4

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

@@ -17,20 +17,21 @@ export async function init(name = '') {
 
 	let config = {};
 	let vesselConfig = {};
+	let vesselDeps;
 
 	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});
 		vesselConfig = {...res};
 	}
 
-	if (vesselConfig.dependencies){
-		config.dependencies = {};
+	if (vesselConfig.dependencies) {
+		vesselDeps = {};
 
-		for (const dep of (vesselConfig.dependencies || [])){
-			config.dependencies[dep.name] = dep;
+		for (const dep of (vesselConfig.dependencies || [])) {
+			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/commands/install-all.js

@@ -13,7 +13,7 @@ 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 {

package/commands/install.js

@@ -91,7 +91,7 @@ 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 {

package/commands/sources.js

@@ -47,10 +47,10 @@ 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 {
@@ -77,7 +77,7 @@ export async function sources({verbose} = {}) {
 
 			let nestedConfig;
 
-			if (repo){
+			if (repo) {
 				const dir = formatGithubDir(name, repo);
 				nestedConfig = await readVesselConfig(dir) || {};
 			}
@@ -92,7 +92,7 @@ export async function sources({verbose} = {}) {
 				versions[name] = [];
 			}
 
-			if (repo){
+			if (repo) {
 				const {branch} = parseGithubURL(repo);
 				versions[name].push(branch);
 			}
@@ -117,7 +117,7 @@ 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 {

package/commands/uninstall.js

@@ -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,7 +22,7 @@ export async function uninstall(pkg, version) {
 	const {repo} = pkgDetails;
 	let pkgDir;
 
-	if (repo){
+	if (repo) {
 		pkgDir = formatGithubDir(pkg, repo);
 	}
 	else {

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,11 +1,11 @@
 {
 	"name": "ic-mops",
-	"version": "0.2.2",
+	"version": "0.2.4",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"
 	},
-	"homepage": "http://mops.one/",
+	"homepage": "https://mops.one",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/ZenVoich/mops.git"

package/vessel.js

@@ -1,9 +1,9 @@
 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';
@@ -21,7 +21,7 @@ const dhallFileToJson = async (filePath) => {
 			return null;
 		}
 
-		if (res.exitCode === 0){
+		if (res.exitCode === 0) {
 			return JSON.parse(res.stdout);
 		}
 		else {
@@ -34,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';
 
@@ -51,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: ''};
 		}),
 	};
 
@@ -78,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) => {
@@ -137,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 {
@@ -160,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});
 		}
 	}
 };