@oclif/core 4.0.0-beta.13 → 4.0.0-beta.15

package/lib/config/ts-path.js

@@ -78,6 +78,24 @@ async function loadTSConfig(root) {
         (0, warn_1.memoizedWarn)(`Could not parse tsconfig.json for ${root}. Falling back to compiled source.`);
     }
 }
+async function registerTsx(root, moduleType) {
+    if (REGISTERED.has(root))
+        return;
+    try {
+        const apiPath = moduleType === 'module' ? 'tsx/esm/api' : 'tsx/cjs/api';
+        const tsxPath = require.resolve(apiPath, { paths: [root] });
+        if (!tsxPath)
+            return;
+        debug('registering tsx at', root);
+        debug('tsx path:', tsxPath);
+        const { register } = await import(tsxPath);
+        register();
+        REGISTERED.add(root);
+    }
+    catch {
+        debug(`Could not find tsx. Skipping tsx registration for ${root}.`);
+    }
+}
 async function registerTSNode(root, tsconfig) {
     if (REGISTERED.has(root))
         return;
@@ -135,18 +153,20 @@ async function registerTSNode(root, tsconfig) {
 }
 /**
  * Skip ts-node registration for ESM plugins in production.
- * The node ecosystem is not mature enough to support auto-transpiling ESM modules at this time.
+ * The node/ts-node ecosystem is not mature enough to support auto-transpiling ESM modules at this time.
  * See the following:
  * - https://github.com/TypeStrong/ts-node/issues/1791#issuecomment-1149754228
  * - https://github.com/nodejs/node/issues/49432
  * - https://github.com/nodejs/node/pull/49407
  * - https://github.com/nodejs/node/issues/34049
  *
- * We still register ts-node for ESM plugins when NODE_ENV is "test" or "development" and root plugin is also ESM
+ * We still register tsx/ts-node for ESM plugins when NODE_ENV is "test" or "development" and root plugin is also ESM
  * since that allows plugins to be auto-transpiled when developing locally using `bin/dev.js`.
  */
 function cannotTranspileEsm(rootPlugin, plugin, isProduction) {
-    return (isProduction || rootPlugin?.moduleType === 'commonjs') && plugin?.moduleType === 'module';
+    return ((isProduction || rootPlugin?.moduleType === 'commonjs') &&
+        plugin?.moduleType === 'module' &&
+        !plugin?.pjson.devDependencies?.tsx);
 }
 /**
  * If the dev script is run with ts-node for an ESM plugin, skip ts-node registration
@@ -166,15 +186,18 @@ function cannotUseTsNode(root, plugin, isProduction) {
 /**
  * Determine the path to the source file from the compiled ./lib files
  */
-async function determinePath(root, orig) {
+async function determinePath(root, orig, plugin) {
     const tsconfig = await loadTSConfig(root);
     if (!tsconfig)
         return orig;
     debug(`Determining path for ${orig}`);
-    if (RUN_TIME === 'tsx' || RUN_TIME === 'bun') {
+    if (RUN_TIME === 'bun') {
         debug(`Skipping ts-node registration for ${root} because the runtime is: ${RUN_TIME}`);
     }
     else {
+        // attempt to register tsx first. If it fails to register, we will fall back to ts-node
+        await registerTsx(root, plugin?.moduleType);
+        // if tsx registration succeeded, then this will exit early since the path will be in REGISTERED already
         await registerTSNode(root, tsconfig);
     }
     const { baseUrl, outDir, rootDir, rootDirs } = tsconfig.compilerOptions;
@@ -251,7 +274,7 @@ async function tsPath(root, orig, plugin) {
         return orig;
     }
     try {
-        return await determinePath(root, orig);
+        return await determinePath(root, orig, plugin);
     }
     catch (error) {
         debug(error);

package/lib/ux/theme.js

@@ -5,8 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTheme = exports.colorize = void 0;
 const ansis_1 = __importDefault(require("ansis"));
+const supports_color_1 = require("supports-color");
 const theme_1 = require("../interfaces/theme");
-function isStandardChalk(color) {
+function isStandardAnsi(color) {
     return theme_1.STANDARD_ANSI.includes(color);
 }
 /**
@@ -18,7 +19,11 @@ function isStandardChalk(color) {
 function colorize(color, text) {
     if (!color)
         return text;
-    if (isStandardChalk(color))
+    if (!supports_color_1.stdout)
+        return text;
+    if (!supports_color_1.stderr)
+        return text;
+    if (isStandardAnsi(color))
         return ansis_1.default[color](text);
     if (color.startsWith('#'))
         return ansis_1.default.hex(color)(text);
@@ -39,5 +44,5 @@ function parseTheme(theme) {
 }
 exports.parseTheme = parseTheme;
 function isValid(color) {
-    return color.startsWith('#') || color.startsWith('rgb') || isStandardChalk(color) ? color : undefined;
+    return color.startsWith('#') || color.startsWith('rgb') || isStandardAnsi(color) ? color : undefined;
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "4.0.0-beta.13",
+  "version": "4.0.0-beta.15",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
     "ansi-escapes": "^4.3.2",
-    "ansis": "^3.0.1",
+    "ansis": "^3.1.1",
     "clean-stack": "^3.0.1",
     "cli-spinners": "^2.9.2",
     "cosmiconfig": "^9.0.0",
@@ -18,7 +18,7 @@
     "is-wsl": "^2.2.0",
     "minimatch": "^9.0.4",
     "string-width": "^4.2.3",
-    "supports-color": "^9.4.0",
+    "supports-color": "^8",
     "widest-line": "^3.1.0",
     "wordwrap": "^1.0.0",
     "wrap-ansi": "^7.0.0"
@@ -40,6 +40,7 @@
     "@types/node": "^18",
     "@types/pnpapi": "^0.0.5",
     "@types/sinon": "^17.0.3",
+    "@types/supports-color": "^8.1.3",
     "@types/wordwrap": "^1.0.3",
     "@types/wrap-ansi": "^3.0.0",
     "benchmark": "^2.1.4",