@oclif/core 3.0.0-beta.9 → 3.0.1

package/lib/help/index.js

@@ -1,23 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Help = exports.HelpBase = exports.normalizeArgv = exports.getHelpFlagAdditions = exports.loadHelpClass = exports.standardizeIDFromArgv = exports.CommandHelp = void 0;
-const stripAnsi = require("strip-ansi");
-const util = require("util");
+exports.loadHelpClass = exports.Help = exports.HelpBase = exports.standardizeIDFromArgv = exports.normalizeArgv = exports.getHelpFlagAdditions = exports.CommandHelp = void 0;
+const tslib_1 = require("tslib");
+const node_util_1 = require("node:util");
+const strip_ansi_1 = tslib_1.__importDefault(require("strip-ansi"));
+const stream_1 = require("../cli-ux/stream");
 const errors_1 = require("../errors");
+const module_loader_1 = require("../module-loader");
+const cache_default_value_1 = require("../util/cache-default-value");
+const util_1 = require("../util/util");
 const command_1 = require("./command");
-const root_1 = require("./root");
-const util_1 = require("../util");
-const util_2 = require("./util");
 const formatter_1 = require("./formatter");
-const config_1 = require("../config/config");
-const stream_1 = require("../ux/stream");
+const root_1 = tslib_1.__importDefault(require("./root"));
+const util_2 = require("./util");
 var command_2 = require("./command");
 Object.defineProperty(exports, "CommandHelp", { enumerable: true, get: function () { return command_2.CommandHelp; } });
 var util_3 = require("./util");
-Object.defineProperty(exports, "standardizeIDFromArgv", { enumerable: true, get: function () { return util_3.standardizeIDFromArgv; } });
-Object.defineProperty(exports, "loadHelpClass", { enumerable: true, get: function () { return util_3.loadHelpClass; } });
 Object.defineProperty(exports, "getHelpFlagAdditions", { enumerable: true, get: function () { return util_3.getHelpFlagAdditions; } });
 Object.defineProperty(exports, "normalizeArgv", { enumerable: true, get: function () { return util_3.normalizeArgv; } });
