From a253ec6a73a209d58ea5f1d71c8c34afc65e7e2b Mon Sep 17 00:00:00 2001 From: Wee Bit Date: Sun, 13 Aug 2023 01:10:13 +0200 Subject: [PATCH 1/2] Revert "Fix version() parameter type" This reverts commit e8bea4aedd750418d094591d63699010f5c7b623. --- lib/command.js | 2 +- typings/index.d.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/command.js b/lib/command.js index d0eaa6845..25464793c 100644 --- a/lib/command.js +++ b/lib/command.js @@ -1809,7 +1809,7 @@ Expecting one of '${allowedValues.join("', '")}'`); * * You can optionally supply the flags and description to override the defaults. * - * @param {string} [str] + * @param {string} str * @param {string} [flags] * @param {string} [description] * @return {this | string} `this` command for chaining, or version string if no arguments diff --git a/typings/index.d.ts b/typings/index.d.ts index 73c606a5d..695c3bd25 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -293,7 +293,7 @@ export class Command { * * You can optionally supply the flags and description to override the defaults. */ - version(str?: string, flags?: string, description?: string): this; + version(str: string, flags?: string, description?: string): this; /** * Define a command, implemented using an action handler. From 8dd417f31b5b289945e1b84ed7c71623ece29524 Mon Sep 17 00:00:00 2001 From: Wee Bit Date: Sun, 13 Aug 2023 03:02:26 +0200 Subject: [PATCH 2/2] Fix help for commands with executable handler & only a short help flag --- lib/command.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/command.js b/lib/command.js index 25464793c..4fca7f998 100644 --- a/lib/command.js +++ b/lib/command.js @@ -1101,9 +1101,9 @@ Expecting one of '${allowedValues.join("', '")}'`); } // Fallback to parsing the help flag to invoke the help. - if (this._helpLongFlag) { - return this._dispatchSubcommand(subcommandName, [], [this._helpLongFlag]); - } + return this._dispatchSubcommand(subcommandName, [], [ + this._helpLongFlag || this._helpShortFlag + ]); } /**