@salesforce/cli 2.41.1 → 2.41.2

package/README.md

@@ -24,7 +24,7 @@ $ npm install -g @salesforce/cli
 $ sf COMMAND
 running command...
 $ sf (--version|-v)
-@salesforce/cli/2.41.1 linux-x64 node-v20.12.2
+@salesforce/cli/2.41.2 linux-x64 node-v20.12.2
 $ sf --help [COMMAND]
 USAGE
   $ sf COMMAND
@@ -3251,7 +3251,7 @@ EXAMPLES
     $ sf org list auth
 ```
 
-_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.5/src/commands/org/list/auth.ts)_
+_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.6/src/commands/org/list/auth.ts)_
 
 ## `sf org list limits`
 
@@ -3551,7 +3551,7 @@ FLAG DESCRIPTIONS
     To specify a sandbox, set --instance-url to "https://<MyDomainName>--<SandboxName>.sandbox.my.salesforce.com".
 ```
 
-_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.5/src/commands/org/login/access-token.ts)_
+_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.6/src/commands/org/login/access-token.ts)_
 
 ## `sf org login device`
 
@@ -3611,7 +3611,7 @@ FLAG DESCRIPTIONS
     To specify a sandbox, set --instance-url to "https://<MyDomainName>--<SandboxName>.sandbox.my.salesforce.com".
 ```
 
-_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.5/src/commands/org/login/device.ts)_
+_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.6/src/commands/org/login/device.ts)_
 
 ## `sf org login jwt`
 
@@ -3702,7 +3702,7 @@ FLAG DESCRIPTIONS
     To specify a sandbox, set --instance-url to "https://<MyDomainName>--<SandboxName>.sandbox.my.salesforce.com".
 ```
 
-_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.5/src/commands/org/login/jwt.ts)_
+_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.6/src/commands/org/login/jwt.ts)_
 
 ## `sf org login sfdx-url`
 
@@ -3767,7 +3767,7 @@ EXAMPLES
   $ echo url | sf org login sfdx-url --sfdx-url-stdin
 ```
 
-_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.5/src/commands/org/login/sfdx-url.ts)_
+_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.6/src/commands/org/login/sfdx-url.ts)_
 
 ## `sf org login web`
 
@@ -3854,7 +3854,7 @@ FLAG DESCRIPTIONS
     To specify a sandbox, set --instance-url to "https://<MyDomainName>--<SandboxName>.sandbox.my.salesforce.com".
 ```
 
-_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.5/src/commands/org/login/web.ts)_
+_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.6/src/commands/org/login/web.ts)_
 
 ## `sf org logout`
 
