@oclif/core 3.25.0 → 3.25.2

package/lib/config/plugin.js

@@ -291,7 +291,7 @@ class Plugin {
         return manifest;
     }
     addErrorScope(err, scope) {
-        err.name = `${err.name} Plugin: ${this.name}`;
+        err.name = err.name ?? (0, node_util_1.inspect)(err).trim();
         err.detail = (0, util_1.compact)([
             err.detail,
             `module: ${this._base}`,
@@ -368,7 +368,8 @@ class Plugin {
     warn(err, scope) {
         if (typeof err === 'string')
             err = new Error(err);
-        process.emitWarning(this.addErrorScope(err, scope));
+        const warning = this.addErrorScope(err, scope);
+        process.emitWarning(warning.name, warning);
     }
 }
 exports.Plugin = Plugin;

package/lib/config/ts-path.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsPath = exports.TS_CONFIGS = void 0;
+const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const cache_1 = __importDefault(require("../cache"));
 const warn_1 = require("../errors/warn");
@@ -200,8 +201,20 @@ async function determinePath(root, orig) {
     // In that case we attempt to resolve to the filename. If it fails it will revert back to the lib path
     debug(`lib dir: ${lib}`);
     debug(`src dir: ${src}`);
-    debug(`src commands dir: ${out}`);
-    if ((0, fs_1.existsSync)(out) || (0, fs_1.existsSync)(out + '.ts')) {
+    debug(`src directory to find: ${out}`);
+    if ((0, fs_1.existsSync)(out)) {
+        debug(`Found source directory for ${orig} at ${out}`);
+        return out;
+    }
+    const sourceFiles = await Promise.all([
+        (0, promises_1.access)(`${out}.ts`)
+            .then(() => `${out}.ts`)
+            .catch(() => false),
+        (0, promises_1.access)(`${out}.tsx`)
+            .then(() => `${out}.tsx`)
+            .catch(() => false),
+    ]);
+    if (sourceFiles.some(Boolean)) {
         debug(`Found source file for ${orig} at ${out}`);
         return out;
     }

package/lib/help/index.js

@@ -8,6 +8,7 @@ const node_util_1 = require("node:util");
 const strip_ansi_1 = __importDefault(require("strip-ansi"));
 const theme_1 = require("../cli-ux/theme");
 const write_1 = __importDefault(require("../cli-ux/write"));
+const ts_path_1 = require("../config/ts-path");
 const error_1 = require("../errors/error");
 const module_loader_1 = require("../module-loader");
 const symbols_1 = require("../symbols");
@@ -321,7 +322,8 @@ async function loadHelpClass(config) {
     const configuredClass = pjson.oclif?.helpClass;
     if (configuredClass) {
         try {
-            const exported = (await (0, module_loader_1.load)(config, configuredClass));
+            const path = (await (0, ts_path_1.tsPath)(config.root, configuredClass)) ?? configuredClass;
+            const exported = await (0, module_loader_1.load)(config, path);
             return extractClass(exported);
         }
         catch (error) {

package/lib/module-loader.js

@@ -11,8 +11,7 @@ const getPackageType = require('get-package-type');
 /**
  * Defines file extension resolution when source files do not have an extension.
  */
-// eslint-disable-next-line camelcase
-const s_EXTENSIONS = ['.ts', '.js', '.mjs', '.cjs', '.mts', '.cts'];
+const SUPPORTED_EXTENSIONS = ['.ts', '.js', '.mjs', '.cjs', '.mts', '.cts', '.tsx', '.jsx'];
 const isPlugin = (config) => config.type !== undefined;
 function handleError(error, isESM, path) {
     if (error.code === 'MODULE_NOT_FOUND' || error.code === 'ERR_MODULE_NOT_FOUND') {
@@ -198,8 +197,7 @@ async function resolvePath(config, modulePath) {
  * @returns {string | null} Modified file path including extension or null if file is not found.
  */
 function findFile(filePath) {
-    // eslint-disable-next-line camelcase
-    for (const extension of s_EXTENSIONS) {
+    for (const extension of SUPPORTED_EXTENSIONS) {
         const testPath = `${filePath}${extension}`;
         if ((0, fs_1.existsSync)(testPath)) {
             return testPath;

package/package.json

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