@oclif/core 3.0.0-beta.12 → 3.0.0-beta.14

package/lib/config/config.js

@@ -1,20 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toCached = exports.Config = void 0;
-const node_url_1 = require("node:url");
-const node_util_1 = require("node:util");
-const node_os_1 = require("node:os");
-const node_path_1 = require("node:path");
-const ejs = require("ejs");
+const tslib_1 = require("tslib");
+const ejs = tslib_1.__importStar(require("ejs"));
 const errors_1 = require("../errors");
 const util_1 = require("./util");
+const node_url_1 = require("node:url");
+const node_os_1 = require("node:os");
 const util_2 = require("../util");
-const module_loader_1 = require("../module-loader");
-const help_1 = require("../help");
-const stream_1 = require("../cli-ux/stream");
+const node_path_1 = require("node:path");
 const performance_1 = require("../performance");
+const plugin_loader_1 = tslib_1.__importDefault(require("./plugin-loader"));
+const node_util_1 = require("node:util");
+const help_1 = require("../help");
+const module_loader_1 = require("../module-loader");
 const settings_1 = require("../settings");
-const plugin_loader_1 = require("./plugin-loader");
+const stream_1 = require("../cli-ux/stream");
 // eslint-disable-next-line new-cap
 const debug = (0, util_1.Debug)();
 const _pjson = (0, util_2.requireJson)(__dirname, '..', '..', 'package.json');
@@ -105,6 +106,7 @@ 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 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;
@@ -117,7 +119,7 @@ class Config {
         this.channel = this.options.channel || channelFromVersion(this.version);
         this.valid = Config._rootPlugin.valid;
         this.arch = ((0, node_os_1.arch)() === 'ia32' ? 'x86' : (0, node_os_1.arch)());
-        this.platform = WSL ? 'wsl' : (0, node_os_1.platform)();
+        this.platform = WSL ? 'wsl' : (0, util_2.getPlatform)();
         this.windows = this.platform === 'win32';
         this.bin = this.pjson.oclif.bin || this.name;
         this.binAliases = this.pjson.oclif.binAliases;
@@ -132,7 +134,7 @@ 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()) || (0, node_os_1.homedir)() || (0, node_os_1.tmpdir)();
+        this.home = process.env.HOME || (this.windows && this.windowsHome()) || (0, util_2.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');
@@ -163,7 +165,6 @@ class Config {
                 ...s3.templates && s3.templates.vanilla,
             },
         };
-        const marker = performance_1.default.mark('config.load');
         await this.loadPluginsAndCommands();
         debug('config done');
         marker?.addDetails({
@@ -175,7 +176,7 @@ class Config {
         marker?.stop();
     }
     async loadPluginsAndCommands(opts) {
-        const marker = performance_1.default.mark('config.loadPluginsAndCommands');
+        const pluginsMarker = performance_1.Performance.mark('config.loadAllPlugins');
         const { plugins, errors } = await this.pluginLoader.loadChildren({
             devPlugins: this.options.devPlugins,
             userPlugins: this.options.userPlugins,
@@ -184,17 +185,19 @@ class Config {
             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);
         }
+        commandsMarker?.stop();
         for (const error of errors) {
             this.warn(error);
         }
-        marker?.stop();
     }
     async runHook(event, opts, timeout, captureErrors) {
-        const marker = performance_1.default.mark(`config.runHook#${event}`);
+        const marker = performance_1.Performance.mark(`config.runHook#${event}`);
         debug('start %s hook', event);
         const search = (m) => {
             if (typeof m === 'function')
@@ -239,14 +242,14 @@ class Config {
             };
             const hooks = p.hooks[event] || [];
             for (const hook of hooks) {
-                const marker = performance_1.default.mark(`config.runHook#${p.name}(${hook})`);
+                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);
@@ -273,14 +276,14 @@ class Config {
         return final;
     }
     async runCommand(id, argv = [], cachedCommand = null) {
-        const marker = performance_1.default.mark(`config.runCommand#${id}`);
+        const marker = performance_1.Performance.mark(`config.runCommand#${id}`);
         debug('runCommand %s %o', id, argv);
         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])
@@ -335,7 +338,7 @@ class Config {
      */
     scopedEnvVarKey(k) {
         return [this.bin, k]
-            .map(p => p.replace(/@/g, '').replace(/[/-]/g, '_'))
+            .map(p => p.replaceAll('@', '').replaceAll(/[/-]/g, '_'))
             .join('_')
             .toUpperCase();
     }
@@ -345,7 +348,7 @@ 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);
@@ -376,12 +379,10 @@ 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 flags = argv.filter(arg => !(0, help_1.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]) => {
-                return def.char ? [def.char, flag] : [flag];
-            });
+            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));
         });