+Object.defineProperty(exports, "standardizeIDFromArgv", { enumerable: true, get: function () { return util_3.standardizeIDFromArgv; } });
 function getHelpSubject(args, config) {
     // for each help flag that starts with '--' create a new flag with same name sans '--'
     const mergedHelpFlags = (0, util_2.getHelpFlagAdditions)(config);
@@ -40,6 +41,10 @@ class HelpBase extends formatter_1.HelpFormatter {
 }
 exports.HelpBase = HelpBase;
 class Help extends HelpBase {
+    CommandHelpClass = command_1.CommandHelp;
+    constructor(config, opts = {}) {
+        super(config, opts);
+    }
     /*
      * _topics is to work around Interfaces.topics mistakenly including commands that do
      * not have children, as well as topics. A topic has children, either commands or other topics. When
@@ -49,31 +54,122 @@ class Help extends HelpBase {
     get _topics() {
         return this.config.topics.filter((topic) => {
             // it is assumed a topic has a child if it has children
-            const hasChild = this.config.topics.some(subTopic => subTopic.name.includes(`${topic.name}:`));
+            const hasChild = this.config.topics.some((subTopic) => subTopic.name.includes(`${topic.name}:`));
             return hasChild;
         });
     }
-    get sortedCommands() {
-        let commands = this.config.commands;
-        commands = commands.filter(c => this.opts.all || !c.hidden);
-        commands = (0, util_1.sortBy)(commands, c => c.id);
-        commands = (0, util_1.uniqBy)(commands, c => c.id);
-        return commands;
+    command(command) {
+        return this.formatCommand(command);
     }
-    get sortedTopics() {
-        let topics = this._topics;
-        topics = topics.filter(t => this.opts.all || !t.hidden);
-        topics = (0, util_1.sortBy)(topics, t => t.name);
-        topics = (0, util_1.uniqBy)(topics, t => t.name);
-        return topics;
+    description(c) {
+        const description = this.render(c.description || '');
+        if (c.summary) {
+            return description;
+        }
+        return description.split('\n').slice(1).join('\n');
     }
-    constructor(config, opts = {}) {
-        super(config, opts);
-        this.CommandHelpClass = command_1.default;
+    formatCommand(command) {
+        if (this.config.topicSeparator !== ':') {
+            command.id = command.id.replaceAll(':', this.config.topicSeparator);
+            command.aliases = command.aliases && command.aliases.map((a) => a.replaceAll(':', this.config.topicSeparator));
+        }
+        const help = this.getCommandHelpClass(command);
+        return help.generate();
+    }
+    formatCommands(commands) {
+        if (commands.length === 0)
+            return '';
+        const body = this.renderList(commands.map((c) => {
+            if (this.config.topicSeparator !== ':')
+                c.id = c.id.replaceAll(':', this.config.topicSeparator);
+            return [c.id, this.summary(c)];
+        }), {
+            indentation: 2,
+            spacer: '\n',
+            stripAnsi: this.opts.stripAnsi,
+        });
+        return this.section('COMMANDS', body);
+    }
+    formatRoot() {
+        const help = new root_1.default(this.config, this.opts);
+        return help.root();
+    }
+    formatTopic(topic) {
+        let description = this.render(topic.description || '');
+        const summary = description.split('\n')[0];
+        description = description.split('\n').slice(1).join('\n');
+        let topicID = `${topic.name}:COMMAND`;
+        if (this.config.topicSeparator !== ':')
+            topicID = topicID.replaceAll(':', this.config.topicSeparator);
+        let output = (0, util_1.compact)([
+            summary,
+            this.section(this.opts.usageHeader || 'USAGE', `$ ${this.config.bin} ${topicID}`),
+            description && this.section('DESCRIPTION', this.wrap(description)),
+        ]).join('\n\n');
+        if (this.opts.stripAnsi)
+            output = (0, strip_ansi_1.default)(output);
+        return output + '\n';
+    }
+    formatTopics(topics) {
+        if (topics.length === 0)
+            return '';
+        const body = this.renderList(topics.map((c) => {
+            if (this.config.topicSeparator !== ':')
+                c.name = c.name.replaceAll(':', this.config.topicSeparator);
+            return [c.name, c.description && this.render(c.description.split('\n')[0])];
+        }), {
+            indentation: 2,
+            spacer: '\n',
+            stripAnsi: this.opts.stripAnsi,
+        });
+        return this.section('TOPICS', body);
+    }
+    getCommandHelpClass(command) {
+        return new this.CommandHelpClass(command, this.config, this.opts);
+    }
+    log(...args) {
+        stream_1.stdout.write(node_util_1.format.apply(this, args) + '\n');
+    }
+    async showCommandHelp(command) {
+        const name = command.id;
+        const depth = name.split(':').length;
+        const subTopics = this.sortedTopics.filter((t) => t.name.startsWith(name + ':') && t.name.split(':').length === depth + 1);
+        const subCommands = this.sortedCommands.filter((c) => c.id.startsWith(name + ':') && c.id.split(':').length === depth + 1);
+        const plugin = this.config.plugins.get(command.pluginName);
+        const state = this.config.pjson?.oclif?.state || plugin?.pjson?.oclif?.state || command.state;
+        if (state) {
+            this.log(state === 'deprecated'
+                ? `${(0, util_2.formatCommandDeprecationWarning)((0, util_2.toConfiguredId)(name, this.config), command.deprecationOptions)}\n`
+                : `This command is in ${state}.\n`);
+        }
+        if (command.deprecateAliases && command.aliases.includes(name)) {
+            const actualCmd = this.config.commands.find((c) => c.aliases.includes(name));
+            const opts = { ...command.deprecationOptions, ...(actualCmd ? { to: actualCmd.id } : {}) };
+            this.log(`${(0, util_2.formatCommandDeprecationWarning)((0, util_2.toConfiguredId)(name, this.config), opts)}\n`);
+        }
+        const summary = this.summary(command);
+        if (summary) {
+            this.log(summary + '\n');
+        }
+        this.log(this.formatCommand(command));
+        this.log('');
+        if (subTopics.length > 0) {
+            this.log(this.formatTopics(subTopics));
+            this.log('');
+        }
+        if (subCommands.length > 0) {
+            const aliases = [];
+            const uniqueSubCommands = subCommands.filter((p) => {
+                aliases.push(...p.aliases);
+                return !aliases.includes(p.id);
+            });
+            this.log(this.formatCommands(uniqueSubCommands));
+            this.log('');
+        }
     }
     async showHelp(argv) {
         const originalArgv = argv.slice(1);
-        argv = argv.filter(arg => !(0, util_2.getHelpFlagAdditions)(this.config).includes(arg));
+        argv = argv.filter((arg) => !(0, util_2.getHelpFlagAdditions)(this.config).includes(arg));
         if (this.config.topicSeparator !== ':')
             argv = (0, util_2.standardizeIDFromArgv)(argv, this.config);
         const subject = getHelpSubject(argv, this.config);
@@ -91,8 +187,14 @@ class Help extends HelpBase {
         const command = this.config.findCommand(subject);
         if (command) {
             if (command.hasDynamicHelp && command.pluginType !== 'jit') {
-                const dynamicCommand = await (0, config_1.toCached)(await command.load());
-                await this.showCommandHelp(dynamicCommand);
+                const loaded = await command.load();
+                for (const [name, flag] of Object.entries(loaded.flags)) {
+                    if (flag.type === 'boolean' || !command.flags[name].hasDynamicHelp)
+                        continue;
+                    // eslint-disable-next-line no-await-in-loop
+                    command.flags[name].default = await (0, cache_default_value_1.cacheDefaultValue)(flag, false);
+                }
+                await this.showCommandHelp(command);
             }
             else {
                 await this.showCommandHelp(command);
@@ -108,8 +210,8 @@ class Help extends HelpBase {
             const matches = this.config.findMatches(subject, originalArgv);
             if (matches.length > 0) {
                 const result = await this.config.runHook('command_incomplete', {
+                    argv: originalArgv.filter((o) => !subject.split(':').includes(o)),
                     id: subject,
-                    argv: originalArgv.filter(o => !subject.split(':').includes(o)),
                     matches,
                 });
                 if (result.successes.length > 0)
@@ -118,68 +220,34 @@ class Help extends HelpBase {
         }
         (0, errors_1.error)(`Command ${subject} not found.`);
     }
-    async showCommandHelp(command) {
-        const name = command.id;
-        const depth = name.split(':').length;
-        const subTopics = this.sortedTopics.filter(t => t.name.startsWith(name + ':') && t.name.split(':').length === depth + 1);
-        const subCommands = this.sortedCommands.filter(c => c.id.startsWith(name + ':') && c.id.split(':').length === depth + 1);
-        const plugin = this.config.plugins.get(command.pluginName);
-        const state = this.config.pjson?.oclif?.state || plugin?.pjson?.oclif?.state || command.state;
-        if (state) {
-            this.log(state === 'deprecated' ?
-                `${(0, util_2.formatCommandDeprecationWarning)((0, util_2.toConfiguredId)(name, this.config), command.deprecationOptions)}` :
-                `This command is in ${state}.\n`);
-        }
-        const summary = this.summary(command);
-        if (summary) {
-            this.log(summary + '\n');
-        }
-        this.log(this.formatCommand(command));
-        this.log('');
-        if (subTopics.length > 0) {
-            this.log(this.formatTopics(subTopics));
-            this.log('');
-        }
-        if (subCommands.length > 0) {
-            const aliases = [];
-            const uniqueSubCommands = subCommands.filter(p => {
-                aliases.push(...p.aliases);
-                return !aliases.includes(p.id);
-            });
-            this.log(this.formatCommands(uniqueSubCommands));
-            this.log('');
-        }
-    }
     async showRootHelp() {
         let rootTopics = this.sortedTopics;
         let rootCommands = this.sortedCommands;
         const state = this.config.pjson?.oclif?.state;
         if (state) {
-            this.log(state === 'deprecated' ?
-                `${this.config.bin} is deprecated` :
-                `${this.config.bin} is in ${state}.\n`);
+            this.log(state === 'deprecated' ? `${this.config.bin} is deprecated` : `${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(':'));
+            rootTopics = rootTopics.filter((t) => !t.name.includes(':'));
+            rootCommands = rootCommands.filter((c) => !c.id.includes(':'));
         }
         if (rootTopics.length > 0) {
             this.log(this.formatTopics(rootTopics));
             this.log('');
         }
         if (rootCommands.length > 0) {
-            rootCommands = rootCommands.filter(c => c.id);
+            rootCommands = rootCommands.filter((c) => c.id);
             this.log(this.formatCommands(rootCommands));
             this.log('');
         }
     }
     async showTopicHelp(topic) {
-        const name = topic.name;
+        const { name } = topic;
         const depth = name.split(':').length;
-        const subTopics = this.sortedTopics.filter(t => t.name.startsWith(name + ':') && t.name.split(':').length === depth + 1);
-        const commands = this.sortedCommands.filter(c => c.id.startsWith(name + ':') && c.id.split(':').length === depth + 1);
+        const subTopics = this.sortedTopics.filter((t) => t.name.startsWith(name + ':') && t.name.split(':').length === depth + 1);
+        const commands = this.sortedCommands.filter((c) => c.id.startsWith(name + ':') && c.id.split(':').length === depth + 1);
         const state = this.config.pjson?.oclif?.state;
         if (state)
             this.log(`This topic is in ${state}.\n`);
@@ -193,88 +261,42 @@ class Help extends HelpBase {
             this.log('');
         }
     }
-    formatRoot() {
-        const help = new root_1.default(this.config, this.opts);
-        return help.root();
-    }
-    formatCommand(command) {
-        if (this.config.topicSeparator !== ':') {
-            command.id = command.id.replace(/:/g, this.config.topicSeparator);
-            command.aliases = command.aliases && command.aliases.map(a => a.replace(/:/g, this.config.topicSeparator));
-        }
-        const help = this.getCommandHelpClass(command);
-        return help.generate();
-    }
-    getCommandHelpClass(command) {
-        return new this.CommandHelpClass(command, this.config, this.opts);
-    }
-    formatCommands(commands) {
-        if (commands.length === 0)
-            return '';
-        const body = this.renderList(commands.map(c => {
-            if (this.config.topicSeparator !== ':')
-                c.id = c.id.replace(/:/g, this.config.topicSeparator);
-            return [
-                c.id,
-                this.summary(c),
-            ];
-        }), {
-            spacer: '\n',
-            stripAnsi: this.opts.stripAnsi,
-            indentation: 2,
-        });
-        return this.section('COMMANDS', body);
-    }
     summary(c) {
         if (c.summary)
             return this.render(c.summary.split('\n')[0]);
         return c.description && this.render(c.description).split('\n')[0];
     }
-    description(c) {
-        const description = this.render(c.description || '');
-        if (c.summary) {
-            return description;
-        }
-        return description.split('\n').slice(1).join('\n');
-    }
-    formatTopic(topic) {
-        let description = this.render(topic.description || '');
-        const summary = description.split('\n')[0];
-        description = description.split('\n').slice(1).join('\n');
-        let topicID = `${topic.name}:COMMAND`;
-        if (this.config.topicSeparator !== ':')
-            topicID = topicID.replace(/:/g, this.config.topicSeparator);
-        let output = (0, util_1.compact)([
-            summary,
-            this.section(this.opts.usageHeader || 'USAGE', `$ ${this.config.bin} ${topicID}`),
-            description && this.section('DESCRIPTION', this.wrap(description)),
-        ]).join('\n\n');
-        if (this.opts.stripAnsi)
-            output = stripAnsi(output);
-        return output + '\n';
-    }
-    formatTopics(topics) {
-        if (topics.length === 0)
-            return '';
-        const body = this.renderList(topics.map(c => {
-            if (this.config.topicSeparator !== ':')
-                c.name = c.name.replace(/:/g, this.config.topicSeparator);
-            return [
-                c.name,
-                c.description && this.render(c.description.split('\n')[0]),
-            ];
-        }), {
-            spacer: '\n',
-            stripAnsi: this.opts.stripAnsi,
-            indentation: 2,
-        });
-        return this.section('TOPICS', body);
-    }
-    command(command) {
-        return this.formatCommand(command);
+    get sortedCommands() {
+        let { commands } = this.config;
+        commands = commands.filter((c) => this.opts.all || !c.hidden);
+        commands = (0, util_1.sortBy)(commands, (c) => c.id);
+        commands = (0, util_1.uniqBy)(commands, (c) => c.id);
+        return commands;
     }
-    log(...args) {
-        stream_1.stdout.write(util.format.apply(this, args) + '\n');
+    get sortedTopics() {
+        let topics = this._topics;
+        topics = topics.filter((t) => this.opts.all || !t.hidden);
+        topics = (0, util_1.sortBy)(topics, (t) => t.name);
+        topics = (0, util_1.uniqBy)(topics, (t) => t.name);
+        return topics;
     }
 }
 exports.Help = Help;
+function extractClass(exported) {
+    return exported && exported.default ? exported.default : exported;
+}
+async function loadHelpClass(config) {
+    const { pjson } = config;
+    const configuredClass = pjson.oclif?.helpClass;
+    if (configuredClass) {
+        try {
+            const exported = (await (0, module_loader_1.load)(config, configuredClass));
+            return extractClass(exported);
+        }
+        catch (error) {
+            throw new Error(`Unable to load configured help class "${configuredClass}", failed with message:\n${error.message}`);
+        }
+    }
+    return Help;
+}
+exports.loadHelpClass = loadHelpClass;

package/lib/help/root.d.ts

@@ -4,8 +4,8 @@ export default class RootHelp extends HelpFormatter {
     config: Interfaces.Config;
     opts: Interfaces.HelpOptions;
     constructor(config: Interfaces.Config, opts: Interfaces.HelpOptions);
+    protected description(): string | undefined;
     root(): string;
     protected usage(): string;
-    protected description(): string | undefined;
     protected version(): string;
 }

package/lib/help/root.js

@@ -1,39 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const stripAnsi = require("strip-ansi");
-const util_1 = require("../util");
+const tslib_1 = require("tslib");
+const strip_ansi_1 = tslib_1.__importDefault(require("strip-ansi"));
+const util_1 = require("../util/util");
 const formatter_1 = require("./formatter");
 class RootHelp extends formatter_1.HelpFormatter {
+    config;
+    opts;
     constructor(config, opts) {
         super(config, opts);
         this.config = config;
         this.opts = opts;
     }
+    description() {
+        let description = this.config.pjson.oclif.description || this.config.pjson.description || '';
+        description = this.render(description);
+        description = description.split('\n').slice(1).join('\n');
+        if (!description)
+            return;
+        return this.section('DESCRIPTION', this.wrap(description));
+    }
     root() {
         let description = this.config.pjson.oclif.description || this.config.pjson.description || '';
         description = this.render(description);
         description = description.split('\n')[0];
-        let output = (0, util_1.compact)([
-            description,
-            this.version(),
-            this.usage(),
-            this.description(),
-        ]).join('\n\n');
+        let output = (0, util_1.compact)([description, this.version(), this.usage(), this.description()]).join('\n\n');
         if (this.opts.stripAnsi)
-            output = stripAnsi(output);
+            output = (0, strip_ansi_1.default)(output);
         return output;
     }
     usage() {
         return this.section(this.opts.usageHeader || 'USAGE', this.wrap(`$ ${this.config.bin} [COMMAND]`));
     }
-    description() {
-        let description = this.config.pjson.oclif.description || this.config.pjson.description || '';
-        description = this.render(description);
-        description = description.split('\n').slice(1).join('\n');
-        if (!description)
-            return;
-        return this.section('DESCRIPTION', this.wrap(description));
-    }
     version() {
         return this.section('VERSION', this.wrap(this.config.userAgent));
     }

package/lib/help/util.d.ts

@@ -1,15 +1,9 @@
-import { Config as IConfig, HelpOptions, Deprecation } from '../interfaces';
-import { HelpBase } from '.';
-interface HelpBaseDerived {
-    new (config: IConfig, opts?: Partial<HelpOptions>): HelpBase;
-}
-export declare function loadHelpClass(config: IConfig): Promise<HelpBaseDerived>;
+import { Deprecation, Config as IConfig } from '../interfaces';
 export declare function template(context: any): (t: string) => string;
 export declare function toStandardizedId(commandID: string, config: IConfig): string;
 export declare function toConfiguredId(commandID: string, config: IConfig): string;
 export declare function standardizeIDFromArgv(argv: string[], config: IConfig): string[];
 export declare function getHelpFlagAdditions(config: IConfig): string[];
-export declare function formatFlagDeprecationWarning(flag: string, opts: true | Deprecation): string;
+export declare function formatFlagDeprecationWarning(flag: string, opts: Deprecation | true): string;
 export declare function formatCommandDeprecationWarning(command: string, opts?: Deprecation): string;
 export declare function normalizeArgv(config: IConfig, argv?: string[]): string[];
-export {};

package/lib/help/util.js

@@ -1,29 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeArgv = exports.formatCommandDeprecationWarning = exports.formatFlagDeprecationWarning = exports.getHelpFlagAdditions = exports.standardizeIDFromArgv = exports.toConfiguredId = exports.toStandardizedId = exports.template = exports.loadHelpClass = void 0;
-const ejs = require("ejs");
-const _1 = require(".");
-const module_loader_1 = require("../module-loader");
+exports.normalizeArgv = exports.formatCommandDeprecationWarning = exports.formatFlagDeprecationWarning = exports.getHelpFlagAdditions = exports.standardizeIDFromArgv = exports.toConfiguredId = exports.toStandardizedId = exports.template = void 0;
+const tslib_1 = require("tslib");
+const ejs = tslib_1.__importStar(require("ejs"));
 const util_1 = require("../config/util");
-function extractClass(exported) {
-    return exported && exported.default ? exported.default : exported;
-}
-async function loadHelpClass(config) {
-    const pjson = config.pjson;
-    const configuredClass = pjson && pjson.oclif && pjson.oclif.helpClass;
-    if (configuredClass) {
-        try {
-            const exported = await module_loader_1.default.load(config, configuredClass);
-            return extractClass(exported);
-        }
-        catch (error) {
-            throw new Error(`Unable to load configured help class "${configuredClass}", failed with message:\n${error.message}`);
-        }
-    }
-    return _1.Help;
-}
-exports.loadHelpClass = loadHelpClass;
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 function template(context) {
     function render(t) {
         return ejs.render(t, context);
@@ -31,6 +11,8 @@ function template(context) {
     return render;
 }
 exports.template = template;
+const isFlag = (s) => s.startsWith('-');
+const isArgWithValue = (s) => s.includes('=');
 function collateSpacedCmdIDFromArgs(argv, config) {
     if (argv.length === 1)
         return argv;
@@ -38,9 +20,7 @@ function collateSpacedCmdIDFromArgs(argv, config) {
         const ids = (0, util_1.collectUsableIds)(config.commandIDs);
         const final = [];
         const idPresent = (id) => ids.has(id);
-        const isFlag = (s) => s.startsWith('-');
-        const isArgWithValue = (s) => s.includes('=');
-        const finalizeId = (s) => s ? [...final, s].join(':') : final.join(':');
+        const finalizeId = (s) => (s ? [...final, s].join(':') : final.join(':'));
         const hasArgs = () => {
             const id = finalizeId();
             if (!id)
@@ -68,12 +48,12 @@ function collateSpacedCmdIDFromArgs(argv, config) {
     return argv; // ID is argv[0]
 }
 function toStandardizedId(commandID, config) {
-    return commandID.replace(new RegExp(config.topicSeparator, 'g'), ':');
+    return commandID.replaceAll(new RegExp(config.topicSeparator, 'g'), ':');
 }
 exports.toStandardizedId = toStandardizedId;
 function toConfiguredId(commandID, config) {
     const defaultTopicSeparator = ':';
-    return commandID.replace(new RegExp(defaultTopicSeparator, 'g'), config.topicSeparator || defaultTopicSeparator);
+    return commandID.replaceAll(new RegExp(defaultTopicSeparator, 'g'), config.topicSeparator || defaultTopicSeparator);
 }
 exports.toConfiguredId = toConfiguredId;
 function standardizeIDFromArgv(argv, config) {

package/lib/index.d.ts

@@ -1,20 +1,19 @@
-import { Command } from './command';
-import run from './main';
-import execute from './execute';
-import handle from './errors/handle';
-import { Config, Plugin, tsPath, toCached } from './config';
-import * as Interfaces from './interfaces';
-import * as Errors from './errors';
-import * as Flags from './flags';
-import * as Args from './args';
-import { CommandHelp, HelpBase, Help, loadHelpClass } from './help';
-import { toStandardizedId, toConfiguredId } from './help/util';
-import * as Parser from './parser';
-import { Hook } from './interfaces/hooks';
-import settings, { Settings } from './settings';
-import { HelpSection, HelpSectionRenderer, HelpSectionKeyValueTable } from './help/formatter';
-import * as ux from './ux';
-import { stderr, stdout } from './ux/stream';
-import Performance from './performance';
-import flush from './ux/flush';
-export { Args, Command, CommandHelp, Config, Errors, execute, Flags, flush, handle, Help, HelpBase, HelpSection, HelpSectionKeyValueTable, HelpSectionRenderer, Hook, Interfaces, loadHelpClass, Parser, Performance, Plugin, run, settings, Settings, stderr, stdout, toCached, toConfiguredId, toStandardizedId, tsPath, ux, };
+export * as Args from './args';
+export * as ux from './cli-ux';
+export { flush } from './cli-ux/flush';
+export { stderr, stdout } from './cli-ux/stream';
+export { Command } from './command';
+export { Config, Plugin } from './config';
+export * as Errors from './errors';
+export { handle } from './errors/handle';
+export { execute } from './execute';
+export * as Flags from './flags';
+export { CommandHelp, Help, HelpBase, loadHelpClass } from './help';
+export { HelpSection, HelpSectionKeyValueTable, HelpSectionRenderer } from './help/formatter';
+export { toConfiguredId, toStandardizedId } from './help/util';
+export * as Interfaces from './interfaces';
+export { Hook } from './interfaces/hooks';
+export { run } from './main';
+export * as Parser from './parser';
+export { Performance } from './performance';
+export { Settings, settings } from './settings';