commander 2.12.2 → 2.13.0

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+2.13.0 / 2018-01-09
+==================
+
+  * Do not print default for --no-
+  * remove trailing spaces in command help
+  * Update CI's Node.js to LTS and latest version
+  * typedefs: Command and Option types added to commander namespace
+
 2.12.2 / 2017-11-28
 ==================
 

package/index.js

@@ -964,7 +964,7 @@ Command.prototype.optionHelp = function() {
   // Append the help information
   return this.options.map(function(option) {
       return pad(option.flags, width) + '  ' + option.description
-        + (option.defaultValue !== undefined ? ' (default: ' + option.defaultValue + ')' : '');
+        + ((option.bool != false && option.defaultValue !== undefined) ? ' (default: ' + option.defaultValue + ')' : '');
   }).concat([pad('-h, --help', width) + '  ' + 'output usage information'])
     .join('\n');
 };
@@ -990,7 +990,7 @@ Command.prototype.commandHelp = function() {
       cmd._name
         + (cmd._alias ? '|' + cmd._alias : '')
         + (cmd.options.length ? ' [options]' : '')
-        + ' ' + args
+        + (args ? ' ' + args : '')
       , cmd._description
     ];
   });
@@ -1005,7 +1005,7 @@ Command.prototype.commandHelp = function() {
     , ''
     , commands.map(function(cmd) {
       var desc = cmd[1] ? '  ' + cmd[1] : '';
-      return pad(cmd[0], width) + desc;
+      return (desc ? pad(cmd[0], width) : cmd[0]) + desc;
     }).join('\n').replace(/^/gm, '    ')
     , ''
   ].join('\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commander",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "the complete solution for node.js command-line programs",
   "keywords": [
     "commander",

package/typings/index.d.ts

@@ -1,7 +1,11 @@
+// Type definitions for commander 2.11
 // Project: https://github.com/visionmedia/commander.js
-// Definitions by: Alan Agius <https://github.com/alan-agius4>, Marcelo Dezem <https://github.com/mdezem>, vvakame <https://github.com/vvakame>
+// Definitions by: Alan Agius <https://github.com/alan-agius4>, Marcelo Dezem <https://github.com/mdezem>, vvakame <https://github.com/vvakame>, Jules Randolph <https://github.com/sveinburne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare class Option {
+declare namespace local {
+
+  class Option {
     flags: string;
     required: boolean;
     optional: boolean;
@@ -17,9 +21,9 @@ declare class Option {
      * @param {string} [description]
      */
     constructor(flags: string, description?: string);
-}
+  }
 
-declare class Command extends NodeJS.EventEmitter {
+  class Command extends NodeJS.EventEmitter {
     [key: string]: any;
 
     args: string[];
@@ -121,6 +125,7 @@ declare class Command extends NodeJS.EventEmitter {
      * @returns {Command} for chaining
      */
     parseExpectedArgs(args: string[]): Command;
+
     /**
      * Register callback `fn` for the command.
      *
@@ -262,16 +267,22 @@ declare class Command extends NodeJS.EventEmitter {
     /**
      * Output help information for this command.
      *
-     * @param {(str: string) => string} [cb] 
+     * @param {(str: string) => string} [cb]
      */
     outputHelp(cb?: (str: string) => string): void;
 
     /** Output help information and exit. */
     help(): void;
+  }
+
 }
 
 declare namespace commander {
 
+    type Command = local.Command
+
+    type Option = local.Option
+
     interface CommandOptions {
         noHelp?: boolean;
         isDefault?: boolean;
@@ -283,8 +294,8 @@ declare namespace commander {
     }
 
     interface CommanderStatic extends Command {
-        Command: typeof Command;
-        Option: typeof Option;
+        Command: typeof local.Command;
+        Option: typeof local.Option;
         CommandOptions: CommandOptions;
         ParseOptionsResult: ParseOptionsResult;
     }
@@ -292,4 +303,4 @@ declare namespace commander {
 }
 
 declare const commander: commander.CommanderStatic;
-export = commander;
+export = commander;