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

Merge with config when array #83

Merged
merged 2 commits into from
Dec 20, 2017
Merged

Merge with config when array #83

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
fb6f990
add failing test
markbirbeck Mar 7, 2017
e3b3629
merge config file values with argv if item is an array (rather than o…
markbirbeck Mar 7, 2017
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
2 changes: 1 addition & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ function parse (args, opts) {
} else {
// setting arguments via CLI takes precedence over
// values within the config file.
if (!hasKey(argv, fullKey.split('.')) || (flags.defaulted[fullKey])) {
if (!hasKey(argv, fullKey.split('.')) || (flags.defaulted[fullKey]) || (flags.arrays[fullKey])) {
setArg(fullKey, value)
}
}
Expand Down
12 changes: 12 additions & 0 deletions test/yargs-parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,18 @@ describe('yargs-parser', function () {
argv.should.have.property('foo').and.deep.equal('baz')
})

it('should combine values from config file and argv, if argv value is an array', function () {
var argv = parser(['--foo', 'bar'], {
config: ['settings'],
array: ['foo'],
default: {
settings: jsonPath
}
})

argv.should.have.property('foo').and.deep.equal(['bar', 'baz'])
})

it('should use value from config file, if argv key is a boolean', function () {
var argv = parser([], {
config: ['settings'],
Expand Down