ic-mops 0.19.1 → 0.20.1

package/.gitignore

@@ -1,2 +1,5 @@
+node_modules
+dist
+cli.js
 identity.pem
 network.txt

package/{cache.js → cache.ts}

@@ -1,34 +1,34 @@
-import fs from 'fs';
-import path from 'path';
+import fs from 'node:fs';
+import path from 'node:path';
 import ncp from 'ncp';
 import getFolderSize from 'get-folder-size';
 
 import {globalCacheDir} from './mops.js';
 
-export let isCached = (pkgId) => {
+export let isCached = (pkgId: string) => {
 	let dir = path.join(globalCacheDir, 'packages', pkgId);
 	return fs.existsSync(dir);
 };
 
-export let addCache = (pkgId, source) => {
+export let addCache = (pkgId: string, source: string) => {
 	let dest = path.join(globalCacheDir, 'packages', pkgId);
 	fs.mkdirSync(dest, {recursive: true});
 
-	return new Promise((resolve, reject) => {
+	return new Promise<void>((resolve, reject) => {
 		ncp.ncp(source, dest, {stopOnErr: true}, (err) => {
 			if (err) {
-				reject(err[0]);
+				reject(err);
 			}
 			resolve();
 		});
 	});
 };
 
-export let copyCache = (pkgId, dest) => {
+export let copyCache = (pkgId: string, dest: string) => {
 	let source = path.join(globalCacheDir, 'packages', pkgId);
 	fs.mkdirSync(dest, {recursive: true});
 
-	return new Promise((resolve, reject) => {
+	return new Promise<void>((resolve, reject) => {
 		ncp.ncp(source, dest, {stopOnErr: true}, (err) => {
 			if (err) {
 				reject(err);

package/{cli.js → cli.ts}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import fs from 'fs';
+import fs from 'node:fs';
 import {program} from 'commander';
 import chalk from 'chalk';
 import {Principal} from '@dfinity/principal';
@@ -26,14 +26,14 @@ import {bump} from './commands/bump.js';
 program.name('mops');
 
 // --version
-let packageJson = JSON.parse(fs.readFileSync(new URL('package.json', import.meta.url)));
+let packageJson = JSON.parse(fs.readFileSync(new URL('package.json', import.meta.url)).toString());
 program.version(`CLI ${packageJson.version}\nAPI ${apiVersion}`, '-v --version');
 
 // init
 program
 	.command('init [name]')
 	.description('Create mops.toml')
-	.action(async (name) => {
+	.action(async (name: string) => {
 		await init(name);
 	});
 
@@ -195,11 +195,11 @@ program
 program
 	.command('template')
 	.description('Apply template')
-	.action(async (options) => {
+	.action(async () => {
 		if (!checkConfigFile()) {
 			process.exit(1);
 		}
-		await template(options);
+		await template();
 	});
 
 // docs

package/commands/{add.js → add.ts}

@@ -1,13 +1,13 @@
-import path from 'path';
+import path from 'node:path';
 import chalk from 'chalk';
 import logUpdate from 'log-update';
 import {checkConfigFile, getHighestVersion, parseGithubURL, readConfig, writeConfig} from '../mops.js';
 import {installFromGithub} from '../vessel.js';
 import {install} from './install.js';
 
-export async function add(name, {verbose, dev} = {}) {
+export async function add(name: string, {verbose = false, dev = false} = {}) {
 	if (!checkConfigFile()) {
-		return false;
+		return;
 	}
 
 	let config = readConfig();
@@ -22,7 +22,7 @@ export async function add(name, {verbose, dev} = {}) {
 		}
 	}
 
-	let pkgDetails;
+	let pkgDetails: any;
 
 	// local package
 	if (name.startsWith('./') || name.startsWith('../') || name.startsWith('/')) {
@@ -34,7 +34,7 @@ export async function add(name, {verbose, dev} = {}) {
 		};
 	}
 	// github package
-	else if (name.startsWith('https://github.com') || name.split('/') > 1) {
+	else if (name.startsWith('https://github.com') || name.split('/').length > 1) {
 		const {org, gitName, branch} = parseGithubURL(name);
 
 		pkgDetails = {
@@ -45,13 +45,14 @@ export async function add(name, {verbose, dev} = {}) {
 	}
 	// mops package
 	else {
-		let ver;
+		let ver: string;
 		if (name.includes('@')) {
+			// @ts-ignore
 			[name, ver] = name.split('@');
 		}
 		else {
 			let versionRes = await getHighestVersion(name);
-			if (versionRes.err) {
+			if ('err' in versionRes) {
 				console.log(chalk.red('Error: ') + versionRes.err);
 				return;
 			}
@@ -75,7 +76,14 @@ export async function add(name, {verbose, dev} = {}) {
 		}
 	}
 
-	config[dev ? 'dev-dependencies' : 'dependencies'][pkgDetails.name] = pkgDetails;
+	const depsProp = dev ? 'dev-dependencies' : 'dependencies';
+	let deps = config[depsProp];
+	if (deps) {
+		deps[pkgDetails.name] = pkgDetails;
+	}
+	else {
+		throw Error(`Invalid config file: [${depsProp}] not found`);
+	}
 	writeConfig(config);
 
 	logUpdate.clear();

package/commands/{bump.js → bump.ts}

@@ -2,7 +2,7 @@ import prompts from 'prompts';
 import chalk from 'chalk';
 import {checkConfigFile, readConfig, writeConfig} from '../mops.js';
 
-export async function bump(part) {
+export async function bump(part: string) {
 	if (!checkConfigFile()) {
 		return;
 	}
@@ -44,15 +44,15 @@ export async function bump(part) {
 	console.log(`Updated version: ${chalk.green.bold(config.package.version)}`);
 }
 
-function updateVersion(version, part) {
+function updateVersion(version: string, part: string) {
 	let parts = version.split('.');
 	let idx = ['major', 'minor', 'patch'].indexOf(part);
-	if (idx < 0) {
+	if (!parts[idx]) {
 		throw new Error(`Invalid version part: ${part}`);
 	}
-	parts[idx] = parseInt(parts[idx]) + 1;
+	parts[idx] = String(parseInt(parts[idx] || '0') + 1);
 	for (let i = idx + 1; i < parts.length; i++) {
-		parts[i] = 0;
+		parts[i] = '0';
 	}
 	return parts.join('.');
 }

package/commands/{docs.js → docs.ts}

@@ -1,22 +1,22 @@
-import {spawn, execSync} from 'child_process';
-import fs from 'fs';
-import path from 'path';
+import {spawn, execSync} from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
 import chalk from 'chalk';
-import glob from 'glob';
-import del from 'del';
+import {globSync} from 'glob';
+import {deleteSync} from 'del';
 import tar from 'tar';
 import streamToPromise from 'stream-to-promise';
 
 import {getRootDir} from '../mops.js';
 
-let moDoc;
+let moDoc: string;
 
-export async function docs({silent} = {}) {
+export async function docs({silent = false} = {}) {
 	let rootDir = getRootDir();
 	let docsDir = path.join(rootDir, '.mops/.docs');
 	let docsDirRelative = path.relative(process.cwd(), docsDir);
 
-	del.sync([docsDir], {force: true});
+	deleteSync([docsDir], {force: true});
 
 	// detect mocv
 	if (process.env.DFX_MOC_PATH && process.env.DFX_MOC_PATH.includes('mocv/versions')) {
@@ -27,7 +27,7 @@ export async function docs({silent} = {}) {
 	}
 
 	// generate docs
-	await new Promise((resolve) => {
+	await new Promise<void>((resolve) => {
 		let proc = spawn(moDoc, [`--source=${path.join(rootDir, 'src')}`, `--output=${docsDirRelative}`, '--format=adoc']);
 
 		// stdout
@@ -75,7 +75,7 @@ export async function docs({silent} = {}) {
 		`${docsDir}/**/*.test.adoc`,
 		`${docsDir}/test/**/*`,
 	];
-	let files = glob.sync(`${docsDir}/**/*.adoc`, {ignore}).map(f => path.relative(docsDir, f));
+	let files = globSync(`${docsDir}/**/*.adoc`, {ignore}).map(f => path.relative(docsDir, f));
 	if (files.length) {
 		let stream = tar.create(
 			{

package/commands/{import-identity.js → import-identity.ts}

@@ -1,12 +1,12 @@
-import fs from 'fs';
+import fs from 'node:fs';
+import path from 'node:path';
 import chalk from 'chalk';
-import path from 'path';
 import prompts from 'prompts';
-import del from 'del';
+import {deleteSync} from 'del';
 import {globalConfigDir} from '../mops.js';
 import {encrypt} from '../pem.js';
 
-export async function importPem(data) {
+export async function importPem(data: string) {
 	try {
 		if (!fs.existsSync(globalConfigDir)) {
 			fs.mkdirSync(globalConfigDir);
@@ -34,12 +34,12 @@ export async function importPem(data) {
 		let identityPem = path.resolve(globalConfigDir, 'identity.pem');
 		let identityPemEncrypted = path.resolve(globalConfigDir, 'identity.pem.encrypted');
 
-		del.sync([identityPem, identityPemEncrypted], {force: true});
+		deleteSync([identityPem, identityPemEncrypted], {force: true});
 
 		// encrypted
 		if (password) {
-			data = await encrypt(Buffer.from(data), password);
-			fs.writeFileSync(identityPemEncrypted, data);
+			let encrypted = await encrypt(Buffer.from(data), password);
+			fs.writeFileSync(identityPemEncrypted, encrypted);
 		}
 		// unencrypted
 		else {

package/commands/{init.js → init.ts}

@@ -1,10 +1,11 @@
+import {execSync} from 'node:child_process';
+import path from 'node:path';
+import fs from 'node:fs';
 import chalk from 'chalk';
-import path from 'path';
-import fs from 'fs';
 import {checkApiCompatibility, mainActor, readDfxJson, writeConfig} from '../mops.js';
 import {installAll} from './install-all.js';
-import {readVesselConfig} from '../vessel.js';
-import {execSync} from 'child_process';
+import {VesselConfig, readVesselConfig} from '../vessel.js';
+import {Config, Dependencies} from '../types.js';
 
 export async function init(name = '') {
 	let configFile = path.join(process.cwd(), 'mops.toml');
@@ -16,23 +17,25 @@ export async function init(name = '') {
 
 	console.log('Initializing...');
 
-	let config = {};
-	let vesselConfig = {};
-	let vesselDeps;
+	let config: Config = {};
+	let vesselConfig: VesselConfig = {dependencies: [], 'dev-dependencies': []};
+	let deps: Dependencies = {};
 
 	const vesselFile = path.join(process.cwd(), 'vessel.dhall');
 
 	if (fs.existsSync(vesselFile)) {
 		console.log('Reading vessel.dhall file');
 		const res = await readVesselConfig(process.cwd(), {cache: false});
-		vesselConfig = {...res};
+		if (res) {
+			vesselConfig = {...res};
+		}
 	}
 
 	if (vesselConfig.dependencies) {
-		vesselDeps = {};
+		deps = {};
 
 		for (const dep of (vesselConfig.dependencies || [])) {
-			vesselDeps[dep.name] = dep;
+			deps[dep.name] = dep;
 		}
 	}
 
@@ -45,8 +48,8 @@ export async function init(name = '') {
 			repository: '',
 		};
 
-		if (vesselDeps) {
-			config.dependencies = vesselDeps;
+		if (deps) {
+			config.dependencies = deps;
 		}
 
 		writeConfig(config, configFile);
@@ -83,13 +86,13 @@ export async function init(name = '') {
 			config.dependencies = {};
 		}
 
-		if (vesselDeps) {
-			config.dependencies = vesselDeps;
+		if (deps) {
+			config.dependencies = deps;
 		}
 
-		defaultPackages.forEach(([name, version]) => {
-			config.dependencies[name] = {version};
-		});
+		for (let [name, version] of defaultPackages) {
+			config.dependencies[name] = {name, version};
+		}
 
 		writeConfig(config, configFile);
 

package/commands/{install-all.js → install-all.ts}

@@ -4,7 +4,7 @@ import {checkConfigFile, readConfig} from '../mops.js';
 import {install} from './install.js';
 import {installFromGithub} from '../vessel.js';
 
-export async function installAll({verbose, silent} = {}) {
+export async function installAll({verbose = false, silent = false} = {}) {
 	if (!checkConfigFile()) {
 		return;
 	}

package/commands/{install.js → install.ts}

@@ -1,13 +1,13 @@
-import path from 'path';
-import fs from 'fs';
+import path from 'node:path';
+import fs from 'node:fs';
 import logUpdate from 'log-update';
+import chalk from 'chalk';
 import {checkConfigFile, formatDir, getHighestVersion, mainActor, progressBar, readConfig, storageActor} from '../mops.js';
 import {parallel} from '../parallel.js';
-import chalk from 'chalk';
 import {installFromGithub} from '../vessel.js';
 import {addCache, copyCache, isCached} from '../cache.js';
 
-export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
+export async function install(pkg: string, version = '', {verbose = false, silent = false, dep = false} = {}) {
 	if (!checkConfigFile()) {
 		return false;
 	}
@@ -23,7 +23,7 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 
 	if (!version) {
 		let versionRes = await getHighestVersion(pkg);
-		if (versionRes.err) {
+		if ('err' in versionRes) {
 			console.log(chalk.red('Error: ') + versionRes.err);
 			return false;
 		}
@@ -50,13 +50,13 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 			actor.getFileIds(pkg, version),
 		]);
 
-		if (packageDetailsRes.err) {
+		if ('err' in packageDetailsRes) {
 			console.log(chalk.red('Error: ') + packageDetailsRes.err);
 			return false;
 		}
 		let packageDetails = packageDetailsRes.ok;
 
-		if (filesIdsRes.err) {
+		if ('err' in filesIdsRes) {
 			console.log(chalk.red('Error: ') + filesIdsRes.err);
 			return false;
 		}
@@ -69,18 +69,18 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 
 		// download files
 		let filesData = new Map;
-		await parallel(16, filesIds, async (fileId) => {
+		await parallel(16, filesIds, async (fileId: string) => {
 			let fileMetaRes = await storage.getFileMeta(fileId);
-			if (fileMetaRes.err) {
+			if ('err' in fileMetaRes) {
 				console.log(chalk.red('ERR: ') + fileMetaRes.err);
 				return;
 			}
 			let fileMeta = fileMetaRes.ok;
 
 			let buffer = Buffer.from([]);
-			for (let i = 0; i < fileMeta.chunkCount; i++) {
+			for (let i = 0n; i < fileMeta.chunkCount; i++) {
 				let chunkRes = await storage.downloadChunk(fileId, i);
-				if (chunkRes.err) {
+				if ('err' in chunkRes) {
 					console.log(chalk.red('ERR: ') + chunkRes.err);
 					return;
 				}

package/commands/{mmf1.js → mmf1.ts}

@@ -4,20 +4,22 @@
 // mops:1:skip
 import chalk from 'chalk';
 
+type Strategy = 'store' | 'print';
+
 export class MMF1 {
-	stack = [];
-	currSuite = '';
+	stack: string[] = [];
+	currSuite: string = '';
 	failed = 0;
 	passed = 0;
 	skipped = 0;
-	srategy; // 'store' | 'print'
-	output = [];
+	srategy: Strategy;
+	output: string[] = [];
 
-	constructor(srategy) {
+	constructor(srategy: Strategy) {
 		this.srategy = srategy;
 	}
 
-	_log(...args) {
+	_log(...args: string[]) {
 		if (this.srategy === 'store') {
 			this.output.push(args.join(' '));
 		}
@@ -30,27 +32,27 @@ export class MMF1 {
 		for (let out of this.output) {
 			console.log(out);
 		}
-		this.store = [];
+		this.output = [];
 	}
 
-	parseLine(line) {
+	parseLine(line: string) {
 		if (line.startsWith('mops:1:start ')) {
-			this._testStart(line.split('mops:1:start ')[1]);
+			this._testStart(line.split('mops:1:start ')[1] || '');
 		}
 		else if (line.startsWith('mops:1:end ')) {
-			this._testEnd(line.split('mops:1:end ')[1]);
+			this._testEnd(line.split('mops:1:end ')[1] || '');
 		}
 		else if (line.startsWith('mops:1:skip ')) {
-			this._testSkip(line.split('mops:1:skip ')[1]);
+			this._testSkip(line.split('mops:1:skip ')[1] || '');
 		}
 		else {
 			this._log(' '.repeat(this.stack.length * 2), chalk.gray('stdout'), line);
 		}
 	}
 
-	_testStart(name) {
-		if (this.stack.length) {
-			let suite = this.stack[this.stack.length - 1];
+	_testStart(name: string) {
+		let suite = this.stack[this.stack.length - 1];
+		if (suite) {
 			if (this.currSuite !== suite) {
 				this.currSuite = suite;
 				this._log(' '.repeat((this.stack.length - 1) * 2), (chalk.gray('•')) + '', suite);
@@ -59,18 +61,18 @@ export class MMF1 {
 		this.stack.push(name);
 	}
 
-	_testEnd(name) {
+	_testEnd(name: string) {
 		if (name !== this.stack.pop()) {
 			throw 'mmf1._testEnd: start and end test mismatch';
 		}
 		this._status(name, 'pass');
 	}
 
-	_testSkip(name) {
+	_testSkip(name: string) {
 		this._status(name, 'skip');
 	}
 
-	_status(name, status) {
+	_status(name: string, status: string) {
 		if (status === 'pass') {
 			// do not print suite at the end
 			if (name === this.currSuite) {
@@ -89,7 +91,7 @@ export class MMF1 {
 		}
 	}
 
-	fail(stderr) {
+	fail(stderr: string) {
 		let name = this.stack.pop() || '';
 		this._status(name, 'fail');
 		this._log(' '.repeat(this.stack.length * 2), chalk.red('FAIL'), stderr);

package/commands/{publish.js → publish.ts}

@@ -1,15 +1,17 @@
-import fs from 'fs';
-import path from 'path';
+import fs from 'node:fs';
+import path from 'node:path';
 import chalk from 'chalk';
 import logUpdate from 'log-update';
 import {globbySync} from 'globby';
-import minimatch from 'minimatch';
+import {minimatch} from 'minimatch';
 import prompts from 'prompts';
 import {checkConfigFile, getRootDir, mainActor, progressBar, readConfig} from '../mops.js';
 import {parallel} from '../parallel.js';
 import {docs} from './docs.js';
+import {DependencyV2, PackageConfigV2} from '../declarations/main/main.did.js';
+import {Dependency} from '../types.js';
 
-export async function publish({noDocs} = {}) {
+export async function publish({noDocs = false} = {}) {
 	if (!checkConfigFile()) {
 		return;
 	}
@@ -31,6 +33,7 @@ export async function publish({noDocs} = {}) {
 		return;
 	}
 	for (let key of ['name', 'version']) {
+		// @ts-ignore
 		if (!config.package[key]) {
 			console.log(chalk.red('Error: ') + `Please specify "${key}" in [config] section in your mops.toml`);
 			return;
@@ -39,6 +42,7 @@ export async function publish({noDocs} = {}) {
 
 	// desired fields
 	for (let key of ['description', 'repository']) {
+		// @ts-ignore
 		if (!config.package[key]) {
 			let res = await prompts({
 				type: 'confirm',
@@ -93,6 +97,7 @@ export async function publish({noDocs} = {}) {
 	};
 
 	for (let [key, max] of Object.entries(keysMax)) {
+		// @ts-ignore
 		if (config.package[key] && config.package[key].length > max) {
 			console.log(chalk.red('Error: ') + `package.${key} value max length is ${max}`);
 			return;
@@ -147,8 +152,16 @@ export async function publish({noDocs} = {}) {
 		}
 	}
 
+	let toBackendDep = (dep: Dependency): DependencyV2 => {
+		return {
+			...dep,
+			version: dep.version || '',
+			repo: dep.repo || ''
+		};
+	};
+
 	// map fields
-	let backendPkgConfig = {
+	let backendPkgConfig: PackageConfigV2 = {
 		name: config.package.name,
 		version: config.package.version,
 		keywords: config.package.keywords || [],
@@ -162,8 +175,8 @@ export async function publish({noDocs} = {}) {
 		dfx: config.package.dfx || '',
 		moc: config.package.moc || '',
 		donation: config.package.donation || '',
-		dependencies: Object.values(config.dependencies || {}),
-		devDependencies: Object.values(config['dev-dependencies'] || {}),
+		dependencies: Object.values(config.dependencies || {}).map(toBackendDep),
+		devDependencies: Object.values(config['dev-dependencies'] || {}).map(toBackendDep),
 		scripts: [],
 	};
 
@@ -203,7 +216,7 @@ export async function publish({noDocs} = {}) {
 
 	// check allowed exts
 	for (let file of files) {
-		if (!minimatch(file, '**/*.{mo,did,md,toml}') && !file.toLowerCase().endsWith('license') && file !== docsFile) {
+		if (!minimatch(file, '**/*.{mo,did,md,toml}') && !file.toLowerCase().endsWith('license') && !file.toLowerCase().endsWith('notice') && file !== docsFile) {
 			console.log(chalk.red('Error: ') + `file ${file} has unsupported extension. Allowed: .mo, .did, .md, .toml`);
 			return;
 		}
@@ -214,7 +227,7 @@ export async function publish({noDocs} = {}) {
 	let step = 0;
 	function progress() {
 		step++;
-		logUpdate(`Publishing ${config.package.name}@${config.package.version} ${progressBar(step, total)}`);
+		logUpdate(`Publishing ${config.package?.name}@${config.package?.version} ${progressBar(step, total)}`);
 	}
 
 	// upload config
@@ -222,14 +235,14 @@ export async function publish({noDocs} = {}) {
 
 	progress();
 	let publishing = await actor.startPublish(backendPkgConfig);
-	if (publishing.err) {
+	if ('err' in publishing) {
 		console.log(chalk.red('Error: ') + publishing.err);
 		return;
 	}
 	let puiblishingId = publishing.ok;
 
 	// upload files
-	await parallel(8, files, async (file) => {
+	await parallel(8, files, async (file: string) => {
 		progress();
 
 		let chunkSize = 1024 * 1024 + 512 * 1024; // 1.5mb
@@ -242,8 +255,8 @@ export async function publish({noDocs} = {}) {
 			file = path.basename(file);
 		}
 
-		let res = await actor.startFileUpload(puiblishingId, file, chunkCount, firstChunk);
-		if (res.err) {
+		let res = await actor.startFileUpload(puiblishingId, file, BigInt(chunkCount), firstChunk);
+		if ('err' in res) {
 			console.log(chalk.red('Error: ') + res.err);
 			return;
 		}
@@ -252,8 +265,8 @@ export async function publish({noDocs} = {}) {
 		for (let i = 1; i < chunkCount; i++) {
 			let start = i * chunkSize;
 			let chunk = Array.from(content.slice(start, start + chunkSize));
-			let res = await actor.uploadFileChunk(puiblishingId, fileId, i, chunk);
-			if (res.err) {
+			let res = await actor.uploadFileChunk(puiblishingId, fileId, BigInt(i), chunk);
+			if ('err' in res) {
 				console.log(chalk.red('Error: ') + res.err);
 				return;
 			}
@@ -265,7 +278,7 @@ export async function publish({noDocs} = {}) {
 	// finish
 	progress();
 	let res = await actor.finishPublish(puiblishingId);
-	if (res.err) {
+	if ('err' in res) {
 		console.log(chalk.red('Error: ') + res.err);
 		return;
 	}