@oclif/core 4.14.0 → 5.0.1

package/lib/help/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Help = exports.HelpBase = exports.standardizeIDFromArgv = exports.normalizeArgv = exports.getHelpFlagAdditions = exports.HelpFormatter = exports.CommandHelp = void 0;
 exports.loadHelpClass = loadHelpClass;
 const ansis_1 = __importDefault(require("ansis"));
+const node_path_1 = require("node:path");
 const ts_path_1 = require("../config/ts-path");
 const error_1 = require("../errors/error");
 const module_loader_1 = require("../module-loader");
@@ -331,11 +332,29 @@ function determineLocation(helpClass) {
 async function loadHelpClass(config) {
     if (config.pjson.oclif?.helpClass) {
         const { identifier, target } = determineLocation(config.pjson.oclif?.helpClass);
-        try {
-            const path = (await (0, ts_path_1.tsPath)(config.root, target)) ?? target;
+        const loadClass = async (path) => {
             const module = await (0, module_loader_1.load)(config, path);
             const helpClass = module[identifier] ?? (identifier === 'default' ? extractClass(module) : undefined);
             return extractClass(helpClass);
+        };
+        // The compiled artifact that `helpClass` points at (e.g. "./dist/help/myHelp.js").
+        const compiledPath = (0, node_path_1.isAbsolute)(target) ? target : (0, node_path_1.join)(config.root, target);
+        try {
+            // `tsPath` may rewrite the compiled path to the TypeScript source for local
+            // development. That source can be unloadable in some runtimes — e.g. an ESM
+            // CLI executed under plain `node` without `tsx` registered, where the `.js`
+            // specifiers in the source can't be resolved to their `.ts` siblings.
+            const path = (await (0, ts_path_1.tsPath)(config.root, target)) ?? target;
+            try {
+                return await loadClass(path);
+            }
+            catch (error) {
+                // If we tried (and failed) to load transpiled source, fall back to the
+                // configured compiled artifact before giving up.
+                if (path === compiledPath)
+                    throw error;
+                return await loadClass(compiledPath);
+            }
         }
         catch (error) {
             throw new Error(`Unable to load configured help class "${target}", failed with message:\n${error.message}`);

package/lib/index.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ux = exports.toStandardizedId = exports.toConfiguredId = exports.settings = exports.Performance = exports.Parser = exports.ModuleLoader = exports.getLogger = exports.Interfaces = exports.loadHelpClass = exports.HelpBase = exports.Help = exports.CommandHelp = exports.flush = exports.Flags = exports.execute = exports.handle = exports.Errors = exports.Constraints = exports.Plugin = exports.Config = exports.Command = exports.Args = void 0;
+exports.ux = exports.toStandardizedId = exports.toConfiguredId = exports.settings = exports.Performance = exports.Parser = exports.ModuleLoader = exports.run = exports.getLogger = exports.Interfaces = exports.loadHelpClass = exports.HelpBase = exports.Help = exports.CommandHelp = exports.flush = exports.Flags = exports.execute = exports.handle = exports.Errors = exports.Constraints = exports.Plugin = exports.Config = exports.Command = exports.Args = void 0;
 const util_1 = require("./util/util");
 function checkCWD() {
     try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "4.14.0",
+  "version": "5.0.1",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -64,10 +64,10 @@
     "sinon": "^18",
     "ts-node": "^10.9.2",
     "tsd": "^0.33.0",
-    "typescript": "^5"
+    "typescript": "^6.0.3"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "files": [
     "/lib"