@dxos/cli 2.18.5-dev.5b370dc9 → 2.19.1-dev.604435f4

package/dist/src/{pluggable.js → extensions/pluggable.js}

@@ -7,101 +7,49 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Pluggable = void 0;
-/* eslint import/no-dynamic-require: 0 */
 /* eslint @typescript-eslint/no-var-requires: 0 */
 /* eslint global-require: 0 */
-const child_process_1 = require("child_process");
-const find_root_1 = __importDefault(require("find-root"));
 const fs_1 = __importDefault(require("fs"));
-const ora_1 = __importDefault(require("ora"));
 const path_1 = __importDefault(require("path"));
 const read_pkg_up_1 = __importDefault(require("read-pkg-up"));
 const strip_json_comments_1 = __importDefault(require("strip-json-comments"));
 const cli_core_1 = require("@dxos/cli-core");
-const extensions_1 = require("./extensions");
+const manager_1 = require("./manager");
+const utils_1 = require("./utils");
 const pkg = read_pkg_up_1.default.sync({ cwd: path_1.default.join(__dirname, '../') });
-/**
- * @param {String} command
- * @param {Array} args
- * @param {Object} options
- */
-const runCommand = async (command, args, options) => {
-    return new Promise((resolve, reject) => {
-        const { spinner: spinnerText } = options;
-        const spinner = (0, ora_1.default)(spinnerText);
-        spinner.start();
-        (0, child_process_1.exec)(`${(0, cli_core_1.prepareExec)(command)} ${args.join(' ')}`, (err) => {
-            if (err) {
-                spinner.fail();
-                reject(err);
-            }
-            else {
-                spinner.succeed();
-                spinner.clear();
-                resolve();
-            }
-        });
-    });
-};
-/**
- * Finds root dir of a workspace.
- * @param {String} from
- */
-const getWorkspaceRoot = from => {
-    try {
-        return (0, find_root_1.default)(from, dir => {
-            const pkgPath = path_1.default.join(dir, 'package.json');
-            if (fs_1.default.existsSync(pkgPath)) {
-                const { workspaces } = require(pkgPath);
-                return workspaces && (Array.isArray(workspaces) || workspaces.packages);
-            }
-        });
-    }
-    catch (err) {
-        return '';
-    }
-};
 /**
  * Pluggable CLI module.
  */
 class Pluggable {
-    /**
-     * @constructor
-     * @param {String} moduleName
-     * @param {String} version
-     */
     constructor({ moduleName, version }) {
         var _a;
         this._moduleName = moduleName;
         this._version = version;
-        this._workspaceRoot = getWorkspaceRoot(__dirname);
-        this._workspacePackages = this._workspaceRoot && JSON.parse((0, strip_json_comments_1.default)(fs_1.default.readFileSync(path_1.default.join(this._workspaceRoot, 'rush.json')).toString())).projects;
-        this._workspaceInfo = this._workspacePackages && this._workspacePackages.find(module => module.packageName === this._moduleName);
-        this._isInWorkspace = this._workspaceInfo && fs_1.default.existsSync(path_1.default.join(this._workspaceRoot, this._workspaceInfo.projectFolder));
-        this._isInCWD = fs_1.default.existsSync(path_1.default.join(process.cwd(), 'package.json')) && ((_a = require(path_1.default.join(process.cwd(), 'package.json'))) === null || _a === void 0 ? void 0 : _a.name) === this._moduleName;
+        this._workspaceRoot = (0, utils_1.getWorkspaceRoot)(__dirname);
+        this._workspacePackages = this._workspaceRoot &&
+            JSON.parse((0, strip_json_comments_1.default)(fs_1.default.readFileSync(path_1.default.join(this._workspaceRoot, 'rush.json')).toString())).projects;
+        this._workspaceInfo = this._workspacePackages &&
+            this._workspacePackages.find(module => module.packageName === this._moduleName);
+        this._isInWorkspace = this._workspaceInfo &&
+            fs_1.default.existsSync(path_1.default.join(this._workspaceRoot, this._workspaceInfo.projectFolder));
+        this._isInCWD = fs_1.default.existsSync(path_1.default.join(process.cwd(), 'package.json')) &&
+            ((_a = require(path_1.default.join(process.cwd(), 'package.json'))) === null || _a === void 0 ? void 0 : _a.name) === this._moduleName;
         this._installed = this.isInstalled();
     }
     /**
      * Pluggable factory.
-     * @param {Object} options
      */
-    static create(options) {
-        return new Pluggable(options);
-    }
-    get moduleName() {
-        return this._moduleName;
-    }
-    get version() {
-        return this._version;
-    }
-    get workspaceRoot() {
-        return this._workspaceRoot;
-    }
-    get installed() {
-        return this._installed;
+    static create(extension) {
+        return new Pluggable(extension);
     }
-    get isInWorkspace() {
-        return this._isInWorkspace;
+    /**
+     * Returns the exported info.
+     */
+    get module() {
+        var _a;
+        const module = require(this.modulePath);
+        const cli = (_a = module.default) !== null && _a !== void 0 ? _a : module; // Difference between `module.exports` and `export default`.
+        return cli;
     }
     get modulePath() {
         if (!this._modulePath) {
@@ -120,11 +68,20 @@ class Pluggable {
         }
         return this._modulePath;
     }
-    get module() {
-        var _a;
-        const module = require(this.modulePath);
-        const moduleCli = (_a = module.default) !== null && _a !== void 0 ? _a : module; // Difference between `module.exports` and `export default`.
-        return moduleCli;
+    get moduleName() {
+        return this._moduleName;
+    }
+    get version() {
+        return this._version;
+    }
+    get workspaceRoot() {
+        return this._workspaceRoot;
+    }
+    get installed() {
+        return this._installed;
+    }
+    get isInWorkspace() {
+        return this._isInWorkspace;
     }
     /**
      * Checks if workspace is defined.
@@ -166,7 +123,7 @@ class Pluggable {
         const command = isYarn ? 'yarn' : 'npm';
         const args = isYarn ? ['global', 'add'] : ['install', '-g'];
         args.push(`${moduleName}${version ? `@${version}` : ''}`);
-        return runCommand(command, args, options);
+        return (0, utils_1.runCommand)(command, args, options);
     }
     /**
      * Uninstall CLI extension.
@@ -181,34 +138,33 @@ class Pluggable {
         const command = isYarn ? 'yarn' : 'npm';
         const args = isYarn ? ['global', 'remove'] : ['uninstall', '-g'];
         args.push(`${moduleName}`);
-        return runCommand(command, args, options);
+        return (0, utils_1.runCommand)(command, args, options);
     }
     /**
      * Init extension in a scope of main CLI.
-     * @param {Object} state
      */
     async init(state) {
-        return this.module.init(state);
+        var _a, _b;
+        return (_b = (_a = this.module).init) === null || _b === void 0 ? void 0 : _b.call(_a, state);
     }
     /**
      * Destroy extension in a scope of main CLI.
-     * @param {Object} state
      */
     async destroy(state) {
-        return this.module.destroy(state);
+        var _a, _b;
+        return (_b = (_a = this.module).destroy) === null || _b === void 0 ? void 0 : _b.call(_a, state);
     }
     /**
      * Runs command of an CLI extension.
-     * @param {Object} state
-     * @param {Object} argv
      */
     async run(state, argv) {
         const { installed, moduleName, version } = this;
         if (!installed) {
             const spinner = `Installing ${moduleName}${version ? `@${version}` : ''}`;
             try {
-                await this.installModule(null, { spinner });
-                await (0, extensions_1.addInstalled)(moduleName, this.getInfo());
+                await this.installModule(undefined, { spinner });
+                const extensionManager = new manager_1.ExtensionManager();
+                await extensionManager.add(moduleName, this.getInfo());
                 const { init, destroy } = this.module;
                 if (init || destroy) {
                     console.log(`${moduleName} was successfully installed. Please run your command again.`);
@@ -228,7 +184,7 @@ class Pluggable {
     }
     getDockerCompose() {
         this._cleanCache();
-        return this.module.dockerCompose;
+        return this.module.docker;
     }
     _cleanCache() {
         delete require.cache[require.resolve(this.modulePath)];

package/dist/src/extensions/pluggable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pluggable.js","sourceRoot":"","sources":["../../../src/extensions/pluggable.ts"],"names":[],"mappings":"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"}

package/dist/src/extensions/utils.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Asynchronosly run the shell command.
+ */
+export declare const runCommand: (command: string, args: string[], options: any) => Promise<unknown>;
+/**
+ * Finds root dir of a workspace.
+ */
+export declare const getWorkspaceRoot: (from: string) => string;
+//# sourceMappingURL=utils.d.ts.map

package/dist/src/extensions/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/extensions/utils.ts"],"names":[],"mappings":"AAeA;;GAEG;AACH,eAAO,MAAM,UAAU,YAAmB,MAAM,QAAQ,MAAM,EAAE,WAAW,GAAG,qBAiB7E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,SAAU,MAAM,WAY5C,CAAC"}

package/dist/src/extensions/utils.js

@@ -0,0 +1,58 @@
+"use strict";
+//
+// Copyright 2020 DXOS.org
+//
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWorkspaceRoot = exports.runCommand = void 0;
+/* eslint @typescript-eslint/no-var-requires: 0 */
+/* eslint global-require: 0 */
+const child_process_1 = require("child_process");
+const find_root_1 = __importDefault(require("find-root"));
+const fs_1 = __importDefault(require("fs"));
+const ora_1 = __importDefault(require("ora"));
+const path_1 = __importDefault(require("path"));
+const cli_core_1 = require("@dxos/cli-core");
+/**
+ * Asynchronosly run the shell command.
+ */
+const runCommand = async (command, args, options) => {
+    return new Promise((resolve, reject) => {
+        const { spinner: spinnerText } = options;
+        const spinner = (0, ora_1.default)(spinnerText);
+        spinner.start();
+        (0, child_process_1.exec)(`${(0, cli_core_1.prepareExec)(command)} ${args.join(' ')}`, (err) => {
+            if (err) {
+                spinner.fail();
+                reject(err);
+            }
+            else {
+                spinner.succeed();
+                spinner.clear();
+                resolve(true);
+            }
+        });
+    });
+};
+exports.runCommand = runCommand;
+/**
+ * Finds root dir of a workspace.
+ */
+const getWorkspaceRoot = (from) => {
+    try {
+        return (0, find_root_1.default)(from, dir => {
+            const pkgPath = path_1.default.join(dir, 'package.json');
+            if (fs_1.default.existsSync(pkgPath)) {
+                const { workspaces } = require(pkgPath);
+                return workspaces && (Array.isArray(workspaces) || workspaces.packages);
+            }
+        });
+    }
+    catch (err) {
+        return '';
+    }
+};
+exports.getWorkspaceRoot = getWorkspaceRoot;
+//# sourceMappingURL=utils.js.map

package/dist/src/extensions/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/extensions/utils.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAAkD;AAClD,8BAA8B;AAE9B,iDAAqC;AACrC,0DAAiC;AACjC,4CAAoB;AACpB,8CAAsB;AACtB,gDAAwB;AAExB,6CAA6C;AAE7C;;GAEG;AACI,MAAM,UAAU,GAAG,KAAK,EAAE,OAAe,EAAE,IAAc,EAAE,OAAY,EAAE,EAAE;IAChF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QACzC,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,WAAW,CAAC,CAAC;QACjC,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,IAAA,oBAAI,EAAC,GAAG,IAAA,sBAAW,EAAC,OAAO,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE;YACxD,IAAI,GAAG,EAAE;gBACP,OAAO,CAAC,IAAI,EAAE,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,CAAC,OAAO,EAAE,CAAC;gBAClB,OAAO,CAAC,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAjBW,QAAA,UAAU,cAiBrB;AAEF;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;IAC/C,IAAI;QACF,OAAO,IAAA,mBAAQ,EAAC,IAAI,EAAE,GAAG,CAAC,EAAE;YAC1B,MAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;YAC/C,IAAI,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBAC1B,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;gBACxC,OAAO,UAAU,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;aACzE;QACH,CAAC,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AAZW,QAAA,gBAAgB,oBAY3B"}

package/dist/src/main.js

@@ -7,91 +7,71 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
-const js_yaml_1 = __importDefault(require("js-yaml"));
 const lodash_uniqby_1 = __importDefault(require("lodash.uniqby"));
 const path_1 = __importDefault(require("path"));
-const read_pkg_up_1 = __importDefault(require("read-pkg-up"));
 const cli_core_1 = require("@dxos/cli-core");
 const extensions_1 = require("./extensions");
-const devtools_1 = require("./modules/devtools");
-const extension_1 = require("./modules/extension");
-const halo_1 = require("./modules/halo");
-const installation_1 = require("./modules/installation");
-const pluggable_1 = require("./modules/pluggable");
-const profile_1 = require("./modules/profile");
-const services_1 = require("./modules/services");
-const storage_1 = require("./modules/storage");
-const KNOWN_EXTENSIONS = (0, fs_1.readFileSync)(path_1.default.join(__dirname, '../known-extensions.yml')).toString();
-const { logError } = (0, cli_core_1.getLoggers)();
-const knownExtensions = js_yaml_1.default.load(KNOWN_EXTENSIONS);
-const pkg = read_pkg_up_1.default.sync({ cwd: __dirname });
+const modules_1 = require("./modules");
 const CLI_BASE_COMMAND = 'dx';
-const EXTENSION_INFO_FILE = 'extension.yml';
+const { logError } = (0, cli_core_1.getLoggers)();
 const CLI_CONFIG = {
     prompt: CLI_BASE_COMMAND,
     baseCommand: '',
     enableInteractive: true
 };
-const extensions = [];
-const destroyers = [];
+const modules = [
+    modules_1.InfoModule,
+    modules_1.ProfileModule,
+    modules_1.DevtoolsModule,
+    modules_1.ServicesModule,
+    modules_1.StorageModule,
+    modules_1.HaloModule,
+    modules_1.UpgradeModule,
+    modules_1.UninstallModule,
+    modules_1.ExtensionModule
+];
+const pluggableModules = [];
 const init = async (state) => {
-    const installedExtensions = await (0, extensions_1.listInstalled)();
+    // Generated by package script from Yargs definitions.
+    const knownExtensions = (0, cli_core_1.loadYml)(path_1.default.join(__dirname, '../known-extensions.yml'));
     // If developing new extension - read info from cwd.
-    const localExtensionFile = path_1.default.join(process.cwd(), EXTENSION_INFO_FILE);
+    const localExtensionFile = path_1.default.join(process.cwd(), cli_core_1.EXTENSION_CONFIG_FILENAME);
     if ((0, fs_1.existsSync)(localExtensionFile)) {
-        const devExtension = ((0, fs_1.readFileSync)(localExtensionFile)).toString();
-        const devExtensionInfo = js_yaml_1.default.load(devExtension);
-        const { name, description, command, initRequired, destroyRequired } = devExtensionInfo;
-        knownExtensions.push({
-            moduleName: `@${name}`,
-            describe: description,
-            command,
-            initRequired,
-            destroyRequired
-        });
-    }
-    const pluggableModules = (0, lodash_uniqby_1.default)(knownExtensions.concat(installedExtensions), 'moduleName');
-    for await (const extension of pluggableModules) {
-        const version = extension.version || (pkg === null || pkg === void 0 ? void 0 : pkg.package.version);
-        const pluggableModule = new pluggable_1.PluggableModule({ ...extension, version }, state);
-        if (extension.initRequired) {
-            await pluggableModule.init();
-        }
-        // eslint-disable-next-line
-        extensions.push(...pluggableModule.export.call(pluggableModule));
-        if (extension.destroyRequired) {
-            destroyers.push(pluggableModule.destroy.bind(pluggableModule));
+        const devExtensionInfo = (0, cli_core_1.loadYml)(localExtensionFile);
+        // TODO(egorgripasov): Once proper dx.yml in place check if DXNS type == 'extension' instead.
+        if (devExtensionInfo.moduleName) {
+            knownExtensions.push(devExtensionInfo);
         }
     }
+    const extensionManager = new extensions_1.ExtensionManager();
+    const installedExtensions = await extensionManager.list();
+    const pluggableExtensions = (0, lodash_uniqby_1.default)(knownExtensions.concat(installedExtensions), 'moduleName');
+    for await (const pluggableExtension of pluggableExtensions) {
+        const pluggableModule = new extensions_1.PluggableModule(pluggableExtension, state);
+        await pluggableModule.init();
+        pluggableModules.push(pluggableModule);
+        const exportedModules = pluggableModule.export();
+        modules.push(...exportedModules);
+    }
 };
 const destroy = async () => {
-    for await (const destroyer of destroyers) {
-        await destroyer();
+    for await (const pluggableModule of pluggableModules) {
+        await pluggableModule.destroy();
     }
 };
-const modules = [
-    profile_1.ProfileModule,
-    devtools_1.DevToolsModule,
-    services_1.ServicesModule,
-    storage_1.StorageModule,
-    halo_1.HaloModule,
-    installation_1.UpgradeModule,
-    installation_1.UninstallModule,
-    extension_1.ExtensionModule
-];
-module.exports = (0, cli_core_1.createCLI)({
-    options: CLI_CONFIG,
-    dir: __dirname,
-    main: !module.parent,
-    init,
-    destroy,
-    getModules: async () => [...modules, ...extensions],
-    info: {}
-});
 const handleError = (err) => {
     logError(err);
     process.exit(1);
 };
 process.on('uncaughtException', handleError);
 process.on('unhandledRejection', handleError);
+module.exports = (0, cli_core_1.createCLI)({
+    dir: __dirname,
+    main: !module.parent,
+    info: (0, cli_core_1.loadYml)(path_1.default.join(__dirname, `../${cli_core_1.EXTENSION_CONFIG_FILENAME}`)),
+    init,
+    destroy,
+    getModules: async () => modules,
+    options: CLI_CONFIG
+});
 //# sourceMappingURL=main.js.map

package/dist/src/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,2BAAgC;AAChC,kEAAmC;AACnC,gDAAwB;AAExB,6CAAiH;AAEjH,6CAAiE;AACjE,uCAUmB;AAEnB,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAE9B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,qBAAU,GAAE,CAAC;AAElC,MAAM,UAAU,GAAG;IACjB,MAAM,EAAE,gBAAgB;IACxB,WAAW,EAAE,EAAE;IACf,iBAAiB,EAAE,IAAI;CACxB,CAAC;AAEF,MAAM,OAAO,GAAG;IACd,oBAAU;IACV,uBAAa;IACb,wBAAc;IACd,wBAAc;IACd,uBAAa;IACb,oBAAU;IACV,uBAAa;IACb,yBAAe;IACf,yBAAe;CAChB,CAAC;AAEF,MAAM,gBAAgB,GAAsB,EAAE,CAAC;AAE/C,MAAM,IAAI,GAAG,KAAK,EAAE,KAAgB,EAAE,EAAE;IACtC,sDAAsD;IACtD,MAAM,eAAe,GAAgB,IAAA,kBAAO,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC,CAAC;IAE9F,oDAAoD;IACpD,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,oCAAyB,CAAC,CAAC;IAC/E,IAAI,IAAA,eAAU,EAAC,kBAAkB,CAAC,EAAE;QAClC,MAAM,gBAAgB,GAAG,IAAA,kBAAO,EAAC,kBAAkB,CAAC,CAAC;QACrD,6FAA6F;QAC7F,IAAI,gBAAgB,CAAC,UAAU,EAAE;YAC/B,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACxC;KACF;IAED,MAAM,gBAAgB,GAAG,IAAI,6BAAgB,EAAE,CAAC;IAChD,MAAM,mBAAmB,GAAgB,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAC;IACvE,MAAM,mBAAmB,GAAgB,IAAA,uBAAM,EAAC,eAAe,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,YAAY,CAAC,CAAC;IAC3G,IAAI,KAAK,EAAE,MAAM,kBAAkB,IAAI,mBAAmB,EAAE;QAC1D,MAAM,eAAe,GAAG,IAAI,4BAAe,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,eAAe,CAAC,IAAI,EAAE,CAAC;QAC7B,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAEvC,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;KAClC;AACH,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;IACzB,IAAI,KAAK,EAAE,MAAM,eAAe,IAAI,gBAAgB,EAAE;QACpD,MAAM,eAAe,CAAC,OAAO,EAAE,CAAC;KACjC;AACH,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,GAAQ,EAAE,EAAE;IAC/B,QAAQ,CAAC,GAAG,CAAC,CAAC;IACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;AAEF,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;AAC7C,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;AAE9C,MAAM,CAAC,OAAO,GAAG,IAAA,oBAAS,EAAC;IACzB,GAAG,EAAE,SAAS;IACd,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM;IACpB,IAAI,EAAE,IAAA,kBAAO,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,oCAAyB,EAAE,CAAC,CAAC;IACtE,IAAI;IACJ,OAAO;IACP,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO;IAC/B,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC"}

package/dist/src/modules/devtools.d.ts

@@ -1,4 +1,4 @@
-export function DevToolsModule({ config }: {
+export function DevtoolsModule({ config }: {
     config: any;
 }): object;
 //# sourceMappingURL=devtools.d.ts.map

package/dist/src/modules/devtools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devtools.d.ts","sourceRoot":"","sources":["../../../src/modules/devtools.js"],"names":[],"mappings":"AAsBO;;IAFM,MAAM,CA+DjB"}
+{"version":3,"file":"devtools.d.ts","sourceRoot":"","sources":["../../../src/modules/devtools.js"],"names":[],"mappings":"AAuBO;;IAHM,MAAM,CA6DjB"}

package/dist/src/modules/devtools.js

@@ -6,7 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DevToolsModule = void 0;
+exports.DevtoolsModule = void 0;
 const assert_1 = __importDefault(require("assert"));
 const download_1 = __importDefault(require("download"));
 const octokit_1 = require("octokit");
@@ -21,9 +21,10 @@ const CONFIG = { timeout: 30000, extract: false, strip: 1, mode: '755' };
  * Cert CLI module.
  * @returns {object}
  */
-const DevToolsModule = ({ config }) => ({
+// TODO(burdon): Move to debug CLI?
+const DevtoolsModule = ({ config }) => ({
     command: ['devtools'],
-    describe: 'Development tools.',
+    describe: 'Browser development tools.',
     builder: yargs => yargs
         .command({
         command: ['collect'],
@@ -61,5 +62,5 @@ const DevToolsModule = ({ config }) => ({
         })
     })
 });
-exports.DevToolsModule = DevToolsModule;
+exports.DevtoolsModule = DevtoolsModule;
 //# sourceMappingURL=devtools.js.map

package/dist/src/modules/devtools.js.map

@@ -1 +1 @@
-{"version":3,"file":"devtools.js","sourceRoot":"","sources":["../../../src/modules/devtools.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"devtools.js","sourceRoot":"","sources":["../../../src/modules/devtools.js"],"names":[],"mappings":"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"}

package/dist/src/modules/extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../../src/modules/extension.js"],"names":[],"mappings":"AAoBO;;IAFM,MAAM,CA6LjB"}
+{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../../src/modules/extension.js"],"names":[],"mappings":"AAmBO;;IAFM,MAAM,CA6LjB"}

package/dist/src/modules/extension.js

@@ -8,12 +8,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExtensionModule = void 0;
 const assert_1 = __importDefault(require("assert"));
-const lodash_get_1 = __importDefault(require("lodash.get"));
 const semver_1 = require("semver");
 const cli_core_1 = require("@dxos/cli-core");
 const debug_1 = require("@dxos/debug");
 const extensions_1 = require("../extensions");
-const pluggable_1 = require("../pluggable");
+// TODO(burdon): Move to config.
 const DEFAULT_TEMPLATE = 'https://github.com/dxos/templates/tree/main/cli-template';
 /**
  * Extension CLI module.
@@ -30,12 +29,13 @@ const ExtensionModule = ({ getReadlineInterface }) => ({
         builder: yargs => yargs,
         handler: (0, cli_core_1.asyncHandler)(async (argv) => {
             const { json } = argv;
-            let extensions = await (0, extensions_1.listInstalled)();
-            extensions = extensions.map(({ moduleName, version, describe, command }) => ({
+            const extensionManager = new extensions_1.ExtensionManager();
+            let extensions = await extensionManager.list();
+            extensions = extensions.map(({ moduleName, version, description, modules }) => ({
                 extension: moduleName,
-                command,
+                modules: modules.map(module => module.command),
                 version,
-                description: describe
+                description
             }));
             (0, cli_core_1.print)(extensions, { json });
         })
@@ -59,16 +59,16 @@ const ExtensionModule = ({ getReadlineInterface }) => ({
         handler: (0, cli_core_1.asyncHandler)(async (argv) => {
             const { module: moduleName, version, npmClient } = argv;
             (0, assert_1.default)(moduleName, 'Invalid extension.');
-            const pluggable = new pluggable_1.Pluggable({ moduleName, version });
+            const pluggable = new extensions_1.Pluggable({ moduleName, version });
             if (pluggable.isInWorkspace) {
                 (0, debug_1.log)(`Local version of "${moduleName}" from workspace is used, aborting.`);
                 return;
             }
             if (pluggable.installed) {
                 const info = pluggable.getInfo();
-                const installedVersion = (0, lodash_get_1.default)(info, 'package.version');
+                const installedVersion = info.version;
                 let action = 'upgrade';
-                // TODO(egorgripasov): Read verison number from WNS.
+                // TODO(egorgripasov): Read verison number from DXNS.
                 if (version && (0, semver_1.valid)(version) && installedVersion) {
                     const comp = (0, semver_1.compare)(version, installedVersion);
                     switch (comp) {
@@ -94,14 +94,16 @@ const ExtensionModule = ({ getReadlineInterface }) => ({
                 rl.close();
                 if (!(/^y/i.test(wishToUpgrade))) {
                     (0, debug_1.log)('Abotring.');
-                    await (0, extensions_1.addInstalled)(moduleName, info);
+                    const extensionManager = new extensions_1.ExtensionManager();
+                    await extensionManager.add(moduleName, info);
                     return;
                 }
             }
             const spinner = `Installing ${moduleName}${version ? `@${version}` : ''}`;
             await pluggable.installModule(npmClient, { spinner });
             const updatedInfo = pluggable.getInfo();
-            await (0, extensions_1.addInstalled)(moduleName, updatedInfo);
+            const extensionManager = new extensions_1.ExtensionManager();
+            await extensionManager.add(moduleName, updatedInfo);
         })
     })
         // Uninstall.
@@ -114,20 +116,20 @@ const ExtensionModule = ({ getReadlineInterface }) => ({
         handler: (0, cli_core_1.asyncHandler)(async (argv) => {
             const { module: moduleName, npmClient } = argv;
             (0, assert_1.default)(moduleName, 'Invalid extension.');
-            const pluggable = new pluggable_1.Pluggable({ moduleName });
+            const pluggable = new extensions_1.Pluggable({ moduleName });
             if (pluggable.isInWorkspace) {
                 (0, debug_1.log)(`Local version of "${moduleName}" from workspace is used, aborting.`);
                 return;
             }
+            const extensionManager = new extensions_1.ExtensionManager();
             if (!pluggable.installed) {
-                await (0, extensions_1.removeInstalled)(moduleName);
+                await extensionManager.remove(moduleName);
                 return;
             }
             const info = pluggable.getInfo();
-            const installedVersion = (0, lodash_get_1.default)(info, 'package.version');
             const rl = getReadlineInterface();
             const wishToProceed = await new Promise(resolve => {
-                rl.question(`Found Extension ${moduleName}${installedVersion ? `@${installedVersion}` : ''} installed, do you wish to remove it? (Yes/No): `, answer => {
+                rl.question(`Found Extension ${moduleName}${info.version ? `@${info.version}` : ''} installed, do you wish to remove it? (Yes/No): `, answer => {
                     resolve(answer);
                 });
             });
@@ -138,7 +140,7 @@ const ExtensionModule = ({ getReadlineInterface }) => ({
             }
             const spinner = `Uninstalling ${moduleName}`;
             await pluggable.uninstallModule(npmClient, { spinner });
-            await (0, extensions_1.removeInstalled)(moduleName);
+            await extensionManager.remove(moduleName);
         })
     })
         // Create an app from the template.