Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dot notation with coerce #57

Merged
merged 2 commits into from
Sep 8, 2016
Merged

Fix dot notation with coerce #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeed711
add tests for dot notation and coercion
maxrimue Aug 30, 2016
1bd95e9
defer coercion completely until after parsing
maxrimue Sep 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ function parse (args, opts) {
setConfig(argv)
setConfigObjects()
applyEnvVars(argv, false)
applyArrayCoercions(argv)
applyCoercions(argv)
applyDefaultsAndAliases(argv, flags.aliases, defaults)

// for any counts either not in args or without an explicit default, set to 0
Expand Down Expand Up @@ -483,11 +483,9 @@ function parse (args, opts) {
})
}

function applyArrayCoercions (argv) {
function applyCoercions (argv) {
var coerce
Object.keys(argv).filter(function (key) {
return key === '_' || checkAllAliases(key, flags.arrays)
}).forEach(function (key) {
Object.keys(argv).forEach(function (key) {
coerce = checkAllAliases(key, flags.coercions)
if (typeof coerce === 'function') {
try {
Expand Down Expand Up @@ -538,14 +536,6 @@ function parse (args, opts) {
})

var key = keys[keys.length - 1]
var coerce = !checkAllAliases(key, flags.arrays) && checkAllAliases(key, flags.coercions)
if (typeof coerce === 'function') {
try {
value = coerce(value)
} catch (err) {
error = err
}
}

if (value === increment) {
o[key] = increment(o[key])
Expand Down
16 changes: 15 additions & 1 deletion test/yargs-parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1980,11 +1980,25 @@ describe('yargs-parser', function () {
parsed.f.should.equal(-99)
})

it('applies coercion function to all dot options', function () {
var parsed = parser(['--foo.bar', 'nananana'], {
coerce: {
foo: function (val) {
val.bar += ', batman!'
return val
}
}
})
parsed.foo.bar.should.equal('nananana, batman!')
})

it('applies coercion function to an implicit array', function () {
var parsed = parser(['--foo', '99', '-f', '33'], {
coerce: {
f: function (arg) {
return arg * -1
return arg.map(function (a) {
return a * -1
})
}
},
alias: {
Expand Down