@@ -3915,7 +3915,7 @@ FLAG DESCRIPTIONS
     All orgs includes Dev Hubs, sandboxes, DE orgs, and expired, deleted, and unknown-status scratch orgs.
 ```
 
-_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.5/src/commands/org/logout.ts)_
+_See code: [@salesforce/plugin-auth](https://github.com/salesforcecli/plugin-auth/blob/3.6.6/src/commands/org/logout.ts)_
 
 ## `sf org open`
 

package/dist/help/sfHelp.js

@@ -9,15 +9,41 @@ import stripAnsi from 'strip-ansi';
 import chalk from 'chalk';
 import { SfCommandHelp } from './sfCommandHelp.js';
 export default class SfHelp extends Help {
-    constructor() {
-        super(...arguments);
+    constructor(config, opts) {
+        super(config, opts);
         this.CommandHelpClass = SfCommandHelp;
         this.showShortHelp = false;
         this.commands = [];
+        this.commands = this.config.commandIDs.map((c) => `${this.config.bin} ${toConfiguredId(c, this.config)}`);
+        const regexes = [];
+        for (const cmd of this.commands) {
+            const subCommands = this.commands.filter((c) => c !== cmd && c.startsWith(cmd)).map((c) => c.replace(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 (see sf project deploy start as an example):
+             * - sf deploy project start
+             * - "sf deploy project start"
+             * - sf org create scratch|sandbox
+             * - "sf org create scratch|sandbox"
+             *
+             * It will not match any child commands of the current command.
+             * For instance, the examples in `sf org list metadata --help` should match `sf org list metadata` but not `sf org list`.
+             *
+             * Example of constructed regex that won't match child commands:
+             * - /sf org list([^\s".]+)?(?! auth| limits| sobject record-counts| metadata| metadata-types| users)/g
+             * - /sf org list metadata([^\s".]+)?(?!-types)/g
+             */
+            let regexString = `${cmd}([^\\s".]+)?`;
+            if (subCommands.length)
+                regexString += `(?!${subCommands.join('|')})`;
+            regexes.push(regexString);
+        }
+        this.commandIdRegex = new RegExp(regexes.join('|'), 'g');
     }
     async showHelp(argv) {
         this.showShortHelp = argv.includes('-h');
-        this.commands = this.config.commandIDs.map((c) => `${this.config.bin} ${toConfiguredId(c, this.config)}`);
         return super.showHelp(argv);
     }
     getCommandHelpClass(command) {
@@ -27,24 +53,12 @@ export default class SfHelp extends Help {
     }
     log(...args) {
         const formatted = args.map((arg) => {
-            for (const cmd of this.commands) {
-                /**
-                 * 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));
-                }
+            let formattedArg = arg.slice();
+            const matches = stripAnsi(formattedArg).match(this.commandIdRegex) ?? [];
+            for (const match of matches) {
+                formattedArg = formattedArg.replaceAll(match, chalk.dim(match));
             }
-            return arg;
+            return formattedArg;
         });
         super.log(...formatted);
     }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@salesforce/cli",
-  "version": "2.41.1",
+  "version": "2.41.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@salesforce/cli",
-      "version": "2.41.1",
+      "version": "2.41.2",
       "hasInstallScript": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -25,7 +25,7 @@
         "@salesforce/core": "^7.2.0",
         "@salesforce/kit": "^3.1.0",
         "@salesforce/plugin-apex": "3.1.11",
-        "@salesforce/plugin-auth": "3.6.5",
+        "@salesforce/plugin-auth": "3.6.6",
         "@salesforce/plugin-data": "3.3.2",
         "@salesforce/plugin-deploy-retrieve": "3.6.9",
         "@salesforce/plugin-info": "3.2.4",
@@ -37,7 +37,7 @@
         "@salesforce/plugin-settings": "2.2.3",
         "@salesforce/plugin-sobject": "1.3.6",
         "@salesforce/plugin-source": "3.3.5",
-        "@salesforce/plugin-telemetry": "3.3.4",
+        "@salesforce/plugin-telemetry": "3.3.5",
         "@salesforce/plugin-templates": "56.2.4",
         "@salesforce/plugin-trust": "3.6.8",
         "@salesforce/plugin-user": "3.5.5",
@@ -4656,9 +4656,9 @@
       }
     },
     "node_modules/@salesforce/plugin-auth": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/@salesforce/plugin-auth/-/plugin-auth-3.6.5.tgz",
-      "integrity": "sha512-lqDSKeJlC2nBlNuH9xQ8ihmjCpM590Ayxd0C2VuVHyhWk+GNL0mEJV/y6H5Rtl3Hyxq6/99eAEeGdzUdCRvXyg==",
+      "version": "3.6.6",
+      "resolved": "https://registry.npmjs.org/@salesforce/plugin-auth/-/plugin-auth-3.6.6.tgz",
+      "integrity": "sha512-h8U6PQ7RSjQjKQjvIbG8/w8A0DFPWG90hPjxR2nkVNCUuvg4FjM+ookptQGzuKay8MxBr0bYJDsfc4c5po+jxA==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@inquirer/checkbox": "^1.5.2",
@@ -5137,9 +5137,9 @@
       }
     },
     "node_modules/@salesforce/plugin-telemetry": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@salesforce/plugin-telemetry/-/plugin-telemetry-3.3.4.tgz",
-      "integrity": "sha512-Xuc3yNbe5k2oW8hFONq7vY+pL2ivRQFyuLAit4Jz485aY4AoBP8htBFoFp8vls4xgO/3bCtNec0rRi9KcgROXQ==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/@salesforce/plugin-telemetry/-/plugin-telemetry-3.3.5.tgz",
+      "integrity": "sha512-6RJEYxEYPNru6izCBuDf4Rwh8H+YImGBvXPUF8h7YsNdg3TDvhjIKiiMjvYsByjRywenqkF5ZTpQ9OC2nAPoTA==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@oclif/core": "^3.26.2",

package/oclif.lock

@@ -2365,10 +2365,10 @@
     color-convert "^2.0.1"
     color-name "^2.0.0"
 
-"@salesforce/plugin-auth@3.6.5":
-  version "3.6.5"
-  resolved "https://registry.npmjs.org/@salesforce/plugin-auth/-/plugin-auth-3.6.5.tgz"
-  integrity sha512-lqDSKeJlC2nBlNuH9xQ8ihmjCpM590Ayxd0C2VuVHyhWk+GNL0mEJV/y6H5Rtl3Hyxq6/99eAEeGdzUdCRvXyg==
+"@salesforce/plugin-auth@3.6.6":
+  version "3.6.6"
+  resolved "https://registry.npmjs.org/@salesforce/plugin-auth/-/plugin-auth-3.6.6.tgz"
+  integrity sha512-h8U6PQ7RSjQjKQjvIbG8/w8A0DFPWG90hPjxR2nkVNCUuvg4FjM+ookptQGzuKay8MxBr0bYJDsfc4c5po+jxA==
   dependencies:
     "@inquirer/checkbox" "^1.5.2"
     "@inquirer/select" "^1.3.3"
@@ -2573,10 +2573,10 @@
     got "^13.0.0"
     proxy-agent "^6.3.1"
 
-"@salesforce/plugin-telemetry@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.npmjs.org/@salesforce/plugin-telemetry/-/plugin-telemetry-3.3.4.tgz"
-  integrity sha512-Xuc3yNbe5k2oW8hFONq7vY+pL2ivRQFyuLAit4Jz485aY4AoBP8htBFoFp8vls4xgO/3bCtNec0rRi9KcgROXQ==
+"@salesforce/plugin-telemetry@3.3.5":
+  version "3.3.5"
+  resolved "https://registry.npmjs.org/@salesforce/plugin-telemetry/-/plugin-telemetry-3.3.5.tgz"
+  integrity sha512-6RJEYxEYPNru6izCBuDf4Rwh8H+YImGBvXPUF8h7YsNdg3TDvhjIKiiMjvYsByjRywenqkF5ZTpQ9OC2nAPoTA==
   dependencies:
     "@oclif/core" "^3.26.2"
     "@salesforce/core" "^7.2.0"

package/oclif.manifest.json

@@ -5384,5 +5384,5 @@
       ]
     }
   },
-  "version": "2.41.1"
+  "version": "2.41.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.41.1",
+  "version": "2.41.2",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run.js",
@@ -153,7 +153,7 @@
     "@salesforce/core": "^7.2.0",
     "@salesforce/kit": "^3.1.0",
     "@salesforce/plugin-apex": "3.1.11",
-    "@salesforce/plugin-auth": "3.6.5",
+    "@salesforce/plugin-auth": "3.6.6",
     "@salesforce/plugin-data": "3.3.2",
     "@salesforce/plugin-deploy-retrieve": "3.6.9",
     "@salesforce/plugin-info": "3.2.4",
@@ -165,7 +165,7 @@
     "@salesforce/plugin-settings": "2.2.3",
     "@salesforce/plugin-sobject": "1.3.6",
     "@salesforce/plugin-source": "3.3.5",
-    "@salesforce/plugin-telemetry": "3.3.4",
+    "@salesforce/plugin-telemetry": "3.3.5",
     "@salesforce/plugin-templates": "56.2.4",
     "@salesforce/plugin-trust": "3.6.8",
     "@salesforce/plugin-user": "3.5.5",
@@ -275,7 +275,7 @@
         "messages/**"
       ],
       "output": [
-        "lib/**",
+        "dist/**",
         "*.tsbuildinfo"
       ],
       "clean": "if-file-deleted"