ic-mops 0.7.0 → 0.7.2

package/cli.js

@@ -39,6 +39,7 @@ program
 program
 	.command('add <pkg>')
 	.description('Install the package and save it to mops.toml')
+	.option('--dev')
 	.option('--verbose')
 	.action(async (pkg, options) => {
 		await add(pkg, options);

package/commands/add.js

@@ -5,14 +5,21 @@ import {checkConfigFile, getHighestVersion, parseGithubURL, readConfig, writeCon
 import {installFromGithub} from '../vessel.js';
 import {install} from './install.js';
 
-export async function add(name, {verbose} = {}) {
+export async function add(name, {verbose, dev} = {}) {
 	if (!checkConfigFile()) {
 		return false;
 	}
 
 	let config = readConfig();
-	if (!config.dependencies) {
-		config.dependencies = {};
+	if (dev) {
+		if (!config['dev-dependencies']) {
+			config['dev-dependencies'] = {};
+		}
+	}
+	else {
+		if (!config.dependencies) {
+			config.dependencies = {};
+		}
 	}
 
 	let pkgDetails;
@@ -68,7 +75,7 @@ export async function add(name, {verbose} = {}) {
 		}
 	}
 
-	config.dependencies[pkgDetails.name] = pkgDetails;
+	config[dev ? 'dev-dependencies' : 'dependencies'][pkgDetails.name] = pkgDetails;
 	writeConfig(config);
 
 	logUpdate.clear();

package/commands/install-all.js

@@ -10,9 +10,11 @@ export async function installAll({verbose, silent} = {}) {
 	}
 
 	let config = readConfig();
-	const deps = Object.values(config.dependencies || {});
+	let deps = Object.values(config.dependencies || {});
+	let devDeps = Object.values(config['dev-dependencies'] || {});
+	let allDeps = [...deps, ...devDeps];
 
-	for (let {name, repo, path, version} of deps) {
+	for (let {name, repo, path, version} of allDeps) {
 		if (repo) {
 			await installFromGithub(name, repo, {verbose, silent});
 		}

package/commands/install.js

@@ -110,7 +110,8 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	// install dependencies
 	let ok = true;
 	let config = readConfig(path.join(dir, 'mops.toml'));
-	for (const {name, repo, version} of Object.values(config.dependencies || {})) {
+	let deps = Object.values(config.dependencies || {});
+	for (const {name, repo, version} of deps) {
 		if (repo) {
 			await installFromGithub(name, repo, {silent, verbose});
 		}

package/commands/publish.js

@@ -17,7 +17,7 @@ export async function publish() {
 
 	// validate
 	for (let key of Object.keys(config)) {
-		if (!['package', 'dependencies', 'scripts'].includes(key)) {
+		if (!['package', 'dependencies', 'dev-dependencies', 'scripts'].includes(key)) {
 			console.log(chalk.red('Error: ') + `Unknown config section [${key}]`);
 			return;
 		}
@@ -112,6 +112,21 @@ export async function publish() {
 		}
 	}
 
+	if (config['dev-dependencies']) {
+		if (Object.keys(config['dev-dependencies']).length > 100) {
+			console.log(chalk.red('Error: ') + 'max dev-dependencies is 100');
+			return;
+		}
+
+		for (let dep of Object.values(config['dev-dependencies'])) {
+			if (dep.path) {
+				console.log(chalk.red('Error: ') + 'you can\'t publish packages with local dev-dependencies');
+				return;
+			}
+			delete dep.path;
+		}
+	}
+
 	if (config.package.keywords) {
 		for (let keyword of config.package.keywords) {
 			if (keyword.length > 20) {
@@ -147,7 +162,7 @@ export async function publish() {
 		moc: config.package.moc || '',
 		donation: config.package.donation || '',
 		dependencies: Object.values(config.dependencies || {}),
-		devDependencies: [],
+		devDependencies: Object.values(config['dev-dependencies'] || {}),
 		scripts: [],
 	};
 
@@ -156,6 +171,8 @@ export async function publish() {
 		'README.md',
 		'LICENSE',
 		'!.mops/**',
+		'!test/**',
+		'!**/*.test.mo',
 	];
 	let files = config.package.files || ['**/*.mo'];
 	files = [...files, ...defaultFiles];

package/commands/sources.js

@@ -59,7 +59,11 @@ export async function sources({verbose} = {}) {
 	};
 
 	let collectDeps = async (config, isRoot = false) => {
-		for (const pkgDetails of Object.values(config.dependencies || {})) {
+		let allDeps = [...Object.values(config.dependencies || {})];
+		if (isRoot) {
+			allDeps = [...allDeps, ...Object.values(config['dev-dependencies'] || {})];
+		}
+		for (const pkgDetails of allDeps) {
 			const {name, repo, version} = pkgDetails;
 
 			// take root dep version or bigger one

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 | number[]],
+    [PublishingId, Text, bigint, Uint8Array],
     Result_2
   >,
   'startPublish' : ActorMethod<[PackageConfigV2], Result_1>,
   'uploadFileChunk' : ActorMethod<
-    [PublishingId, FileId, bigint, Uint8Array | number[]],
+    [PublishingId, FileId, bigint, Uint8Array],
     Result
   >,
 }

package/mops.js

@@ -124,33 +124,40 @@ export function readConfig(configFile = path.join(process.cwd(), 'mops.toml')) {
 	let text = fs.readFileSync(configFile).toString();
 	let toml = TOML.parse(text);
 
-	const deps = toml.dependencies || {};
-
-	Object.entries(deps).forEach(([name, data]) => {
-		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 if (data.match(/^(\.?\.)?\//)) {
-			deps[name] = {name, repo: '', path: data, version: ''};
-		}
-		else {
-			deps[name] = {name, repo: '', version: data};
-		}
-	});
+	let processDeps = (deps) => {
+		Object.entries(deps).forEach(([name, data]) => {
+			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 if (data.match(/^(\.?\.)?\//)) {
+				deps[name] = {name, repo: '', path: data, version: ''};
+			}
+			else {
+				deps[name] = {name, repo: '', version: data};
+			}
+		});
+	};
+
+	processDeps(toml.dependencies || {});
+	processDeps(toml['dev-dependencies'] || {});
 
 	return toml;
 }
 
 export function writeConfig(config, configFile = path.join(process.cwd(), 'mops.toml')) {
 	const deps = config.dependencies || {};
-
 	Object.entries(deps).forEach(([name, {repo, path, version}]) => {
 		deps[name] = repo || path || version;
 	});
 
+	const devDeps = config['dev-dependencies'] || {};
+	Object.entries(devDeps).forEach(([name, {repo, path, version}]) => {
+		devDeps[name] = repo || path || version;
+	});
+
 	fs.writeFileSync(configFile, TOML.stringify(config).trim());
 }
 

package/package.json

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