@@ -442,7 +443,7 @@ 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 node_url_1.URL(host);
@@ -453,9 +454,9 @@ class Config {
         return [...this.plugins.values()];
     }
     dir(category) {
-        const base = process.env[`XDG_${category.toUpperCase()}_HOME`] ||
-            (this.windows && process.env.LOCALAPPDATA) ||
-            (0, node_path_1.join)(this.home, category === 'data' ? '.local/share' : '.' + category);
+        const base = process.env[`XDG_${category.toUpperCase()}_HOME`]
+            || (this.windows && process.env.LOCALAPPDATA)
+            || (0, node_path_1.join)(this.home, category === 'data' ? '.local/share' : '.' + category);
         return (0, node_path_1.join)(base, this.dirname);
     }
     windowsHome() {
@@ -472,7 +473,7 @@ class Config {
     }
     _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('/');
@@ -483,7 +484,7 @@ class Config {
         else {
             shellPath = ['unknown'];
         }
-        return shellPath[shellPath.length - 1];
+        return shellPath.at(-1) ?? 'unknown';
     }
     _debug() {
         if (this.scopedEnvVarTrue('DEBUG'))
@@ -506,7 +507,7 @@ class Config {
         if (err instanceof Error) {
             const modifiedErr = err;
             modifiedErr.name = `${err.name} Plugin: ${this.name}`;
-            modifiedErr.detail = (0, util_1.compact)([
+            modifiedErr.detail = (0, util_2.compact)([
                 err.detail,
                 `module: ${this._base}`,
                 scope && `task: ${scope}`,
@@ -520,7 +521,7 @@ class Config {
         // 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_1.compact)([
+        err.detail = (0, util_2.compact)([
             err.detail,
             `module: ${this._base}`,
             scope && `task: ${scope}`,
@@ -552,7 +553,7 @@ class Config {
         return id;
     }
     loadCommands(plugin) {
-        const marker = performance_1.default.mark(`config.loadCommands#${plugin.name}`, { plugin: plugin.name });
+        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)) {
@@ -562,8 +563,13 @@ class Config {
             else {
                 this._commands.set(command.id, command);
             }
+            // 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 command.permutations ?? [command.id]) {
+            for (const permutation of permutations) {
                 this.commandPermutations.add(permutation, command.id);
             }
             // set command aliases
@@ -576,7 +582,13 @@ class Config {
                     this._commands.set(alias, { ...command, id: alias });
                 }
                 // set every permutation of the aliases
-                for (const permutation of command.aliasPermutations ?? [alias]) {
+                // 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);
                 }
             }
@@ -585,8 +597,8 @@ class Config {
         marker?.stop();
     }
     loadTopics(plugin) {
-        const marker = performance_1.default.mark(`config.loadTopics#${plugin.name}`, { plugin: plugin.name });
-        for (const topic of (0, util_1.compact)(plugin.topics)) {
+        const marker = performance_1.Performance.mark(`config.loadTopics#${plugin.name}`, { plugin: plugin.name });
+        for (const topic of (0, util_2.compact)(plugin.topics)) {
             const existing = this._topics.get(topic.name);
             if (existing) {
                 existing.description = topic.description || existing.description;
@@ -750,6 +762,7 @@ async function toCached(c, plugin, respectNoCacheDefault = false) {
                 deprecated: flag.deprecated,
                 deprecateAliases: c.deprecateAliases,
                 aliases: flag.aliases,
+                charAliases: flag.charAliases,
                 delimiter: flag.delimiter,
                 noCacheDefault: flag.noCacheDefault,
             };
@@ -775,6 +788,7 @@ async function toCached(c, plugin, respectNoCacheDefault = false) {
                 deprecated: flag.deprecated,
                 deprecateAliases: c.deprecateAliases,
                 aliases: flag.aliases,
+                charAliases: flag.charAliases,
                 delimiter: flag.delimiter,
                 noCacheDefault: flag.noCacheDefault,
             };

package/lib/config/plugin-loader.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const Plugin = require("./plugin");
-const util_1 = require("./util");
-const util_2 = require("../util");
+const tslib_1 = require("tslib");
+const Plugin = tslib_1.__importStar(require("./plugin"));
+const util_1 = require("../util");
+const util_2 = require("./util");
 const performance_1 = require("../performance");
+const node_path_1 = require("node:path");
 // eslint-disable-next-line new-cap
-const debug = (0, util_1.Debug)();
+const debug = (0, util_2.Debug)();
 class PluginLoader {
     constructor(options) {
         this.options = options;
@@ -25,8 +26,18 @@ class PluginLoader {
             rootPlugin = plugins.find(p => p.root === this.options.root) ?? plugins[0];
         }
         else {
+            const marker = performance_1.Performance.mark('plugin.load#root');
             rootPlugin = new Plugin.Plugin({ root: this.options.root });
             await rootPlugin.load();
+            marker?.addDetails({
+                hasManifest: rootPlugin.hasManifest ?? false,
+                commandCount: rootPlugin.commands.length,
+                topicCount: rootPlugin.topics.length,
+                type: rootPlugin.type,
+                usesMain: Boolean(rootPlugin.pjson.main),
+                name: rootPlugin.name,
+            });
+            marker?.stop();
         }
         this.plugins.set(rootPlugin.name, rootPlugin);
         return rootPlugin;
@@ -47,10 +58,10 @@ class PluginLoader {
     async loadDevPlugins(opts) {
         if (opts.devPlugins !== false) {
             // do not load oclif.devPlugins in production
-            if ((0, util_2.isProd)())
+            if ((0, util_1.isProd)())
                 return;
             try {
-                const devPlugins = opts.rootPlugin.pjson.oclif.devPlugins;
+                const { devPlugins } = opts.rootPlugin.pjson.oclif;
                 if (devPlugins)
                     await this.loadPlugins(opts.rootPlugin.root, 'dev', devPlugins);
             }
@@ -62,9 +73,9 @@ class PluginLoader {
     async loadUserPlugins(opts) {
         if (opts.userPlugins !== false) {
             try {
-                const userPJSONPath = path.join(opts.dataDir, 'package.json');
+                const userPJSONPath = (0, node_path_1.join)(opts.dataDir, 'package.json');
                 debug('reading user plugins pjson %s', userPJSONPath);
-                const pjson = await (0, util_1.loadJSON)(userPJSONPath);
+                const pjson = await (0, util_1.readJson)(userPJSONPath);
                 if (!pjson.oclif)
                     pjson.oclif = { schema: 1 };
                 if (!pjson.oclif.plugins)
@@ -81,7 +92,7 @@ class PluginLoader {
     async loadPlugins(root, type, plugins, parent) {
         if (!plugins || plugins.length === 0)
             return;
-        const mark = performance_1.default.mark(`config.loadPlugins#${type}`);
+        const mark = performance_1.Performance.mark(`config.loadPlugins#${type}`);
         debug('loading plugins', plugins);
         await Promise.all((plugins || []).map(async (plugin) => {
             try {
@@ -95,9 +106,12 @@ class PluginLoader {
                     opts.tag = plugin.tag || opts.tag;
                     opts.root = plugin.root || opts.root;
                 }
+                if (parent) {
+                    opts.parent = parent;
+                }
                 if (this.plugins.has(name))
                     return;
-                const pluginMarker = performance_1.default.mark(`plugin.load#${name}`);
+                const pluginMarker = performance_1.Performance.mark(`plugin.load#${name}`);
                 const instance = new Plugin.Plugin(opts);
                 await instance.load();
                 pluginMarker?.addDetails({

package/lib/config/plugin.d.ts

@@ -1,8 +1,8 @@
 import { Plugin as IPlugin, PluginOptions } from '../interfaces/plugin';
+import { Command } from '../command';
 import { Manifest } from '../interfaces/manifest';
 import { PJSON } from '../interfaces/pjson';
 import { Topic } from '../interfaces/topic';
-import { Command } from '../command';
 export declare class Plugin implements IPlugin {
     options: PluginOptions;
     _base: string;

package/lib/config/plugin.js

@@ -2,43 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Plugin = void 0;
 const errors_1 = require("../errors");
-const globby = require("globby");
-const path = require("path");
-const util_1 = require("util");
-const config_1 = require("./config");
-const util_2 = require("./util");
-const ts_node_1 = require("./ts-node");
-const util_3 = require("./util");
-const util_4 = require("../util");
+const util_1 = require("./util");
+const util_2 = require("../util");
+const node_path_1 = require("node:path");
 const module_loader_1 = require("../module-loader");
 const performance_1 = require("../performance");
-const _pjson = (0, util_4.requireJson)(__dirname, '..', '..', 'package.json');
+const node_util_1 = require("node:util");
+const globby_1 = require("globby");
+const config_1 = require("./config");
+const ts_node_1 = require("./ts-node");
+const _pjson = (0, util_2.requireJson)(__dirname, '..', '..', 'package.json');
 function topicsToArray(input, base) {
     if (!input)
         return [];
     base = base ? `${base}:` : '';
     if (Array.isArray(input)) {
-        return [...input, ...(0, util_3.flatMap)(input, t => topicsToArray(t.subtopics, `${base}${t.name}`))];
+        return [...input, ...(0, util_1.flatMap)(input, t => topicsToArray(t.subtopics, `${base}${t.name}`))];
     }
-    return (0, util_3.flatMap)(Object.keys(input), k => {
+    return (0, util_1.flatMap)(Object.keys(input), k => {
         input[k].name = k;
         return [{ ...input[k], name: `${base}${k}` }, ...topicsToArray(input[k].subtopics, `${base}${input[k].name}`)];
     });
 }
 // essentially just "cd .."
 function* up(from) {
-    while (path.dirname(from) !== from) {
+    while ((0, node_path_1.dirname)(from) !== from) {
         yield from;
-        from = path.dirname(from);
+        from = (0, node_path_1.dirname)(from);
     }
     yield from;
 }
 async function findSourcesRoot(root) {
     for (const next of up(root)) {
-        const cur = path.join(next, 'package.json');
+        const cur = (0, node_path_1.join)(next, 'package.json');
         // eslint-disable-next-line no-await-in-loop
-        if (await (0, util_3.exists)(cur))
-            return path.dirname(cur);
+        if (await (0, util_2.exists)(cur))
+            return (0, node_path_1.dirname)(cur);
     }
 }
 /**
@@ -56,23 +55,23 @@ async function findRootLegacy(name, root) {
     for (const next of up(root)) {
         let cur;
         if (name) {
-            cur = path.join(next, 'node_modules', name, 'package.json');
+            cur = (0, node_path_1.join)(next, 'node_modules', name, 'package.json');
             // eslint-disable-next-line no-await-in-loop
-            if (await (0, util_3.exists)(cur))
-                return path.dirname(cur);
+            if (await (0, util_2.exists)(cur))
+                return (0, node_path_1.dirname)(cur);
             try {
                 // eslint-disable-next-line no-await-in-loop
-                const pkg = await (0, util_3.loadJSON)(path.join(next, 'package.json'));
+                const pkg = await (0, util_2.readJson)((0, node_path_1.join)(next, 'package.json'));
                 if (pkg.name === name)
                     return next;
             }
             catch { }
         }
         else {
-            cur = path.join(next, 'package.json');
+            cur = (0, node_path_1.join)(next, 'package.json');
             // eslint-disable-next-line no-await-in-loop
-            if (await (0, util_3.exists)(cur))
-                return path.dirname(cur);
+            if (await (0, util_2.exists)(cur))
+                return (0, node_path_1.dirname)(cur);
         }
     }
 }
@@ -80,13 +79,21 @@ async function findRoot(name, root) {
     if (name) {
         let pkgPath;
         try {
-            pkgPath = (0, util_3.resolvePackage)(name, { paths: [root] });
+            pkgPath = (0, util_1.resolvePackage)(name, { paths: [root] });
         }
         catch { }
-        return pkgPath ? findSourcesRoot(path.dirname(pkgPath)) : findRootLegacy(name, root);
+        return pkgPath ? findSourcesRoot((0, node_path_1.dirname)(pkgPath)) : findRootLegacy(name, root);
     }
     return findSourcesRoot(root);
 }
+const cachedCommandCanBeUsed = (manifest, id) => Boolean(manifest?.commands[id] && ('isESM' in manifest.commands[id] && 'relativePath' in manifest.commands[id]));
+const search = (cmd) => {
+    if (typeof cmd.run === 'function')
+        return cmd;
+    if (cmd.default && cmd.default.run)
+        return cmd.default;
+    return Object.values(cmd).find((cmd) => typeof cmd.run === 'function');
+};
 class Plugin {
     constructor(options) {
         this.options = options;
@@ -96,29 +103,34 @@ class Plugin {
         this.children = [];
         this.hasManifest = false;
         // eslint-disable-next-line new-cap
-        this._debug = (0, util_2.Debug)();
+        this._debug = (0, util_1.Debug)();
         this.warned = false;
     }
     async load() {
         this.type = this.options.type || 'core';
         this.tag = this.options.tag;
-        const root = await findRoot(this.options.name, this.options.root);
+        if (this.options.parent)
+            this.parent = this.options.parent;
+        // Linked plugins already have a root so there's no need to search for it.
+        // However there could be child plugins nested inside the linked plugin, in which
+        // case we still need to search for the child plugin's root.
+        const root = this.type === 'link' && !this.parent ? this.options.root : await findRoot(this.options.name, this.options.root);
         if (!root)
-            throw new errors_1.CLIError(`could not find package.json with ${(0, util_1.inspect)(this.options)}`);
+            throw new errors_1.CLIError(`could not find package.json with ${(0, node_util_1.inspect)(this.options)}`);
         this.root = root;
         this._debug('reading %s plugin %s', this.type, root);
-        this.pjson = await (0, util_3.loadJSON)(path.join(root, 'package.json'));
+        this.pjson = await (0, util_2.readJson)((0, node_path_1.join)(root, 'package.json'));
         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;
-        const pjsonPath = path.join(root, 'package.json');
+        const pjsonPath = (0, node_path_1.join)(root, 'package.json');
         if (!this.name)
             throw new errors_1.CLIError(`no name in ${pjsonPath}`);
-        if (!(0, util_4.isProd)() && !this.pjson.files)
+        if (!(0, util_2.isProd)() && !this.pjson.files)
             this.warn(`files attribute must be specified in ${pjsonPath}`);
         // eslint-disable-next-line new-cap
-        this._debug = (0, util_2.Debug)(this.name);
+        this._debug = (0, util_1.Debug)(this.name);
         this.version = this.pjson.version;
         if (this.pjson.oclif) {
             this.valid = true;
@@ -126,7 +138,7 @@ class Plugin {
         else {
             this.pjson.oclif = this.pjson['cli-engine'] || {};
         }
-        this.hooks = (0, util_3.mapValues)(this.pjson.oclif.hooks || {}, i => Array.isArray(i) ? i : [i]);
+        this.hooks = (0, util_1.mapValues)(this.pjson.oclif.hooks || {}, i => Array.isArray(i) ? i : [i]);
         this.manifest = await this._manifest();
         this.commands = Object
             .entries(this.manifest.commands)
@@ -150,18 +162,18 @@ class Plugin {
     get commandIDs() {
         if (!this.commandsDir)
             return [];
-        const marker = performance_1.default.mark(`plugin.commandIDs#${this.name}`, { plugin: this.name });
+        const marker = performance_1.Performance.mark(`plugin.commandIDs#${this.name}`, { plugin: this.name });
         this._debug(`loading IDs from ${this.commandsDir}`);
         const patterns = [
             '**/*.+(js|cjs|mjs|ts|tsx)',
             '!**/*.+(d.ts|test.ts|test.js|spec.ts|spec.js)?(x)',
         ];
-        const ids = globby.sync(patterns, { cwd: this.commandsDir })
+        const ids = (0, globby_1.sync)(patterns, { cwd: this.commandsDir })
             .map(file => {
-            const p = path.parse(file);
+            const p = (0, node_path_1.parse)(file);
             const topics = p.dir.split('/');
             const command = p.name !== 'index' && p.name;
-            const id = [...topics, command].filter(f => f).join(':');
+            const id = [...topics, command].filter(Boolean).join(':');
             return id === '' ? '.' : id;
         });
         this._debug('found commands', ids);
@@ -170,34 +182,31 @@ class Plugin {
         return ids;
     }
     async findCommand(id, opts = {}) {
-        const marker = performance_1.default.mark(`plugin.findCommand#${this.name}.${id}`, { id, plugin: this.name });
+        const marker = performance_1.Performance.mark(`plugin.findCommand#${this.name}.${id}`, { id, plugin: this.name });
         const fetch = async () => {
             if (!this.commandsDir)
                 return;
-            const search = (cmd) => {
-                if (typeof cmd.run === 'function')
-                    return cmd;
-                if (cmd.default && cmd.default.run)
-                    return cmd.default;
-                return Object.values(cmd).find((cmd) => typeof cmd.run === 'function');
-            };
-            let m;
+            let module;
+            let isESM;
+            let filePath;
             try {
-                const p = path.join(this.commandsDir ?? this.pjson.oclif.commands, ...id.split(':'));
-                const { isESM, module, filePath } = await module_loader_1.default.loadWithData(this, p);
+                ({ isESM, module, filePath } = cachedCommandCanBeUsed(this.manifest, id)
+                    ? await (0, module_loader_1.loadWithDataFromManifest)(this.manifest.commands[id], this.root)
+                    : await (0, module_loader_1.loadWithData)(this, (0, node_path_1.join)(this.commandsDir ?? this.pjson.oclif.commands, ...id.split(':'))));
                 this._debug(isESM ? '(import)' : '(require)', filePath);
-                m = module;
             }
             catch (error) {
                 if (!opts.must && error.code === 'MODULE_NOT_FOUND')
                     return;
                 throw error;
             }
-            const cmd = search(m);
+            const cmd = search(module);
             if (!cmd)
                 return;
             cmd.id = id;
             cmd.plugin = this;
+            cmd.isESM = isESM;
+            cmd.relativePath = (0, node_path_1.relative)(this.root, filePath || '').split(node_path_1.sep);
             return cmd;
         };
         const cmd = await fetch();
@@ -212,8 +221,8 @@ class Plugin {
         const respectNoCacheDefault = Boolean(this.options.respectNoCacheDefault);
         const readManifest = async (dotfile = false) => {
             try {
-                const p = path.join(this.root, `${dotfile ? '.' : ''}oclif.manifest.json`);
-                const manifest = await (0, util_3.loadJSON)(p);
+                const p = (0, node_path_1.join)(this.root, `${dotfile ? '.' : ''}oclif.manifest.json`);
+                const manifest = await (0, util_2.readJson)(p);
                 if (!process.env.OCLIF_NEXT_VERSION && manifest.version.split('-')[0] !== this.version.split('-')[0]) {
                     process.emitWarning(`Mismatched version in ${this.name} plugin manifest. Expected: ${this.version} Received: ${manifest.version}\nThis usually means you have an oclif.manifest.json file that should be deleted in development. This file should be automatically generated when publishing.`);
                 }
@@ -233,7 +242,7 @@ class Plugin {
                 }
             }
         };
-        const marker = performance_1.default.mark(`plugin.manifest#${this.name}`, { plugin: this.name });
+        const marker = performance_1.Performance.mark(`plugin.manifest#${this.name}`, { plugin: this.name });
         if (!ignoreManifest) {
             const manifest = await readManifest();
             if (manifest) {
@@ -248,8 +257,8 @@ class Plugin {
                 try {
                     const cached = await (0, config_1.toCached)(await this.findCommand(id, { must: true }), this, respectNoCacheDefault);
                     if (this.flexibleTaxonomy) {
-                        const permutations = (0, util_2.getCommandIdPermutations)(id);
-                        const aliasPermutations = cached.aliases.flatMap(a => (0, util_2.getCommandIdPermutations)(a));
+                        const permutations = (0, util_1.getCommandIdPermutations)(id);
+                        const aliasPermutations = cached.aliases.flatMap(a => (0, util_1.getCommandIdPermutations)(a));
                         return [id, { ...cached, permutations, aliasPermutations }];
                     }
                     return [id, cached];
@@ -262,6 +271,7 @@ class Plugin {
                         throw this.addErrorScope(error, scope);
                 }
             })))
+                // eslint-disable-next-line unicorn/no-await-expression-member, unicorn/prefer-native-coercion-functions
                 .filter((f) => Boolean(f))
                 .reduce((commands, [id, c]) => {
                 commands[id] = c;
@@ -281,7 +291,7 @@ class Plugin {
     }
     addErrorScope(err, scope) {
         err.name = `${err.name} Plugin: ${this.name}`;
-        err.detail = (0, util_3.compact)([err.detail, `module: ${this._base}`, scope && `task: ${scope}`, `plugin: ${this.name}`, `root: ${this.root}`, 'See more details with DEBUG=*']).join('\n');
+        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');
         return err;
     }
 }