ic-mops 0.8.2 → 0.8.3

package/README.md

@@ -1,6 +1,6 @@
-# MOPS
+# Mops
 
-MOPS is a package manager for the Motoko programming language.
+Mops is a package manager for the Motoko programming language.
 
 See https://mops.one
 

package/cli.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 import fs from 'fs';
-import path from 'path';
 import {program} from 'commander';
 import chalk from 'chalk';
 
@@ -9,7 +8,7 @@ import {init} from './commands/init.js';
 import {publish} from './commands/publish.js';
 import {importPem} from './commands/import-identity.js';
 import {sources} from './commands/sources.js';
-import {checkApiCompatibility, getNetwork, setNetwork, apiVersion} from './mops.js';
+import {checkApiCompatibility, getNetwork, setNetwork, apiVersion, checkConfigFile} from './mops.js';
 import {whoami} from './commands/whoami.js';
 import {installAll} from './commands/install-all.js';
 import {search} from './commands/search.js';
@@ -19,9 +18,6 @@ import {test} from './commands/test.js';
 import {template} from './commands/template.js';
 import {upgrade} from './commands/upgrade.js';
 
-let cwd = process.cwd();
-let configFile = path.join(cwd, 'mops.toml');
-
 program.name('mops');
 
 // --version
@@ -43,6 +39,9 @@ program
 	.option('--dev')
 	.option('--verbose')
 	.action(async (pkg, options) => {
+		if (!checkConfigFile()) {
+			process.exit(1);
+		}
 		await add(pkg, options);
 	});
 
