@oclif/core 4.2.3 → 4.2.5

package/lib/args.d.ts

@@ -17,7 +17,7 @@ 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 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;

package/lib/cache.d.ts

@@ -1,15 +1,15 @@
 import { Config } from './config/config';
 import { OclifConfiguration, Plugin } from './interfaces';
-type OclifCoreInfo = {
-    name: string;
-    version: string;
-};
 type CacheContents = {
     rootPlugin: Plugin;
     config: Config;
     exitCodes: OclifConfiguration['exitCodes'];
     '@oclif/core': OclifCoreInfo;
 };
+type OclifCoreInfo = {
+    name: string;
+    version: string;
+};
 type ValueOf<T> = T[keyof T];
 /**
  * A simple cache for storing values that need to be accessed globally.
@@ -18,10 +18,10 @@ export default class Cache extends Map<keyof CacheContents, ValueOf<CacheContent
     static instance: Cache;
     constructor();
     static getInstance(): Cache;
-    get(key: 'config'): Config | undefined;
-    get(key: '@oclif/core'): OclifCoreInfo;
-    get(key: 'rootPlugin'): Plugin | undefined;
-    get(key: 'exitCodes'): OclifConfiguration['exitCodes'] | undefined;
+    get(_key: 'config'): Config | undefined;
+    get(_key: '@oclif/core'): OclifCoreInfo;
+    get(_key: 'rootPlugin'): Plugin | undefined;
+    get(_key: 'exitCodes'): OclifConfiguration['exitCodes'] | undefined;
     private getOclifCoreMeta;
 }
 export {};

package/lib/command.d.ts

@@ -11,6 +11,7 @@ import { Plugin } from './interfaces/plugin';
 export declare abstract class Command {
     argv: string[];
     config: Config;
+    private static readonly _base;
     /** An array of aliases for this command. */
     static aliases: string[];
     /** An order-dependent object of arguments for the command */
