Skip to content

Merge alias values instead of overwriting when both forms are used #32

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

Open
afonsojanu wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −4
Open

Merge alias values instead of overwriting when both forms are used #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 18 additions & 4 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ export default function (args, opts) {
}
}

var parsedKeys = Object.keys(out);

if (defaults) {
for (k in opts.default) {
if (out[k] === void 0) {
Expand All @@ -107,10 +109,22 @@ export default function (args, opts) {
}

if (alibi) {
for (k in out) {
arr = opts.alias[k] || [];
while (arr.length > 0) {
out[arr.shift()] = out[k];
var outKeys = Object.keys(out);
var seen = {};
for (i=0; i < outKeys.length; i++) {
k = outKeys[i];
if (seen[k]) continue;
var group = [k].concat(opts.alias[k] || []);
var merged = void 0;
for (j=0; j < group.length; j++) {
if (!~parsedKeys.indexOf(group[j])) continue;
val = out[group[j]];
merged = merged === void 0 ? val : (Array.isArray(merged) ? merged.concat(val) : [merged, val]);
}
if (merged === void 0) merged = out[k];
for (j=0; j < group.length; j++) {
out[group[j]] = merged;
seen[group[j]] = true;
}
}
}
Expand Down
23 changes: 23 additions & 0 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,29 @@ test('multiAlias', t => {
t.end();
});

test('alias values set independently on both short and long forms are merged, not overwritten', t => {
const opts = { alias: { H: 'header' } };

const argv1 = fn(['-H', 'one', '--header=two'], opts);
t.deepEqual(argv1.H, ['one', 'two'], 'H combines both values');
t.deepEqual(argv1.header, ['one', 'two'], 'header combines both values');

const argv2 = fn(['-H', 'one', '--header', 'two'], opts);
t.deepEqual(argv2.H, ['one', 'two']);
t.deepEqual(argv2.header, ['one', 'two']);

// still works the same as before when only one side is ever used
const argv3 = fn(['-H', 'one', '-H', 'two'], opts);
t.deepEqual(argv3.H, ['one', 'two']);
t.deepEqual(argv3.header, ['one', 'two']);

const argv4 = fn(['--header', 'one', '--header', 'two'], opts);
t.deepEqual(argv4.header, ['one', 'two']);
t.deepEqual(argv4.H, ['one', 'two']);

t.end();
});

// test('nested dotted objects', t => {
// const argv = fn([
// '--foo.bar', '3', '--foo.baz', '4',
Expand Down