Merge branch 'feature/createOption-in-helpOption' into feature/obscur…

…ed-help-option-warnings
tj · Aug 13, 2023 · aa6e9b3 · aa6e9b3
2 parents daa3fed + 513a4b5
commit aa6e9b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/command.js b/lib/command.js
@@ -1116,9 +1116,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
     }
 
     // Fallback to parsing the help flag to invoke the help.
-    if (this._helpOption.long) {
-      return this._dispatchSubcommand(subcommandName, [], [this._helpOption.long]);
-    }
+    return this._dispatchSubcommand(subcommandName, [], [
+      this._helpOption.long || this._helpOption.short
+    ]);
   }
 
   /**
@@ -1824,7 +1824,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
@@ -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.