@@ -72,12 +73,7 @@ export declare abstract class Command {
     static usage: string | string[] | undefined;
     protected debug: (...args: any[]) => void;
     id: string | undefined;
-    private static readonly _base;
     constructor(argv: string[], config: Config);
-    /**
-     * actual command run code goes here
-     */
-    abstract run(): Promise<any>;
     /**
      * instantiate and run the command
      *
@@ -88,6 +84,7 @@ export declare abstract class Command {
      */
     static run<T extends Command>(this: new (argv: string[], config: Config) => T, argv?: string[], opts?: LoadOptions): Promise<ReturnType<T['run']>>;
     protected get ctor(): typeof Command;
+    protected _run<T>(): Promise<T>;
     protected catch(err: CommandError): Promise<any>;
     error(input: Error | string, options: {
         code?: string;
@@ -110,12 +107,15 @@ export declare abstract class Command {
     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>>;
+    /**
+     * actual command run code goes here
+     */
+    abstract run(): Promise<any>;
     protected toErrorJson(err: unknown): any;
     protected toSuccessJson(result: unknown): any;
     warn(input: Error | string): Error | string;
     protected warnIfCommandDeprecated(): void;
     protected warnIfFlagDeprecated(flags: Record<string, unknown>): void;
-    protected _run<T>(): Promise<T>;
     private removeEnvVar;
 }
 export declare namespace Command {

package/lib/command.js

@@ -66,6 +66,7 @@ process.stdout.on('error', (err) => {
 class Command {
     argv;
     config;
+    static _base = `${pjson.name}@${pjson.version}`;
     /** An array of aliases for this command. */
     static aliases = [];
     /** An order-dependent object of arguments for the command */
@@ -127,7 +128,6 @@ class Command {
     static usage;
     debug;
     id;
-    static _base = `${pjson.name}@${pjson.version}`;
     constructor(argv, config) {
         this.argv = argv;
         this.config = config;
@@ -171,6 +171,26 @@ class Command {
     get ctor() {
         return this.constructor;
     }
+    async _run() {
+        let err;
+        let result;
+        try {
+            // remove redirected env var to allow subsessions to run autoupdated client
+            this.removeEnvVar('REDIRECTED');
+            await this.init();
+            result = await this.run();
+        }
+        catch (error) {
+            err = error;
+            await this.catch(error);
+        }
+        finally {
+            await this.finally(err);
+        }
+        if (result && this.jsonEnabled())
+            this.logJson(this.toSuccessJson(result));
+        return result;
+    }
     async catch(err) {
         process.exitCode = process.exitCode ?? err.exitCode ?? 1;
         if (this.jsonEnabled()) {
@@ -195,7 +215,7 @@ class Command {
     async finally(_) { }
     async init() {
         this.debug('init version: %s argv: %o', this.ctor._base, this.argv);
-        const g = global;
+        const g = globalThis;
         g['http-call'] = g['http-call'] || {};
         g['http-call'].userAgent = this.config.userAgent;
         this.warnIfCommandDeprecated();
@@ -216,9 +236,9 @@ class Command {
         const jsonIndex = this.argv.indexOf('--json');
         return passThroughIndex === -1
             ? // If '--' is not present, then check for `--json` in this.argv
-                jsonIndex > -1
+                jsonIndex !== -1
             : // If '--' is present, return true only the --json flag exists and is before the '--'
-                jsonIndex > -1 && jsonIndex < passThroughIndex;
+                jsonIndex !== -1 && jsonIndex < passThroughIndex;
     }
     log(message = '', ...args) {
         if (!this.jsonEnabled()) {
@@ -302,26 +322,6 @@ class Command {
             }
         }
     }
-    async _run() {
-        let err;
-        let result;
-        try {
-            // remove redirected env var to allow subsessions to run autoupdated client
-            this.removeEnvVar('REDIRECTED');
-            await this.init();
-            result = await this.run();
-        }
-        catch (error) {
-            err = error;
-            await this.catch(error);
-        }
-        finally {
-            await this.finally(err);
-        }
-        if (result && this.jsonEnabled())
-            this.logJson(this.toSuccessJson(result));
-        return result;
-    }
     removeEnvVar(envVar) {
         const keys = [];
         try {

package/lib/config/config.d.ts

@@ -44,12 +44,13 @@ export declare class Config implements IConfig {
     private topicPermutations;
     constructor(options: Options);
     static load(opts?: LoadOptions): Promise<Config>;
-    static get rootPlugin(): IPlugin | undefined;
     get commandIDs(): string[];
     get commands(): Command.Loadable[];
     protected get isProd(): boolean;
+    static get rootPlugin(): IPlugin | undefined;
     get topics(): Topic[];
     get versionDetails(): VersionDetails;
+    protected _shell(): string;
     protected dir(category: 'cache' | 'config' | 'data'): string;
     findCommand(id: string, opts: {
         must: true;
@@ -101,13 +102,13 @@ export declare class Config implements IConfig {
     scopedEnvVar(k: string): string | undefined;
     /**
      * this DOES NOT account for bin aliases, use scopedEnvVarKeys instead which will account for bin aliases
-     * @param {string} k, the unscoped key you want to get the value for
+     * @param k {string}, the unscoped key you want to get the value for
      * @returns {string} returns the env var key
      */
     scopedEnvVarKey(k: string): string;
     /**
      * gets the scoped env var keys for a given key, including bin aliases
-     * @param {string} k, the env key e.g. 'debug'
+     * @param k {string}, the env key e.g. 'debug'
      * @returns {string[]} e.g. ['SF_DEBUG', 'SFDX_DEBUG']
      */
     scopedEnvVarKeys(k: string): string[];
@@ -115,7 +116,6 @@ export declare class Config implements IConfig {
     protected windowsHome(): string | undefined;
     protected windowsHomedriveHome(): string | undefined;
     protected windowsUserprofileHome(): string | undefined;
-    protected _shell(): string;
     private buildS3Config;
     private getCmdLookupId;
     private getTopicLookupId;
@@ -126,7 +126,6 @@ export declare class Config implements IConfig {
      * with oclif-compatible ones returned by @oclif/plugin-legacy init hook.
      *
      * @param plugins array of oclif-compatible plugins
-     * @returns void
      */
     private insertLegacyPlugins;
     private isJitPluginCommand;

package/lib/config/config.js

@@ -178,9 +178,6 @@ class Config {
         await config.load();
         return config;
     }
-    static get rootPlugin() {
-        return this.rootPlugin;
-    }
     get commandIDs() {
         if (this._commandIDs)
             return this._commandIDs;
@@ -193,6 +190,9 @@ class Config {
     get isProd() {
         return (0, util_2.isProd)();
     }
+    static get rootPlugin() {
+        return this.rootPlugin;
+    }
     get topics() {
         return [...this._topics.values()];
     }
@@ -208,6 +208,27 @@ class Config {
             shell: this.shell,
         };
     }
+    _shell() {
+        let shellPath;
+        const { COMSPEC } = process.env;
+        const SHELL = process.env.SHELL ?? (0, node_os_1.userInfo)().shell?.split(node_path_1.sep)?.pop();
+        if (SHELL) {
+            shellPath = SHELL.split('/');
+        }
+        else if (this.windows && process.title.toLowerCase().includes('powershell')) {
+            shellPath = ['powershell'];
+        }
+        else if (this.windows && process.title.toLowerCase().includes('command prompt')) {
+            shellPath = ['cmd.exe'];
+        }
+        else if (this.windows && COMSPEC) {
+            shellPath = COMSPEC.split(/\\|\//);
+        }
+        else {
+            shellPath = ['unknown'];
+        }
+        return shellPath.at(-1) ?? 'unknown';
+    }
     dir(category) {
         const base = process.env[`XDG_${category.toUpperCase()}_HOME`] ||
             (this.windows && process.env.LOCALAPPDATA) ||
@@ -379,8 +400,8 @@ class Config {
             return this.pjson.oclif.theme;
         };
         const [defaultTheme, userTheme] = await Promise.all([
-            await getDefaultTheme(),
-            await (0, fs_1.safeReadJson)(userThemeFile),
+            getDefaultTheme(),
+            (0, fs_1.safeReadJson)(userThemeFile),
         ]);
         // Merge the default theme with the user theme, giving the user theme precedence.
         const merged = { ...defaultTheme, ...userTheme };
@@ -431,7 +452,7 @@ class Config {
             }
         }
         const command = await c.load();
-        await this.runHook('prerun', { Command: command, argv });
+        await this.runHook('prerun', { argv, Command: command });
         const result = (await command.run(argv, this));
         // If plugins:uninstall was run, we need to remove all the uninstalled plugins
         // from this.plugins so that the postrun hook doesn't attempt to run any
@@ -440,7 +461,7 @@ class Config {
             for (const arg of argv)
                 this.plugins.delete(arg);
         }
-        await this.runHook('postrun', { Command: command, argv, result });
+        await this.runHook('postrun', { argv, Command: command, result });
         marker?.addDetails({ command: id, plugin: c.pluginName });
         marker?.stop();
         return result;
@@ -560,7 +581,7 @@ class Config {
     }
     /**
      * this DOES NOT account for bin aliases, use scopedEnvVarKeys instead which will account for bin aliases
-     * @param {string} k, the unscoped key you want to get the value for
+     * @param k {string}, the unscoped key you want to get the value for
      * @returns {string} returns the env var key
      */
     scopedEnvVarKey(k) {
@@ -571,7 +592,7 @@ class Config {
     }
     /**
      * gets the scoped env var keys for a given key, including bin aliases
-     * @param {string} k, the env key e.g. 'debug'
+     * @param k {string}, the env key e.g. 'debug'
      * @returns {string[]} e.g. ['SF_DEBUG', 'SFDX_DEBUG']
      */
     scopedEnvVarKeys(k) {
@@ -592,27 +613,6 @@ class Config {
     windowsUserprofileHome() {
         return process.env.USERPROFILE;
     }
-    _shell() {
-        let shellPath;
-        const { COMSPEC } = process.env;
-        const SHELL = process.env.SHELL ?? (0, node_os_1.userInfo)().shell?.split(node_path_1.sep)?.pop();
-        if (SHELL) {
-            shellPath = SHELL.split('/');
-        }
-        else if (this.windows && process.title.toLowerCase().includes('powershell')) {
-            shellPath = ['powershell'];
-        }
-        else if (this.windows && process.title.toLowerCase().includes('command prompt')) {
-            shellPath = ['cmd.exe'];
-        }
-        else if (this.windows && COMSPEC) {
-            shellPath = COMSPEC.split(/\\|\//);
-        }
-        else {
-            shellPath = ['unknown'];
-        }
-        return shellPath.at(-1) ?? 'unknown';
-    }
     buildS3Config() {
         const s3 = this.pjson.oclif.update?.s3;
         const bucket = this.scopedEnvVar('S3_BUCKET') ?? s3?.bucket;
@@ -661,7 +661,6 @@ class Config {
      * with oclif-compatible ones returned by @oclif/plugin-legacy init hook.
      *
      * @param plugins array of oclif-compatible plugins
-     * @returns void
      */
     insertLegacyPlugins(plugins) {
         for (const plugin of plugins) {

package/lib/config/plugin.d.ts

@@ -5,6 +5,8 @@ import { Plugin as IPlugin, PluginOptions } from '../interfaces/plugin';
 import { Topic } from '../interfaces/topic';
 export declare class Plugin implements IPlugin {
     options: PluginOptions;
+    _base: string;
+    protected _debug: (..._: any) => void;
     alias: string;
     alreadyLoaded: boolean;
     children: Plugin[];
@@ -26,8 +28,6 @@ export declare class Plugin implements IPlugin {
     type: string;
     valid: boolean;
     version: string;
-    _base: string;
-    protected _debug: (..._: any) => void;
     private commandCache;
     private commandDiscoveryOpts;
     private flexibleTaxonomy;

package/lib/config/plugin.js

@@ -81,6 +81,8 @@ function determineHookOptions(hook) {
 }
 class Plugin {
     options;
+    _base = `${_pjson.name}@${_pjson.version}`;
+    _debug = (0, util_2.makeDebug)();
     alias;
     alreadyLoaded = false;
     children = [];
@@ -101,8 +103,6 @@ class Plugin {
     type;
     valid = false;
     version;
-    _base = `${_pjson.name}@${_pjson.version}`;
-    _debug = (0, util_2.makeDebug)();
     commandCache;
     commandDiscoveryOpts;
     flexibleTaxonomy;
@@ -162,6 +162,7 @@ class Plugin {
         marker?.stop();
         return cmd;
     }
+    // eslint-disable-next-line complexity
     async load() {
         this.type = this.options.type ?? 'core';
         this.tag = this.options.tag;

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

@@ -17,7 +17,7 @@ export declare class CLIError extends Error implements OclifError {
     get stack(): string;
     /**
      * @deprecated `render` Errors display should be handled by display function, like pretty-print
-     * @return {string} returns a string representing the dispay of the error
+     * @returns {string} returns a string representing the display of the error
      */
     render(): string;
 }

package/lib/errors/errors/cli.js

@@ -20,7 +20,7 @@ function addOclifExitCode(error, options) {
         ;
         error.oclif = {};
     }
-    error.oclif.exit = options?.exit === undefined ? cache_1.default.getInstance().get('exitCodes')?.default ?? 2 : options.exit;
+    error.oclif.exit = options?.exit === undefined ? (cache_1.default.getInstance().get('exitCodes')?.default ?? 2) : options.exit;
     return error;
 }
 class CLIError extends Error {
@@ -34,6 +34,7 @@ class CLIError extends Error {
         this.code = options.code;
         this.suggestions = options.suggestions;
     }
+    // eslint-disable-next-line getter-return
     get bang() {
         try {
             return (0, theme_1.colorize)('red', process.platform === 'win32' ? '»' : '›');
@@ -45,7 +46,7 @@ class CLIError extends Error {
     }
     /**
      * @deprecated `render` Errors display should be handled by display function, like pretty-print
-     * @return {string} returns a string representing the dispay of the error
+     * @returns {string} returns a string representing the display of the error
      */
     render() {
         if (settings_1.settings.debug) {
@@ -66,6 +67,7 @@ exports.CLIError = CLIError;
             super(err instanceof Error ? err.message : err);
             this.name = 'Warning';
         }
+        // eslint-disable-next-line getter-return
         get bang() {
             try {
                 return (0, theme_1.colorize)('yellow', process.platform === 'win32' ? '»' : '›');

package/lib/execute.d.ts

@@ -2,9 +2,6 @@ import { LoadOptions } from './interfaces';
 /**
  * Load and run oclif CLI
  *
- * @param options - options to load the CLI
- * @returns Promise<void>
- *
  * @example For ESM dev.js
  * ```
  * #!/usr/bin/env -S node --loader ts-node/esm --no-warnings=ExperimentalWarning

package/lib/execute.js

@@ -9,9 +9,6 @@ const settings_1 = require("./settings");
 /**
  * Load and run oclif CLI
  *
- * @param options - options to load the CLI
- * @returns Promise<void>
- *
  * @example For ESM dev.js
  * ```
  * #!/usr/bin/env -S node --loader ts-node/esm --no-warnings=ExperimentalWarning

package/lib/help/command.js

@@ -164,6 +164,7 @@ class CommandHelp extends formatter_1.HelpFormatter {
         if (flags.length === 0)
             return;
         const noChar = flags.reduce((previous, current) => previous && current.char === undefined, true);
+        // eslint-disable-next-line complexity
         return flags.map((flag) => {
             let left = this.flagHelpLabel(flag);
             if (noChar)

package/lib/help/formatter.d.ts

@@ -54,7 +54,7 @@ export declare class HelpFormatter {
      * ```
      * @param body the text to indent
      * @param spacing the final number of spaces this text will be indented
-     * @return the formatted indented text
+     * @returns the formatted indented text
      */
     indent(body: string, spacing?: number): string;
     renderList(input: (string | undefined)[][], opts: {

package/lib/help/formatter.js

@@ -57,7 +57,7 @@ class HelpFormatter {
      * ```
      * @param body the text to indent
      * @param spacing the final number of spaces this text will be indented
-     * @return the formatted indented text
+     * @returns the formatted indented text
      */
     indent(body, spacing = this.indentSpacing) {
         return (0, indent_string_1.default)(body, spacing);

package/lib/help/index.d.ts

@@ -22,6 +22,7 @@ export declare abstract class HelpBase extends HelpFormatter {
 export declare class Help extends HelpBase {
     protected CommandHelpClass: typeof CommandHelp;
     constructor(config: Interfaces.Config, opts?: Partial<Interfaces.HelpOptions>);
+    private get _topics();
     protected get sortedCommands(): Command.Loadable[];
     protected get sortedTopics(): Interfaces.Topic[];
     protected command(command: Command.Loadable): string;
@@ -38,7 +39,6 @@ export declare class Help extends HelpBase {
     protected showRootHelp(): Promise<void>;
     protected showTopicHelp(topic: Interfaces.Topic): Promise<void>;
     protected summary(c: Command.Loadable): string | undefined;
-    private get _topics();
 }
 interface HelpBaseDerived {
     new (config: Interfaces.Config, opts?: Partial<Interfaces.HelpOptions>): HelpBase;

package/lib/help/index.js

@@ -53,6 +53,19 @@ class Help extends HelpBase {
     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
+     * this is fixed upstream config.topics should return *only* topics with children,
+     * and this can be removed.
+     */
+    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}:`));
+            return hasChild;
+        });
+    }
     get sortedCommands() {
         let { commands } = this.config;
         commands = commands.filter((c) => this.opts.all || !c.hidden);
@@ -147,7 +160,7 @@ class Help extends HelpBase {
         return new this.CommandHelpClass(command, this.config, this.opts);
     }
     log(...args) {
-        this.opts.sendToStderr ? ux_1.ux.stderr(args) : ux_1.ux.stdout(args);
+        return this.opts.sendToStderr ? ux_1.ux.stderr(args) : ux_1.ux.stdout(args);
     }
     async showCommandHelp(command) {
         const name = command.id;
@@ -303,19 +316,6 @@ class Help extends HelpBase {
             return (0, theme_1.colorize)(this.config?.theme?.commandSummary, this.render(c.summary.split('\n')[0]));
         return c.description && (0, theme_1.colorize)(this.config?.theme?.commandSummary, this.render(c.description).split('\n')[0]);
     }
-    /*
-     * _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
-     * this is fixed upstream config.topics should return *only* topics with children,
-     * and this can be removed.
-     */
-    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}:`));
-            return hasChild;
-        });
-    }
 }
 exports.Help = Help;
 function extractClass(exported) {

package/lib/help/util.js

@@ -96,7 +96,7 @@ function standardizeIDFromArgv(argv, config) {
 function getHelpFlagAdditions(config) {
     const helpFlags = ['--help'];
     const additionalHelpFlags = config.pjson.oclif.additionalHelpFlags ?? [];
-    return [...new Set([...helpFlags, ...additionalHelpFlags]).values()];
+    return [...new Set([...additionalHelpFlags, ...helpFlags]).values()];
 }
 function formatFlagDeprecationWarning(flag, opts) {
     let message = `The "${flag}" flag has been deprecated`;

package/lib/index.js

@@ -49,8 +49,8 @@ function checkNodeVersion() {
     if (process.env.OCLIF_DISABLE_ENGINE_WARNING && (0, util_1.isTruthy)(process.env.OCLIF_DISABLE_ENGINE_WARNING))
         return;
     try {
-        const semver = require('semver');
         const path = require('node:path');
+        const semver = require('semver');
         const root = path.join(__dirname, '..');
         const pjson = require(path.join(root, 'package.json'));
         if (!semver.satisfies(process.versions.node, pjson.engines.node)) {

package/lib/interfaces/config.d.ts

@@ -111,8 +111,8 @@ export interface Config {
      */
     readonly shell: string;
     readonly theme?: Theme | undefined;
-    topicSeparator: ' ' | ':';
     readonly topics: Topic[];
+    topicSeparator: ' ' | ':';
     readonly updateConfig: NonNullable<OclifConfiguration['update']>;
     /**
      * user agent to use for http calls

package/lib/module-loader.js

@@ -4,13 +4,13 @@ exports.load = load;
 exports.loadWithData = loadWithData;
 exports.loadWithDataFromManifest = loadWithDataFromManifest;
 exports.isPathModule = isPathModule;
+const getPackageType = require('get-package-type');
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const ts_path_1 = require("./config/ts-path");
 const module_load_1 = require("./errors/errors/module-load");
 const fs_1 = require("./util/fs");
-const getPackageType = require('get-package-type');
 /**
  * Defines file extension resolution when source files do not have an extension.
  */

package/lib/parser/parse.d.ts

@@ -23,9 +23,9 @@ export declare class Parser<T extends ParserInput, TFlags extends OutputFlags<T[
     private readonly flagAliases;
     private readonly raw;
     constructor(input: T);
+    private get _argTokens();
     parse(): Promise<ParserOutput<TFlags, BFlags, TArgs>>;
     private _args;
-    private get _argTokens();
     private _debugInput;
     private _debugOutput;
     private _flags;

package/lib/parser/parse.js

@@ -33,9 +33,9 @@ const readStdin = async () => {
     // Because of this, we have to set a timeout to prevent the process from hanging.
     if (stdin.isTTY)
         return null;
-    if (global.oclif?.stdinCache) {
-        debug('resolved stdin from global cache', global.oclif.stdinCache);
-        return global.oclif.stdinCache;
+    if (globalThis.oclif?.stdinCache) {
+        debug('resolved stdin from global cache', globalThis.oclif.stdinCache);
+        return globalThis.oclif.stdinCache;
     }
     return new Promise((resolve) => {
         let result = '';
@@ -53,7 +53,7 @@ const readStdin = async () => {
         rl.once('close', () => {
             clearTimeout(timeout);
             debug('resolved from stdin', result);
-            global.oclif = { ...global.oclif, stdinCache: result };
+            globalThis.oclif = { ...globalThis.oclif, stdinCache: result };
             resolve(result);
         });
         signal.addEventListener('abort', () => {
@@ -89,6 +89,9 @@ class Parser {
         this.booleanFlags = (0, util_1.pickBy)(input.flags, (f) => f.type === 'boolean');
         this.flagAliases = Object.fromEntries(Object.values(input.flags).flatMap((flag) => [...(flag.aliases ?? []), ...(flag.charAliases ?? [])].map((a) => [a, flag])));
     }
+    get _argTokens() {
+        return this.raw.filter((o) => o.type === 'arg');
+    }
     async parse() {
         this._debugInput();
         // eslint-disable-next-line complexity
@@ -235,9 +238,6 @@ class Parser {
         }
         return { args, argv };
     }
-    get _argTokens() {
-        return this.raw.filter((o) => o.type === 'arg');
-    }
     _debugInput() {
         debug('input: %s', this.argv.join(' '));
         const args = Object.keys(this.input.args);

package/lib/parser/validate.js

@@ -192,12 +192,12 @@ async function validate(parse) {
                 case 'all': {
                     return validateDependsOn(name, relationship.flags);
                 }
-                case 'some': {
-                    return validateSome(name, relationship.flags);
-                }
                 case 'none': {
                     return validateExclusive(name, relationship.flags);
                 }
+                case 'some': {
+                    return validateSome(name, relationship.flags);
+                }
                 default: {
                     throw new Error(`Unknown relationship type: ${relationship.type}`);
                 }

package/lib/performance.d.ts

@@ -53,10 +53,8 @@ export declare class Performance {
     static collect(): Promise<void>;
     /**
      * Add debug logs for plugin loading performance
-     * @returns void
      */
     static debug(): void;
-    static get enabled(): boolean;
     static getResult(owner: string, name: string): PerfResult | undefined;
     /**
      * Add a new performance marker
@@ -67,6 +65,7 @@ export declare class Performance {
      * @returns Marker instance
      */
     static mark(owner: string, name: string, details?: Details): Marker | undefined;
+    static get enabled(): boolean;
     static get oclifPerf(): PerfHighlights | Record<string, never>;
     /** returns a map of owner, PerfResult[].  Excludes oclif PerfResult, which you can get from oclifPerf */
     static get results(): Map<string, PerfResult[]>;

package/lib/performance.js

@@ -62,6 +62,7 @@ class Performance {
             marker.stop();
         }
         return new Promise((resolve) => {
+            // eslint-disable-next-line complexity
             const perfObserver = new node_perf_hooks_1.PerformanceObserver((items) => {
                 for (const entry of items.getEntries()) {
                     const marker = Performance.markers.get(entry.name);
@@ -81,7 +82,7 @@ class Performance {
                 const oclifResults = Performance._results.get(exports.OCLIF_MARKER_OWNER) ?? [];
                 const command = oclifResults.find((r) => r.name.startsWith('config.runCommand'));
                 const commandLoadTime = command
-                    ? Performance.getResult(exports.OCLIF_MARKER_OWNER, `plugin.findCommand#${command.details.plugin}.${command.details.command}`)?.duration ?? 0
+                    ? (Performance.getResult(exports.OCLIF_MARKER_OWNER, `plugin.findCommand#${command.details.plugin}.${command.details.command}`)?.duration ?? 0)
                     : 0;
                 const pluginLoadTimes = Object.fromEntries(oclifResults
                     .filter(({ name }) => name.startsWith('plugin.load#'))
@@ -139,7 +140,6 @@ class Performance {
     }
     /**
      * Add debug logs for plugin loading performance
-     * @returns void
      */
     static debug() {
         if (!Performance.enabled)
@@ -189,9 +189,6 @@ class Performance {
             }
         }
     }
-    static get enabled() {
-        return settings_1.settings.performanceEnabled ?? false;
-    }
     static getResult(owner, name) {
         return Performance._results.get(owner)?.find((r) => r.name === name);
     }
@@ -210,6 +207,9 @@ class Performance {
         Performance.markers.set(marker.name, marker);
         return marker;
     }
+    static get enabled() {
+        return settings_1.settings.performanceEnabled ?? false;
+    }
     static get oclifPerf() {
         if (!Performance.enabled)
             return {};

package/lib/settings.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.settings = void 0;
 // Set global.oclif to the new object if it wasn't set before
-if (!global.oclif)
-    global.oclif = {};
-exports.settings = global.oclif;
+if (!globalThis.oclif)
+    globalThis.oclif = {};
+exports.settings = globalThis.oclif;

package/lib/util/cache-command.js

@@ -74,8 +74,8 @@ async function cacheCommand(uncachedCmd, plugin, respectNoCacheDefault = false)
     // @ts-expect-error because v2 commands have base flags stored in _baseFlags
     const uncachedBaseFlags = cmd.baseFlags ?? cmd._baseFlags;
     const [flags, args] = await Promise.all([
-        await cacheFlags((0, aggregate_flags_1.aggregateFlags)(uncachedFlags, uncachedBaseFlags, cmd.enableJsonFlag), respectNoCacheDefault),
-        await cacheArgs((0, ensure_arg_object_1.ensureArgObject)(cmd.args), respectNoCacheDefault),
+        cacheFlags((0, aggregate_flags_1.aggregateFlags)(uncachedFlags, uncachedBaseFlags, cmd.enableJsonFlag), respectNoCacheDefault),
+        cacheArgs((0, ensure_arg_object_1.ensureArgObject)(cmd.args), respectNoCacheDefault),
     ]);
     const stdProperties = {
         aliases: cmd.aliases ?? [],
@@ -110,7 +110,7 @@ async function cacheCommand(uncachedCmd, plugin, respectNoCacheDefault = false)
         '_base',
     ];
     // Add in any additional properties that are not standard command properties.
-    const stdKeysAndIgnored = new Set([...Object.keys(stdProperties), ...ignoreCommandProperties]);
+    const stdKeysAndIgnored = new Set([...ignoreCommandProperties, ...Object.keys(stdProperties)]);
     const keysToAdd = Object.keys(cmd).filter((property) => !stdKeysAndIgnored.has(property));
     const additionalProperties = Object.fromEntries(keysToAdd.map((key) => [key, cmd[key]]));
     return { ...stdProperties, ...additionalProperties };

package/lib/util/determine-priority.d.ts

@@ -14,8 +14,5 @@ import { Command } from '../command';
  *
  * 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
  */
 export declare function determinePriority(plugins: string[], commands: Command.Loadable[]): Command.Loadable;

package/lib/util/determine-priority.js

@@ -16,9 +16,6 @@ exports.determinePriority = determinePriority;
  *
  * 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
  */
 function determinePriority(plugins, commands) {
     const commandPlugins = commands.sort((a, b) => {

package/lib/ux/action/base.d.ts

@@ -10,6 +10,7 @@ export declare class ActionBase {
     protected stdmocks?: ['stderr' | 'stdout', string[]][];
     type: ActionType;
     private stdmockOrigs;
+    private get globals();
     protected get output(): string | undefined;
     protected set output(output: string | undefined);
     get running(): boolean;
@@ -17,10 +18,6 @@ export declare class ActionBase {
     set status(status: string | undefined);
     get task(): Task | undefined;
     set task(task: Task | undefined);
-    pause(fn: () => any, icon?: string): Promise<any>;
-    pauseAsync<T>(fn: () => Promise<T>, icon?: string): Promise<T>;
-    start(action: string, status?: string, opts?: Options): void;
-    stop(msg?: string): void;
     protected _flushStdout(): void;
     protected _pause(_?: string): void;
     protected _resume(): void;
@@ -29,6 +26,9 @@ export declare class ActionBase {
     protected _stop(_: string): void;
     protected _updateStatus(_: string | undefined, __?: string): void;
     protected _write(std: 'stderr' | 'stdout', s: string | string[]): void;
-    private get globals();
+    pause(fn: () => any, icon?: string): Promise<any>;
+    pauseAsync<T>(fn: () => Promise<T>, icon?: string): Promise<T>;
+    start(action: string, status?: string, opts?: Options): void;
+    stop(msg?: string): void;
 }
 export {};

package/lib/ux/action/base.js

@@ -11,6 +11,13 @@ class ActionBase {
         stderr: process.stderr.write,
         stdout: process.stdout.write,
     };
+    get globals() {
+        ;
+        globalThis.ux = globalThis.ux || {};
+        const globals = globalThis.ux;
+        globals.action = globals.action || {};
+        return globals;
+    }
     get output() {
         return this.globals.output;
     }
@@ -40,52 +47,6 @@ class ActionBase {
     set task(task) {
         this.globals.action.task = task;
     }
-    pause(fn, icon) {
-        const { task } = this;
-        const active = task && task.active;
-        if (task && active) {
-            this._pause(icon);
-            this._stdout(false);
-            task.active = false;
-        }
-        const ret = fn();
-        if (task && active) {
-            this._resume();
-        }
-        return ret;
-    }
-    async pauseAsync(fn, icon) {
-        const { task } = this;
-        const active = task && task.active;
-        if (task && active) {
-            this._pause(icon);
-            this._stdout(false);
-            task.active = false;
-        }
-        const ret = await fn();
-        if (task && active) {
-            this._resume();
-        }
-        return ret;
-    }
-    start(action, status, opts = {}) {
-        this.std = opts.stdout ? 'stdout' : 'stderr';
-        const task = { action, active: Boolean(this.task && this.task.active), status };
-        this.task = task;
-        this._start(opts);
-        task.active = true;
-        this._stdout(true);
-    }
-    stop(msg = 'done') {
-        const { task } = this;
-        if (!task) {
-            return;
-        }
-        this._stop(msg);
-        task.active = false;
-        this.task = undefined;
-        this._stdout(false);
-    }
     // flush mocked stdout/stderr
     _flushStdout() {
         try {
@@ -159,25 +120,64 @@ class ActionBase {
     // write to the real stdout/stderr
     _write(std, s) {
         switch (std) {
-            case 'stdout': {
-                this.stdmockOrigs.stdout.apply(process.stdout, (0, util_1.castArray)(s));
-                break;
-            }
             case 'stderr': {
                 this.stdmockOrigs.stderr.apply(process.stderr, (0, util_1.castArray)(s));
                 break;
             }
+            case 'stdout': {
+                this.stdmockOrigs.stdout.apply(process.stdout, (0, util_1.castArray)(s));
+                break;
+            }
             default: {
                 throw new Error(`invalid std: ${std}`);
             }
         }
     }
-    get globals() {
-        ;
-        global.ux = global.ux || {};
-        const globals = global.ux;
-        globals.action = globals.action || {};
-        return globals;
+    pause(fn, icon) {
+        const { task } = this;
+        const active = task && task.active;
+        if (task && active) {
+            this._pause(icon);
+            this._stdout(false);
+            task.active = false;
+        }
+        const ret = fn();
+        if (task && active) {
+            this._resume();
+        }
+        return ret;
+    }
+    async pauseAsync(fn, icon) {
+        const { task } = this;
+        const active = task && task.active;
+        if (task && active) {
+            this._pause(icon);
+            this._stdout(false);
+            task.active = false;
+        }
+        const ret = await fn();
+        if (task && active) {
+            this._resume();
+        }
+        return ret;
+    }
+    start(action, status, opts = {}) {
+        this.std = opts.stdout ? 'stdout' : 'stderr';
+        const task = { action, active: Boolean(this.task && this.task.active), status };
+        this.task = task;
+        this._start(opts);
+        task.active = true;
+        this._stdout(true);
+    }
+    stop(msg = 'done') {
+        const { task } = this;
+        if (!task) {
+            return;
+        }
+        this._stop(msg);
+        task.active = false;
+        this.task = undefined;
+        this._stdout(false);
     }
 }
 exports.ActionBase = ActionBase;

package/lib/ux/action/simple.d.ts

@@ -1,11 +1,11 @@
 import { ActionBase, ActionType } from './base';
 export default class SimpleAction extends ActionBase {
     type: ActionType;
-    private _flush;
     protected _pause(icon?: string): void;
-    private _render;
     protected _resume(): void;
     protected _start(): void;
     protected _stop(status: string): void;
     protected _updateStatus(status: string, prevStatus?: string, newline?: boolean): void;
+    private _flush;
+    private _render;
 }

package/lib/ux/action/simple.js

@@ -3,23 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const base_1 = require("./base");
 class SimpleAction extends base_1.ActionBase {
     type = 'simple';
-    _flush() {
-        this._write(this.std, '\n');
-        this._flushStdout();
-    }
     _pause(icon) {
         if (icon)
             this._updateStatus(icon);
         else
             this._flush();
     }
-    _render(action, status) {
-        if (!this.task)
-            return;
-        if (this.task.active)
-            this._flush();
-        this._write(this.std, status ? `${action}... ${status}` : `${action}...`);
-    }
     _resume() {
         // Not implemented
     }
@@ -43,5 +32,16 @@ class SimpleAction extends base_1.ActionBase {
         if (newline || !prevStatus)
             this._flush();
     }
+    _flush() {
+        this._write(this.std, '\n');
+        this._flushStdout();
+    }
+    _render(action, status) {
+        if (!this.task)
+            return;
+        if (this.task.active)
+            this._flush();
+        this._write(this.std, status ? `${action}... ${status}` : `${action}...`);
+    }
 }
 exports.default = SimpleAction;

package/lib/ux/action/spinner.d.ts

@@ -7,13 +7,13 @@ export default class SpinnerAction extends ActionBase {
     private frames;
     private spinner?;
     constructor();
-    protected colorize(s: string): string;
     protected _frame(): string;
-    private _lines;
     protected _pause(icon?: string): void;
-    private _render;
-    private _reset;
     protected _start(opts: Options): void;
     protected _stop(status: string): void;
+    protected colorize(s: string): string;
+    private _lines;
+    private _render;
+    private _reset;
     private getFrames;
 }

package/lib/ux/action/spinner.js

@@ -3,13 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const ansiEscapes = require('ansi-escapes');
 const ansis_1 = __importDefault(require("ansis"));
 const cli_spinners_1 = __importDefault(require("cli-spinners"));
 const cache_1 = __importDefault(require("../../cache"));
 const screen_1 = require("../../screen");
 const theme_1 = require("../theme");
 const base_1 = require("./base");
-const ansiEscapes = require('ansi-escapes');
 class SpinnerAction extends base_1.ActionBase {
     type = 'spinner';
     color = 'magenta';
@@ -21,19 +21,11 @@ class SpinnerAction extends base_1.ActionBase {
         this.frames = this.getFrames();
         this.frameIndex = 0;
     }
-    colorize(s) {
-        return (0, theme_1.colorize)(this.color, s);
-    }
     _frame() {
         const frame = this.frames[this.frameIndex];
         this.frameIndex = ++this.frameIndex % this.frames.length;
         return this.colorize(frame);
     }
-    _lines(s) {
-        return ansis_1.default.strip(s).split('\n')
-            .map((l) => Math.ceil(l.length / screen_1.errtermwidth))
-            .reduce((c, i) => c + i, 0);
-    }
     _pause(icon) {
         if (this.spinner)
             clearInterval(this.spinner);
@@ -42,23 +34,6 @@ class SpinnerAction extends base_1.ActionBase {
             this._render(` ${icon}`);
         this.output = undefined;
     }
-    _render(icon) {
-        if (!this.task)
-            return;
-        this._reset();
-        this._flushStdout();
-        const frame = icon === 'spinner' ? ` ${this._frame()}` : icon || '';
-        const status = this.task.status ? ` ${this.task.status}` : '';
-        this.output = `${this.task.action}...${frame}${status}\n`;
-        this._write(this.std, this.output);
-    }
-    _reset() {
-        if (!this.output)
-            return;
-        const lines = this._lines(this.output);
-        this._write(this.std, ansiEscapes.cursorLeft + ansiEscapes.cursorUp(lines) + ansiEscapes.eraseDown);
-        this.output = undefined;
-    }
     _start(opts) {
         this.color = cache_1.default.getInstance().get('config')?.theme?.spinner ?? this.color;
         if (opts.style)
@@ -79,6 +54,31 @@ class SpinnerAction extends base_1.ActionBase {
         this._render();
         this.output = undefined;
     }
+    colorize(s) {
+        return (0, theme_1.colorize)(this.color, s);
+    }
+    _lines(s) {
+        return ansis_1.default.strip(s).split('\n')
+            .map((l) => Math.ceil(l.length / screen_1.errtermwidth))
+            .reduce((c, i) => c + i, 0);
+    }
+    _render(icon) {
+        if (!this.task)
+            return;
+        this._reset();
+        this._flushStdout();
+        const frame = icon === 'spinner' ? ` ${this._frame()}` : icon || '';
+        const status = this.task.status ? ` ${this.task.status}` : '';
+        this.output = `${this.task.action}...${frame}${status}\n`;
+        this._write(this.std, this.output);
+    }
+    _reset() {
+        if (!this.output)
+            return;
+        const lines = this._lines(this.output);
+        this._write(this.std, ansiEscapes.cursorLeft + ansiEscapes.cursorUp(lines) + ansiEscapes.eraseDown);
+        this.output = undefined;
+    }
     getFrames(opts) {
         if (opts?.style)
             return cli_spinners_1.default[opts.style].frames;

package/lib/ux/colorize-json.js

@@ -34,9 +34,9 @@ function serializer(replacer, cycleReplacer) {
             // @ts-expect-error because `this` is not typed
             const thisPos = stack.indexOf(this);
             // @ts-expect-error because `this` is not typed
-            // eslint-disable-next-line no-bitwise
+            // eslint-disable-next-line no-bitwise, @typescript-eslint/no-unused-expressions
             ~thisPos ? stack.splice(thisPos + 1) : stack.push(this);
-            // eslint-disable-next-line no-bitwise
+            // eslint-disable-next-line no-bitwise, @typescript-eslint/no-unused-expressions
             ~thisPos ? keys.splice(thisPos, Number.POSITIVE_INFINITY, key) : keys.push(key);
             // @ts-expect-error because `this` is not typed
             if (stack.includes(value))

package/lib/ux/list.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = renderList;
+const wordwrap = require('wordwrap');
 const screen_1 = require("../screen");
 const util_1 = require("../util/util");
-const wordwrap = require('wordwrap');
 function linewrap(length, s) {
     return wordwrap(length, screen_1.stdtermwidth, {
         skipScheme: 'ansi-color',

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "4.2.3",
+  "version": "4.2.5",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
     "ansi-escapes": "^4.3.2",
-    "ansis": "^3.8.1",
+    "ansis": "^3.9.0",
     "clean-stack": "^3.0.1",
     "cli-spinners": "^2.9.2",
     "debug": "^4.4.0",
@@ -26,6 +26,7 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^19",
+    "@eslint/compat": "^1.2.5",
     "@oclif/plugin-help": "^6",
     "@oclif/plugin-plugins": "^5",
     "@oclif/prettier-config": "^0.2.1",
@@ -49,10 +50,9 @@
     "chai-as-promised": "^7.1.2",
     "commitlint": "^19",
     "cross-env": "^7.0.3",
-    "eslint": "^8.57.1",
-    "eslint-config-oclif": "^5.2.2",
-    "eslint-config-oclif-typescript": "^3.1.13",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint": "^9",
+    "eslint-config-oclif": "^6",
+    "eslint-config-prettier": "^10",
     "husky": "^9.1.7",
     "lint-staged": "^15",
     "madge": "^6.1.0",
@@ -96,6 +96,7 @@
     "./hooks": "./lib/interfaces/hooks.js",
     "./interfaces": "./lib/interfaces/index.js",
     "./logger": "./lib/logger.js",
+    "./package.json": "./package.json",
     "./parser": "./lib/parser/index.js",
     "./performance": "./lib/performance.js",
     "./run": "./lib/main.js",
@@ -118,7 +119,7 @@
     "build": "shx rm -rf lib && tsc",
     "compile": "tsc",
     "format": "prettier --write \"+(src|test)/**/*.+(ts|js|json)\"",
-    "lint": "eslint . --ext .ts",
+    "lint": "eslint",
     "posttest": "yarn lint && yarn test:circular-deps",
     "prepack": "yarn run build",
     "prepare": "husky",