@oclif/core 1.6.2 → 1.7.0

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.7.0](https://github.com/oclif/core/compare/v1.6.4...v1.7.0) (2022-04-11)
+
+
+### Features
+
+* move console.log to single class method ([#400](https://github.com/oclif/core/issues/400)) ([2ccb274](https://github.com/oclif/core/commit/2ccb2740912dba3b81c4d36712fbb20fd6a03c23))
+
+### [1.6.4](https://github.com/oclif/core/compare/v1.6.3...v1.6.4) (2022-03-31)
+
+
+### Bug Fixes
+
+* dynamic help ([#395](https://github.com/oclif/core/issues/395)) ([8ecc8f4](https://github.com/oclif/core/commit/8ecc8f41ec62ef5b05bdb70a79dce09b5913d14b))
+
+### [1.6.3](https://github.com/oclif/core/compare/v1.6.2...v1.6.3) (2022-03-23)
+
+
+### Bug Fixes
+
+* use plugin alias if available ([245d841](https://github.com/oclif/core/commit/245d84197a64e55b17524c22cbc17ec025a07c08))
+
 ### [1.6.2](https://github.com/oclif/core/compare/v1.6.1...v1.6.2) (2022-03-23)
 
 

package/lib/help/index.d.ts

@@ -24,7 +24,6 @@ export declare class Help extends HelpBase {
     protected get sortedTopics(): Interfaces.Topic[];
     constructor(config: Interfaces.Config, opts?: Partial<Interfaces.HelpOptions>);
     showHelp(argv: string[]): Promise<void>;
-    private getDynamicCommand;
     showCommandHelp(command: Interfaces.Command): Promise<void>;
     protected showRootHelp(): Promise<void>;
     protected showTopicHelp(topic: Interfaces.Topic): Promise<void>;
@@ -42,4 +41,5 @@ export declare class Help extends HelpBase {
      * @return {string} the readme help string for the given command
      */
     protected command(command: Interfaces.Command): string;
+    protected log(...args: string[]): void;
 }

package/lib/help/index.js

@@ -8,7 +8,6 @@ const root_1 = require("./root");
 const util_1 = require("../util");
 const util_2 = require("./util");
 const formatter_1 = require("./formatter");
-const plugin_1 = require("../config/plugin");
 const config_1 = require("../config/config");
 var command_2 = require("./command");
 Object.defineProperty(exports, "CommandHelp", { enumerable: true, get: function () { return command_2.CommandHelp; } });
@@ -87,7 +86,7 @@ class Help extends HelpBase {
         const command = this.config.findCommand(subject);
         if (command) {
             if (command.hasDynamicHelp) {
-                const dynamicCommand = await (0, config_1.toCached)(await this.getDynamicCommand(command));
+                const dynamicCommand = await (0, config_1.toCached)(await command.load());
                 await this.showCommandHelp(dynamicCommand);
             }
             else {
@@ -110,15 +109,6 @@ class Help extends HelpBase {
         }
         (0, errors_1.error)(`Command ${subject} not found.`);
     }
-    async getDynamicCommand(command) {
-        const plugin = new plugin_1.Plugin({ ignoreManifest: true, root: this.config.root, name: command.pluginName });
-        await plugin.load();
-        const cmd = await plugin.findCommand(command.id);
-        if (!cmd) {
-            throw new Error(`Command ${command.id} not found.`);
-        }
-        return cmd;
-    }
     async showCommandHelp(command) {
         var _a, _b, _c, _d;
         const name = command.id;
@@ -128,20 +118,20 @@ class Help extends HelpBase {
         const plugin = this.config.plugins.find(p => p.name === command.pluginName);
         const state = ((_b = (_a = this.config.pjson) === null || _a === void 0 ? void 0 : _a.oclif) === null || _b === void 0 ? void 0 : _b.state) || ((_d = (_c = plugin === null || plugin === void 0 ? void 0 : plugin.pjson) === null || _c === void 0 ? void 0 : _c.oclif) === null || _d === void 0 ? void 0 : _d.state) || command.state;
         if (state)
-            console.log(`This command is in ${state}.\n`);
+            this.log(`This command is in ${state}.\n`);
         const summary = this.summary(command);
         if (summary) {
-            console.log(summary + '\n');
+            this.log(summary + '\n');
         }
-        console.log(this.formatCommand(command));
-        console.log('');
+        this.log(this.formatCommand(command));
+        this.log('');
         if (subTopics.length > 0) {
-            console.log(this.formatTopics(subTopics));
-            console.log('');
+            this.log(this.formatTopics(subTopics));
+            this.log('');
         }
         if (subCommands.length > 0) {
-            console.log(this.formatCommands(subCommands));
-            console.log('');
+            this.log(this.formatCommands(subCommands));
+            this.log('');
         }
     }
     async showRootHelp() {
@@ -150,21 +140,21 @@ class Help extends HelpBase {
         let rootCommands = this.sortedCommands;
         const state = (_b = (_a = this.config.pjson) === null || _a === void 0 ? void 0 : _a.oclif) === null || _b === void 0 ? void 0 : _b.state;
         if (state)
-            console.log(`${this.config.bin} is in ${state}.\n`);
-        console.log(this.formatRoot());
-        console.log('');
+            this.log(`${this.config.bin} is in ${state}.\n`);
+        this.log(this.formatRoot());
+        this.log('');
         if (!this.opts.all) {
             rootTopics = rootTopics.filter(t => !t.name.includes(':'));
             rootCommands = rootCommands.filter(c => !c.id.includes(':'));
         }
         if (rootTopics.length > 0) {
-            console.log(this.formatTopics(rootTopics));
-            console.log('');
+            this.log(this.formatTopics(rootTopics));
+            this.log('');
         }
         if (rootCommands.length > 0) {
             rootCommands = rootCommands.filter(c => c.id);
-            console.log(this.formatCommands(rootCommands));
-            console.log('');
+            this.log(this.formatCommands(rootCommands));
+            this.log('');
         }
     }
     async showTopicHelp(topic) {
@@ -175,15 +165,15 @@ class Help extends HelpBase {
         const commands = this.sortedCommands.filter(c => c.id.startsWith(name + ':') && c.id.split(':').length === depth + 1);
         const state = (_b = (_a = this.config.pjson) === null || _a === void 0 ? void 0 : _a.oclif) === null || _b === void 0 ? void 0 : _b.state;
         if (state)
-            console.log(`This topic is in ${state}.\n`);
-        console.log(this.formatTopic(topic));
+            this.log(`This topic is in ${state}.\n`);
+        this.log(this.formatTopic(topic));
         if (subTopics.length > 0) {
-            console.log(this.formatTopics(subTopics));
-            console.log('');
+            this.log(this.formatTopics(subTopics));
+            this.log('');
         }
         if (commands.length > 0) {
-            console.log(this.formatCommands(commands));
-            console.log('');
+            this.log(this.formatCommands(commands));
+            this.log('');
         }
     }
     formatRoot() {
@@ -271,5 +261,8 @@ class Help extends HelpBase {
     command(command) {
         return this.formatCommand(command);
     }
+    log(...args) {
+        console.log(...args);
+    }
 }
 exports.Help = Help;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {