diff --git a/argv.js b/argv.js index 20f2aae..64d22be 100644 --- a/argv.js +++ b/argv.js @@ -580,18 +580,23 @@ object.Constructor('Parser', { var short = this.helpShortOptionSize || 1 var expandVars = this.expandTextVars.bind(this) var formDoc = function(doc, handler, arg){ + var dfl = getValue(handler, 'default')[1] + var req = getValue(handler, 'required')[1] + var val_req = getValue(handler, 'valueRequired')[1] + var env = getValue(handler, 'env')[1] + var info = [ - ...(handler.required ? + ...(req ? ['required'] : []), - ...(handler.valueRequired ? + ...(val_req ? ['required value'] : []), - ...('default' in handler ? - [`default: ${handler.default}`] + ...(dfl ? + [`default: ${dfl}`] : []), - ...(handler.env ? - [`env: \$${handler.env}`] + ...(env ? + [`env: \$${env}`] : []), ...(handler instanceof Parser ? //[`more: ${ that.scriptName } ${ arg.slice(1) } -h`] diff --git a/package.json b/package.json index a194d80..209d614 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ig-argv", - "version": "2.11.2", + "version": "2.11.3", "description": "simple argv parser", "main": "argv.js", "scripts": { diff --git a/test.js b/test.js index 5d439b4..f741e91 100644 --- a/test.js +++ b/test.js @@ -20,6 +20,26 @@ var lang = module.lang = require('./examples/lang').parser +//--------------------------------------------------------------------- + +var setups = { + bare: require('./examples/bare').parser, + options: require('./examples/options').parser, + lang: require('./examples/lang').parser, +} + +var modifiers = { +} + +var tests = { +} + + +var cases = { +} + + + //---------------------------------------------------------------------