@oclif/core 4.0.0-beta.14 → 4.0.0-beta.16

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/help/command.js

@@ -153,12 +153,7 @@ class CommandHelp extends formatter_1.HelpFormatter {
             label = labels.join(flag.char ? (0, theme_1.colorize)(this.config?.theme?.flagSeparator, ', ') : '  ');
         }
         if (flag.type === 'option') {
-            let value = flag.helpValue || (this.opts.showFlagNameInTitle ? flag.name : '<value>');
-            if (!flag.helpValue && flag.options) {
-                value = showOptions || this.opts.showFlagOptionsInTitle ? `${flag.options.join('|')}` : '<option>';
-            }
-            if (flag.multiple)
-                value += '...';
+            let value = docopts_1.DocOpts.formatUsageType(flag, this.opts.showFlagNameInTitle ?? false, this.opts.showFlagOptionsInTitle ?? showOptions);
             if (!value.includes('|'))
                 value = ansis_1.default.underline(value);
             label += `=${value}`;
@@ -304,7 +299,11 @@ class CommandHelp extends formatter_1.HelpFormatter {
             const dollarSign = (0, theme_1.colorize)(this.config?.theme?.dollarSign, '$');
             const bin = (0, theme_1.colorize)(this.config?.theme?.bin, this.config.bin);
             const command = (0, theme_1.colorize)(this.config?.theme?.command, '<%= command.id %>');
-            const commandDescription = (0, theme_1.colorize)(this.config?.theme?.sectionDescription, u.replace('<%= command.id %>', '').replace(standardId, '').replace(configuredId, '').trim());
+            const commandDescription = (0, theme_1.colorize)(this.config?.theme?.sectionDescription, u
+                .replace('<%= command.id %>', '')
+                .replace(new RegExp(`^${standardId}`), '')
+                .replace(new RegExp(`^${configuredId}`), '')
+                .trim());
             const line = `${dollarSign} ${bin} ${command} ${commandDescription}`.trim();
             if (line.length > allowedSpacing) {
                 const splitIndex = line.slice(0, Math.max(0, allowedSpacing)).lastIndexOf(' ');

package/lib/help/docopts.d.ts

@@ -60,6 +60,7 @@ export declare class DocOpts {
     private flagList;
     private flagMap;
     constructor(cmd: Command.Loadable);
+    static formatUsageType(flag: Command.Flag.Any, showFlagName: boolean, showOptions: boolean): string;
     static generate(cmd: Command.Loadable): string;
     toString(): string;
     private combineElementsToFlag;

package/lib/help/docopts.js

@@ -73,6 +73,27 @@ class DocOpts {
             return flag;
         });
     }
+    static formatUsageType(flag, showFlagName, showOptions) {
+        if (flag.type !== 'option')
+            return '';
+        let helpValues;
+        if (flag.helpValue) {
+            // if there is a given helpValue, use it
+            helpValues = typeof flag.helpValue === 'string' ? [flag.helpValue] : flag.helpValue;
+        }
+        else if (flag.options) {
+            // if there are options, show them if wanted
+            helpValues = [showOptions ? flag.options.join('|') : '<option>'];
+        }
+        else if (showFlagName) {
+            helpValues = [flag.name];
+        }
+        else {
+            // default to <value>
+            helpValues = ['<value>'];
+        }
+        return helpValues.map((v) => `${v}${flag.multiple ? '...' : ''}`).join(' ');
+    }
     static generate(cmd) {
         return new DocOpts(cmd).toString();
     }
@@ -93,7 +114,7 @@ class DocOpts {
                 const name = flag.char ? `-${flag.char}` : `--${flag.name}`;
                 if (flag.type === 'boolean')
                     return name;
-                return `${name}=<value>`;
+                return `${name}=${DocOpts.formatUsageType(flag, false, true)}`;
             }));
         }
         return opts.join(' ');
@@ -123,7 +144,7 @@ class DocOpts {
             // not all flags have short names
             const flagName = flag.char ? `-${flag.char}` : `--${flag.name}`;
             if (flag.type === 'option') {
-                type = flag.options ? ` ${flag.options.join('|')}` : ' <value>';
+                type = ` ${DocOpts.formatUsageType(flag, false, true)}`;
             }
             const element = `${flagName}${type}`;
             elementMap[flag.name] = element;

package/lib/interfaces/parser.d.ts

@@ -198,7 +198,7 @@ export type BooleanFlagProps = FlagProps & {
 };
 export type OptionFlagProps = FlagProps & {
     type: 'option';
-    helpValue?: string;
+    helpValue?: string | string[];
     options?: readonly string[];
     multiple?: boolean;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "4.0.0-beta.14",
+  "version": "4.0.0-beta.16",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -10,7 +10,7 @@
     "clean-stack": "^3.0.1",
     "cli-spinners": "^2.9.2",
     "cosmiconfig": "^9.0.0",
-    "debug": "^4.3.4",
+    "debug": "^4.3.5",
     "ejs": "^3.1.10",
     "get-package-type": "^0.1.0",
     "globby": "^11.1.0",