Skip to content

Commit d9d6fbd

Browse files
committed
fix boolean default setting
1 parent 7e01a2c commit d9d6fbd

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

index.js

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,6 @@ function parse (args, opts) {
132132
})
133133

134134
var argv = { _: [] }
135-
136-
Object.keys(flags.bools).forEach(function (key) {
137-
if (Object.prototype.hasOwnProperty.call(defaults, key)) {
138-
setArg(key, defaults[key])
139-
setDefaulted(key)
140-
}
141-
})
142-
143135
var notFlags = []
144136

145137
for (var i = 0; i < args.length; i++) {
@@ -406,8 +398,6 @@ function parse (args, opts) {
406398
}
407399

408400
function setArg (key, val) {
409-
unsetDefaulted(key)
410-
411401
if (/-/.test(key) && configuration['camel-case-expansion']) {
412402
var alias = key.split('.').map(function (prop) {
413403
return camelCase(prop)
@@ -704,7 +694,7 @@ function parse (args, opts) {
704694
}
705695
} else if (o[key] === undefined && isTypeArray) {
706696
o[key] = isValueArray ? value : [value]
707-
} else if (duplicate && !(o[key] === undefined || checkAllAliases(key, flags.bools) || checkAllAliases(keys.join('.'), flags.bools) || checkAllAliases(key, flags.counts))) {
697+
} else if (duplicate && !(o[key] === undefined || checkAllAliases(key, flags.counts))) {
708698
o[key] = [ o[key], value ]
709699
} else {
710700
o[key] = value
@@ -762,19 +752,7 @@ function parse (args, opts) {
762752
return isSet
763753
}
764754

765-
function setDefaulted (key) {
766-
[].concat(flags.aliases[key] || [], key).forEach(function (k) {
767-
flags.defaulted[k] = true
768-
})
769-
}
770-
771-
function unsetDefaulted (key) {
772-
[].concat(flags.aliases[key] || [], key).forEach(function (k) {
773-
delete flags.defaulted[k]
774-
})
775-
}
776-
777-
// make a best effor to pick a default value
755+
// make a best effort to pick a default value
778756
// for an option based on name and type.
779757
function defaultValue (key) {
780758
if (!checkAllAliases(key, flags.bools) &&

0 commit comments

Comments
 (0)