ic-mops 0.6.4 → 0.6.6

package/cli.js

@@ -4,7 +4,6 @@ import fs from 'fs';
 import path from 'path';
 import {program} from 'commander';
 import chalk from 'chalk';
-import child_process from 'child_process';
 
 import {init} from './commands/init.js';
 import {publish} from './commands/publish.js';
@@ -16,6 +15,7 @@ import {installAll} from './commands/install-all.js';
 import {search} from './commands/search.js';
 import {add} from './commands/add.js';
 import {cacheSize, cleanCache} from './cache.js';
+import {test} from './commands/test.js';
 // import {upgrade} from './commands/upgrade.js';
 
 let cwd = process.cwd();
@@ -151,6 +151,14 @@ program
 		}
 	});
 
+// test
+program
+	.command('test')
+	.description('Run tests')
+	.action(async () => {
+		await test();
+	});
+
 // // upgrade
 // program
 // 	.command('upgrade')

package/commands/add.js

@@ -5,7 +5,7 @@ import {checkConfigFile, getHighestVersion, parseGithubURL, readConfig, writeCon
 import {installFromGithub} from '../vessel.js';
 import {install} from './install.js';
 
-export async function add(name, {verbose, silent} = {}) {
+export async function add(name, {verbose} = {}) {
 	if (!checkConfigFile()) {
 		return false;
 	}
@@ -16,7 +16,6 @@ export async function add(name, {verbose, silent} = {}) {
 	}
 
 	let pkgDetails;
-	let existingPkg = config.dependencies[name];
 
 	// local package
 	if (name.startsWith('./') || name.startsWith('../') || name.startsWith('/')) {
@@ -36,11 +35,9 @@ export async function add(name, {verbose, silent} = {}) {
 			repo: `https://github.com/${org}/${gitName}#${branch}`,
 			version: '',
 		};
-
-		existingPkg = config.dependencies[pkgDetails.name];
 	}
 	// mops package
-	else if (!existingPkg || !existingPkg.repo) {
+	else {
 		let ver;
 		if (name.includes('@')) {
 			[name, ver] = name.split('@');
@@ -59,25 +56,12 @@ export async function add(name, {verbose, silent} = {}) {
 			repo: '',
 			version: ver,
 		};
-
-	}
-	else {
-		silent || logUpdate(`Installing ${existingPkg.name}@${existingPkg.version} (cache) from Github`);
-		return;
 	}
 
-	if (pkgDetails.repo || pkgDetails.path) {
-		// pkg name conflict with an installed mops pkg
-		if (existingPkg && !existingPkg.repo) {
-			console.log(chalk.red('Error: ') + `Conflicting Package Name '${pkgDetails.name}`);
-			console.log('Consider entering the repo url and assigning a new name in the \'mops.toml\' file');
-			return;
-		}
-		if (pkgDetails.repo) {
-			await installFromGithub(pkgDetails.name, pkgDetails.repo, {verbose: verbose});
-		}
+	if (pkgDetails.repo) {
+		await installFromGithub(pkgDetails.name, pkgDetails.repo, {verbose: verbose});
 	}
-	else {
+	else if (!pkgDetails.path) {
 		let ok = await install(pkgDetails.name, pkgDetails.version, {verbose: verbose});
 		if (!ok) {
 			return;

package/commands/install.js

@@ -112,10 +112,10 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	let config = readConfig(path.join(dir, 'mops.toml'));
 	for (const {name, repo, version} of Object.values(config.dependencies || {})) {
 		if (repo) {
-			await installFromGithub(name, repo, {verbose});
+			await installFromGithub(name, repo, {silent, verbose});
 		}
 		else {
-			let res = await install(name, version, {verbose});
+			let res = await install(name, version, {silent, verbose});
 			if (!res) {
 				ok = false;
 			}

package/commands/test.js

@@ -0,0 +1,61 @@
+import {execSync} from 'child_process';
+import chalk from 'chalk';
+import glob from 'glob';
+
+let globConfig = {
+	nocase: true,
+	ignore: [
+		'**/node_modules/**',
+		'**/.mops/**',
+		'**/.vessel/**',
+	],
+};
+
+export async function test() {
+	let files = [];
+	let libFiles = glob.sync('**/test?(s)/lib.mo', globConfig);
+	if (libFiles.length) {
+		files = [libFiles[0]];
+	}
+	else {
+		files = glob.sync('**/test?(s)/**/*.test.mo', globConfig);
+	}
+	if (!files.length) {
+		console.log('No test files found');
+		return;
+	}
+
+	console.log('Test files:');
+	for (let file of files) {
+		console.log(chalk.gray(`• ${file}`));
+	}
+	console.log('-'.repeat(50));
+
+	let start = Date.now();
+	let failed = 0;
+	let passed = 0;
+	let dfxCache = execSync('dfx cache show').toString().trim();
+	let mopsSources = execSync('mops-local sources').toString().trim().replace(/\n/g, ' ');
+
+	for (let file of files) {
+		try {
+			console.log(`Running ${chalk.gray(file)}`);
+			execSync(`${dfxCache}/moc -r -wasi-system-api --hide-warnings --error-detail 2 ${mopsSources} ${file}`, {stdio: 'pipe'});
+			console.log(' ', chalk.green('PASS'));
+			passed++;
+		}
+		catch (err) {
+			failed++;
+			if (err.status === 1) {
+				console.log(' ', chalk.red('FAIL'), err.stderr.toString().trim());
+			}
+			else {
+				console.log(chalk.red('Unknown status:'), err.status);
+				console.log(err.message);
+			}
+		}
+	}
+
+	console.log('-'.repeat(50));
+	console.log(`Done in ${chalk.gray(((Date.now() - start) / 1000).toFixed(2) + 's')}, failed ${chalk[failed ? 'redBright' : 'gray'](failed)}, passed ${chalk.greenBright(passed)}`);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.6.4",
+	"version": "0.6.6",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"
@@ -26,6 +26,7 @@
 		"eslint": "^8.15.0",
 		"execa": "^6.1.0",
 		"get-folder-size": "^4.0.0",
+		"glob": "^8.1.0",
 		"globby": "^13.1.1",
 		"got": "^12.5.3",
 		"log-update": "^5.0.1",