@oclif/core 4.0.0-beta.7 → 4.0.0-beta.9

package/lib/args.d.ts

@@ -21,14 +21,14 @@ import { Arg, ArgDefinition } from './interfaces/parser';
 export declare function custom<T = string, P = Record<string, unknown>>(defaults: Partial<Arg<T, P>>): ArgDefinition<T, P>;
 export declare const boolean: ArgDefinition<boolean, Record<string, unknown>>;
 export declare const integer: ArgDefinition<number, {
-    max?: number | undefined;
-    min?: number | undefined;
+    max?: number;
+    min?: number;
 }>;
 export declare const directory: ArgDefinition<string, {
-    exists?: boolean | undefined;
+    exists?: boolean;
 }>;
 export declare const file: ArgDefinition<string, {
-    exists?: boolean | undefined;
+    exists?: boolean;
 }>;
 /**
  * Initializes a string as a URL. Throws an error

package/lib/cache.d.ts

@@ -1,5 +1,5 @@
 import { Config } from './config/config';
-import { PJSON, Plugin } from './interfaces';
+import { OclifConfiguration, Plugin } from './interfaces';
 type OclifCoreInfo = {
     name: string;
     version: string;
@@ -7,7 +7,7 @@ type OclifCoreInfo = {
 type CacheContents = {
     rootPlugin: Plugin;
     config: Config;
-    exitCodes: PJSON.Plugin['oclif']['exitCodes'];
+    exitCodes: OclifConfiguration['exitCodes'];
     '@oclif/core': OclifCoreInfo;
 };
 type ValueOf<T> = T[keyof T];
@@ -21,7 +21,7 @@ export default class Cache extends Map<keyof CacheContents, ValueOf<CacheContent
     get(key: 'config'): Config | undefined;
     get(key: '@oclif/core'): OclifCoreInfo;
     get(key: 'rootPlugin'): Plugin | undefined;
-    get(key: 'exitCodes'): PJSON.Plugin['oclif']['exitCodes'] | undefined;
+    get(key: 'exitCodes'): OclifConfiguration['exitCodes'] | undefined;
     private getOclifCoreMeta;
 }
 export {};

package/lib/cache.js

@@ -28,7 +28,7 @@ class Cache extends Map {
             try {
                 return {
                     name: '@oclif/core',
-                    version: JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(__dirname, '..', 'package.json'), 'utf8')),
+                    version: JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(__dirname, '..', 'package.json'), 'utf8')).version,
                 };
             }
             catch {

package/lib/command.d.ts

@@ -15,7 +15,6 @@ export declare abstract class Command {
     static aliases: string[];
     /** An order-dependent object of arguments for the command */
     static args: ArgInput;
-    static baseFlags: FlagInput;
     /**
      * Emit deprecation warning when a command alias is used
      */
