refactor to handle exec.exec return values together

github · Sep 2, 2020 · 231537b · 231537b
1 parent 6ef5334
commit 231537b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/lib/exec_wrapper.js b/lib/exec_wrapper.js
diff --git a/lib/exec_wrapper.js.map b/lib/exec_wrapper.js.map
diff --git a/src/exec_wrapper.ts b/src/exec_wrapper.ts
@@ -45,29 +45,30 @@ export async function exec_wrapper(commandLine: string, args?: string[],
   };
 
   // we capture the original return code and error so that (if no match is found) we can duplicate the behaviour
-  let originalReturnCode: number;
-  let originalError: Error|undefined;
+  let originalReturnValue: Error|number;
   try {
-    originalReturnCode = await exec.exec(
+    originalReturnValue = await exec.exec(
       commandLine,
       args,
       {
         listeners: listeners,
         ...options
       });
   } catch (e) {
-    originalError = e;
-    originalReturnCode = 1; // TODO linter insists, but presumably there's a better way to do _all_ this...
+    originalReturnValue = e;
   }
 
   if (matchers) {
     for (const [customCode, regex, message] of matchers) {
-      if (customCode === originalReturnCode || regex.test(stderr) || regex.test(stdout) ) {
+      if (customCode === originalReturnValue || regex.test(stderr) || regex.test(stdout) ) {
         throw new Error(message);
       }
     }
   }
 
-  if (originalError) throw originalError;
-  return originalReturnCode;
+  if (typeof originalReturnValue === 'number') {
+    return originalReturnValue;
+  } else {
+    throw originalReturnValue;
+  }
 }