@oclif/core 3.26.6 → 4.0.0-beta.10

package/lib/config/config.js

@@ -33,24 +33,34 @@ const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const cache_1 = __importDefault(require("../cache"));
-const cli_ux_1 = require("../cli-ux");
-const theme_1 = require("../cli-ux/theme");
 const errors_1 = require("../errors");
 const util_1 = require("../help/util");
+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 = require("../ux");
+const theme_1 = require("../ux/theme");
 const plugin_loader_1 = __importDefault(require("./plugin-loader"));
 const ts_path_1 = require("./ts-path");
 const util_3 = require("./util");
-// eslint-disable-next-line new-cap
-const debug = (0, util_3.Debug)();
+const debug = (0, util_3.makeDebug)();
 const _pjson = cache_1.default.getInstance().get('@oclif/core');
 const BASE = `${_pjson.name}@${_pjson.version}`;
 const ROOT_ONLY_HOOKS = new Set(['preparse']);
+function displayWarnings() {
+    if (process.listenerCount('warning') > 1)
+        return;
+    process.on('warning', (warning) => {
+        console.error(warning.stack);
+        if (warning.detail)
+            console.error(warning.detail);
+    });
+}
 function channelFromVersion(version) {
     const m = version.match(/[^-]+(?:-([^.]+))?/);
     return (m && m[1]) || 'stable';
@@ -94,9 +104,7 @@ class Config {
     channel;
     configDir;
     dataDir;
-    debug = 0;
     dirname;
-    errlog;
     flexibleTaxonomy;
     home;
     isSingleCommandCLI = false;
@@ -110,6 +118,7 @@ class Config {
     shell;
     theme;
     topicSeparator = ':';
+    updateConfig;
     userAgent;
     userPJSON;
     valid;
@@ -128,6 +137,7 @@ class Config {
         this.options = options;
     }
     static async load(opts = module.filename || __dirname) {
+        (0, logger_1.setLogger)(opts);
         // Handle the case when a file URL string is passed in such as 'import.meta.url'; covert to file path.
         if (typeof opts === 'string' && opts.startsWith('file://')) {
             opts = (0, node_url_1.fileURLToPath)(opts);
@@ -262,6 +272,9 @@ class Config {
     async load() {
         settings_1.settings.performanceEnabled =
             (settings_1.settings.performanceEnabled === undefined ? this.options.enablePerf : settings_1.settings.performanceEnabled) ?? false;
+        if (settings_1.settings.debug)
+            displayWarnings();
+        (0, logger_1.setLogger)(this.options);
         const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, 'config.load');
         this.pluginLoader = new plugin_loader_1.default({ plugins: this.options.plugins, root: this.options.root });
         this.rootPlugin = await this.pluginLoader.loadRoot({ pjson: this.options.pjson });
@@ -294,46 +307,22 @@ class Config {
             this.dirname = this.dirname.replace('/', '\\');
         this.userAgent = `${this.name}/${this.version} ${this.platform}-${this.arch} node-${process.version}`;
         this.shell = this._shell();
-        this.debug = this._debug();
         this.home = process.env.HOME || (this.windows && this.windowsHome()) || (0, os_1.getHomeDir)() || (0, node_os_1.tmpdir)();
         this.cacheDir = this.scopedEnvVar('CACHE_DIR') || this.macosCacheDir() || this.dir('cache');
         this.configDir = this.scopedEnvVar('CONFIG_DIR') || this.dir('config');
         this.dataDir = this.scopedEnvVar('DATA_DIR') || this.dir('data');
-        this.errlog = (0, node_path_1.join)(this.cacheDir, 'error.log');
         this.binPath = this.scopedEnvVar('BINPATH');
         this.npmRegistry = this.scopedEnvVar('NPM_REGISTRY') || this.pjson.oclif.npmRegistry;
-        if (!this.scopedEnvVarTrue('DISABLE_THEME')) {
-            const { theme } = await this.loadThemes();
-            this.theme = theme;
-        }
-        this.pjson.oclif.update = this.pjson.oclif.update || {};
-        this.pjson.oclif.update.node = this.pjson.oclif.update.node || {};
-        const s3 = this.pjson.oclif.update.s3 || {};
-        this.pjson.oclif.update.s3 = s3;
-        s3.bucket = this.scopedEnvVar('S3_BUCKET') || s3.bucket;
-        if (s3.bucket && !s3.host)
-            s3.host = `https://${s3.bucket}.s3.amazonaws.com`;
-        s3.templates = {
-            ...s3.templates,
-            target: {
-                baseDir: '<%- bin %>',
-                manifest: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- platform %>-<%- arch %>",
-                unversioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-<%- platform %>-<%- arch %><%- ext %>",
-                versioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-v<%- version %>/<%- bin %>-v<%- version %>-<%- platform %>-<%- arch %><%- ext %>",
-                ...(s3.templates && s3.templates.target),
-            },
-            vanilla: {
-                baseDir: '<%- bin %>',
-                manifest: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %>version",
-                unversioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %><%- ext %>",
-                versioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-v<%- version %>/<%- bin %>-v<%- version %><%- ext %>",
-                ...(s3.templates && s3.templates.vanilla),
-            },
+        this.theme = await this.loadTheme();
+        this.updateConfig = {
+            ...this.pjson.oclif.update,
+            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');
         marker?.addDetails({
@@ -366,23 +355,25 @@ class Config {
             this.warn(error);
         }
     }
-    async loadThemes() {
-        const defaultThemeFile = this.pjson.oclif.theme
-            ? (0, node_path_1.resolve)(this.root, this.pjson.oclif.theme)
-            : this.pjson.oclif.theme;
+    async loadTheme() {
+        if (this.scopedEnvVarTrue('DISABLE_THEME'))
+            return;
         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.
         const merged = { ...defaultTheme, ...userTheme };
-        return {
-            // Point to the user file if it exists, otherwise use the default file.
-            // This doesn't really serve a purpose to anyone but removing it would be a breaking change.
-            file: userTheme ? userThemeFile : defaultThemeFile,
-            theme: Object.keys(merged).length > 0 ? (0, theme_1.parseTheme)(merged) : undefined,
-        };
+        return Object.keys(merged).length > 0 ? (0, theme_1.parseTheme)(merged) : undefined;
     }
     macosCacheDir() {
         return (this.platform === 'darwin' && (0, node_path_1.join)(this.home, 'Library', 'Caches', this.dirname)) || undefined;
@@ -471,7 +462,7 @@ class Config {
         };
         const plugins = ROOT_ONLY_HOOKS.has(event) ? [this.rootPlugin] : [...this.plugins.values()];
         const promises = plugins.map(async (p) => {
-            const debug = require('debug')([this.bin, p.name, 'hooks', event].join(':'));
+            const debug = (0, logger_1.makeDebug)([p.name, 'hooks', event].join(':'));
             const context = {
                 config: this,
                 debug,
@@ -482,7 +473,7 @@ class Config {
                     (0, errors_1.exit)(code);
                 },
                 log(message, ...args) {
-                    cli_ux_1.ux.info(message, ...args);
+                    ux_1.ux.stdout(message, ...args);
                 },
                 warn(message) {
                     (0, errors_1.warn)(message);
@@ -542,11 +533,11 @@ class Config {
             options = ext;
         else if (ext)
             options.ext = ext;
-        const template = this.pjson.oclif.update.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) {
-        const { host } = this.pjson.oclif.update.s3;
+        const { host } = this.updateConfig.s3 ?? { host: undefined };
         if (!host)
             throw new Error('no s3 host is set');
         const url = new node_url_1.URL(host);
@@ -581,40 +572,6 @@ class Config {
         const v = this.scopedEnvVar(k);
         return v === '1' || v === 'true';
     }
-    warn(err, scope) {
-        if (this.warned)
-            return;
-        if (typeof err === 'string') {
-            process.emitWarning(err);
-            return;
-        }
-        if (err instanceof Error) {
-            const modifiedErr = err;
-            modifiedErr.name = `${err.name} Plugin: ${this.name}`;
-            modifiedErr.detail = (0, util_2.compact)([
-                err.detail,
-                `module: ${this._base}`,
-                scope && `task: ${scope}`,
-                `plugin: ${this.name}`,
-                `root: ${this.root}`,
-                'See more details with DEBUG=*',
-            ]).join('\n');
-            process.emitWarning(err);
-            return;
-        }
-        // err is an object
-        process.emitWarning('Config.warn expected either a string or Error, but instead received an object');
-        err.name = `${err.name} Plugin: ${this.name}`;
-        err.detail = (0, util_2.compact)([
-            err.detail,
-            `module: ${this._base}`,
-            scope && `task: ${scope}`,
-            `plugin: ${this.name}`,
-            `root: ${this.root}`,
-            'See more details with DEBUG=*',
-        ]).join('\n');
-        process.emitWarning(JSON.stringify(err));
-    }
     windowsHome() {
         return this.windowsHomedriveHome() || this.windowsUserprofileHome();
     }
@@ -624,17 +581,6 @@ class Config {
     windowsUserprofileHome() {
         return process.env.USERPROFILE;
     }
-    _debug() {
-        if (this.scopedEnvVarTrue('DEBUG'))
-            return 1;
-        try {
-            const { enabled } = require('debug')(this.bin);
-            if (enabled)
-                return 1;
-        }
-        catch { }
-        return 0;
-    }
     _shell() {
         let shellPath;
         const { COMSPEC } = process.env;
@@ -650,57 +596,32 @@ class Config {
         }
         return shellPath.at(-1) ?? 'unknown';
     }
-    /**
-     * 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];
+    buildS3Config() {
+        const s3 = this.pjson.oclif.update?.s3;
+        const bucket = this.scopedEnvVar('S3_BUCKET') ?? s3?.bucket;
+        const host = s3?.host ?? (bucket && `https://${bucket}.s3.amazonaws.com`);
+        const templates = {
+            ...s3?.templates,
+            target: {
+                baseDir: '<%- bin %>',
+                manifest: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- platform %>-<%- arch %>",
+                unversioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-<%- platform %>-<%- arch %><%- ext %>",
+                versioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-v<%- version %>/<%- bin %>-v<%- version %>-<%- platform %>-<%- arch %><%- ext %>",
+                ...(s3?.templates && s3?.templates.target),
+            },
+            vanilla: {
+                baseDir: '<%- bin %>',
+                manifest: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %>version",
+                unversioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %><%- ext %>",
+                versioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-v<%- version %>/<%- bin %>-v<%- version %><%- ext %>",
+                ...(s3?.templates && s3?.templates.vanilla),
+            },
+        };
+        return {
+            bucket,
+            host,
+            templates,
+        };
     }
     getCmdLookupId(id) {
         if (this._commands.has(id))
@@ -729,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);
@@ -750,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 {
@@ -767,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 {
@@ -825,5 +752,45 @@ class Config {
         }
         marker?.stop();
     }
+    maybeAdjustDebugSetting() {
+        if (this.scopedEnvVarTrue('DEBUG')) {
+            settings_1.settings.debug = true;
+            displayWarnings();
+        }
+    }
+    warn(err, scope) {
+        if (this.warned)
+            return;
+        if (typeof err === 'string') {
+            process.emitWarning(err);
+            return;
+        }
+        if (err instanceof Error) {
+            const modifiedErr = err;
+            modifiedErr.name = `${err.name} Plugin: ${this.name}`;
+            modifiedErr.detail = (0, util_2.compact)([
+                err.detail,
+                `module: ${this._base}`,
+                scope && `task: ${scope}`,
+                `plugin: ${this.name}`,
+                `root: ${this.root}`,
+                'See more details with DEBUG=*',
+            ]).join('\n');
+            process.emitWarning(err);
+            return;
+        }
+        // err is an object
+        process.emitWarning('Config.warn expected either a string or Error, but instead received an object');
+        err.name = `${err.name} Plugin: ${this.name}`;
+        err.detail = (0, util_2.compact)([
+            err.detail,
+            `module: ${this._base}`,
+            scope && `task: ${scope}`,
+            `plugin: ${this.name}`,
+            `root: ${this.root}`,
+            'See more details with DEBUG=*',
+        ]).join('\n');
+        process.emitWarning(JSON.stringify(err));
+    }
 }
 exports.Config = Config;

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,37 +1,13 @@
 "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");
-// eslint-disable-next-line new-cap
-const debug = (0, util_2.Debug)();
+const debug = (0, util_2.makeDebug)();
 function findMatchingDependencies(dependencies, patterns) {
     return Object.keys(dependencies).filter((p) => patterns.some((w) => (0, minimatch_1.minimatch)(p, w)));
 }
@@ -63,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,
@@ -155,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

@@ -15,6 +15,7 @@ const symbols_1 = require("../symbols");
 const cache_command_1 = require("../util/cache-command");
 const find_root_1 = require("../util/find-root");
 const fs_1 = require("../util/fs");
+const read_pjson_1 = require("../util/read-pjson");
 const util_1 = require("../util/util");
 const ts_path_1 = require("./ts-path");
 const util_2 = require("./util");
@@ -56,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 };
     }
@@ -104,8 +102,7 @@ class Plugin {
     valid = false;
     version;
     _base = `${_pjson.name}@${_pjson.version}`;
-    // eslint-disable-next-line new-cap
-    _debug = (0, util_2.Debug)();
+    _debug = (0, util_2.makeDebug)();
     commandCache;
     commandDiscoveryOpts;
     flexibleTaxonomy;
@@ -183,15 +180,14 @@ class Plugin {
             throw new errors_1.CLIError(`could not find package.json with ${(0, node_util_1.inspect)(this.options)}`);
         this.root = root;
         this._debug(`loading ${this.type} plugin from ${root}`);
-        this.pjson = this.options.pjson ?? (await (0, fs_1.readJson)((0, node_path_1.join)(root, 'package.json')));
+        this.pjson = this.options.pjson ?? (await (0, read_pjson_1.readPjson)(root));
         this.flexibleTaxonomy = this.options?.flexibleTaxonomy || this.pjson.oclif?.flexibleTaxonomy || false;
         this.moduleType = this.pjson.type === 'module' ? 'module' : 'commonjs';
         this.name = this.pjson.name;
         this.alias = this.options.name ?? this.pjson.name;
         if (!this.name)
             throw new errors_1.CLIError(`no name in package.json (${root})`);
-        // eslint-disable-next-line new-cap
-        this._debug = (0, util_2.Debug)(this.name);
+        this._debug = (0, util_2.makeDebug)(this.name);
         this.version = this.pjson.version;
         if (this.pjson.oclif) {
             this.valid = true;
@@ -203,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)
@@ -278,7 +274,7 @@ class Plugin {
                         throw this.addErrorScope(error, scope);
                 }
             })))
-                // eslint-disable-next-line unicorn/no-await-expression-member, unicorn/prefer-native-coercion-functions
+                // eslint-disable-next-line unicorn/prefer-native-coercion-functions
                 .filter((f) => Boolean(f))
                 .reduce((commands, [id, c]) => {
                 commands[id] = c;

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/config/ts-path.js

@@ -13,8 +13,7 @@ const fs_1 = require("../util/fs");
 const read_tsconfig_1 = require("../util/read-tsconfig");
 const util_1 = require("../util/util");
 const util_2 = require("./util");
-// eslint-disable-next-line new-cap
-const debug = (0, util_2.Debug)('ts-path');
+const debug = (0, util_2.makeDebug)('ts-path');
 exports.TS_CONFIGS = {};
 const REGISTERED = new Set();
 function determineRuntime() {

package/lib/config/util.d.ts

@@ -1,4 +1,4 @@
-export declare function Debug(...scope: string[]): (..._: any) => void;
+export declare function makeDebug(...scope: string[]): (..._: any) => void;
 export declare function getPermutations(arr: string[]): Array<string[]>;
 export declare function getCommandIdPermutations(commandId: string): string[];
 /**

package/lib/config/util.js

@@ -1,27 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.collectUsableIds = exports.getCommandIdPermutations = exports.getPermutations = exports.Debug = void 0;
-const debug = require('debug');
-function displayWarnings() {
-    if (process.listenerCount('warning') > 1)
-        return;
-    process.on('warning', (warning) => {
-        console.error(warning.stack);
-        if (warning.detail)
-            console.error(warning.detail);
-    });
+exports.collectUsableIds = exports.getCommandIdPermutations = exports.getPermutations = exports.makeDebug = void 0;
+const logger_1 = require("../logger");
+function makeDebug(...scope) {
+    return (formatter, ...args) => (0, logger_1.getLogger)(['config', ...scope].join(':')).debug(formatter, ...args);
 }
-function Debug(...scope) {
-    if (!debug)
-        return (..._) => {
-            // noop
-        };
-    const d = debug(['config', ...scope].join(':'));
-    if (d.enabled)
-        displayWarnings();
-    return (...args) => d(...args);
-}
-exports.Debug = Debug;
+exports.makeDebug = makeDebug;
 // Adapted from https://github.com/angus-c/just/blob/master/packages/array-permutations/index.js
 function getPermutations(arr) {
     if (arr.length === 0)