@@ -109,7 +108,7 @@ export declare abstract class Command {
     log(message?: string, ...args: any[]): void;
     protected logJson(json: unknown): void;
     logToStderr(message?: string, ...args: any[]): void;
-    protected parse<F extends FlagOutput, B extends FlagOutput, A extends ArgOutput>(options?: Input<F, B, A>, argv?: string[]): Promise<ParserOutput<F, B, A>>;
+    protected parse<F extends FlagOutput, A extends ArgOutput>(options?: Input<F, A>, argv?: string[]): Promise<ParserOutput<F, A>>;
     protected toErrorJson(err: unknown): any;
     protected toSuccessJson(result: unknown): any;
     warn(input: Error | string): Error | string;
@@ -143,15 +142,15 @@ export declare namespace Command {
      */
     type Cached = {
         [key: string]: unknown;
-        aliasPermutations?: string[];
+        aliasPermutations?: string[] | undefined;
         aliases: string[];
         args: {
             [name: string]: Arg.Cached;
         };
-        deprecateAliases?: boolean;
-        deprecationOptions?: Deprecation;
-        description?: string;
-        examples?: Example[];
+        deprecateAliases?: boolean | undefined;
+        deprecationOptions?: Deprecation | undefined;
+        description?: string | undefined;
+        examples?: Example[] | undefined;
         flags: {
             [name: string]: Flag.Cached;
         };
@@ -159,22 +158,22 @@ export declare namespace Command {
         hidden: boolean;
         hiddenAliases: string[];
         id: string;
-        isESM?: boolean;
-        permutations?: string[];
-        pluginAlias?: string;
-        pluginName?: string;
-        pluginType?: string;
-        relativePath?: string[];
-        state?: 'beta' | 'deprecated' | string;
-        strict?: boolean;
-        summary?: string;
-        type?: string;
-        usage?: string | string[];
+        isESM?: boolean | undefined;
+        permutations?: string[] | undefined;
+        pluginAlias?: string | undefined;
+        pluginName?: string | undefined;
+        pluginType?: string | undefined;
+        relativePath?: string[] | undefined;
+        state?: 'beta' | 'deprecated' | string | undefined;
+        strict?: boolean | undefined;
+        summary?: string | undefined;
+        type?: string | undefined;
+        usage?: string | string[] | undefined;
     };
     type Flag = IFlag<any>;
     namespace Flag {
         type Cached = Omit<Flag, 'input' | 'parse'> & (BooleanFlagProps | OptionFlagProps) & {
-            hasDynamicHelp?: boolean;
+            hasDynamicHelp?: boolean | undefined;
         };
         type Any = Cached | Flag;
     }

package/lib/command.js

@@ -39,7 +39,7 @@ const Parser = __importStar(require("./parser"));
 const aggregate_flags_1 = require("./util/aggregate-flags");
 const ids_1 = require("./util/ids");
 const util_2 = require("./util/util");
-const ux_1 = __importDefault(require("./ux"));
+const ux_1 = require("./ux");
 const pjson = cache_1.default.getInstance().get('@oclif/core');
 /**
  * swallows stdout epipe errors
@@ -61,7 +61,6 @@ class Command {
     static aliases = [];
     /** An order-dependent object of arguments for the command */
     static args = {};
-    static baseFlags;
     /**
      * Emit deprecation warning when a command alias is used
      */
@@ -148,6 +147,9 @@ class Command {
             opts = (0, node_url_1.fileURLToPath)(opts);
         }
         const config = await config_1.Config.load(opts || require.main?.filename || __dirname);
+        const cache = cache_1.default.getInstance();
+        if (!cache.has('config'))
+            cache.set('config', config);
         const cmd = new this(argv, config);
         if (!cmd.id) {
             const id = cmd.constructor.name.toLowerCase();
@@ -168,7 +170,7 @@ class Command {
             if (!err.message)
                 throw err;
             try {
-                ux_1.default.action.stop(ansis_1.default.bold.red('!'));
+                ux_1.ux.action.stop(ansis_1.default.bold.red('!'));
             }
             catch { }
             throw err;
@@ -211,16 +213,16 @@ class Command {
     log(message = '', ...args) {
         if (!this.jsonEnabled()) {
             message = typeof message === 'string' ? message : (0, node_util_1.inspect)(message);
-            ux_1.default.stdout(message, ...args);
+            ux_1.ux.stdout(message, ...args);
         }
     }
     logJson(json) {
-        ux_1.default.stdout(ux_1.default.colorizeJson(json, { pretty: true, theme: this.config.theme?.json }));
+        ux_1.ux.stdout(ux_1.ux.colorizeJson(json, { pretty: true, theme: this.config.theme?.json }));
     }
     logToStderr(message = '', ...args) {
         if (!this.jsonEnabled()) {
             message = typeof message === 'string' ? message : (0, node_util_1.inspect)(message);
-            ux_1.default.stderr(message, ...args);
+            ux_1.ux.stderr(message, ...args);
         }
     }
     async parse(options, argv = this.argv) {
@@ -229,7 +231,7 @@ class Command {
         const opts = {
             context: this,
             ...options,
-            flags: (0, aggregate_flags_1.aggregateFlags)(options.flags, options.baseFlags, options.enableJsonFlag),
+            flags: (0, aggregate_flags_1.aggregateFlags)(options.flags, options.enableJsonFlag),
         };
         const hookResult = await this.config.runHook('preparse', { argv: [...argv], options: opts });
         // Since config.runHook will only run the hook for the root plugin, hookResult.successes will always have a length of 0 or 1
@@ -266,7 +268,7 @@ class Command {
         }
     }
     warnIfFlagDeprecated(flags) {
-        const allFlags = (0, aggregate_flags_1.aggregateFlags)(this.ctor.flags, this.ctor.baseFlags, this.ctor.enableJsonFlag);
+        const allFlags = (0, aggregate_flags_1.aggregateFlags)(this.ctor.flags, this.ctor.enableJsonFlag);
         for (const flag of Object.keys(flags)) {
             const flagDef = allFlags[flag];
             const deprecated = flagDef?.deprecated;

package/lib/config/config.d.ts

@@ -1,5 +1,5 @@
 import { Command } from '../command';
-import { Hook, Hooks, PJSON, Topic } from '../interfaces';
+import { Hook, Hooks, OclifConfiguration, PJSON, S3Templates, Topic, UserPJSON } from '../interfaces';
 import { ArchTypes, Config as IConfig, LoadOptions, PlatformTypes, VersionDetails } from '../interfaces/config';
 import { Plugin as IPlugin, Options } from '../interfaces/plugin';
 import { Theme } from '../interfaces/theme';
@@ -7,8 +7,8 @@ export declare class Config implements IConfig {
     options: Options;
     arch: ArchTypes;
     bin: string;
-    binAliases?: string[];
-    binPath?: string;
+    binAliases?: string[] | undefined;
+    binPath?: string | undefined;
     cacheDir: string;
     channel: string;
     configDir: string;
@@ -18,18 +18,18 @@ export declare class Config implements IConfig {
     home: string;
     isSingleCommandCLI: boolean;
     name: string;
-    npmRegistry?: string;
-    nsisCustomization?: string;
-    pjson: PJSON.CLI;
+    npmRegistry?: string | undefined;
+    nsisCustomization?: string | undefined;
+    pjson: PJSON;
     platform: PlatformTypes;
     plugins: Map<string, IPlugin>;
     root: string;
     shell: string;
-    theme?: Theme;
+    theme?: Theme | undefined;
     topicSeparator: ' ' | ':';
-    updateConfig: NonNullable<PJSON.CLI['oclif']['update']>;
+    updateConfig: NonNullable<OclifConfiguration['update']>;
     userAgent: string;
-    userPJSON?: PJSON.User;
+    userPJSON?: UserPJSON | undefined;
     valid: boolean;
     version: string;
     protected warned: boolean;
@@ -96,7 +96,7 @@ export declare class Config implements IConfig {
     protected macosCacheDir(): string | undefined;
     runCommand<T = unknown>(id: string, argv?: string[], cachedCommand?: Command.Loadable | null): Promise<T>;
     runHook<T extends keyof Hooks>(event: T, opts: Hooks[T]['options'], timeout?: number, captureErrors?: boolean): Promise<Hook.Result<Hooks[T]['return']>>;
-    s3Key(type: keyof PJSON.S3.Templates, ext?: '.tar.gz' | '.tar.xz' | IConfig.s3Key.Options, options?: IConfig.s3Key.Options): string;
+    s3Key(type: keyof S3Templates, ext?: '.tar.gz' | '.tar.xz' | IConfig.s3Key.Options, options?: IConfig.s3Key.Options): string;
     s3Url(key: string): string;
     scopedEnvVar(k: string): string | undefined;
     /**
@@ -117,26 +117,6 @@ export declare class Config implements IConfig {
     protected windowsUserprofileHome(): string | undefined;
     protected _shell(): string;
     private buildS3Config;
-    /**
-     * This method is responsible for locating the correct plugin to use for a named command id
-     * It searches the {Config} registered commands to match either the raw command id or the command alias
-     * It is possible that more than one command will be found. This is due the ability of two distinct plugins to
-     * create the same command or command alias.
-     *
-     * In the case of more than one found command, the function will select the command based on the order in which
-     * the plugin is included in the package.json `oclif.plugins` list. The command that occurs first in the list
-     * is selected as the command to run.
-     *
-     * Commands can also be present from either an install or a link. When a command is one of these and a core plugin
-     * is present, this function defers to the core plugin.
-     *
-     * If there is not a core plugin command present, this function will return the first
-     * plugin as discovered (will not change the order)
-     *
-     * @param commands commands to determine the priority of
-     * @returns command instance {Command.Loadable} or undefined
-     */
-    private determinePriority;
     private getCmdLookupId;
     private getTopicLookupId;
     /**

package/lib/config/config.js

@@ -39,10 +39,11 @@ const logger_1 = require("../logger");
 const module_loader_1 = require("../module-loader");
 const performance_1 = require("../performance");
 const settings_1 = require("../settings");
+const determine_priority_1 = require("../util/determine-priority");
 const fs_1 = require("../util/fs");
 const os_1 = require("../util/os");
 const util_2 = require("../util/util");
-const ux_1 = __importDefault(require("../ux"));
+const ux_1 = require("../ux");
 const theme_1 = require("../ux/theme");
 const plugin_loader_1 = __importDefault(require("./plugin-loader"));
 const ts_path_1 = require("./ts-path");
@@ -318,10 +319,9 @@ class Config {
             node: this.pjson.oclif.update?.node ?? {},
             s3: this.buildS3Config(),
         };
-        this.isSingleCommandCLI = Boolean(this.pjson.oclif.default ||
-            (typeof this.pjson.oclif.commands !== 'string' &&
-                this.pjson.oclif.commands?.strategy === 'single' &&
-                this.pjson.oclif.commands?.target));
+        this.isSingleCommandCLI = Boolean(typeof this.pjson.oclif.commands !== 'string' &&
+            this.pjson.oclif.commands?.strategy === 'single' &&
+            this.pjson.oclif.commands?.target);
         this.maybeAdjustDebugSetting();
         await this.loadPluginsAndCommands();
         debug('config done');
@@ -358,12 +358,17 @@ class Config {
     async loadTheme() {
         if (this.scopedEnvVarTrue('DISABLE_THEME'))
             return;
-        const defaultThemeFile = this.pjson.oclif.theme
-            ? (0, node_path_1.resolve)(this.root, this.pjson.oclif.theme)
-            : this.pjson.oclif.theme;
         const userThemeFile = (0, node_path_1.resolve)(this.configDir, 'theme.json');
+        const getDefaultTheme = async () => {
+            if (!this.pjson.oclif.theme)
+                return;
+            if (typeof this.pjson.oclif.theme === 'string') {
+                return (0, fs_1.safeReadJson)((0, node_path_1.resolve)(this.root, this.pjson.oclif.theme));
+            }
+            return this.pjson.oclif.theme;
+        };
         const [defaultTheme, userTheme] = await Promise.all([
-            defaultThemeFile ? await (0, fs_1.safeReadJson)(defaultThemeFile) : undefined,
+            await getDefaultTheme(),
             await (0, fs_1.safeReadJson)(userThemeFile),
         ]);
         // Merge the default theme with the user theme, giving the user theme precedence.
@@ -468,7 +473,7 @@ class Config {
                     (0, errors_1.exit)(code);
                 },
                 log(message, ...args) {
-                    ux_1.default.stdout(message, ...args);
+                    ux_1.ux.stdout(message, ...args);
                 },
                 warn(message) {
                     (0, errors_1.warn)(message);
@@ -528,7 +533,7 @@ class Config {
             options = ext;
         else if (ext)
             options.ext = ext;
-        const template = this.updateConfig.s3.templates[options.platform ? 'target' : 'vanilla'][type] ?? '';
+        const template = this.updateConfig.s3?.templates?.[options.platform ? 'target' : 'vanilla'][type] ?? '';
         return ejs.render(template, { ...this, ...options });
     }
     s3Url(key) {
@@ -618,58 +623,6 @@ class Config {
             templates,
         };
     }
-    /**
-     * This method is responsible for locating the correct plugin to use for a named command id
-     * It searches the {Config} registered commands to match either the raw command id or the command alias
-     * It is possible that more than one command will be found. This is due the ability of two distinct plugins to
-     * create the same command or command alias.
-     *
-     * In the case of more than one found command, the function will select the command based on the order in which
-     * the plugin is included in the package.json `oclif.plugins` list. The command that occurs first in the list
-     * is selected as the command to run.
-     *
-     * Commands can also be present from either an install or a link. When a command is one of these and a core plugin
-     * is present, this function defers to the core plugin.
-     *
-     * If there is not a core plugin command present, this function will return the first
-     * plugin as discovered (will not change the order)
-     *
-     * @param commands commands to determine the priority of
-     * @returns command instance {Command.Loadable} or undefined
-     */
-    determinePriority(commands) {
-        const oclifPlugins = this.pjson.oclif?.plugins ?? [];
-        const commandPlugins = commands.sort((a, b) => {
-            const pluginAliasA = a.pluginAlias ?? 'A-Cannot-Find-This';
-            const pluginAliasB = b.pluginAlias ?? 'B-Cannot-Find-This';
-            const aIndex = oclifPlugins.indexOf(pluginAliasA);
-            const bIndex = oclifPlugins.indexOf(pluginAliasB);
-            // When both plugin types are 'core' plugins sort based on index
-            if (a.pluginType === 'core' && b.pluginType === 'core') {
-                // If b appears first in the pjson.plugins sort it first
-                return aIndex - bIndex;
-            }
-            // if b is a core plugin and a is not sort b first
-            if (b.pluginType === 'core' && a.pluginType !== 'core') {
-                return 1;
-            }
-            // if a is a core plugin and b is not sort a first
-            if (a.pluginType === 'core' && b.pluginType !== 'core') {
-                return -1;
-            }
-            // if a is a jit plugin and b is not sort b first
-            if (a.pluginType === 'jit' && b.pluginType !== 'jit') {
-                return 1;
-            }
-            // if b is a jit plugin and a is not sort a first
-            if (b.pluginType === 'jit' && a.pluginType !== 'jit') {
-                return -1;
-            }
-            // neither plugin is core, so do not change the order
-            return 0;
-        });
-        return commandPlugins[0];
-    }
     getCmdLookupId(id) {
         if (this._commands.has(id))
             return id;
@@ -697,7 +650,7 @@ class Config {
         for (const plugin of plugins) {
             this.plugins.set(plugin.name, plugin);
             // Delete all commands from the legacy plugin so that we can re-add them.
-            // This is necessary because this.determinePriority will pick the initial
+            // This is necessary because determinePriority will pick the initial
             // command that was added, which won't have been converted by PluginLegacy yet.
             for (const cmd of plugin.commands ?? []) {
                 this._commands.delete(cmd.id);
@@ -718,7 +671,10 @@ class Config {
         for (const command of plugin.commands) {
             // set canonical command id
             if (this._commands.has(command.id)) {
-                const prioritizedCommand = this.determinePriority([this._commands.get(command.id), command]);
+                const prioritizedCommand = (0, determine_priority_1.determinePriority)(this.pjson.oclif.plugins ?? [], [
+                    this._commands.get(command.id),
+                    command,
+                ]);
                 this._commands.set(prioritizedCommand.id, prioritizedCommand);
             }
             else {
@@ -735,7 +691,10 @@ class Config {
             }
             const handleAlias = (alias, hidden = false) => {
                 if (this._commands.has(alias)) {
-                    const prioritizedCommand = this.determinePriority([this._commands.get(alias), command]);
+                    const prioritizedCommand = (0, determine_priority_1.determinePriority)(this.pjson.oclif.plugins ?? [], [
+                        this._commands.get(alias),
+                        command,
+                    ]);
                     this._commands.set(alias, { ...prioritizedCommand, id: alias });
                 }
                 else {

package/lib/config/plugin-loader.d.ts

@@ -1,20 +1,20 @@
 import { PJSON } from '../interfaces';
 import { Plugin as IPlugin } from '../interfaces/plugin';
 type PluginLoaderOptions = {
-    plugins?: IPlugin[] | PluginsMap;
+    plugins?: IPlugin[] | PluginsMap | undefined;
     root: string;
 };
 type LoadOpts = {
     dataDir: string;
-    devPlugins?: boolean;
-    force?: boolean;
+    devPlugins?: boolean | undefined;
+    force?: boolean | undefined;
     rootPlugin: IPlugin;
-    userPlugins?: boolean;
+    userPlugins?: boolean | undefined;
     pluginAdditions?: {
         core?: string[];
         dev?: string[];
         path?: string;
-    };
+    } | undefined;
 };
 type PluginsMap = Map<string, IPlugin>;
 export default class PluginLoader {
@@ -28,7 +28,7 @@ export default class PluginLoader {
         plugins: PluginsMap;
     }>;
     loadRoot({ pjson }: {
-        pjson?: PJSON.Plugin;
+        pjson?: PJSON | undefined;
     }): Promise<IPlugin>;
     private loadCorePlugins;
     private loadDevPlugins;

package/lib/config/plugin-loader.js

@@ -1,34 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const minimatch_1 = require("minimatch");
 const node_path_1 = require("node:path");
 const performance_1 = require("../performance");
 const fs_1 = require("../util/fs");
 const util_1 = require("../util/util");
-const Plugin = __importStar(require("./plugin"));
+const plugin_1 = require("./plugin");
 const util_2 = require("./util");
 const debug = (0, util_2.makeDebug)();
 function findMatchingDependencies(dependencies, patterns) {
@@ -62,7 +39,7 @@ class PluginLoader {
         }
         else {
             const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, 'plugin.load#root');
-            rootPlugin = new Plugin.Plugin({ isRoot: true, pjson, root: this.options.root });
+            rootPlugin = new plugin_1.Plugin({ isRoot: true, pjson, root: this.options.root });
             await rootPlugin.load();
             marker?.addDetails({
                 commandCount: rootPlugin.commands.length,
@@ -154,7 +131,7 @@ class PluginLoader {
                 if (this.plugins.has(name))
                     return;
                 const pluginMarker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `plugin.load#${name}`);
-                const instance = new Plugin.Plugin(opts);
+                const instance = new plugin_1.Plugin(opts);
                 await instance.load();
                 pluginMarker?.addDetails({
                     commandCount: instance.commands.length,

package/lib/config/plugin.d.ts

@@ -19,10 +19,10 @@ export declare class Plugin implements IPlugin {
     manifest: Manifest;
     moduleType: 'commonjs' | 'module';
     name: string;
-    parent: Plugin | undefined;
-    pjson: PJSON.Plugin;
+    parent?: Plugin | undefined;
+    pjson: PJSON;
     root: string;
-    tag?: string;
+    tag?: string | undefined;
     type: string;
     valid: boolean;
     version: string;

package/lib/config/plugin.js

@@ -57,12 +57,9 @@ function processCommandIds(files) {
         return id === '' ? symbols_1.SINGLE_COMMAND_CLI_SYMBOL : id;
     });
 }
-function determineCommandDiscoveryOptions(commandDiscovery, defaultCmdId) {
+function determineCommandDiscoveryOptions(commandDiscovery) {
     if (!commandDiscovery)
         return;
-    if (typeof commandDiscovery === 'string' && defaultCmdId) {
-        return { strategy: 'single', target: commandDiscovery };
-    }
     if (typeof commandDiscovery === 'string') {
         return { globPatterns: GLOB_PATTERNS, strategy: 'pattern', target: commandDiscovery };
     }
@@ -202,7 +199,7 @@ class Plugin {
             k,
             (0, util_1.castArray)(v).map((v) => determineHookOptions(v)),
         ]));
-        this.commandDiscoveryOpts = determineCommandDiscoveryOptions(this.pjson.oclif?.commands, this.pjson.oclif?.default);
+        this.commandDiscoveryOpts = determineCommandDiscoveryOptions(this.pjson.oclif?.commands);
         this._debug('command discovery options', this.commandDiscoveryOpts);
         this.manifest = await this._manifest();
         this.commands = Object.entries(this.manifest.commands)

package/lib/config/ts-path.d.ts

@@ -6,4 +6,4 @@ export declare const TS_CONFIGS: Record<string, TSConfig | undefined>;
  * if there is a tsconfig and the original sources exist, it attempts to require ts-node
  */
 export declare function tsPath(root: string, orig: string, plugin: Plugin): Promise<string>;
-export declare function tsPath(root: string, orig: string | undefined, plugin?: Plugin): Promise<string | undefined>;
+export declare function tsPath(root: string, orig: string | undefined, plugin?: Plugin | undefined): Promise<string | undefined>;

package/lib/errors/errors/cli.d.ts

@@ -3,15 +3,15 @@ import { OclifError, PrettyPrintableError } from '../../interfaces/errors';
  * properties specific to internal oclif error handling
  */
 export declare function addOclifExitCode(error: Record<string, any>, options?: {
-    exit?: false | number;
+    exit?: false | number | undefined;
 }): OclifError;
 export declare class CLIError extends Error implements OclifError {
-    code?: string;
+    code?: string | undefined;
     oclif: OclifError['oclif'];
-    skipOclifErrorHandling?: boolean;
-    suggestions?: string[];
+    skipOclifErrorHandling?: boolean | undefined;
+    suggestions?: string[] | undefined;
     constructor(error: Error | string, options?: {
-        exit?: false | number;
+        exit?: false | number | undefined;
     } & PrettyPrintableError);
     get bang(): string | undefined;
     get stack(): string;

package/lib/errors/errors/pretty-print.d.ts

@@ -1,7 +1,7 @@
 import { PrettyPrintableError } from '../../interfaces/errors';
 type CLIErrorDisplayOptions = {
-    bang?: string;
-    name?: string;
+    bang?: string | undefined;
+    name?: string | undefined;
 };
 export declare function applyPrettyPrintOptions(error: Error, options: PrettyPrintableError): PrettyPrintableError;
 export default function prettyPrint(error: Error & PrettyPrintableError & CLIErrorDisplayOptions): string | undefined;

package/lib/flags.d.ts

@@ -72,8 +72,8 @@ export declare function boolean<T = boolean>(options?: Partial<BooleanFlag<T>>):
  * - `max` option allows to set a maximum value.
  */
 export declare const integer: FlagDefinition<number, {
-    max?: number | undefined;
-    min?: number | undefined;
+    max?: number;
+    min?: number;
 }, {
     multiple: false;
     requiredOrDefaulted: false;
@@ -84,7 +84,7 @@ export declare const integer: FlagDefinition<number, {
  * - `exists` option allows you to throw an error if the directory does not exist.
  */
 export declare const directory: FlagDefinition<string, {
-    exists?: boolean | undefined;
+    exists?: boolean;
 }, {
     multiple: false;
     requiredOrDefaulted: false;
@@ -95,7 +95,7 @@ export declare const directory: FlagDefinition<string, {
  * - `exists` option allows you to throw an error if the file does not exist.
  */
 export declare const file: FlagDefinition<string, {
-    exists?: boolean | undefined;
+    exists?: boolean;
 }, {
     multiple: false;
     requiredOrDefaulted: false;

package/lib/flush.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flush = void 0;
-const errors_1 = require("./errors");
+const error_1 = require("./errors/error");
 function timeout(p, ms) {
     function wait(ms, unref = false) {
         return new Promise((resolve) => {
@@ -10,7 +10,7 @@ function timeout(p, ms) {
                 t.unref();
         });
     }
-    return Promise.race([p, wait(ms, true).then(() => (0, errors_1.error)('timed out'))]);
+    return Promise.race([p, wait(ms, true).then(() => (0, error_1.error)('timed out'))]);
 }
 async function _flush() {
     const p = new Promise((resolve) => {