@salesforce/cli 1.66.2 → 1.67.1

package/dist/cli.js

@@ -113,7 +113,7 @@ function create(version, channel, run, env = env_1.default) {
             debugCliInfo(version, channel, env, config);
             if (args[0] === 'doctor') {
                 // The doctor command requires CLI version details obtained from the CLI's oclif config.
-                const versionDetail = (await plugin_version_1.VersionCommand.run(['--verbose', '--json']));
+                const versionDetail = await plugin_version_1.VersionCommand.run(['--verbose', '--json']);
                 plugin_info_1.Doctor.init(config, versionDetail);
             }
             // Example of how run is used in a test https://github.com/salesforcecli/cli/pull/171/files#diff-1deee0a575599b2df117c280da319f7938aaf6fdb0c04bcdbde769dbf464be69R46

package/dist/hooks/incomplete.js

@@ -10,24 +10,40 @@ const os = require("os");
 const core_1 = require("@oclif/core");
 const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_2 = require("@salesforce/core");
+function buildChoices(matches, config) {
+    const configuredIds = matches.map((p) => (0, core_1.toConfiguredId)(p.id, config));
+    const maxCommandLength = configuredIds.reduce((max, id) => Math.max(max, id.length), 0);
+    return matches.map((p, i) => {
+        const summary = p.summary ?? p.description?.split(os.EOL)[0] ?? '';
+        return {
+            name: `${configuredIds[i].padEnd(maxCommandLength + 5, ' ')}${summary}`,
+            value: p,
+            short: configuredIds[i],
+        };
+    });
+}
 async function determineCommand(config, matches) {
     if (matches.length === 1)
         return matches[0].id;
     const prompter = new sf_plugins_core_1.Prompter();
+    const choices = buildChoices(matches, config);
     const { command } = await prompter.timedPrompt([
         {
             name: 'command',
             type: 'list',
             message: 'Which of these commands do you mean',
-            choices: matches.map((p) => (0, core_1.toConfiguredId)(p.id, config)),
+            choices,
         },
     ]);
-    return command;
+    return command.id;
 }
 const hook = async function ({ config, matches, argv }) {
     const command = await determineCommand(config, matches);
     if (argv.includes('--help') || argv.includes('-h')) {
-        return config.runCommand('help', [(0, core_1.toStandardizedId)(command, config)]);
+        const Help = await (0, core_1.loadHelpClass)(config);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        const help = new Help(config, config.pjson.helpOptions);
+        return help.showHelp([(0, core_1.toStandardizedId)(command, config), ...argv]);
     }
     if (matches.length === 1) {
         await core_2.Lifecycle.getInstance().emitWarning(`One command matches the partial command entered, running command:${os.EOL}${config.bin} ${(0, core_1.toConfiguredId)(command, config)} ${argv.join(' ')}`);