fix: scope exitErr

oclif · Jan 19, 2018 · 01eac05 · 01eac05
1 parent 75eba57
commit 01eac05
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/errors.ts b/src/errors.ts
@@ -61,8 +61,8 @@ export default function (o: Rx.Subject<Message>): Rx.Observable<any> {
     // and can be ignored
     try {
       if (err.code === 'EPIPE') return
-      if (typeof err.exitCode === 'number') {
-        process.exit(err.exitCode)
+      if (err['cli-ux'] && typeof err['cli-ux'].exitCode === 'number') {
+        process.exit(err['cli-ux'].exitCode)
       } else {
         const cli = new CLI(scope)
         cli.fatal(err, {exit: false})

diff --git a/src/exit.ts b/src/exit.ts
@@ -1,13 +1,15 @@
 export class ExitError extends Error {
-  public exitCode: number
+  public 'cli-ux': {
+    exitCode: number
+  }
   public code: 'EEXIT'
   public error?: Error
 
   constructor(status: number, error?: Error) {
     const code = 'EEXIT'
     super(error ? error.message : `${code}: ${status}`)
     this.error = error
-    this.exitCode = status
+    this['cli-ux'] = {exitCode: status}
     this.code = code
   }
 }
diff --git a/src/index.ts b/src/index.ts
@@ -37,7 +37,7 @@ export class CLI {
     const code = getExitCode(options)
     if (code === false) return
     let exitErr: ExitError = error as any
-    exitErr.exitCode = exitErr.exitCode || code
+    exitErr['cli-ux'] = exitErr['cli-ux'] || {exitCode: code}
     throw exitErr
   }