Pass dispatch to higher-order middleware and re-implement thunk

Author: acdlite

src/Redux.js

@@ -8,7 +8,7 @@ export default class Redux {
       // A shortcut notation to use the default dispatcher
       dispatcher = createDispatcher(
         composeStores(dispatcher),
-        getState => [thunkMiddleware(getState)]
+        ({ getState, dispatch }) => [thunkMiddleware(getState, dispatch)]
       );
     }
 

src/createDispatcher.js

@@ -14,7 +14,7 @@ export default function createDispatcher(store, middlewares = []) {
     }
 
     const finalMiddlewares = typeof middlewares === 'function' ?
-      middlewares(getState) :
+      middlewares({ getState, dispatch }) :
       middlewares;
 
     return composeMiddleware(...finalMiddlewares, dispatch);

src/middleware/thunk.js

@@ -1,10 +1,6 @@
-export default function thunkMiddleware(getState) {
-  return (next) => {
-    const recurse = (action) =>
-      typeof action === 'function' ?
-        action(recurse, getState) :
-        next(action);
-
-    return recurse;
-  };
+export default function thunkMiddleware(getState, dispatch) {
+  return next => action =>
+    typeof action === 'function' ?
+      action(dispatch, getState) :
+      next(action);
 }

test/createDispatcher.spec.js

@@ -17,7 +17,7 @@ describe('createDispatcher', () => {
     const dispatcher = createDispatcher(
       composeStores({ todoStore }),
       // we need this middleware to handle async actions
-      getState => [thunkMiddleware(getState)]
+      ({ getState, dispatch }) => [thunkMiddleware(getState, dispatch)]
     );
 
     expect(dispatcher).toBeA('function');