bash completion: Add support for aliases

Change-type: minor

completion/_balena

@@ -8,7 +8,7 @@ _balena() {
   local context state line curcontext="$curcontext"
 
   # Valid top-level completions
-  main_commands=( api-key app block build config deploy device devices env envs fleet internal join key leave local login logout logs notes orgs os preload push release scan settings ssh support tag tags tunnel util version whoami )
+  main_commands=( api-key api-keys app block build config deploy device devices env envs fleet fleets internal join key keys leave local login logout logs notes orgs os preload push release releases scan settings ssh support tag tags tunnel util version whoami )
   # Sub-completions
   api_key_cmds=( generate list revoke )
   app_cmds=( create )

completion/balena-completion.bash

@@ -7,7 +7,7 @@ _balena_complete()
   local cur prev
 
   # Valid top-level completions
-  main_commands="api-key app block build config deploy device devices env envs fleet internal join key leave local login logout logs notes orgs os preload push release scan settings ssh support tag tags tunnel util version whoami"
+  main_commands="api-key api-keys app block build config deploy device devices env envs fleet fleets internal join key keys leave local login logout logs notes orgs os preload push release releases scan settings ssh support tag tags tunnel util version whoami"
   # Sub-completions
   api_key_cmds="generate list revoke"
   app_cmds="create"

completion/generate-completion.js

@@ -33,7 +33,7 @@ const commandsJson = JSON.parse(fs.readFileSync(commandsFilePath, 'utf8'));
 
 const mainCommands = [];
 const additionalCommands = [];
-for (const key of Object.keys(commandsJson.commands).sort()) {
+for (const [key, { aliases }] of Object.entries(commandsJson.commands).sort()) {
 	const cmd = key.split(':');
 	if (cmd.length > 1) {
 		additionalCommands.push(cmd);
@@ -43,6 +43,17 @@ for (const key of Object.keys(commandsJson.commands).sort()) {
 	} else {
 		mainCommands.push(cmd[0]);
 	}
+	for (const alias of aliases) {
+		const splitAlias = alias.split(' ');
+		if (splitAlias.length > 1) {
+			additionalCommands.push(splitAlias);
+			if (!mainCommands.includes(splitAlias[0])) {
+				mainCommands.push(splitAlias[0]);
+			}
+		} else {
+			mainCommands.push(splitAlias[0]);
+		}
+	}
 }
 const mainCommandsStr = mainCommands.join(' ');
 
@@ -73,29 +84,33 @@ fs.readFile(bashFilePathIn, 'utf8', function (err, data) {
 		'main_commands="' + mainCommandsStr + '"',
 	);
 	let subCommands = [];
-	let prevElement = additionalCommands[0][0];
+	let prevElement = additionalCommands.sort((cmd1, cmd2) =>
-	additionalCommands.forEach(function (element) {
+		cmd1[0].localeCompare(cmd2[0]),
-		if (element[0] === prevElement) {
+	)[0][0];
-			subCommands.push(element[1]);
+	additionalCommands
-		} else {
+		.sort((cmd1, cmd2) => cmd1[0].localeCompare(cmd2[0]))
-			const prevElement2 = prevElement.replace(/-/g, '_') + '_cmds';
+		.forEach(function (element) {
-			data = data.replace(
+			if (element[0] === prevElement) {
-				/\$sub_cmds\$/g,
+				subCommands.push(element[1]);
-				'  ' + prevElement2 + '="' + subCommands.join(' ') + '"\n$sub_cmds$',
+			} else {
-			);
+				const prevElement2 = prevElement.replace(/-/g, '_') + '_cmds';
-			data = data.replace(
+				data = data.replace(
-				/\$sub_cmds_prev\$/g,
+					/\$sub_cmds\$/g,
-				'      ' +
+					'  ' + prevElement2 + '="' + subCommands.join(' ') + '"\n$sub_cmds$',
-					prevElement +
+				);
-					')\n        COMPREPLY=( $(compgen -W "$' +
+				data = data.replace(
-					prevElement2 +
+					/\$sub_cmds_prev\$/g,
-					'" -- $cur) )\n        ;;\n$sub_cmds_prev$',
+					'      ' +
-			);
+						prevElement +
-			prevElement = element[0];
+						')\n        COMPREPLY=( $(compgen -W "$' +
-			subCommands = [];
+						prevElement2 +
-			subCommands.push(element[1]);
+						'" -- $cur) )\n        ;;\n$sub_cmds_prev$',
-		}
+				);
-	});
+				prevElement = element[0];
+				subCommands = [];
+				subCommands.push(element[1]);
+			}
+		});
 	// cleanup placeholders
 	data = data.replace(/\$sub_cmds\$/g, '');
 	data = data.replace(/\$sub_cmds_prev\$/g, '');