ic-mops 0.1.9 → 0.1.12

package/README.md

@@ -1,5 +1,5 @@
 # MOPS
-CLI tool for [MOPS](http://mops.one)
+CLI tool for [MOPS](https://mops.one)
 
 ## Usage
 
@@ -13,4 +13,4 @@ npm i -g ic-mops
 mops i <package_name>
 ```
 
-For more docs visit http://mops.one
+For more docs visit https://mops.one

package/cli.js

@@ -64,7 +64,13 @@ program
 			installAll(options);
 		}
 		else {
-			let version = await getHighestVersion(pkg);
+			let versionRes = await getHighestVersion(pkg);
+			if (versionRes.err) {
+				console.log(chalk.red('Error: ') + versionRes.err);
+				return;
+			}
+			let version = versionRes.ok;
+
 			await install(pkg, version, {verbose: options.verbose});
 
 			config.dependencies[pkg] = version;

package/commands/install.js

@@ -11,7 +11,12 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 	}
 
 	if (!version) {
-		version = await getHighestVersion(pkg);
+		let versionRes = await getHighestVersion(pkg);
+		if (versionRes.err) {
+			console.log(chalk.red('Error: ') + versionRes.err);
+			return;
+		}
+		version = versionRes.ok;
 	}
 
 	let dir = path.join(process.cwd(), '.mops', `${pkg}@${version}`);
@@ -28,8 +33,21 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 		if (!dep) {
 			actor.notifyInstall(pkg, version);
 		}
-		let packageDetails = await actor.getPackageDetails(pkg, version);
-		let filesIds = await actor.getFileIds(pkg, version);
+
+		let packageDetailsRes = await actor.getPackageDetails(pkg, version);
+		if (packageDetailsRes.err) {
+			console.log(chalk.red('Error: ') + packageDetailsRes.err);
+			return;
+		}
+		let packageDetails = packageDetailsRes.ok;
+
+		let filesIdsRes = await actor.getFileIds(pkg, version);
+		if (filesIdsRes.err) {
+			console.log(chalk.red('Error: ') + filesIdsRes.err);
+			return;
+		}
+		let filesIds = filesIdsRes.ok;
+
 		let storage = await storageActor(packageDetails.publication.storage);
 
 		// progress
@@ -57,7 +75,8 @@ export async function install(pkg, version = '', {verbose, silent, dep} = {}) {
 					console.log(chalk.red('ERR: ') + chunkRes.err);
 					return;
 				}
-				buffer = Buffer.concat([buffer, chunkRes.ok]);
+				let chunk = chunkRes.ok;
+				buffer = Buffer.concat([buffer, Buffer.from(chunk)]);
 			}
 
 			fs.mkdirSync(path.join(dir, path.dirname(fileMeta.path)), {recursive: true});

package/commands/publish.js

@@ -57,6 +57,7 @@ export async function publish() {
 		'repository',
 		'documentation',
 		'homepage',
+		'baseDir',
 		'readme',
 		'license',
 		'files',
@@ -86,6 +87,7 @@ export async function publish() {
 		dfx: 10,
 		moc: 10,
 		donation: 64,
+		root: 50,
 	};
 
 	for (let [key, max] of Object.entries(keysMax)) {
@@ -127,6 +129,7 @@ export async function publish() {
 		repository: config.package.repository || '',
 		homepage: config.package.homepage || '',
 		documentation: config.package.documentation || '',
+		baseDir: 'src',
 		readme: 'README.md',
 		license: config.package.license || '',
 		owner: getIdentity()?.getPrincipal() || Principal.anonymous(),
@@ -136,6 +139,7 @@ export async function publish() {
 		dependencies: (Object.entries(config.dependencies || {})).map(([name, version]) => {
 			return {name, version};
 		}),
+		devDependencies: [],
 		scripts: [],
 	};
 
@@ -161,7 +165,7 @@ export async function publish() {
 
 	// check allowed exts
 	for (let file of files) {
-		if (!minimatch(file, '**/*.{mo,did,md,toml}')) {
+		if (!minimatch(file, '**/*.{mo,did,md,toml}') && !file.toLowerCase().endsWith('license')) {
 			console.log(chalk.red('Error: ') + `file ${file} has unsupported extension. Allowed: .mo, .did, .md, .toml`);
 			return;
 		}

package/commands/sources.js

@@ -73,7 +73,13 @@ export async function sources({verbose} = {}) {
 			packages['base-unofficial'] = downloadedPackages['base-unofficial'];
 		}
 		else {
-			let version = await getHighestVersion('base-unofficial');
+			let versionRes = await getHighestVersion('base-unofficial');
+			if (versionRes.err) {
+				console.log(chalk.red('Error: ') + versionRes.err);
+				return;
+			}
+			let version = versionRes.ok;
+
 			await install('base-unofficial', version, {silent: true, dep: true});
 			packages['base-unofficial'] = version;
 		}
@@ -90,7 +96,7 @@ export async function sources({verbose} = {}) {
 
 	// sources
 	for (let [name, ver] of Object.entries(packages)) {
-		let pkgDir = path.relative(process.cwd(), path.join(root, `.mops/${name}@${ver}`));
+		let pkgDir = path.relative(process.cwd(), path.join(root, `.mops/${name}@${ver}/src`));
 		console.log(`--package ${name} ${pkgDir}`);
 
 		// fallback base to base-unofficial

package/declarations/main/main.did

@@ -1,4 +1,4 @@
-type Version = text;
+type Ver = text;
 type Time = int;
 type Text = text;
 type StorageStats = 
@@ -13,6 +13,21 @@ type Script =
    name: text;
    value: text;
  };
+type Result_5 = 
+ variant {
+   err: Err;
+   ok: vec FileId;
+ };
+type Result_4 = 
+ variant {
+   err: Err;
+   ok: Ver;
+ };
+type Result_3 = 
+ variant {
+   err: Err;
+   ok: PackageDetails;
+ };
 type Result_2 = 
  variant {
    err: Err;
@@ -48,8 +63,10 @@ type PackageDetails =
  };
 type PackageConfig__1 = 
  record {
+   baseDir: text;
    dependencies: vec Dependency;
    description: text;
+   devDependencies: vec Dependency;
    dfx: text;
    documentation: text;
    donation: text;
@@ -65,8 +82,10 @@ type PackageConfig__1 =
  };
 type PackageConfig = 
  record {
+   baseDir: text;
    dependencies: vec Dependency;
    description: text;
+   devDependencies: vec Dependency;
    dfx: text;
    documentation: text;
    donation: text;
@@ -90,15 +109,15 @@ type Dependency =
 service : {
   finishPublish: (PublishingId) -> (Result);
   getApiVersion: () -> (Text) query;
-  getFileIds: (PackageName__1, Version) -> (vec FileId) query;
-  getHighestVersion: (PackageName__1) -> (Version) query;
-  getPackageDetails: (PackageName__1, Version) -> (PackageDetails) query;
+  getFileIds: (PackageName__1, Ver) -> (Result_5) query;
+  getHighestVersion: (PackageName__1) -> (Result_4) query;
+  getPackageDetails: (PackageName__1, Ver) -> (Result_3) query;
   getRecentlyUpdatedPackages: () -> (vec PackageDetails) query;
   getStoragesStats: () -> (vec record {
                                  StorageId;
                                  StorageStats;
                                }) query;
-  notifyInstall: (PackageName__1, Version) -> () oneway;
+  notifyInstall: (PackageName__1, Ver) -> () oneway;
   search: (Text) -> (vec PackageDetails) query;
   startFileUpload: (PublishingId, Text, nat, blob) -> (Result_2);
   startPublish: (PackageConfig) -> (Result_1);

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

@@ -8,6 +8,7 @@ export interface PackageConfig {
   'dfx' : string,
   'moc' : string,
   'scripts' : Array<Script>,
+  'baseDir' : string,
   'documentation' : string,
   'name' : PackageName,
   'homepage' : string,
@@ -15,6 +16,7 @@ export interface PackageConfig {
   'version' : string,
   'keywords' : Array<string>,
   'donation' : string,
+  'devDependencies' : Array<Dependency>,
   'repository' : string,
   'dependencies' : Array<Dependency>,
   'license' : string,
@@ -24,6 +26,7 @@ export interface PackageConfig__1 {
   'dfx' : string,
   'moc' : string,
   'scripts' : Array<Script>,
+  'baseDir' : string,
   'documentation' : string,
   'name' : PackageName,
   'homepage' : string,
@@ -31,6 +34,7 @@ export interface PackageConfig__1 {
   'version' : string,
   'keywords' : Array<string>,
   'donation' : string,
+  'devDependencies' : Array<Dependency>,
   'repository' : string,
   'dependencies' : Array<Dependency>,
   'license' : string,
@@ -58,6 +62,12 @@ export type Result_1 = { 'ok' : PublishingId } |
   { 'err' : PublishingErr };
 export type Result_2 = { 'ok' : FileId } |
   { 'err' : Err };
+export type Result_3 = { 'ok' : PackageDetails } |
+  { 'err' : Err };
+export type Result_4 = { 'ok' : Ver } |
+  { 'err' : Err };
+export type Result_5 = { 'ok' : Array<FileId> } |
+  { 'err' : Err };
 export interface Script { 'value' : string, 'name' : string }
 export type StorageId = Principal;
 export interface StorageStats {
@@ -67,16 +77,16 @@ export interface StorageStats {
 }
 export type Text = string;
 export type Time = bigint;
-export type Version = string;
+export type Ver = string;
 export interface _SERVICE {
   'finishPublish' : ActorMethod<[PublishingId], Result>,
   'getApiVersion' : ActorMethod<[], Text>,
-  'getFileIds' : ActorMethod<[PackageName__1, Version], Array<FileId>>,
-  'getHighestVersion' : ActorMethod<[PackageName__1], Version>,
-  'getPackageDetails' : ActorMethod<[PackageName__1, Version], PackageDetails>,
+  'getFileIds' : ActorMethod<[PackageName__1, Ver], Result_5>,
+  'getHighestVersion' : ActorMethod<[PackageName__1], Result_4>,
+  'getPackageDetails' : ActorMethod<[PackageName__1, Ver], Result_3>,
   'getRecentlyUpdatedPackages' : ActorMethod<[], Array<PackageDetails>>,
   'getStoragesStats' : ActorMethod<[], Array<[StorageId, StorageStats]>>,
-  'notifyInstall' : ActorMethod<[PackageName__1, Version], undefined>,
+  'notifyInstall' : ActorMethod<[PackageName__1, Ver], undefined>,
   'search' : ActorMethod<[Text], Array<PackageDetails>>,
   'startFileUpload' : ActorMethod<
     [PublishingId, Text, bigint, Array<number>],

package/declarations/main/main.did.js

@@ -4,8 +4,10 @@ export const idlFactory = ({ IDL }) => {
   const Result = IDL.Variant({ 'ok' : IDL.Null, 'err' : Err });
   const Text = IDL.Text;
   const PackageName__1 = IDL.Text;
-  const Version = IDL.Text;
+  const Ver = IDL.Text;
   const FileId = IDL.Text;
+  const Result_5 = IDL.Variant({ 'ok' : IDL.Vec(FileId), 'err' : Err });
+  const Result_4 = IDL.Variant({ 'ok' : Ver, 'err' : Err });
   const Script = IDL.Record({ 'value' : IDL.Text, 'name' : IDL.Text });
   const PackageName = IDL.Text;
   const Dependency = IDL.Record({ 'name' : PackageName, 'version' : IDL.Text });
@@ -13,6 +15,7 @@ export const idlFactory = ({ IDL }) => {
     'dfx' : IDL.Text,
     'moc' : IDL.Text,
     'scripts' : IDL.Vec(Script),
+    'baseDir' : IDL.Text,
     'documentation' : IDL.Text,
     'name' : PackageName,
     'homepage' : IDL.Text,
@@ -20,6 +23,7 @@ export const idlFactory = ({ IDL }) => {
     'version' : IDL.Text,
     'keywords' : IDL.Vec(IDL.Text),
     'donation' : IDL.Text,
+    'devDependencies' : IDL.Vec(Dependency),
     'repository' : IDL.Text,
     'dependencies' : IDL.Vec(Dependency),
     'license' : IDL.Text,
@@ -38,6 +42,7 @@ export const idlFactory = ({ IDL }) => {
     'config' : PackageConfig__1,
     'publication' : PackagePublication,
   });
+  const Result_3 = IDL.Variant({ 'ok' : PackageDetails, 'err' : Err });
   const StorageId = IDL.Principal;
   const StorageStats = IDL.Record({
     'fileCount' : IDL.Nat,
@@ -49,6 +54,7 @@ export const idlFactory = ({ IDL }) => {
     'dfx' : IDL.Text,
     'moc' : IDL.Text,
     'scripts' : IDL.Vec(Script),
+    'baseDir' : IDL.Text,
     'documentation' : IDL.Text,
     'name' : PackageName,
     'homepage' : IDL.Text,
@@ -56,6 +62,7 @@ export const idlFactory = ({ IDL }) => {
     'version' : IDL.Text,
     'keywords' : IDL.Vec(IDL.Text),
     'donation' : IDL.Text,
+    'devDependencies' : IDL.Vec(Dependency),
     'repository' : IDL.Text,
     'dependencies' : IDL.Vec(Dependency),
     'license' : IDL.Text,
@@ -66,15 +73,11 @@ export const idlFactory = ({ IDL }) => {
   return IDL.Service({
     'finishPublish' : IDL.Func([PublishingId], [Result], []),
     'getApiVersion' : IDL.Func([], [Text], ['query']),
-    'getFileIds' : IDL.Func(
-        [PackageName__1, Version],
-        [IDL.Vec(FileId)],
-        ['query'],
-      ),
-    'getHighestVersion' : IDL.Func([PackageName__1], [Version], ['query']),
+    'getFileIds' : IDL.Func([PackageName__1, Ver], [Result_5], ['query']),
+    'getHighestVersion' : IDL.Func([PackageName__1], [Result_4], ['query']),
     'getPackageDetails' : IDL.Func(
-        [PackageName__1, Version],
-        [PackageDetails],
+        [PackageName__1, Ver],
+        [Result_3],
         ['query'],
       ),
     'getRecentlyUpdatedPackages' : IDL.Func(
@@ -87,7 +90,7 @@ export const idlFactory = ({ IDL }) => {
         [IDL.Vec(IDL.Tuple(StorageId, StorageStats))],
         ['query'],
       ),
-    'notifyInstall' : IDL.Func([PackageName__1, Version], [], ['oneway']),
+    'notifyInstall' : IDL.Func([PackageName__1, Ver], [], ['oneway']),
     'search' : IDL.Func([Text], [IDL.Vec(PackageDetails)], ['query']),
     'startFileUpload' : IDL.Func(
         [PublishingId, Text, IDL.Nat, IDL.Vec(IDL.Nat8)],

package/package.json

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