@oclif/core 3.10.4 → 3.10.6

package/lib/config/config.js

@@ -43,6 +43,7 @@ const os_1 = require("../util/os");
 const util_2 = require("../util/util");
 const cache_1 = __importDefault(require("./cache"));
 const plugin_loader_1 = __importDefault(require("./plugin-loader"));
+const ts_node_1 = require("./ts-node");
 const util_3 = require("./util");
 // eslint-disable-next-line new-cap
 const debug = (0, util_3.Debug)();
@@ -458,7 +459,7 @@ class Config {
                 const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `config.runHook#${p.name}(${hook})`);
                 try {
                     /* eslint-disable no-await-in-loop */
-                    const { filePath, isESM, module } = await (0, module_loader_1.loadWithData)(p, hook);
+                    const { filePath, isESM, module } = await (0, module_loader_1.loadWithData)(p, await (0, ts_node_1.tsPath)(p.root, hook, p));
                     debug('start', isESM ? '(import)' : '(require)', filePath);
                     const result = timeout
                         ? await withTimeout(timeout, search(module).call(context, { ...opts, config: this, context }))

package/lib/config/plugin.js

@@ -56,6 +56,7 @@ class Plugin {
     alreadyLoaded = false;
     children = [];
     commandIDs = [];
+    // This will be initialized in the _manifest() method, which gets called in the load() method.
     commands;
     commandsDir;
     hasManifest = false;
@@ -88,7 +89,8 @@ class Plugin {
             plugin: this.name,
         });
         const fetch = async () => {
-            if (!this.commandsDir)
+            const commandsDir = await this.getCommandsDir();
+            if (!commandsDir)
                 return;
             let module;
             let isESM;
@@ -97,7 +99,7 @@ class Plugin {
                 ;
                 ({ filePath, isESM, module } = 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(':'))));
+                    : await (0, module_loader_1.loadWithData)(this, (0, node_path_1.join)(commandsDir ?? this.pjson.oclif.commands, ...id.split(':'))));
                 this._debug(isESM ? '(import)' : '(require)', filePath);
             }
             catch (error) {
@@ -142,8 +144,6 @@ class Plugin {
         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_1.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.version = this.pjson.version;
@@ -153,12 +153,7 @@ class Plugin {
         else {
             this.pjson.oclif = this.pjson['cli-engine'] || {};
         }
-        this.commandsDir = await this.getCommandsDir();
-        this.commandIDs = await this.getCommandIDs();
-        this.hooks = Object.fromEntries(await Promise.all(Object.entries(this.pjson.oclif.hooks ?? {}).map(async ([k, v]) => [
-            k,
-            await Promise.all((0, util_1.castArray)(v).map(async (i) => (0, ts_node_1.tsPath)(this.root, i, this))),
-        ])));
+        this.hooks = Object.fromEntries(Object.entries(this.pjson.oclif.hooks ?? {}).map(([k, v]) => [k, (0, util_1.castArray)(v)]));
         this.manifest = await this._manifest();
         this.commands = Object.entries(this.manifest.commands)
             .map(([id, c]) => ({
@@ -202,9 +197,11 @@ class Plugin {
             if (manifest) {
                 marker?.addDetails({ commandCount: Object.keys(manifest.commands).length, fromCache: true });
                 marker?.stop();
+                this.commandIDs = Object.keys(manifest.commands);
                 return manifest;
             }
         }
+        this.commandIDs = await this.getCommandIDs();
         const manifest = {
             commands: (await Promise.all(this.commandIDs.map(async (id) => {
                 try {
@@ -249,11 +246,12 @@ class Plugin {
         return err;
     }
     async getCommandIDs() {
-        if (!this.commandsDir)
+        const commandsDir = await this.getCommandsDir();
+        if (!commandsDir)
             return [];
         const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `plugin.getCommandIDs#${this.name}`, { plugin: this.name });
-        this._debug(`loading IDs from ${this.commandsDir}`);
-        const files = await (0, globby_1.default)(GLOB_PATTERNS, { cwd: this.commandsDir });
+        this._debug(`loading IDs from ${commandsDir}`);
+        const files = await (0, globby_1.default)(GLOB_PATTERNS, { cwd: commandsDir });
         const ids = processCommandIds(files);
         this._debug('found commands', ids);
         marker?.addDetails({ count: ids.length });
@@ -261,7 +259,8 @@ class Plugin {
         return ids;
     }
     async getCommandsDir() {
-        return (0, ts_node_1.tsPath)(this.root, this.pjson.oclif.commands, this);
+        this.commandsDir = await (0, ts_node_1.tsPath)(this.root, this.pjson.oclif.commands, this);
+        return this.commandsDir;
     }
     warn(err, scope) {
         if (this.warned)

package/lib/config/ts-node.js

@@ -176,7 +176,7 @@ async function tsPath(root, orig, plugin) {
     }
     const isProduction = (0, util_1.isProd)();
     if (cannotTranspileEsm(rootPlugin, plugin, isProduction)) {
-        debug(`Skipping ts-node registration for ${root} because it's an ESM module (NODE_ENV: ${process.env.NODE_ENV}, root plugin module type: ${rootPlugin?.moduleType})))`);
+        debug(`Skipping ts-node registration for ${root} because it's an ESM module (NODE_ENV: ${process.env.NODE_ENV}, root plugin module type: ${rootPlugin?.moduleType})`);
         if (plugin?.type === 'link')
             (0, errors_1.memoizedWarn)(`${plugin?.name} is a linked ESM module and cannot be auto-transpiled. Existing compiled source will be used instead.`);
         return orig;

package/lib/util/find-root.js

@@ -25,12 +25,13 @@ function* up(from) {
 async function findPluginRoot(root, name) {
     // If we know the plugin name then we just need to traverse the file
     // system until we find the directory that matches the plugin name.
+    debug.extend(name ?? 'root-plugin')(`Finding root starting at ${root}`);
     if (name) {
-        debug.extend(name)(`Finding root starting at ${root}`);
         for (const next of up(root)) {
-            debug.extend(name)(`Checking ${next}`);
-            if (next.endsWith((0, node_path_1.basename)(name)))
+            if (next.endsWith((0, node_path_1.basename)(name))) {
+                debug.extend(name)('Found root based on plugin name!');
                 return next;
+            }
         }
     }
     // If there's no plugin name (typically just the root plugin), then we need
@@ -43,9 +44,11 @@ async function findPluginRoot(root, name) {
         }
         try {
             const cur = (0, node_path_1.join)(next, 'package.json');
-            debug.extend('root-plugin')(`Checking ${cur}`);
-            if (await (0, fs_1.safeReadJson)(cur))
+            debug.extend(name ?? 'root-plugin')(`Checking ${cur}`);
+            if (await (0, fs_1.safeReadJson)(cur)) {
+                debug.extend(name ?? 'root-plugin')('Found root by traversing up from starting point!');
                 return (0, node_path_1.dirname)(cur);
+            }
         }
         catch { }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "3.10.4",
+  "version": "3.10.6",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {