refactor: internal

Author: evilebottnawi

__tests__/index.test.js

@@ -420,6 +420,62 @@ describe("execa-webpack-plugin", () => {
       });
   });
 
+  it("should not throw error with `bail: false` option (sync event)", () => {
+    expect.assertions(1);
+
+    let catchError = null;
+
+    return run({
+      bail: false,
+      logLevel: "silent",
+      onCompile: [
+        {
+          cmd: "not-found"
+        }
+      ]
+    })
+      .catch(error => {
+        catchError = error;
+
+        return Promise.resolve();
+      })
+      .then(() => {
+        // execa not return error instanceOf Error
+        // expect(catchError).toBeInstanceOf(Error);
+        expect(catchError).toBeNull();
+
+        return Promise.resolve();
+      });
+  });
+
+  it("should not throw error with `bail: false` option (async event)", () => {
+    expect.assertions(1);
+
+    let catchError = null;
+
+    return run({
+      bail: false,
+      logLevel: "silent",
+      onDone: [
+        {
+          cmd: "not-found"
+        }
+      ]
+    })
+      .catch(error => {
+        catchError = error;
+
+        return Promise.resolve();
+      })
+      .then(() => {
+        // execa not return error instanceOf Error
+        // expect(catchError).toBeInstanceOf(Error);
+        expect(catchError).toBeNull();
+
+        return Promise.resolve();
+      });
+  });
+
   it("should works and output 'stdout' and 'stderr' with `logLevel: 'info'` command (sync event)", () =>
     run({
       logLevel: "info",

src/CommandRunner.js

@@ -13,8 +13,7 @@ class CommandRunner {
   }
 
   static buildError(error, command) {
-    const { cmd } = command;
-    const args = command.args || [];
+    const { cmd, args } = command;
 
     return new Error(
       `Command "${cmd}${args.length > 0 ? ` ${args.join(" ")}` : ""}" return ${
@@ -24,6 +23,10 @@ class CommandRunner {
   }
 
   handleResult(result) {
+    if (!result) {
+      return;
+    }
+
     const { stdout, stderr } = result;
 
     if (stdout) {
@@ -44,9 +47,7 @@ class CommandRunner {
   }
 
   run(command, async) {
-    const { cmd } = command;
-    const args = command.args || [];
-    const opts = command.opts || {};
+    const { cmd, args = [], opts = {} } = command;
 
     opts.stdio = ["ignore", "pipe", "pipe"];
 
@@ -76,7 +77,7 @@ class CommandRunner {
 
     this.handleResult(result, cmd, args);
 
-    return result.stdout;
+    return result ? result.stdout : null;
   }
 }
 

src/ExecaWebpackPlugin.js

@@ -61,41 +61,42 @@ class ExecaWebpackPlugin {
 
   execute(commands, async) {
     const results = [];
-
-    commands.forEach(command => {
-      const args = command.args || [];
-
-      args.forEach((arg, index) => {
-        if (
-          typeof arg === "object" &&
-          Boolean(arg) &&
-          Object.keys(arg).length > 0
-        ) {
-          const commandResult = this.execute([arg], async);
-
-          command.args[index] = Array.isArray(commandResult)
-            ? commandResult[0]
-            : commandResult;
-        } else {
-          command.args[index] = async ? Promise.resolve(arg) : arg;
-        }
-      });
-
-      let result = null;
-
+    const runCommandRunner = command => {
       if (async) {
-        result = Promise.all(args).then(resolvedArgs => {
+        return Promise.all(command.args).then(resolvedArgs => {
           command.args = resolvedArgs.map(
             item => (item[0] && item[0].stdout ? item[0].stdout : item)
           );
 
           return new CommandRunner(this.options).run(command, async);
         });
+      }
+
+      return new CommandRunner(this.options).run(command, async);
+    };
+
+    commands.forEach(command => {
+      if (command.args) {
+        command.args = command.args.map(arg => {
+          if (
+            typeof arg === "object" &&
+            Boolean(arg) &&
+            Object.keys(arg).length > 0
+          ) {
+            const commandResult = this.execute([arg], async);
+
+            return Array.isArray(commandResult)
+              ? commandResult[0]
+              : commandResult;
+          }
+
+          return async ? Promise.resolve(arg) : arg;
+        });
       } else {
-        result = new CommandRunner(this.options).run(command, async);
+        command.args = [];
       }
 
-      results.push(result);
+      results.push(runCommandRunner(command));
     });
 
     return async ? Promise.all(results) : results;