@@ -53,9 +52,8 @@ program
 	.description('Install all dependencies specified in mops.toml')
 	.option('--verbose')
 	.action(async (pkg, options) => {
-		if (!fs.existsSync(configFile)) {
-			console.log(chalk.red('Error: ') + `mops.toml not found. Please run ${chalk.green('mops init')} first`);
-			return;
+		if (!checkConfigFile()) {
+			process.exit(1);
 		}
 
 		let compatible = await checkApiCompatibility();
@@ -77,6 +75,9 @@ program
 	.command('publish')
 	.description('Publish package to the mops registry')
 	.action(async () => {
+		if (!checkConfigFile()) {
+			process.exit(1);
+		}
 		let compatible = await checkApiCompatibility();
 		if (compatible) {
 			await publish();
@@ -115,6 +116,9 @@ program
 	.description('for dfx packtool')
 	.option('--verbose')
 	.action(async (options) => {
+		if (!checkConfigFile()) {
+			process.exit(1);
+		}
 		await installAll({silent: true});
 		let sourcesArr = await sources(options);
 		console.log(sourcesArr.join('\n'));
@@ -168,6 +172,9 @@ program
 	.command('template')
 	.description('Apply template')
 	.action(async (options) => {
+		if (!checkConfigFile()) {
+			process.exit(1);
+		}
 		await template(options);
 	});
 

package/commands/init.js

@@ -49,7 +49,7 @@ export async function init(name = '') {
 			config.dependencies = vesselDeps;
 		}
 
-		writeConfig(config);
+		writeConfig(config, configFile);
 
 		if (Object.keys(config.dependencies || {}).length) {
 			await installAll({verbose: true});
@@ -91,7 +91,7 @@ export async function init(name = '') {
 			config.dependencies[name] = {version};
 		});
 
-		writeConfig(config);
+		writeConfig(config, configFile);
 
 		await installAll({verbose: true});
 	}

package/commands/sources.js

@@ -1,25 +1,12 @@
 import path from 'path';
 import fs from 'fs';
 import chalk from 'chalk';
-import {formatDir, formatGithubDir, parseGithubURL, readConfig} from '../mops.js';
+import {checkConfigFile, formatDir, formatGithubDir, parseGithubURL, readConfig} from '../mops.js';
 import {readVesselConfig} from '../vessel.js';
 
-function rootDir(cwd = process.cwd()) {
-	let configFile = path.join(cwd, 'mops.toml');
-	if (fs.existsSync(configFile)) {
-		return cwd;
-	}
-	if (!path.basename(cwd)) {
-		console.log(chalk.red('Error: ') + 'Cannot find mops.toml');
-		return;
-	}
-	return rootDir(path.join(cwd, '..'));
-}
-
 // TODO: resolve conflicts
 export async function sources({verbose} = {}) {
-	let root = rootDir();
-	if (!root) {
+	if (!checkConfigFile()) {
 		return [];
 	}
 
@@ -108,7 +95,7 @@ export async function sources({verbose} = {}) {
 		}
 	};
 
-	let config = readConfig(path.join(root, 'mops.toml'));
+	let config = readConfig();
 	await collectDeps(config, true);
 
 	// show conflicts

package/commands/template.js

@@ -2,6 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import chalk from 'chalk';
 import prompts from 'prompts';
+import {getRootDir} from '../mops.js';
 
 export async function template() {
 	let res = await prompts({
@@ -16,13 +17,13 @@ export async function template() {
 	});
 
 	if (res.value === 'github-workflow:mops-test') {
-		let dest = path.resolve(process.cwd(), '.github/workflows/mops-test.yml');
+		let dest = path.resolve(getRootDir(), '.github/workflows/mops-test.yml');
 		if (fs.existsSync(dest)) {
 			console.log(chalk.yellow('Workflow already exists:'), dest);
 			return;
 		}
 		let mopsTestYml = new URL('../templates/mops-test.yml', import.meta.url);
-		fs.mkdirSync(path.resolve(process.cwd(), '.github/workflows'), {recursive: true});
+		fs.mkdirSync(path.resolve(getRootDir(), '.github/workflows'), {recursive: true});
 		fs.copyFileSync(mopsTestYml, dest);
 		console.log(chalk.green('Workflow created:'), dest);
 	}

package/commands/test.js

@@ -3,8 +3,10 @@ import chalk from 'chalk';
 import glob from 'glob';
 import chokidar from 'chokidar';
 import debounce from 'debounce';
+import path from 'path';
 import {MMF1} from './mmf1.js';
 import {sources} from './sources.js';
+import {getRootDir} from '../mops.js';
 
 let ignore = [
 	'**/node_modules/**',
@@ -31,7 +33,7 @@ export async function test(filter = '', {watch = false} = {}) {
 			console.log(chalk.gray((`Press ${chalk.gray('Ctrl+C')} to exit.`)));
 		}, 200);
 
-		let watcher = chokidar.watch('**/*.mo', {
+		let watcher = chokidar.watch(path.join(getRootDir(), '**/*.mo'), {
 			ignored: ignore,
 			ignoreInitial: true,
 		});
@@ -64,9 +66,13 @@ export async function runAll(filter = '') {
 		if (filter) {
 			globStr = `**/test?(s)/**/*${filter}*`;
 		}
-		files = glob.sync(globStr, globConfig);
+		files = glob.sync(path.join(getRootDir(), globStr), globConfig);
 	}
 	if (!files.length) {
+		if (filter) {
+			console.log(`No test files found for filter '${filter}'`);
+			return;
+		}
 		console.log('No test files found');
 		console.log('Put your tests in \'test\' directory in *.test.mo files');
 		return;

package/declarations/main/main.did.d.ts

@@ -103,12 +103,12 @@ export interface _SERVICE {
   'notifyInstall' : ActorMethod<[PackageName__1, Ver], undefined>,
   'search' : ActorMethod<[Text], Array<PackageDetails>>,
   'startFileUpload' : ActorMethod<
-    [PublishingId, Text, bigint, Uint8Array],
+    [PublishingId, Text, bigint, Uint8Array | number[]],
     Result_2
   >,
   'startPublish' : ActorMethod<[PackageConfigV2], Result_1>,
   'uploadFileChunk' : ActorMethod<
-    [PublishingId, FileId, bigint, Uint8Array],
+    [PublishingId, FileId, bigint, Uint8Array | number[]],
     Result
   >,
 }

package/mops.js

@@ -88,10 +88,29 @@ export let storageActor = async (storageId) => {
 	});
 };
 
+export function getClosestConfigFile(dir = process.cwd()) {
+	if (!path.basename(dir)) {
+		return null;
+	}
+	let configFile = path.join(dir, 'mops.toml');
+	if (fs.existsSync(configFile)) {
+		return configFile;
+	}
+	return getClosestConfigFile(path.resolve(dir, '..'));
+}
+
+export function getRootDir() {
+	let configFile = getClosestConfigFile();
+	if (!configFile) {
+		return null;
+	}
+	return path.dirname(configFile);
+}
+
 export function checkConfigFile() {
-	let configFile = path.join(process.cwd(), 'mops.toml');
-	if (!fs.existsSync(configFile)) {
-		console.log(chalk.red('Error: ') + `Config file not found ${configFile}`);
+	let configFile = getClosestConfigFile();
+	if (!configFile) {
+		console.log(chalk.red('Error: ') + `Config file 'mops.toml' not found. Please run ${chalk.green('mops init')} first`);
 		return false;
 	}
 	return true;
@@ -120,7 +139,7 @@ export function parseGithubURL(href) {
 	return {org, gitName, branch};
 }
 
-export function readConfig(configFile = path.join(process.cwd(), 'mops.toml')) {
+export function readConfig(configFile = getClosestConfigFile()) {
 	let text = fs.readFileSync(configFile).toString();
 	let toml = TOML.parse(text);
 
@@ -147,7 +166,7 @@ export function readConfig(configFile = path.join(process.cwd(), 'mops.toml')) {
 	return toml;
 }
 
-export function writeConfig(config, configFile = path.join(process.cwd(), 'mops.toml')) {
+export function writeConfig(config, configFile = getClosestConfigFile()) {
 	const deps = config.dependencies || {};
 	Object.entries(deps).forEach(([name, {repo, path, version}]) => {
 		deps[name] = repo || path || version;
@@ -162,12 +181,12 @@ export function writeConfig(config, configFile = path.join(process.cwd(), 'mops.
 }
 
 export function formatDir(name, version) {
-	return path.join(process.cwd(), '.mops', `${name}@${version}`);
+	return path.join(getRootDir(), '.mops', `${name}@${version}`);
 }
 
 export function formatGithubDir(name, repo) {
 	const {branch} = parseGithubURL(repo);
-	return path.join(process.cwd(), '.mops/_github', `${name}@${branch}`);
+	return path.join(getRootDir(), '.mops/_github', `${name}@${branch}`);
 }
 
 export function readDfxJson() {

package/package.json

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