refactor how onlyArg is handled

handy-common-utils · Mar 10, 2024 · 743d03c · 743d03c
1 parent 8e4334a
commit 743d03c
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/src/oclif-utils.ts b/src/oclif-utils.ts
@@ -39,24 +39,30 @@ export function generateHelpText<T extends Command>(commandInstance: T, options?
 }
 
 export async function withHelpHandled<T extends { argv: string[]; log: Command['log']; exit: Command['exit']; new(...args: any): any}, O>(commandInstance: InstanceType<T>, parse: () => Promise<O>, options?: Partial<Interfaces.HelpOptions>): Promise<O> {
-  const firstArg = commandInstance.argv?.[0];
-  if (commandInstance.argv?.length === 1 && (firstArg === '--help' || firstArg === '-h')) {
-    async function printPrettyHelp() {
+  let cliOptions;
+  let parsingError;
+  try {
+    cliOptions = await parse();
+  } catch (error) {
+    parsingError = error;
+  }
+
+  const onlyArg = commandInstance.argv?.length === 1 ? commandInstance.argv[0] : undefined;
+  switch(onlyArg) {
+    case '--help':
+    case '-h': {
       const helpText = await generateHelpText(commandInstance, options);
       commandInstance.log(helpText);
+      commandInstance.exit(0);
+      break;
     }
+  }
 
-    try {
-      await printPrettyHelp();
-    } catch {
-      try {
-        await parse();
-      } catch {}
-      await printPrettyHelp();
-    }
-    commandInstance.exit(0);
+  if (cliOptions) {
+    return cliOptions;
+  } else {
+    throw parsingError;
   }
-  return parse();
 }
 
 /**