ic-mops 1.1.2-pre.0 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Mops CLI Changelog
 
+## 1.2.0
+- Removed `mops transfer-ownership` command
+- Added `mops owner` command to manage package owners ([docs](https://docs.mops.one/cli/mops-owner))
+- Added `mops maintainers` command to manage package maintainers ([docs](https://docs.mops.one/cli/mops-maintainers))
+- Added experimental support for pocket-ic replica that comes with dfx in `mops test` command ([docs](https://docs.mops.one/cli/mops-test#--replica))
+- Added flag `--verbose` to `mops test` command to show replica logs
+- Fixed bug where `mops watch` would fail if dfx.json did not exist
+- Fixed bug with local dependencies without `mops.toml` file
+
+## 1.1.2
+- Fixed `{MOPS_ENV}` substitution in local package path
+
 ## 1.1.1
 - `moc-wrapper` now adds hostname to the moc path cache(`.mops/moc-*` filename) to avoid errors when running in Dev Containers
 - `mops watch` now deploys canisters with the `--yes` flag to skip data loss confirmation

package/cli.ts

@@ -21,12 +21,13 @@ import {sync} from './commands/sync.js';
 import {outdated} from './commands/outdated.js';
 import {update} from './commands/update.js';
 import {bench} from './commands/bench.js';
-import {transferOwnership} from './commands/transfer-ownership.js';
 import {toolchain} from './commands/toolchain/index.js';
 import {Tool} from './types.js';
 import * as self from './commands/self.js';
 import {resolvePackages} from './resolve-packages.js';
 import {watch} from './commands/watch/watch.js';
+import {addOwner, printOwners, removeOwner} from './commands/owner.js';
+import {addMaintainer, printMaintainers, removeMaintainer} from './commands/maintainer.js';
 
 declare global {
 	// eslint-disable-next-line no-var
@@ -214,7 +215,7 @@ program
 	.addOption(new Option('--mode <mode>', 'Test mode').choices(['interpreter', 'wasi', 'replica']).default('interpreter'))
 	.addOption(new Option('--replica <replica>', 'Which replica to use to run tests in replica mode').choices(['dfx', 'pocket-ic']))
 	.option('-w, --watch', 'Enable watch mode')
-	.option('--debug', 'Show debug logs')
+	.option('--verbose', 'Verbose output')
 	.action(async (filter, options) => {
 		checkConfigFile(true);
 		await installAll({silent: true, lock: 'ignore', installFromLockFile: true});
@@ -290,6 +291,68 @@ userCommand
 
 program.addCommand(userCommand);
 
+// mops owner *
+const ownerCommand = new Command('owner').description('Package owner management');
+
+// mops owner list
+ownerCommand
+	.command('list')
+	.description('List package owners')
+	.action(async () => {
+		await printOwners();
+	});
+
+// mops owner add
+ownerCommand
+	.command('add <principal>')
+	.description('Add package owner')
+	.addOption(new Option('--yes', 'Do not ask for confirmation'))
+	.action(async (data, options) => {
+		await addOwner(data, options.yes);
+	});
+
+// mops owner remove
+ownerCommand
+	.command('remove <principal>')
+	.description('Remove package owner')
+	.addOption(new Option('--yes', 'Do not ask for confirmation'))
+	.action(async (data, options) => {
+		await removeOwner(data, options.yes);
+	});
+
+program.addCommand(ownerCommand);
+
+// mops maintainer *
+const maintainerCommand = new Command('maintainer').description('Package maintainer management');
+
+// mops maintainer list
+maintainerCommand
+	.command('list')
+	.description('List package maintainers')
+	.action(async () => {
+		await printMaintainers();
+	});
+
+// mops maintainer add
+maintainerCommand
+	.command('add <principal>')
+	.description('Add package maintainer')
+	.addOption(new Option('--yes', 'Do not ask for confirmation'))
+	.action(async (data, options) => {
+		await addMaintainer(data, options.yes);
+	});
+
+// mops maintainer remove
+maintainerCommand
+	.command('remove <principal>')
+	.description('Remove package maintainer')
+	.addOption(new Option('--yes', 'Do not ask for confirmation'))
+	.action(async (data, options) => {
+		await removeMaintainer(data, options.yes);
+	});
+
+program.addCommand(maintainerCommand);
+
 // bump
 program
 	.command('bump [major|minor|patch]')
@@ -324,14 +387,6 @@ program
 		await update(pkg, options);
 	});
 
-// transfer-ownership
-program
-	.command('transfer-ownership [to-principal]')
-	.description('Transfer ownership of the current package to another principal')
-	.action(async (toPrincipal) => {
-		await transferOwnership(toPrincipal);
-	});
-
 // toolchain
 const toolchainCommand = new Command('toolchain').description('Toolchain management');
 

package/commands/install/install-local-dep.ts

@@ -1,5 +1,6 @@
 import process from 'node:process';
 import path from 'node:path';
+import {existsSync} from 'node:fs';
 import {createLogUpdate} from 'log-update';
 import {getRootDir, readConfig} from '../../mops.js';
 import {installDeps} from './install-deps.js';
@@ -27,11 +28,17 @@ export async function installLocalDep(pkg : string, pkgPath = '', {verbose, sile
 
 	// install dependencies
 	if (!ignoreTransitive) {
-		let dir = path.resolve(getRootDir(), pkgPath);
-		let config = readConfig(path.join(dir, 'mops.toml'));
+		let dir = path.resolve(getRootDir(), pkgPath).replaceAll('{MOPS_ENV}', process.env.MOPS_ENV || 'local');
+		let mopsToml = path.join(dir, 'mops.toml');
+
+		if (!existsSync(mopsToml)) {
+			return true;
+		}
+
+		let config = readConfig(mopsToml);
 		return installDeps(Object.values(config.dependencies || {}), {silent, verbose}, pkgPath);
 	}
 	else {
 		return true;
 	}
-}
+}

package/commands/maintainer.ts

@@ -0,0 +1,105 @@
+import process from 'node:process';
+import chalk from 'chalk';
+import {checkConfigFile, getIdentity, readConfig} from '../mops.js';
+import {mainActor} from '../api/actors.js';
+import {Principal} from '@dfinity/principal';
+import prompts from 'prompts';
+
+export async function printMaintainers() {
+	if (!checkConfigFile()) {
+		return;
+	}
+
+	let config = readConfig();
+	let actor = await mainActor();
+
+	let maintainers = await actor.getPackageMaintainers(config.package?.name || '');
+	console.log(`Maintainers of package ${chalk.bold(config.package?.name)}:`);
+	for (let maintainer of maintainers) {
+		console.log(maintainer.toText());
+	}
+}
+
+export async function addMaintainer(maintainer : string, yes = false) {
+	if (!checkConfigFile()) {
+		return;
+	}
+
+	let config = readConfig();
+	let principal = Principal.fromText(maintainer);
+
+	if (!yes) {
+		let promptsConfig = {
+			onCancel() {
+				console.log('aborted');
+				process.exit(0);
+			},
+		};
+
+		let {confirm} = await prompts({
+			type: 'confirm',
+			name: 'confirm',
+			message: `Are you sure you want to add maintainer ${chalk.yellow(maintainer)} to ${chalk.yellow(config.package?.name)} package?`,
+			initial: true,
+		}, promptsConfig);
+
+		if (!confirm) {
+			return;
+		}
+	}
+
+	let identity = await getIdentity();
+	let actor = await mainActor(identity);
+
+	let res = await actor.addMaintainer(config.package?.name || '', principal);
+	if ('ok' in res) {
+		console.log(chalk.green('Success!'));
+		console.log(`Added maintainer ${chalk.bold(maintainer)} to package ${chalk.bold(config.package?.name)}`);
+	}
+	else {
+		console.error(chalk.red('Error: ') + res.err);
+		process.exit(1);
+	}
+}
+
+export async function removeMaintainer(maintainer : string, yes = false) {
+	if (!checkConfigFile()) {
+		return;
+	}
+
+	let config = readConfig();
+	let principal = Principal.fromText(maintainer);
+
+	if (!yes) {
+		let promptsConfig = {
+			onCancel() {
+				console.log('aborted');
+				process.exit(0);
+			},
+		};
+
+		let {confirm} = await prompts({
+			type: 'confirm',
+			name: 'confirm',
+			message: `Are you sure you want to remove maintainer ${chalk.red(maintainer)} from ${chalk.red(config.package?.name)} package?`,
+			initial: true,
+		}, promptsConfig);
+
+		if (!confirm) {
+			return;
+		}
+	}
+
+	let identity = await getIdentity();
+	let actor = await mainActor(identity);
+
+	let res = await actor.removeMaintainer(config.package?.name || '', principal);
+	if ('ok' in res) {
+		console.log(chalk.green('Success!'));
+		console.log(`Removed maintainer ${chalk.bold(maintainer)} from package ${chalk.bold(config.package?.name)}`);
+	}
+	else {
+		console.error(chalk.red('Error: ') + res.err);
+		process.exit(1);
+	}
+}

package/commands/owner.ts

@@ -0,0 +1,105 @@
+import process from 'node:process';
+import chalk from 'chalk';
+import {checkConfigFile, getIdentity, readConfig} from '../mops.js';
+import {mainActor} from '../api/actors.js';
+import {Principal} from '@dfinity/principal';
+import prompts from 'prompts';
+
+export async function printOwners() {
+	if (!checkConfigFile()) {
+		return;
+	}
+
+	let config = readConfig();
+	let actor = await mainActor();
+
+	let owners = await actor.getPackageOwners(config.package?.name || '');
+	console.log(`Owners of package ${chalk.bold(config.package?.name)}:`);
+	for (let owner of owners) {
+		console.log(owner.toText());
+	}
+}
+
+export async function addOwner(owner : string, yes = false) {
+	if (!checkConfigFile()) {
+		return;
+	}
+
+	let config = readConfig();
+	let principal = Principal.fromText(owner);
+
+	if (!yes) {
+		let promptsConfig = {
+			onCancel() {
+				console.log('aborted');
+				process.exit(0);
+			},
+		};
+
+		let {confirm} = await prompts({
+			type: 'confirm',
+			name: 'confirm',
+			message: `Are you sure you want to add owner ${chalk.yellow(owner)} to ${chalk.yellow(config.package?.name)} package?`,
+			initial: true,
+		}, promptsConfig);
+
+		if (!confirm) {
+			return;
+		}
+	}
+
+	let identity = await getIdentity();
+	let actor = await mainActor(identity);
+
+	let res = await actor.addOwner(config.package?.name || '', principal);
+	if ('ok' in res) {
+		console.log(chalk.green('Success!'));
+		console.log(`Added owner ${chalk.bold(owner)} to package ${chalk.bold(config.package?.name)}`);
+	}
+	else {
+		console.error(chalk.red('Error: ') + res.err);
+		process.exit(1);
+	}
+}
+
+export async function removeOwner(owner : string, yes = false) {
+	if (!checkConfigFile()) {
+		return;
+	}
+
+	let config = readConfig();
+	let principal = Principal.fromText(owner);
+
+	if (!yes) {
+		let promptsConfig = {
+			onCancel() {
+				console.log('aborted');
+				process.exit(0);
+			},
+		};
+
+		let {confirm} = await prompts({
+			type: 'confirm',
+			name: 'confirm',
+			message: `Are you sure you want to remove owner ${chalk.red(owner)} from ${chalk.red(config.package?.name)} package?`,
+			initial: true,
+		}, promptsConfig);
+
+		if (!confirm) {
+			return;
+		}
+	}
+
+	let identity = await getIdentity();
+	let actor = await mainActor(identity);
+
+	let res = await actor.removeOwner(config.package?.name || '', principal);
+	if ('ok' in res) {
+		console.log(chalk.green('Success!'));
+		console.log(`Removed owner ${chalk.bold(owner)} from package ${chalk.bold(config.package?.name)}`);
+	}
+	else {
+		console.error(chalk.red('Error: ') + res.err);
+		process.exit(1);
+	}
+}

package/commands/replica.ts

@@ -62,7 +62,7 @@ export class Replica {
 				}
 				if (data.toString().includes('Failed to bind socket to')) {
 					console.error(chalk.red(data.toString()));
-					console.log('Please run again after some time');
+					console.log('Please try again after some time');
 					process.exit(11);
 				}
 			});

package/commands/test/test.ts

@@ -48,7 +48,7 @@ type TestOptions = {
 	reporter : ReporterName;
 	mode : TestMode;
 	replica : ReplicaName;
-	debug : boolean;
+	verbose : boolean;
 };
 
 
@@ -82,7 +82,7 @@ export async function test(filter = '', options : Partial<TestOptions> = {}) {
 	}
 
 	replica.type = replicaType;
-	replica.verbose = !!options.debug;
+	replica.verbose = !!options.verbose;
 
 	if (options.watch) {
 		replica.ttl = 60 * 15; // 15 minutes

package/commands/watch/parseDfxJson.ts

@@ -51,14 +51,14 @@ function readDfxJson() : DfxConfig | Record<string, never> {
 
 export function getMotokoCanisters() : Record<string, string> {
 	let dfxJson = readDfxJson();
-	return Object.fromEntries(Object.entries(dfxJson.canisters)
+	return Object.fromEntries(Object.entries(dfxJson.canisters || {})
 		.filter(([_, canister]) => canister.type === 'motoko')
 		.map(([name, canister]) => [name, canister.main ?? '']));
 }
 
 export function getMotokoCanistersWithDeclarations() : Record<string, string> {
 	let dfxJson = readDfxJson();
-	return Object.fromEntries(Object.entries(dfxJson.canisters)
+	return Object.fromEntries(Object.entries(dfxJson.canisters || {})
 		.filter(([_, canister]) => canister.type === 'motoko' && canister.declarations)
 		.map(([name, canister]) => [name, canister.main ?? '']));
 }

package/declarations/main/main.did

@@ -90,7 +90,7 @@ type Result_6 =
  variant {
    err: Err;
    ok: vec record {
-             PackageName;
+             PackageName__1;
              PackageVersion__1;
            };
  };
@@ -106,18 +106,18 @@ type Result_4 =
  };
 type Result_3 = 
  variant {
-   err: Err;
-   ok: FileId;
+   err: text;
+   ok;
  };
 type Result_2 = 
  variant {
    err: Err;
-   ok: PublishingId;
+   ok: FileId;
  };
 type Result_1 = 
  variant {
-   err: text;
-   ok;
+   err: Err;
+   ok: PublishingId;
  };
 type Result = 
  variant {
@@ -157,9 +157,12 @@ type PackageSummary__1 =
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
    highestVersion: PackageVersion;
+   maintainers: vec User;
    owner: principal;
    ownerInfo: User;
+   owners: vec User;
    publication: PackagePublication;
+   publisher: User;
    quality: PackageQuality;
  };
 type PackageSummaryWithChanges__1 = 
@@ -171,9 +174,12 @@ type PackageSummaryWithChanges__1 =
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
    highestVersion: PackageVersion;
+   maintainers: vec User;
    owner: principal;
    ownerInfo: User;
+   owners: vec User;
    publication: PackagePublication;
+   publisher: User;
    quality: PackageQuality;
  };
 type PackageSummaryWithChanges = 
@@ -185,9 +191,12 @@ type PackageSummaryWithChanges =
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
    highestVersion: PackageVersion;
+   maintainers: vec User;
    owner: principal;
    ownerInfo: User;
+   owners: vec User;
    publication: PackagePublication;
+   publisher: User;
    quality: PackageQuality;
  };
 type PackageSummary = 
@@ -198,9 +207,12 @@ type PackageSummary =
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
    highestVersion: PackageVersion;
+   maintainers: vec User;
    owner: principal;
    ownerInfo: User;
+   owners: vec User;
    publication: PackagePublication;
+   publisher: User;
    quality: PackageQuality;
  };
 type PackageQuality = 
@@ -243,9 +255,12 @@ type PackageDetails =
    downloadsTotal: nat;
    fileStats: PackageFileStatsPublic;
    highestVersion: PackageVersion;
+   maintainers: vec User;
    owner: principal;
    ownerInfo: User;
+   owners: vec User;
    publication: PackagePublication;
+   publisher: User;
    quality: PackageQuality;
    testStats: TestStats__1;
    versionHistory: vec PackageSummaryWithChanges__1;
@@ -263,7 +278,7 @@ type PackageConfigV3_Publishing =
    keywords: vec text;
    license: text;
    moc: text;
-   name: PackageName__1;
+   name: PackageName;
    readme: text;
    repository: text;
    requirements: opt vec Requirement;
@@ -283,7 +298,7 @@ type PackageConfigV3 =
    keywords: vec text;
    license: text;
    moc: text;
-   name: PackageName__1;
+   name: PackageName;
    readme: text;
    repository: text;
    requirements: vec Requirement;
@@ -301,6 +316,8 @@ type PackageChanges =
  };
 type Main = 
  service {
+   addMaintainer: (PackageName__1, principal) -> (Result_3);
+   addOwner: (PackageName__1, principal) -> (Result_3);
    backup: () -> ();
    computeHashesForExistingFiles: () -> ();
    finishPublish: (PublishingId) -> (Result);
@@ -308,14 +325,14 @@ type Main =
    getBackupCanisterId: () -> (principal) query;
    getDefaultPackages: (text) ->
     (vec record {
-           PackageName;
+           PackageName__1;
            PackageVersion__1;
          }) query;
    getDownloadTrendByPackageId: (PackageId) ->
     (vec DownloadsSnapshot__1) query;
-   getDownloadTrendByPackageName: (PackageName) ->
+   getDownloadTrendByPackageName: (PackageName__1) ->
     (vec DownloadsSnapshot__1) query;
-   getFileHashes: (PackageName, PackageVersion__1) -> (Result_8);
+   getFileHashes: (PackageName__1, PackageVersion__1) -> (Result_8);
    getFileHashesByPackageIds: (vec PackageId) ->
     (vec record {
            PackageId;
@@ -324,19 +341,22 @@ type Main =
                  blob;
                };
          });
-   getFileHashesQuery: (PackageName, PackageVersion__1) -> (Result_8) query;
-   getFileIds: (PackageName, PackageVersion__1) -> (Result_7) query;
+   getFileHashesQuery: (PackageName__1, PackageVersion__1) ->
+    (Result_8) query;
+   getFileIds: (PackageName__1, PackageVersion__1) -> (Result_7) query;
    getHighestSemverBatch:
     (vec record {
-           PackageName;
+           PackageName__1;
            PackageVersion__1;
            SemverPart;
          }) -> (Result_6) query;
-   getHighestVersion: (PackageName) -> (Result_5) query;
+   getHighestVersion: (PackageName__1) -> (Result_5) query;
    getMostDownloadedPackages: () -> (vec PackageSummary) query;
    getMostDownloadedPackagesIn7Days: () -> (vec PackageSummary) query;
    getNewPackages: () -> (vec PackageSummary) query;
-   getPackageDetails: (PackageName, PackageVersion__1) -> (Result_4) query;
+   getPackageDetails: (PackageName__1, PackageVersion__1) -> (Result_4) query;
+   getPackageMaintainers: (PackageName__1) -> (vec principal) query;
+   getPackageOwners: (PackageName__1) -> (vec principal) query;
    getPackagesByCategory: () -> (vec record {
                                        text;
                                        vec PackageSummary;
@@ -350,17 +370,18 @@ type Main =
    getTotalPackages: () -> (nat) query;
    getUser: (principal) -> (opt User__1) query;
    http_request: (Request) -> (Response) query;
-   notifyInstall: (PackageName, PackageVersion__1) -> () oneway;
+   notifyInstall: (PackageName__1, PackageVersion__1) -> () oneway;
    notifyInstalls: (vec record {
-                          PackageName;
+                          PackageName__1;
                           PackageVersion__1;
                         }) -> () oneway;
+   removeMaintainer: (PackageName__1, principal) -> (Result_3);
+   removeOwner: (PackageName__1, principal) -> (Result_3);
    restore: (nat) -> ();
    search: (Text, opt nat, opt nat) -> (vec PackageSummary, PageCount) query;
-   setUserProp: (text, text) -> (Result_1);
-   startFileUpload: (PublishingId, Text, nat, blob) -> (Result_3);
-   startPublish: (PackageConfigV3_Publishing) -> (Result_2);
-   transferOwnership: (PackageName, principal) -> (Result_1);
+   setUserProp: (text, text) -> (Result_3);
+   startFileUpload: (PublishingId, Text, nat, blob) -> (Result_2);
+   startPublish: (PackageConfigV3_Publishing) -> (Result_1);
    transformRequest: (HttpTransformArg) -> (HttpResponse) query;
    uploadBenchmarks: (PublishingId, Benchmarks) -> (Result);
    uploadFileChunk: (PublishingId, FileId, nat, blob) -> (Result);
@@ -410,7 +431,7 @@ type DepsStatus =
  };
 type DependencyV2 = 
  record {
-   name: PackageName__1;
+   name: PackageName;
    repo: text;
    version: text;
  };