From c48564e85a618af64c5f63722f0039f6e75862ba Mon Sep 17 00:00:00 2001
From: Scott Lowe <scott@balena.io>
Date: Mon, 26 Oct 2020 09:32:08 +0100
Subject: [PATCH] Remove need for hardcoded list of command ids

Change-type: patch
Signed-off-by: Scott Lowe <scott@balena.io>
---
 lib/preparser.ts         | 77 +++-------------------------------------
 lib/utils/oclif-utils.ts | 14 ++++++++
 2 files changed, 19 insertions(+), 72 deletions(-)

diff --git a/lib/preparser.ts b/lib/preparser.ts
index a935e3cb..a5ba60bb 100644
--- a/lib/preparser.ts
+++ b/lib/preparser.ts
@@ -70,7 +70,7 @@ export async function preparseArgs(argv: string[]): Promise<string[]> {
 	let args = cmdSlice;
 
 	// Convert space separated subcommands (e.g. `end add`), to colon-separated format (e.g. `env:add`)
-	if (isSubcommand(cmdSlice)) {
+	if (await isSubcommand(cmdSlice)) {
 		// convert space-separated commands to oclif's topic:command syntax
 		args = [cmdSlice[0] + ':' + cmdSlice[1], ...cmdSlice.slice(2)];
 		Logger.command = `${cmdSlice[0]} ${cmdSlice[1]}`;
@@ -136,75 +136,8 @@ export function checkDeletedCommand(argvSlice: string[]): void {
 
 // Check if this is a space separated 'topic command' style command subcommand (e.g. `end add`)
 // by comparing with oclif style colon-separated subcommand list (e.g. `env:add`)
-// TODO: Need to find a way of doing this that does not require maintaining list of IDs
-export function isSubcommand(args: string[]) {
-	return oclifCommandIds.includes(`${args[0] || ''}:${args[1] || ''}`);
+export async function isSubcommand(args: string[]) {
+	const { getCommandIdsFromManifest } = await import('./utils/oclif-utils');
+	const commandIds = await getCommandIdsFromManifest();
+	return commandIds.includes(`${args[0] || ''}:${args[1] || ''}`);
 }
-
-export const oclifCommandIds = [
-	'api-key:generate',
-	'app',
-	'app:create',
-	'app:rename',
-	'app:restart',
-	'app:rm',
-	'apps',
-	'build',
-	'config:generate',
-	'config:inject',
-	'config:read',
-	'config:reconfigure',
-	'config:write',
-	'deploy',
-	'device',
-	'device:identify',
-	'device:init',
-	'device:move',
-	'device:os-update',
-	'device:public-url',
-	'device:reboot',
-	'device:register',
-	'device:rename',
-	'device:restart',
-	'device:rm',
-	'device:shutdown',
-	'devices',
-	'devices:supported',
-	'envs',
-	'env:add',
-	'env:rename',
-	'env:rm',
-	'help',
-	'internal:scandevices',
-	'internal:osinit',
-	'join',
-	'keys',
-	'key',
-	'key:add',
-	'key:rm',
-	'leave',
-	'local:configure',
-	'local:flash',
-	'login',
-	'logout',
-	'logs',
-	'note',
-	'os:build-config',
-	'os:configure',
-	'os:versions',
-	'os:download',
-	'os:initialize',
-	'preload',
-	'push',
-	'scan',
-	'settings',
-	'ssh',
-	'support',
-	'tags',
-	'tag:rm',
-	'tag:set',
-	'tunnel',
-	'util:available-drives',
-	'version',
-	'whoami',
-];
diff --git a/lib/utils/oclif-utils.ts b/lib/utils/oclif-utils.ts
index de1f9717..7d0d5ab9 100644
--- a/lib/utils/oclif-utils.ts
+++ b/lib/utils/oclif-utils.ts
@@ -69,3 +69,17 @@ export function capitanoizeOclifUsage(
 		.replace(/(?<=\s)[A-Z]+(?=(\s|$))/g, (match) => `<${match}>`)
 		.toLowerCase();
 }
+
+export async function getCommandsFromManifest() {
+	const manifest = require('../../oclif.manifest.json');
+
+	if (manifest.commands == null) {
+		throw new Error('Commands section not found in manifest.');
+	}
+	return manifest.commands;
+}
+
+export async function getCommandIdsFromManifest() {
+	const commands = await getCommandsFromManifest();
+	return Object.keys(commands);
+}