Throw CLIError directly from read file util

Jonathan Spruance (Insight Global) · Jonathan Spruance (Insight Global) · commit 5c2ddd0d20d4 · 2019-09-11T11:03:05.000-07:00
diff --git a/packages/chatdown/src/commands/chatdown.ts b/packages/chatdown/src/commands/chatdown.ts
@@ -77,27 +77,17 @@ export default class Chatdown extends Command {
   }
 
   private async getInput(args: any) {
-    try {
-      // Check if path passed in --in
-      if (args && args.length > 0) {
-        return utils.readTextFile(args)
-      } else {
-        //Check if piped data was sent
-        const {stdin} = process
-        if (stdin.isTTY) {
-          return false
-        } else {
-          return await this.readStdin()
-        }
-      }
-    } catch (err) {
-      if (err.message.match(/no such file or directory/)) {
-        throw new CLIError(err.message)
-      }
-      if (err.message.match(/No Input/)) {
+    // Check if path passed in --in
+    if (args && args.length > 0) {
+      return utils.readTextFile(args)
+    } else {
+      //Check if piped data was sent
+      const {stdin} = process
+      if (stdin.isTTY) {
         return false
+      } else {
+        return this.readStdin()
       }
-      throw err
     }
   }
 
diff --git a/packages/command/src/utils.ts b/packages/command/src/utils.ts
@@ -1,4 +1,5 @@
 const fs = require('fs-extra')
+import { CLIError } from '@oclif/errors'
 
 const utils = {
   readTextFile: async (file: any) => {
@@ -46,7 +47,7 @@ const utils = {
         return resolve(fileBuffer.toString('utf8').replace(/\0/g, ''))
       } catch (err) {
         if (err.message.match(/ENOENT: no such file or directory/)) {
-          return reject(err)
+          return reject(new CLIError(err.message))
         }
         return reject(
           `Invalid Input. Sorry, unable to parse file: \n\n ${JSON.stringify(err, null, 2)}\n\n`)
