@dxos/cli 2.4.13 → 2.4.15

package/dist/es/main.js

@@ -29,7 +29,7 @@ var _extensions = require("./extensions");
 //
 
 /* babel-plugin-inline-import '../known-extensions.yml' */
-const KNOWN_EXTENSIONS = "# This is an autogenerated file. Do not edit this file directly.\n---\n  - \n    moduleName: \"@dxos/cli-app\"\n    describe: \"App proxy extension.\"\n    command: \n      - \"app\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-bot\"\n    describe: \"Bot extension.\"\n    command: \n      - \"bot\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-chat\"\n    describe: \"Chat extension.\"\n    command: \n      - \"chat\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-console\"\n    describe: \"KUBE console extension.\"\n    command: \n      - \"console\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-data\"\n    describe: \"Party management.\"\n    command: \n      - \n        command: \"party\"\n        describe: \"Party management.\"\n      - \n        command: \"storage\"\n        describe: \"Storage management.\"\n    initRequired: true\n    destroyRequired: true\n  - \n    moduleName: \"@dxos/cli-dxns\"\n    describe: \"DXNS extension.\"\n    command: \n      - \"dxns\"\n    initRequired: true\n    destroyRequired: true\n  - \n    moduleName: \"@dxos/cli-echo\"\n    describe: \"ECHO extension.\"\n    command: \n      - \"echo\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-halo\"\n    describe: \"HALO extension.\"\n    command: \n      - \"halo\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-ipfs\"\n    describe: \"IPFS extension.\"\n    command: \n      - \"ipfs\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-kube\"\n    describe: \"KUBE extension.\"\n    command: \n      - \"kube\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-mdns\"\n    describe: \"MDNS extension.\"\n    command: \n      - \"mdns\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-mesh\"\n    describe: \"MESH extension.\"\n    command: \n      - \"mesh\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-pad\"\n    describe: \"Pad extension.\"\n    command: \n      - \"pad\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-signal\"\n    describe: \"Signal server extension.\"\n    command: \n      - \n        command: \"signal\"\n        describe: \"Signal server as process.\"\n      - \n        command: \"container-signal\"\n        describe: \"Signal server as container.\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-wns\"\n    describe: \"Registry extension.\"\n    command: \n      - \n        command: \"wns\"\n        describe: \"Registry operations.\"\n      - \n        command: \"faucet\"\n        describe: \"Faucet management.\"\n      - \n        command: \"keys\"\n        describe: \"Keys management.\"\n    initRequired: false\n    destroyRequired: false\n\n";
+const KNOWN_EXTENSIONS = "# This is an autogenerated file. Do not edit this file directly.\n---\n  - \n    moduleName: \"@dxos/cli-app\"\n    describe: \"App proxy extension.\"\n    command: \n      - \"app\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-bot\"\n    describe: \"Bot extension.\"\n    command: \n      - \"bot\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-chat\"\n    describe: \"Chat extension.\"\n    command: \n      - \"chat\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-console\"\n    describe: \"KUBE console extension.\"\n    command: \n      - \"console\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-data\"\n    describe: \"Party and Device management.\"\n    command: \n      - \n        command: \"party\"\n        describe: \"Party management.\"\n      - \n        command: \"storage\"\n        describe: \"Storage management.\"\n      - \n        command: \"device\"\n        describe: \"Device management.\"\n    initRequired: true\n    destroyRequired: true\n  - \n    moduleName: \"@dxos/cli-dxns\"\n    describe: \"DXNS extension.\"\n    command: \n      - \"dxns\"\n    initRequired: true\n    destroyRequired: true\n  - \n    moduleName: \"@dxos/cli-echo\"\n    describe: \"ECHO extension.\"\n    command: \n      - \"echo\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-halo\"\n    describe: \"HALO extension.\"\n    command: \n      - \"halo\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-ipfs\"\n    describe: \"IPFS extension.\"\n    command: \n      - \"ipfs\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-kube\"\n    describe: \"KUBE extension.\"\n    command: \n      - \"kube\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-mdns\"\n    describe: \"MDNS extension.\"\n    command: \n      - \"mdns\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-mesh\"\n    describe: \"MESH extension.\"\n    command: \n      - \"mesh\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-pad\"\n    describe: \"Pad extension.\"\n    command: \n      - \"pad\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-signal\"\n    describe: \"Signal server extension.\"\n    command: \n      - \n        command: \"signal\"\n        describe: \"Signal server as process.\"\n      - \n        command: \"container-signal\"\n        describe: \"Signal server as container.\"\n    initRequired: false\n    destroyRequired: false\n  - \n    moduleName: \"@dxos/cli-wns\"\n    describe: \"Registry extension.\"\n    command: \n      - \n        command: \"wns\"\n        describe: \"Registry operations.\"\n      - \n        command: \"faucet\"\n        describe: \"Faucet management.\"\n      - \n        command: \"keys\"\n        describe: \"Keys management.\"\n    initRequired: false\n    destroyRequired: false\n\n";
 const {
   logError
 } = (0, _cliCore.getLoggers)();

