Cleaned-up error-handling code

Author: JamesMessinger

src/cli/exit-code.ts

@@ -0,0 +1,10 @@
+/**
+ * CLI exit codes.
+ *
+ * @see https://nodejs.org/api/process.html#process_exit_codes
+ */
+export enum ExitCode {
+  Success = 0,
+  FatalError = 1,
+  InvalidArgument = 9
+}

src/cli/index.ts

@@ -2,20 +2,11 @@
 import { success } from "log-symbols";
 import { manifest } from "../manifest";
 import { versionBump } from "../version-bump";
-import { VersionBumpOptions } from "../version-bump-options";
 import { ProgressEvent, VersionBumpProgress } from "../version-bump-progress";
+import { ExitCode } from "./exit-code";
 import { helpText } from "./help";
 import { parseArgs } from "./parse-args";
 
-/**
- * @see https://nodejs.org/api/process.html#process_exit_codes
- */
-enum ExitCode {
-  Success = 0,
-  FatalError = 1,
-  InvalidArgument = 9,
-}
-
 /**
  * The main entry point of the CLI
  *
@@ -45,21 +36,9 @@ export async function main(args: string[]): Promise<void> {
         options.progress = progress;
       }
 
-      await bump(options);
+      await versionBump(options);
     }
   }
-  catch (error) {
-    // There was an error parsing the command-line args
-    console.error((error as Error).message);
-    console.error(helpText);
-    process.exit(ExitCode.InvalidArgument);
-  }
-}
-
-async function bump(options: VersionBumpOptions): Promise<void> {
-  try {
-    await versionBump(options);
-  }
   catch (error) {
     errorHandler(error as Error);
   }

src/cli/parse-args.ts

@@ -1,7 +1,10 @@
+// tslint:disable: no-console
 import * as commandLineArgs from "command-line-args";
 import * as semver from "semver";
 import { isReleaseType } from "../release-type";
 import { VersionBumpOptions } from "../version-bump-options";
+import { ExitCode } from "./exit-code";
+import { helpText } from "./help";
 
 /**
  * The parsed command-line arguments
@@ -17,62 +20,70 @@ export interface ParsedArgs {
  * Parses the command-line arguments
  */
 export function parseArgs(argv: string[]): ParsedArgs {
-  let args = commandLineArgs(
-    [
-      { name: "preid", type: String },
-      { name: "commit", alias: "c", type: String },
-      { name: "tag", alias: "t", type: String },
-      { name: "push", alias: "p", type: Boolean },
-      { name: "all", alias: "a", type: Boolean },
-      { name: "no-verify", type: Boolean },
-      { name: "quiet", alias: "q", type: Boolean },
-      { name: "version", alias: "v", type: Boolean },
-      { name: "help", alias: "h", type: Boolean },
-      { name: "files", type: String, multiple: true, defaultOption: true },
-    ],
-    { argv }
-  );
+  try {
+    let args = commandLineArgs(
+      [
+        { name: "preid", type: String },
+        { name: "commit", alias: "c", type: String },
+        { name: "tag", alias: "t", type: String },
+        { name: "push", alias: "p", type: Boolean },
+        { name: "all", alias: "a", type: Boolean },
+        { name: "no-verify", type: Boolean },
+        { name: "quiet", alias: "q", type: Boolean },
+        { name: "version", alias: "v", type: Boolean },
+        { name: "help", alias: "h", type: Boolean },
+        { name: "files", type: String, multiple: true, defaultOption: true },
+      ],
+      { argv }
+    );
 
-  let parsedArgs: ParsedArgs = {
-    help: args.help as boolean,
-    version: args.version as boolean,
-    quiet: args.quiet as boolean,
-    options: {
-      preid: args.preid as string,
-      commit: args.commit as string | boolean,
-      tag: args.tag as string | boolean,
-      push: args.push as boolean,
-      all: args.all as boolean,
-      noVerify: args["no-verify"] as boolean,
-      files: args.files as string[],
-    }
-  };
+    let parsedArgs: ParsedArgs = {
+      help: args.help as boolean,
+      version: args.version as boolean,
+      quiet: args.quiet as boolean,
+      options: {
+        preid: args.preid as string,
+        commit: args.commit as string | boolean,
+        tag: args.tag as string | boolean,
+        push: args.push as boolean,
+        all: args.all as boolean,
+        noVerify: args["no-verify"] as boolean,
+        files: args.files as string[],
+      }
+    };
 
-  // If --preid is used without an argument, then throw an error, since it's probably a mistake.
-  // If they want to use the default value ("beta"), then they should not pass the argument at all
-  if (args.preid === null) {
-    throw new Error(`The --preid option requires a value, such as "alpha", "beta", etc.`);
-  }
+    // If --preid is used without an argument, then throw an error, since it's probably a mistake.
+    // If they want to use the default value ("beta"), then they should not pass the argument at all
+    if (args.preid === null) {
+      throw new Error(`The --preid option requires a value, such as "alpha", "beta", etc.`);
+    }
 
-  // If --commit is used without an argument, then treat it as a boolean flag
-  if (args.commit === null) {
-    parsedArgs.options.commit = true;
-  }
+    // If --commit is used without an argument, then treat it as a boolean flag
+    if (args.commit === null) {
+      parsedArgs.options.commit = true;
+    }
 
-  // If --tag is used without an argument, then treat it as a boolean flag
-  if (args.tag === null) {
-    parsedArgs.options.tag = true;
-  }
+    // If --tag is used without an argument, then treat it as a boolean flag
+    if (args.tag === null) {
+      parsedArgs.options.tag = true;
+    }
 
-  // If a version number or release type was specified, then it will mistakenly be added to the "files" array
-  if (parsedArgs.options.files && parsedArgs.options.files.length > 0) {
-    let firstArg = parsedArgs.options.files[0];
+    // If a version number or release type was specified, then it will mistakenly be added to the "files" array
+    if (parsedArgs.options.files && parsedArgs.options.files.length > 0) {
+      let firstArg = parsedArgs.options.files[0];
 
-    if (firstArg === "prompt" || isReleaseType(firstArg) || semver.valid(firstArg)) {
-      parsedArgs.options.release = firstArg;
-      parsedArgs.options.files.shift();
+      if (firstArg === "prompt" || isReleaseType(firstArg) || semver.valid(firstArg)) {
+        parsedArgs.options.release = firstArg;
+        parsedArgs.options.files.shift();
+      }
     }
-  }
 
-  return parsedArgs;
+    return parsedArgs;
+  }
+  catch (error) {
+    // There was an error parsing the command-line args
+    console.error((error as Error).message);
+    console.error(helpText);
+    return process.exit(ExitCode.InvalidArgument);
+  }
 }