@oclif/core 3.0.0-beta.2 → 3.0.0-beta.21

package/lib/config/config.js

@@ -1,41 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toCached = exports.Config = void 0;
+exports.Config = void 0;
+const tslib_1 = require("tslib");
+const ejs = tslib_1.__importStar(require("ejs"));
 const errors_1 = require("../errors");
-const ejs = require("ejs");
-const os = require("os");
-const path = require("path");
-const url_1 = require("url");
-const util_1 = require("util");
-const Plugin = require("./plugin");
-const util_2 = require("./util");
-const util_3 = require("../util");
-const module_loader_1 = require("../module-loader");
-const help_1 = require("../help");
-const stream_1 = require("../cli-ux/stream");
-const performance_1 = require("../performance");
-const settings_1 = require("../settings");
+const util_1 = require("./util");
+const node_url_1 = require("node:url");
 const node_os_1 = require("node:os");
+const util_2 = require("../util/util");
+const os_1 = require("../util/os");
 const node_path_1 = require("node:path");
+const performance_1 = require("../performance");
+const plugin_loader_1 = tslib_1.__importDefault(require("./plugin-loader"));
+const is_wsl_1 = tslib_1.__importDefault(require("is-wsl"));
+const node_util_1 = require("node:util");
+const util_3 = require("../help/util");
+const module_loader_1 = require("../module-loader");
+const fs_1 = require("../util/fs");
+const settings_1 = require("../settings");
+const stream_1 = require("../cli-ux/stream");
 // eslint-disable-next-line new-cap
-const debug = (0, util_2.Debug)();
-const _pjson = (0, util_3.requireJson)(__dirname, '..', '..', 'package.json');
+const debug = (0, util_1.Debug)();
+const _pjson = (0, fs_1.requireJson)(__dirname, '..', '..', 'package.json');
+const BASE = `${_pjson.name}@${_pjson.version}`;
 function channelFromVersion(version) {
     const m = version.match(/[^-]+(?:-([^.]+))?/);
     return (m && m[1]) || 'stable';
 }