package/dist/es/modules/services.js

@@ -217,6 +217,10 @@ const ServicesModule = ({
       type: 'boolean',
       default: false,
       description: 'Dev build'
+    }).option('replace-args', {
+      type: 'boolean',
+      description: 'Replace default arguments with provided.',
+      default: false
     }),
     handler: (0, _cliCore.asyncHandler)(async argv => {
       const {
@@ -228,7 +232,8 @@ const ServicesModule = ({
         profilePath: profile,
         storagePath,
         binds: additionalBinds = [],
-        dev
+        dev,
+        replaceArgs
       } = argv;
       const service = getServiceInfo(moduleName, serviceName);
       const dockerImage = new _cliCore.DockerImage({
@@ -236,7 +241,7 @@ const ServicesModule = ({
         dev
       });
       const forwardArgs = forward ? JSON.parse(forward).args : [];
-      const command = service.command.split(' ').concat(forwardArgs);
+      const command = replaceArgs ? forwardArgs : service.command.split(' ').concat(forwardArgs);
       const {
         name = service.container_name
       } = argv;

package/dist/es/pluggable.js

@@ -153,6 +153,16 @@ class Pluggable {
 
     return this._modulePath;
   }
+
+  get module() {
+    var _module$default;
+
+    const module = require(this.modulePath);
+
+    const moduleCli = (_module$default = module.default) !== null && _module$default !== void 0 ? _module$default : module; // Difference between `module.exports` and `export default`.
+
+    return moduleCli;
+  }
   /**
    * Checks if workspace is defined.
    */
@@ -230,7 +240,7 @@ class Pluggable {
 
 
   async init(state) {
-    return require(this.modulePath).init(state);
+    return this.module.init(state);
   }
   /**
    * Destroy extension in a scope of main CLI.
@@ -239,7 +249,7 @@ class Pluggable {
 
 
   async destroy(state) {
-    return require(this.modulePath).destroy(state);
+    return this.module.destroy(state);
   }
   /**
    * Runs command of an CLI extension.
@@ -263,11 +273,10 @@ class Pluggable {
           spinner
         });
         await (0, _extensions.addInstalled)(moduleName, this.getInfo());
-
         const {
           init,
           destroy
-        } = require(this.modulePath);
+        } = this.module;
 
         if (init || destroy) {
           console.log(`${moduleName} was successfully installed. Please run your command again.`);
@@ -279,19 +288,19 @@ class Pluggable {
       }
     }
 
-    return require(this.modulePath).runAsExtension(state, argv);
+    return this.module.runAsExtension(state, argv);
   }
 
   getInfo() {
     this._cleanCache();
 
-    return require(this.modulePath).info;
+    return this.module.info;
   }
 
   getDockerCompose() {
     this._cleanCache();
 
-    return require(this.modulePath).dockerCompose;
+    return this.module.dockerCompose;
   }
 
   _cleanCache() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/cli",
-  "version": "2.4.13",
+  "version": "2.4.15",
   "description": "DXOS CLI",
   "homepage": "https://github.com/dxos/cli/tree/master/packages/cli#readme",
   "license": "AGPL-3.0",
@@ -37,9 +37,9 @@
   },
   "dependencies": {
     "@babel/runtime": "7.7.2",
-    "@dxos/cli-core": "^2.4.13",
-    "@dxos/debug": "~2.12.20",
-    "@dxos/random-access-multi-storage": "~2.12.20",
+    "@dxos/cli-core": "^2.4.15",
+    "@dxos/debug": "~2.12.22",
+    "@dxos/random-access-multi-storage": "~2.12.22",
     "assert": "^2.0.0",
     "find-root": "^1.1.0",
     "fs-extra": "^8.1.0",
@@ -71,7 +71,7 @@
     "babel-loader": "^8.0.0",
     "babel-plugin-add-module-exports": "^1.0.0",
     "babel-plugin-inline-import": "^3.0.0",
-    "jest": "^25.1.0",
+    "jest": "^27.2.0",
     "json2yaml": "^1.1.0",
     "semistandard": "14.2.0",
     "yaml2json": "^1.0.2"
@@ -92,5 +92,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e2815efa9ccb8b6b011c1b2860c2afcde804288d"
+  "gitHead": "7ed53a9522c434b01358303873d654d23466aad2"
 }