refactor: reduce duplicate code

Author: HigherOrderLogic

src/command.ts

@@ -1,4 +1,9 @@
-import type { CommandContext, CommandDef, ArgsDef } from "./types";
+import type {
+  CommandContext,
+  CommandDef,
+  ArgsDef,
+  SubCommandsDef,
+} from "./types";
 import { CLIError, resolveValue } from "./_utils";
 import { parseArgs } from "./args";
 
@@ -14,6 +19,27 @@ export interface RunCommandOptions {
   showUsage?: boolean;
 }
 
+async function getSubCommand(
+  subCommandsList: SubCommandsDef,
+  subCommandName: string,
+): Promise<CommandDef<any> | undefined> {
+  const subCommand = await resolveValue(subCommandsList[subCommandName]);
+
+  if (subCommand) {
+    return subCommand;
+  }
+
+  for (const _subCmd of Object.values(subCommandsList)) {
+    const subCmd = await resolveValue(_subCmd);
+    const subCmdMeta = await resolveValue(subCmd.meta);
+    if ((subCmdMeta?.aliases || []).includes(subCommandName)) {
+      return subCmd;
+    }
+  }
+
+  return undefined;
+}
+
 export async function runCommand<T extends ArgsDef = ArgsDef>(
   cmd: CommandDef<T>,
   opts: RunCommandOptions,
@@ -43,20 +69,7 @@ export async function runCommand<T extends ArgsDef = ArgsDef>(
       );
       const subCommandName = opts.rawArgs[subCommandArgIndex];
       if (subCommandName) {
-        let subCommand = await resolveValue(subCommands[subCommandName]);
-
-        if (!subCommand) {
-          for (const _subCmd of Object.values(subCommands)) {
-            const subCmd = await resolveValue(_subCmd);
-            const subCmdMeta = await resolveValue(subCmd.meta);
-            for (const alias of subCmdMeta?.aliases || []) {
-              if (alias === subCommandName) {
-                subCommand = subCmd;
-                break;
-              }
-            }
-          }
-        }
+        const subCommand = await getSubCommand(subCommands, subCommandName);
 
         if (!subCommand) {
           throw new CLIError(
@@ -95,20 +108,7 @@ export async function resolveSubCommand<T extends ArgsDef = ArgsDef>(
   if (subCommands && Object.keys(subCommands).length > 0) {
     const subCommandArgIndex = rawArgs.findIndex((arg) => !arg.startsWith("-"));
     const subCommandName = rawArgs[subCommandArgIndex];
-    let subCommand = await resolveValue(subCommands[subCommandName]);
-
-    if (!subCommand) {
-      for (const _subCmd of Object.values(subCommands)) {
-        const subCmd = await resolveValue(_subCmd);
-        const subCmdMeta = await resolveValue(subCmd.meta);
-        for (const alias of subCmdMeta?.aliases || []) {
-          if (alias === subCommandName) {
-            subCommand = subCmd;
-            break;
-          }
-        }
-      }
-    }
+    const subCommand = await getSubCommand(subCommands, subCommandName);
 
     if (subCommand) {
       return resolveSubCommand(

src/usage.ts

@@ -99,7 +99,10 @@ export async function renderUsage<T extends ArgsDef = ArgsDef>(
       if (meta?.hidden) {
         continue;
       }
-      commandsLines.push([`\`${[name, ...(meta?.aliases || [])].join(", ")}\``, meta?.description || ""]);
+      commandsLines.push([
+        `\`${[name, ...(meta?.aliases || [])].join(", ")}\``,
+        meta?.description || "",
+      ]);
       commandNames.push(name);
     }
     usageLine.push(commandNames.join("|"));