fix: handle same-length command aliases

Author: lukeed

lib/index.js

@@ -60,7 +60,8 @@ class Sade {
 	alias(...names) {
 		if (this.single) throw new Error('Cannot call `alias()` in "single" mode');
 		if (!this.curr) throw new Error('Cannot call `alias()` before defining a command');
-		this.tree[this.curr].alibi = this.tree[this.curr].alibi.concat(...names);
+		let arr = this.tree[this.curr].alibi = this.tree[this.curr].alibi.concat(...names);
+		arr.forEach(key => this.tree[key] = this.curr);
 		return this;
 	}
 
@@ -118,20 +119,18 @@ class Sade {
 			cmd = this.tree[DEF];
 		} else {
 			// Loop thru possible command(s)
-			let k, i=1, len=argv._.length + 1;
+			let i=1, xyz, len=argv._.length + 1;
 			for (; i < len; i++) {
 				tmp = argv._.slice(0, i).join(' ');
-				if (this.tree[tmp] !== void 0) {
-					name=tmp; idx=arr.indexOf(tmp, 1);
-				} else {
-					for (k in this.tree) {
-						if (this.tree[k].alibi.includes(tmp)) {
-							idx = arr.indexOf(tmp);
-							arr.splice(idx, 1, ...k.split(' '));
-							name = k;
-							break;
-						}
-					}
+				xyz = this.tree[tmp];
+				if (typeof xyz === 'string') {
+					idx = (name=xyz).split(' ');
+					arr.splice(arr.indexOf(argv._[0]), i, ...idx);
+					i += (idx.length - i);
+				} else if (xyz) {
+					name = tmp;
+				} else if (name) {
+					break;
 				}
 			}
 

lib/utils.js

@@ -53,16 +53,17 @@ exports.help = function (bin, tree, key, single) {
 	out += section('Usage', [cmd.usage], prefix);
 
 	if (!single && key === DEF) {
-		// General help :: print all non-internal commands & their 1st line of text
-		let cmds = Object.keys(tree).filter(k => !/__/.test(k));
-		let text = cmds.map(k => [k, (tree[k].describe || [''])[0]]);
-		out += section('Available Commands', format(text), noop);
+		let key, rgx=/^__/, help='', cmds=[];
+		// General help :: print all non-(alias|internal) commands & their 1st line of helptext
+		for (key in tree) {
+			if (typeof tree[key] == 'string' || rgx.test(key)) continue;
+			if (cmds.push([key, (tree[key].describe || [''])[0]]) < 3) {
+				help += (NL + __ + __ + `${pfx} ${key} --help`);
+			}
+		}
 
-		out += (NL + __ + 'For more info, run any command with the `--help` flag');
-		cmds.slice(0, 2).forEach(k => {
-			out += (NL + __ + __ + `${pfx} ${k} --help`);
-		});
-		out += NL;
+		out += section('Available Commands', format(cmds), noop);
+		out += (NL + __ + 'For more info, run any command with the `--help` flag') + help + NL;
 	} else if (!single && key !== DEF) {
 		// Command help :: print its aliases if any
 		out += section('Aliases', cmd.alibi, prefix);

test/fixtures/subs.js

@@ -7,7 +7,7 @@ sade('bin')
     console.log('~> ran "remote" action');
   })
 
-	.command('remote add <name> <url>', '', { alias: 'ra' })
+	.command('remote add <name> <url>', '', { alias: ['ra', 'remote new'] })
   .action((name, uri, opts) => {
 		console.log(`~> ran "remote add" with "${name}" and "${uri}" args`);
   })

test/usage.js

@@ -1012,6 +1012,11 @@ test('(usage) order :: subcommands', t => {
 	t.is(pid3.stdout.toString(), '~> ran "remote add" with "origin" and "foobar" args\n', '~> ran "add" child');
 	t.is(pid3.stderr.length, 0, '~> stderr is empty');
 
+	let pid4 = exec('subs.js', ['--foo', 'bar', 'remote', 'new', 'origin', 'foobar']);
+	t.is(pid4.status, 0, 'exits without error code');
+	t.is(pid4.stdout.toString(), '~> ran "remote add" with "origin" and "foobar" args\n', '~> ran "add" child');
+	t.is(pid4.stderr.length, 0, '~> stderr is empty');
+
 	t.end();
 });
 
@@ -1031,6 +1036,11 @@ test('(usage) order :: subcommands :: help', t => {
 	t.true(pid3.stdout.toString().includes('Usage\n    $ bin remote rename <old> <new> [options]'), '~> shows "remote rename" help text');
 	t.is(pid3.stderr.length, 0, '~> stderr is empty');
 
+	let pid4 = exec('subs.js', ['--foo', 'bar', 'remote', 'new', '--help']);
+	t.is(pid4.status, 0, 'exits without error code');
+	t.is(pid4.stdout.toString(), '\n  Usage\n    $ bin remote add <name> <url> [options]\n\n  Aliases\n    $ bin ra\n    $ bin remote new\n\n  Options\n    -h, --help    Displays this message\n\n');
+	t.is(pid4.stderr.length, 0, '~> stderr is empty');
+
 	t.end();
 });