@salesforce/cli 2.28.4 → 2.28.5

package/README.md

@@ -24,7 +24,7 @@ $ npm install -g @salesforce/cli
 $ sf COMMAND
 running command...
 $ sf (--version|-v)
-@salesforce/cli/2.28.4 linux-x64 node-v20.11.0
+@salesforce/cli/2.28.5 linux-x64 node-v20.11.0
 $ sf --help [COMMAND]
 USAGE
   $ sf COMMAND
@@ -7310,7 +7310,7 @@ EXAMPLES
     $ sf update --available
 ```
 
-_See code: [@oclif/plugin-update](https://github.com/oclif/plugin-update/blob/4.1.9/src/commands/update.ts)_
+_See code: [@oclif/plugin-update](https://github.com/oclif/plugin-update/blob/4.1.10/src/commands/update.ts)_
 
 ## `sf version`
 

package/dist/help/sfHelp.js

@@ -4,7 +4,8 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Help } from '@oclif/core';
+import { Help, toConfiguredId } from '@oclif/core';
+import stripAnsi from 'strip-ansi';
 import chalk from 'chalk';
 import { SfCommandHelp } from './sfCommandHelp.js';
 export default class SfHelp extends Help {
@@ -13,16 +14,10 @@ export default class SfHelp extends Help {
         this.CommandHelpClass = SfCommandHelp;
         this.showShortHelp = false;
         this.commands = [];
-        this.subCommands = {};
     }
     async showHelp(argv) {
         this.showShortHelp = argv.includes('-h');
-        this.commands = this.config.commandIDs.map((c) => `${this.config.bin} ${c.replace(/:/g, this.config.topicSeparator)}`);
-        for (const cmd of this.commands) {
-            this.subCommands[cmd] = this.commands
-                .filter((c) => c.startsWith(cmd) && c !== cmd)
-                .map((c) => `${c.replace(cmd, '')}`);
-        }
+        this.commands = this.config.commandIDs.map((c) => `${this.config.bin} ${toConfiguredId(c, this.config)}`);
         return super.showHelp(argv);
     }
     getCommandHelpClass(command) {
@@ -33,10 +28,21 @@ export default class SfHelp extends Help {
     log(...args) {
         const formatted = args.map((arg) => {
             for (const cmd of this.commands) {
-                const regex = this.subCommands[cmd].length > 0
-                    ? new RegExp(`(?<!\\$ )${cmd}(?!${this.subCommands[cmd].join('|')})`, 'g')
-                    : new RegExp(`(?<!\\$ )${cmd}`, 'g');
-                arg = arg.replace(regex, chalk.dim(cmd));
+                /**
+                 * This regex matches any command in the help output.
+                 * It will continue to match until the next space, quote, or period.
+                 *
+                 * Examples that will match:
+                 * - sf deploy project start
+                 * - "sf deploy project start"
+                 * - sf org create scratch|sandbox
+                 * - "sf org create scratch|sandbox"
+                 */
+                const regex = new RegExp(`${cmd}([^\\s".]+)?`, 'g');
+                const [match] = stripAnsi(arg.slice()).match(regex) ?? [];
+                if (match) {
+                    arg = arg.replace(regex, chalk.dim(match));
+                }
             }
             return arg;
         });