-const WSL = require('is-wsl');
 function isConfig(o) {
     return o && Boolean(o._base);
 }
 class Permutations extends Map {
-    constructor() {
-        super(...arguments);
-        this.validPermutations = new Map();
-    }
+    validPermutations = new Map();
     add(permutation, commandId) {
         this.validPermutations.set(permutation, commandId);
-        for (const id of (0, util_2.collectUsableIds)([permutation])) {
+        for (const id of (0, util_1.collectUsableIds)([permutation])) {
             if (this.has(id)) {
                 this.set(id, this.get(id).add(commandId));
             }
@@ -58,27 +57,72 @@ class Permutations extends Map {
     }
 }
 class Config {
+    options;
+    _base = BASE;
+    arch;
+    bin;
+    binPath;
+    cacheDir;
+    channel;
+    configDir;
+    dataDir;
+    debug = 0;
+    dirname;
+    errlog;
+    flexibleTaxonomy;
+    home;
+    name;
+    npmRegistry;
+    pjson;
+    platform;
+    plugins = new Map();
+    root;
+    shell;
+    topicSeparator = ':';
+    userAgent;
+    userPJSON;
+    valid;
+    version;
+    windows;
+    binAliases;
+    nsisCustomization;
+    warned = false;
+    commandPermutations = new Permutations();
+    topicPermutations = new Permutations();
+    _commands = new Map();
+    _topics = new Map();
+    _commandIDs;
+    pluginLoader;
+    static _rootPlugin;
     constructor(options) {
         this.options = options;
-        this._base = `${_pjson.name}@${_pjson.version}`;
-        this.debug = 0;
-        this.plugins = [];
-        this.topicSeparator = ':';
-        this.warned = false;
-        this.commandPermutations = new Permutations();
-        this.topicPermutations = new Permutations();
-        this._commands = new Map();
-        this._topics = new Map();
     }
     static async load(opts = module.filename || __dirname) {
         // 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, url_1.fileURLToPath)(opts);
+            opts = (0, node_url_1.fileURLToPath)(opts);
         }
         if (typeof opts === 'string')
             opts = { root: opts };
-        if (isConfig(opts))
+        if (isConfig(opts)) {
+            /**
+             * Reload the Config based on the version required by the command.
+             * This is needed because the command is given the Config instantiated
+             * by the root plugin, which may be a different version than the one
+             * required by the command.
+             *
+             * Doing this ensures that the command can freely use any method on Config that
+             * exists in the version of Config required by the command but may not exist on the
+             * root's instance of Config.
+             */
+            if (BASE !== opts._base) {
+                debug(`reloading config from ${opts._base} to ${BASE}`);
+                const config = new Config({ ...opts.options, plugins: opts.plugins });
+                await config.load();
+                return config;
+            }
             return opts;
+        }
         const config = new Config(opts);
         await config.load();
         return config;
@@ -88,19 +132,22 @@ class Config {
     }
     // eslint-disable-next-line complexity
     async load() {
-        settings_1.settings.performanceEnabled = (settings_1.settings.performanceEnabled === undefined ? this.options.enablePerf : settings_1.settings.performanceEnabled) ?? false;
-        const plugin = new Plugin.Plugin({ root: this.options.root });
-        await plugin.load();
-        Config._rootPlugin = plugin;
-        this.plugins.push(plugin);
-        this.root = plugin.root;
-        this.pjson = plugin.pjson;
+        settings_1.settings.performanceEnabled =
+            (settings_1.settings.performanceEnabled === undefined ? this.options.enablePerf : settings_1.settings.performanceEnabled) ?? false;
+        const marker = performance_1.Performance.mark('config.load');
+        this.pluginLoader = new plugin_loader_1.default({ root: this.options.root, plugins: this.options.plugins });
+        Config._rootPlugin = await this.pluginLoader.loadRoot();
+        this.root = Config._rootPlugin.root;
+        this.pjson = Config._rootPlugin.pjson;
+        this.plugins.set(Config._rootPlugin.name, Config._rootPlugin);
+        this.root = Config._rootPlugin.root;
+        this.pjson = Config._rootPlugin.pjson;
         this.name = this.pjson.name;
         this.version = this.options.version || this.pjson.version || '0.0.0';
         this.channel = this.options.channel || channelFromVersion(this.version);
-        this.valid = plugin.valid;
-        this.arch = (os.arch() === 'ia32' ? 'x86' : os.arch());
-        this.platform = WSL ? 'wsl' : os.platform();
+        this.valid = Config._rootPlugin.valid;
+        this.arch = (0, node_os_1.arch)() === 'ia32' ? 'x86' : (0, node_os_1.arch)();
+        this.platform = is_wsl_1.default ? 'wsl' : (0, os_1.getPlatform)();
         this.windows = this.platform === 'win32';
         this.bin = this.pjson.oclif.bin || this.name;
         this.binAliases = this.pjson.oclif.binAliases;
@@ -115,11 +162,11 @@ class Config {
         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()) || os.homedir() || os.tmpdir();
+        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 = path.join(this.cacheDir, 'error.log');
+        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;
         this.pjson.oclif.update = this.pjson.oclif.update || {};
@@ -136,76 +183,45 @@ class Config {
                 unversioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-<%- platform %>-<%- arch %><%- ext %>",
                 versioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-v<%- version %>/<%- bin %>-v<%- version %>-<%- platform %>-<%- arch %><%- ext %>",
                 manifest: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- platform %>-<%- arch %>",
-                ...s3.templates && s3.templates.target,
+                ...(s3.templates && s3.templates.target),
             },
             vanilla: {
                 unversioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %><%- ext %>",
                 versioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-v<%- version %>/<%- bin %>-v<%- version %><%- ext %>",
                 baseDir: '<%- bin %>',
                 manifest: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %>version",
-                ...s3.templates && s3.templates.vanilla,
+                ...(s3.templates && s3.templates.vanilla),
             },
         };
-        const marker = performance_1.Performance.mark('config.load');
         await this.loadPluginsAndCommands();
         debug('config done');
         marker?.addDetails({
-            plugins: this.plugins.length,
+            plugins: this.plugins.size,
             commandPermutations: this.commands.length,
-            commands: this.plugins.reduce((acc, p) => acc + p.commands.length, 0),
+            commands: [...this.plugins.values()].reduce((acc, p) => acc + p.commands.length, 0),
             topics: this.topics.length,
         });
         marker?.stop();
     }
-    async loadPluginsAndCommands() {
-        const marker = performance_1.Performance.mark('config.loadPluginsAndCommands');
-        await this.loadUserPlugins();
-        await this.loadDevPlugins();
-        await this.loadCorePlugins();
-        for (const plugin of this.plugins) {
+    async loadPluginsAndCommands(opts) {
+        const pluginsMarker = performance_1.Performance.mark('config.loadAllPlugins');
+        const { plugins, errors } = await this.pluginLoader.loadChildren({
+            devPlugins: this.options.devPlugins,
+            userPlugins: this.options.userPlugins,
+            dataDir: this.dataDir,
+            rootPlugin: Config._rootPlugin,
+            force: opts?.force ?? false,
+        });
+        this.plugins = plugins;
+        pluginsMarker?.stop();
+        const commandsMarker = performance_1.Performance.mark('config.loadAllCommands');
+        for (const plugin of this.plugins.values()) {
             this.loadCommands(plugin);
             this.loadTopics(plugin);
         }
-        marker?.stop();
-    }
-    async loadCorePlugins() {
-        if (this.pjson.oclif.plugins) {
-            await this.loadPlugins(this.root, 'core', this.pjson.oclif.plugins);
-        }
-    }
-    async loadDevPlugins() {
-        if (this.options.devPlugins !== false) {
-            // do not load oclif.devPlugins in production
-            if (this.isProd)
-                return;
-            try {
-                const devPlugins = this.pjson.oclif.devPlugins;
-                if (devPlugins)
-                    await this.loadPlugins(this.root, 'dev', devPlugins);
-            }
-            catch (error) {
-                process.emitWarning(error);
-            }
-        }
-    }
-    async loadUserPlugins() {
-        if (this.options.userPlugins !== false) {
-            try {
-                const userPJSONPath = path.join(this.dataDir, 'package.json');
-                debug('reading user plugins pjson %s', userPJSONPath);
-                const pjson = await (0, util_2.loadJSON)(userPJSONPath);
-                this.userPJSON = pjson;
-                if (!pjson.oclif)
-                    pjson.oclif = { schema: 1 };
-                if (!pjson.oclif.plugins)
-                    pjson.oclif.plugins = [];
-                await this.loadPlugins(userPJSONPath, 'user', pjson.oclif.plugins.filter((p) => p.type === 'user'));
-                await this.loadPlugins(userPJSONPath, 'link', pjson.oclif.plugins.filter((p) => p.type === 'link'));
-            }
-            catch (error) {
-                if (error.code !== 'ENOENT')
-                    process.emitWarning(error);
-            }
+        commandsMarker?.stop();
+        for (const error of errors) {
+            this.warn(error);
         }
     }
     async runHook(event, opts, timeout, captureErrors) {
@@ -225,7 +241,7 @@ class Config {
                     reject(new Error(`Timed out after ${ms} ms.`));
                 }, ms).unref();
             });
-            return Promise.race([promise, timeout]).then(result => {
+            return Promise.race([promise, timeout]).then((result) => {
                 clearTimeout(id);
                 return result;
             });
@@ -234,7 +250,7 @@ class Config {
             successes: [],
             failures: [],
         };
-        const promises = this.plugins.map(async (p) => {
+        const promises = [...this.plugins.values()].map(async (p) => {
             const debug = require('debug')([this.bin, p.name, 'hooks', event].join(':'));
             const context = {
                 config: this,
@@ -243,7 +259,7 @@ class Config {
                     (0, errors_1.exit)(code);
                 },
                 log(message, ...args) {
-                    stream_1.stdout.write((0, util_1.format)(message, ...args) + '\n');
+                    stream_1.stdout.write((0, node_util_1.format)(message, ...args) + '\n');
                 },
                 error(message, options = {}) {
                     (0, errors_1.error)(message, options);
@@ -257,11 +273,11 @@ class Config {
                 const marker = performance_1.Performance.mark(`config.runHook#${p.name}(${hook})`);
                 try {
                     /* eslint-disable no-await-in-loop */
-                    const { isESM, module, filePath } = await module_loader_1.default.loadWithData(p, hook);
+                    const { isESM, module, filePath } = await (0, module_loader_1.loadWithData)(p, (0, node_path_1.join)(p.root, hook));
                     debug('start', isESM ? '(import)' : '(require)', filePath);
-                    const result = timeout ?
-                        await withTimeout(timeout, search(module).call(context, { ...opts, config: this })) :
-                        await search(module).call(context, { ...opts, config: this });
+                    const result = timeout
+                        ? await withTimeout(timeout, search(module).call(context, { ...opts, config: this }))
+                        : await search(module).call(context, { ...opts, config: this });
                     final.successes.push({ plugin: p, result });
                     if (p.name === '@oclif/plugin-legacy' && event === 'init') {
                         this.insertLegacyPlugins(result);
@@ -293,9 +309,9 @@ class Config {
         let c = cachedCommand ?? this.findCommand(id);
         if (!c) {
             const matches = this.flexibleTaxonomy ? this.findMatches(id, argv) : [];
-            const hookResult = this.flexibleTaxonomy && matches.length > 0 ?
-                await this.runHook('command_incomplete', { id, argv, matches }) :
-                await this.runHook('command_not_found', { id, argv });
+            const hookResult = this.flexibleTaxonomy && matches.length > 0
+                ? await this.runHook('command_incomplete', { id, argv, matches })
+                : await this.runHook('command_not_found', { id, argv });
             if (hookResult.successes[0])
                 return hookResult.successes[0].result;
             if (hookResult.failures[0])
@@ -315,7 +331,7 @@ class Config {
             if (jitResult.failures[0])
                 throw jitResult.failures[0].error;
             if (jitResult.successes[0]) {
-                await this.loadPluginsAndCommands();
+                await this.loadPluginsAndCommands({ force: true });
                 c = this.findCommand(id) ?? c;
             }
             else {
@@ -337,10 +353,10 @@ class Config {
         return result;
     }
     scopedEnvVar(k) {
-        return process.env[this.scopedEnvVarKeys(k).find(k => process.env[k])];
+        return process.env[this.scopedEnvVarKeys(k).find((k) => process.env[k])];
     }
     scopedEnvVarTrue(k) {
-        const v = process.env[this.scopedEnvVarKeys(k).find(k => process.env[k])];
+        const v = process.env[this.scopedEnvVarKeys(k).find((k) => process.env[k])];
         return v === '1' || v === 'true';
     }
     /**
@@ -350,7 +366,7 @@ class Config {
      */
     scopedEnvVarKey(k) {
         return [this.bin, k]
-            .map(p => p.replace(/@/g, '').replace(/[/-]/g, '_'))
+            .map((p) => p.replaceAll('@', '').replaceAll(/[/-]/g, '_'))
             .join('_')
             .toUpperCase();
     }
@@ -360,7 +376,9 @@ class Config {
      * @returns {string[]} e.g. ['SF_DEBUG', 'SFDX_DEBUG']
      */
     scopedEnvVarKeys(k) {
-        return [this.bin, ...this.binAliases ?? []].filter(alias => Boolean(alias)).map(alias => [alias.replace(/@/g, '').replace(/[/-]/g, '_'), k].join('_').toUpperCase());
+        return [this.bin, ...(this.binAliases ?? [])]
+            .filter(Boolean)
+            .map((alias) => [alias.replaceAll('@', '').replaceAll(/[/-]/g, '_'), k].join('_').toUpperCase());
     }
     findCommand(id, opts = {}) {
         const lookupId = this.getCmdLookupId(id);
@@ -391,14 +409,14 @@ class Config {
      * @returns string[]
      */
     findMatches(partialCmdId, argv) {
-        const flags = argv.filter(arg => !(0, help_1.getHelpFlagAdditions)(this).includes(arg) && arg.startsWith('-')).map(a => a.replace(/-/g, ''));
-        const possibleMatches = [...this.commandPermutations.get(partialCmdId)].map(k => this._commands.get(k));
-        const matches = possibleMatches.filter(command => {
-            const cmdFlags = Object.entries(command.flags).flatMap(([flag, def]) => {
-                return def.char ? [def.char, flag] : [flag];
-            });
+        const flags = argv
+            .filter((arg) => !(0, util_3.getHelpFlagAdditions)(this).includes(arg) && arg.startsWith('-'))
+            .map((a) => a.replaceAll('-', ''));
+        const possibleMatches = [...this.commandPermutations.get(partialCmdId)].map((k) => this._commands.get(k));
+        const matches = possibleMatches.filter((command) => {
+            const cmdFlags = Object.entries(command.flags).flatMap(([flag, def]) => def.char ? [def.char, flag] : [flag]);
             // A command is a match if the provided flags belong to the full command
-            return flags.every(f => cmdFlags.includes(f));
+            return flags.every((f) => cmdFlags.includes(f));
         });
         return matches;
     }
@@ -422,7 +440,7 @@ class Config {
      * @returns string[]
      */
     getAllCommandIDs() {
-        return this.getAllCommands().map(c => c.id);
+        return this.getAllCommands().map((c) => c.id);
     }
     get commands() {
         return [...this._commands.values()];
@@ -430,7 +448,7 @@ class Config {
     get commandIDs() {
         if (this._commandIDs)
             return this._commandIDs;
-        this._commandIDs = this.commands.map(c => c.id);
+        this._commandIDs = this.commands.map((c) => c.id);
         return this._commandIDs;
     }
     get topics() {
@@ -442,8 +460,8 @@ class Config {
             cliVersion,
             architecture,
             nodeVersion,
-            pluginVersions: Object.fromEntries(this.plugins.map(p => [p.name, { version: p.version, type: p.type, root: p.root }])),
-            osVersion: `${os.type()} ${os.release()}`,
+            pluginVersions: Object.fromEntries([...this.plugins.values()].map((p) => [p.name, { version: p.version, type: p.type, root: p.root }])),
+            osVersion: `${(0, node_os_1.type)()} ${(0, node_os_1.release)()}`,
             shell: this.shell,
             rootPath: this.root,
         };
@@ -457,37 +475,37 @@ class Config {
         return ejs.render(template, { ...this, ...options });
     }
     s3Url(key) {
-        const host = this.pjson.oclif.update.s3.host;
+        const { host } = this.pjson.oclif.update.s3;
         if (!host)
             throw new Error('no s3 host is set');
-        const url = new url_1.URL(host);
-        url.pathname = path.join(url.pathname, key);
+        const url = new node_url_1.URL(host);
+        url.pathname = (0, node_path_1.join)(url.pathname, key);
         return url.toString();
     }
     getPluginsList() {
-        return this.plugins;
+        return [...this.plugins.values()];
     }
     dir(category) {
         const base = process.env[`XDG_${category.toUpperCase()}_HOME`] ||
             (this.windows && process.env.LOCALAPPDATA) ||
-            path.join(this.home, category === 'data' ? '.local/share' : '.' + category);
-        return path.join(base, this.dirname);
+            (0, node_path_1.join)(this.home, category === 'data' ? '.local/share' : '.' + category);
+        return (0, node_path_1.join)(base, this.dirname);
     }
     windowsHome() {
         return this.windowsHomedriveHome() || this.windowsUserprofileHome();
     }
     windowsHomedriveHome() {
-        return (process.env.HOMEDRIVE && process.env.HOMEPATH && path.join(process.env.HOMEDRIVE, process.env.HOMEPATH));
+        return process.env.HOMEDRIVE && process.env.HOMEPATH && (0, node_path_1.join)(process.env.HOMEDRIVE, process.env.HOMEPATH);
     }
     windowsUserprofileHome() {
         return process.env.USERPROFILE;
     }
     macosCacheDir() {
-        return (this.platform === 'darwin' && path.join(this.home, 'Library', 'Caches', this.dirname)) || undefined;
+        return (this.platform === 'darwin' && (0, node_path_1.join)(this.home, 'Library', 'Caches', this.dirname)) || undefined;
     }
     _shell() {
         let shellPath;
-        const COMSPEC = process.env.COMSPEC;
+        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('/');
@@ -498,7 +516,7 @@ class Config {
         else {
             shellPath = ['unknown'];
         }
-        return shellPath[shellPath.length - 1];
+        return shellPath.at(-1) ?? 'unknown';
     }
     _debug() {
         if (this.scopedEnvVarTrue('DEBUG'))
@@ -511,52 +529,6 @@ class Config {
         catch { }
         return 0;
     }
-    async loadPlugins(root, type, plugins, parent) {
-        if (!plugins || plugins.length === 0)
-            return;
-        const mark = performance_1.Performance.mark(`config.loadPlugins#${type}`);
-        debug('loading plugins', plugins);
-        await Promise.all((plugins || []).map(async (plugin) => {
-            try {
-                const opts = { type, root };
-                if (typeof plugin === 'string') {
-                    opts.name = plugin;
-                }
-                else {
-                    opts.name = plugin.name || opts.name;
-                    opts.tag = plugin.tag || opts.tag;
-                    opts.root = plugin.root || opts.root;
-                }
-                const pluginMarker = performance_1.Performance.mark(`plugin.load#${opts.name}`);
-                const instance = new Plugin.Plugin(opts);
-                await instance.load();
-                pluginMarker?.addDetails({
-                    hasManifest: instance.hasManifest,
-                    commandCount: instance.commands.length,
-                    topicCount: instance.topics.length,
-                    type: instance.type,
-                    usesMain: Boolean(instance.pjson.main),
-                    name: instance.name,
-                });
-                pluginMarker?.stop();
-                if (this.plugins.find(p => p.name === instance.name))
-                    return;
-                this.plugins.push(instance);
-                if (parent) {
-                    instance.parent = parent;
-                    if (!parent.children)
-                        parent.children = [];
-                    parent.children.push(instance);
-                }
-                await this.loadPlugins(instance.root, type, instance.pjson.oclif.plugins || [], instance);
-            }
-            catch (error) {
-                this.warn(error, 'loadPlugins');
-            }
-        }));
-        mark?.addDetails({ pluginCount: plugins.length });
-        mark?.stop();
-    }
     warn(err, scope) {
         if (this.warned)
             return;
@@ -592,10 +564,12 @@ class Config {
         process.emitWarning(JSON.stringify(err));
     }
     get isProd() {
-        return (0, util_3.isProd)();
+        return (0, util_2.isProd)();
     }
     isJitPluginCommand(c) {
-        return Object.keys(this.pjson.oclif.jitPlugins ?? {}).includes(c.pluginName ?? '') && !this.plugins.find(p => p.name === c?.pluginName);
+        // Return true if the command's plugin is listed under oclif.jitPlugins AND if the plugin hasn't been loaded to this.plugins
+        return (Object.keys(this.pjson.oclif.jitPlugins ?? {}).includes(c.pluginName ?? '') &&
+            Boolean(c?.pluginName && !this.plugins.has(c.pluginName)));
     }
     getCmdLookupId(id) {
         if (this._commands.has(id))
@@ -614,6 +588,7 @@ class Config {
     loadCommands(plugin) {
         const marker = performance_1.Performance.mark(`config.loadCommands#${plugin.name}`, { plugin: plugin.name });
         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]);
                 this._commands.set(prioritizedCommand.id, prioritizedCommand);
@@ -621,10 +596,16 @@ class Config {
             else {
                 this._commands.set(command.id, command);
             }
-            const permutations = this.flexibleTaxonomy ? (0, util_2.getCommandIdPermutations)(command.id) : [command.id];
+            // v3 moved command id permutations to the manifest, but some plugins may not have
+            // the new manifest yet. For those, we need to calculate the permutations here.
+            const permutations = this.flexibleTaxonomy && command.permutations === undefined
+                ? (0, util_1.getCommandIdPermutations)(command.id)
+                : command.permutations ?? [command.id];
+            // set every permutation
             for (const permutation of permutations) {
                 this.commandPermutations.add(permutation, command.id);
             }
+            // set command aliases
             for (const alias of command.aliases ?? []) {
                 if (this._commands.has(alias)) {
                     const prioritizedCommand = this.determinePriority([this._commands.get(alias), command]);
@@ -633,7 +614,13 @@ class Config {
                 else {
                     this._commands.set(alias, { ...command, id: alias });
                 }
-                const aliasPermutations = this.flexibleTaxonomy ? (0, util_2.getCommandIdPermutations)(alias) : [alias];
+                // set every permutation of the aliases
+                // v3 moved command alias permutations to the manifest, but some plugins may not have
+                // the new manifest yet. For those, we need to calculate the permutations here.
+                const aliasPermutations = this.flexibleTaxonomy && command.aliasPermutations === undefined
+                    ? (0, util_1.getCommandIdPermutations)(alias)
+                    : command.permutations ?? [alias];
+                // set every permutation
                 for (const permutation of aliasPermutations) {
                     this.commandPermutations.add(permutation, command.id);
                 }
@@ -653,13 +640,13 @@ class Config {
             else {
                 this._topics.set(topic.name, topic);
             }
-            const permutations = this.flexibleTaxonomy ? (0, util_2.getCommandIdPermutations)(topic.name) : [topic.name];
+            const permutations = this.flexibleTaxonomy ? (0, util_1.getCommandIdPermutations)(topic.name) : [topic.name];
             for (const permutation of permutations) {
                 this.topicPermutations.add(permutation, topic.name);
             }
         }
         // Add missing topics for displaying help when partial commands are entered.
-        for (const c of plugin.commands.filter(c => !c.hidden)) {
+        for (const c of plugin.commands.filter((c) => !c.hidden)) {
             const parts = c.id.split(':');
             while (parts.length > 0) {
                 const name = parts.join(':');
@@ -724,160 +711,19 @@ class Config {
         return commandPlugins[0];
     }
     /**
-      * Insert legacy plugins
-      *
-      * Replace invalid CLI plugins (cli-engine plugins, mostly Heroku) loaded via `this.loadPlugins`
-      * with oclif-compatible ones returned by @oclif/plugin-legacy init hook.
-      *
-      * @param plugins array of oclif-compatible plugins
-      * @returns void
-      */
+     * Insert legacy plugins
+     *
+     * Replace invalid CLI plugins (cli-engine plugins, mostly Heroku) loaded via `this.loadPlugins`
+     * 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) {
-            const idx = this.plugins.findIndex(p => p.name === plugin.name);
-            if (idx !== -1) {
-                // invalid plugin instance found in `this.plugins`
-                // replace with the oclif-compatible one
-                this.plugins.splice(idx, 1, plugin);
-            }
+            this.plugins.set(plugin.name, plugin);
             this.loadCommands(plugin);
         }
     }
 }
 exports.Config = Config;
-// when no manifest exists, the default is calculated.  This may throw, so we need to catch it
-const defaultFlagToCached = async (flag, isWritingManifest = false) => {
-    // Prefer the helpDefaultValue function (returns a friendly string for complex types)
-    if (typeof flag.defaultHelp === 'function') {
-        try {
-            return await flag.defaultHelp({ options: flag, flags: {} }, isWritingManifest);
-        }
-        catch {
-            return;
-        }
-    }
-    // if not specified, try the default function
-    if (typeof flag.default === 'function') {
-        try {
-            return await flag.default({ options: flag, flags: {} }, isWritingManifest);
-        }
-        catch { }
-    }
-    else {
-        return flag.default;
-    }
-};
-const defaultArgToCached = async (arg, isWritingManifest = false) => {
-    // Prefer the helpDefaultValue function (returns a friendly string for complex types)
-    if (typeof arg.defaultHelp === 'function') {
-        try {
-            return await arg.defaultHelp({ options: arg, flags: {} }, isWritingManifest);
-        }
-        catch {
-            return;
-        }
-    }
-    // if not specified, try the default function
-    if (typeof arg.default === 'function') {
-        try {
-            return await arg.default({ options: arg, flags: {} }, isWritingManifest);
-        }
-        catch { }
-    }
-    else {
-        return arg.default;
-    }
-};
-async function toCached(c, plugin, isWritingManifest) {
-    const flags = {};
-    for (const [name, flag] of Object.entries(c.flags || {})) {
-        if (flag.type === 'boolean') {
-            flags[name] = {
-                name,
-                type: flag.type,
-                char: flag.char,
-                summary: flag.summary,
-                description: flag.description,
-                hidden: flag.hidden,
-                required: flag.required,
-                helpLabel: flag.helpLabel,
-                helpGroup: flag.helpGroup,
-                allowNo: flag.allowNo,
-                dependsOn: flag.dependsOn,
-                relationships: flag.relationships,
-                exclusive: flag.exclusive,
-                deprecated: flag.deprecated,
-                deprecateAliases: c.deprecateAliases,
-                aliases: flag.aliases,
-                delimiter: flag.delimiter,
-            };
-        }
-        else {
-            flags[name] = {
-                name,
-                type: flag.type,
-                char: flag.char,
-                summary: flag.summary,
-                description: flag.description,
-                hidden: flag.hidden,
-                required: flag.required,
-                helpLabel: flag.helpLabel,
-                helpValue: flag.helpValue,
-                helpGroup: flag.helpGroup,
-                multiple: flag.multiple,
-                options: flag.options,
-                dependsOn: flag.dependsOn,
-                relationships: flag.relationships,
-                exclusive: flag.exclusive,
-                default: await defaultFlagToCached(flag, isWritingManifest),
-                deprecated: flag.deprecated,
-                deprecateAliases: c.deprecateAliases,
-                aliases: flag.aliases,
-                delimiter: flag.delimiter,
-            };
-            // a command-level placeholder in the manifest so that oclif knows it should regenerate the command during help-time
-            if (typeof flag.defaultHelp === 'function') {
-                c.hasDynamicHelp = true;
-            }
-        }
-    }
-    const args = {};
-    for (const [name, arg] of Object.entries((0, util_3.ensureArgObject)(c.args))) {
-        args[name] = {
-            name,
-            description: arg.description,
-            required: arg.required,
-            options: arg.options,
-            default: await defaultArgToCached(arg, isWritingManifest),
-            hidden: arg.hidden,
-        };
-    }
-    const stdProperties = {
-        id: c.id,
-        summary: c.summary,
-        description: c.description,
-        strict: c.strict,
-        usage: c.usage,
-        pluginName: plugin && plugin.name,
-        pluginAlias: plugin && plugin.alias,
-        pluginType: plugin && plugin.type,
-        hidden: c.hidden,
-        state: c.state,
-        aliases: c.aliases || [],
-        examples: c.examples || c.example,
-        deprecationOptions: c.deprecationOptions,
-        deprecateAliases: c.deprecateAliases,
-        flags,
-        args,
-    };
-    // do not include these properties in manifest
-    const ignoreCommandProperties = ['plugin', '_flags', '_enableJsonFlag', '_globalFlags', '_baseFlags'];
-    const stdKeys = Object.keys(stdProperties);
-    const keysToAdd = Object.keys(c).filter(property => ![...stdKeys, ...ignoreCommandProperties].includes(property));
-    const additionalProperties = {};
-    for (const key of keysToAdd) {
-        additionalProperties[key] = c[key];
-    }
-    return { ...stdProperties, ...additionalProperties };
-}
-exports.toCached = toCached;