Skip to content

Commit

Permalink
allow dotted aliases & defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
coleste authored and James Halliday committed Aug 28, 2013
1 parent e40f611 commit 321c33e
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 6 deletions.
23 changes: 17 additions & 6 deletions index.js
Expand Up @@ -35,7 +35,7 @@ module.exports = function (args, opts) {
setKey(argv, key.split('.'), value);

(aliases[key] || []).forEach(function (x) {
argv[x] = argv[key];
setKey(argv, x.split('.'), value);
});
}

Expand Down Expand Up @@ -129,17 +129,28 @@ module.exports = function (args, opts) {
}

Object.keys(defaults).forEach(function (key) {
if (!(key in argv)) {
argv[key] = defaults[key];
if (key in aliases) {
argv[aliases[key]] = defaults[key];
}
if (!hasKey(argv, key.split('.'))) {
setKey(argv, key.split('.'), defaults[key]);

(aliases[key] || []).forEach(function (x) {
setKey(argv, x.split('.'), defaults[key]);
});
}
});

return argv;
};

function hasKey (obj, keys) {
var o = obj;
keys.slice(0,-1).forEach(function (key) {
o = (o[key] || {});
});

var key = keys[keys.length - 1];
return key in o;
}

function setKey (obj, keys, value) {
var o = obj;
keys.slice(0,-1).forEach(function (key) {
Expand Down
16 changes: 16 additions & 0 deletions test/dotted.js
@@ -0,0 +1,16 @@
var parse = require('../');
var test = require('tape');

test('dotted alias', function (t) {
var argv = parse(['--a.b', '22'], {default: {'a.b': 11}, alias: {'a.b': 'aa.bb'}});
t.equal(argv.a.b, 22);
t.equal(argv.aa.bb, 22);
t.end();
});

test('dotted default', function (t) {
var argv = parse('', {default: {'a.b': 11}, alias: {'a.b': 'aa.bb'}});
t.equal(argv.a.b, 11);
t.equal(argv.aa.bb, 11);
t.end();
});

0 comments on commit 321c33e

Please sign in to comment.