Bypass action and meta creators if payload is an Error object

package.json

@@ -34,6 +34,7 @@
     "chai": "^3.0.0",
     "eslint": "^0.24.0",
     "eslint-config-airbnb": "0.0.6",
+    "escope": "3.3.0",
     "lodash.isplainobject": "^3.2.0",
     "mocha": "^2.2.5"
   },

src/__tests__/createAction-test.js

@@ -70,5 +70,17 @@ describe('createAction()', () => {
         payload: foobar
       });
     });
+
+    it('bypasses action and meta creators if payload is an Error object', () => {
+      const actionCreator = createAction(type, () => 'not this', () => 'not this either');
+      const errObj = new TypeError('this is an error');
+
+      const errAction = actionCreator(errObj);
+      expect(errAction).to.deep.equal({
+        type,
+        payload: errObj,
+        error: true
+      });
+    });
   });
 });

src/createAction.js

@@ -8,17 +8,16 @@ export default function createAction(type, actionCreator, metaCreator) {
     : identity;
 
   return (...args) => {
+    const hasError = args.length === 1 && args[0] instanceof Error;
+
     const action = {
       type,
-      payload: finalActionCreator(...args)
+      payload: hasError ? args[0] : finalActionCreator(...args)
     };
 
-    if (args.length === 1 && args[0] instanceof Error) {
-      // Handle FSA errors where the payload is an Error object. Set error.
+    if (hasError) {
       action.error = true;
-    }
-
-    if (typeof metaCreator === 'function') {
+    } else if (typeof metaCreator === 'function') {
       action.meta = metaCreator(...args);
     }
 

src/handleActions.js

@@ -6,7 +6,7 @@ export default function handleActions(handlers, defaultState) {
   const reducers = ownKeys(handlers).map(type => {
     return handleAction(type, handlers[type]);
   });
-  const reducer = reduceReducers(...reducers)
+  const reducer = reduceReducers(...reducers);
 
   return typeof defaultState !== 'undefined'
     ? (state = defaultState, action) => reducer(state, action)