From d918f4b45a790aa424d81e3f4f2182cac7dc0690 Mon Sep 17 00:00:00 2001
From: Szymon Lesisz <sz.lesisz@gmail.com>
Date: Thu, 20 Sep 2018 16:32:35 +0200
Subject: [PATCH] flowtype: allow middleware to use async/await + add new
 action type (PayloadAction)

---
 src/flowtype/index.js            |  2 ++
 src/flowtype/npm/redux_v3.x.x.js | 16 +++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/flowtype/index.js b/src/flowtype/index.js
index ece6a996..6217abe3 100644
--- a/src/flowtype/index.js
+++ b/src/flowtype/index.js
@@ -6,6 +6,7 @@ import type {
     MiddlewareAPI as ReduxMiddlewareAPI,
     Middleware as ReduxMiddleware,
     ThunkAction as ReduxThunkAction,
+    PayloadAction as ReduxPayloadAction,
     AsyncAction as ReduxAsyncAction,
     PromiseAction as ReduxPromiseAction,
     ThunkDispatch as ReduxThunkDispatch,
@@ -164,6 +165,7 @@ export type MiddlewareAPI = ReduxMiddlewareAPI<State, Action>;
 export type Middleware = ReduxMiddleware<State, Action>;
 
 export type ThunkAction = ReduxThunkAction<State, Action>;
+export type PayloadAction<R> = ReduxPayloadAction<State, Action, R>;
 export type AsyncAction = ReduxAsyncAction<State, Action>;
 export type PromiseAction<R> = ReduxPromiseAction<State, Action, R>;
 
diff --git a/src/flowtype/npm/redux_v3.x.x.js b/src/flowtype/npm/redux_v3.x.x.js
index cdd88212..5e42f2f1 100644
--- a/src/flowtype/npm/redux_v3.x.x.js
+++ b/src/flowtype/npm/redux_v3.x.x.js
@@ -2,7 +2,6 @@
 
 declare module 'redux' {
   /*
-
     S = State
     A = Action
     D = Dispatch
@@ -16,28 +15,27 @@ declare module 'redux' {
   declare export type ThunkAction<S, A> = (dispatch: ReduxDispatch<S, A>, getState: () => S) => void;
   declare export type AsyncAction<S, A> = (dispatch: ReduxDispatch<S, A>, getState: () => S) => Promise<void>;
   declare export type PromiseAction<S, A, R> = (dispatch: ReduxDispatch<S, A>, getState: () => S) => Promise<R>;
+  declare export type PayloadAction<S, A, R> = (dispatch: ReduxDispatch<S, A>, getState: () => S) => R;
 
   declare export type ThunkDispatch<S, A> = (action: ThunkAction<S, A>) => void;
   declare export type AsyncDispatch<S, A> = (action: AsyncAction<S, A>) => Promise<void>;
   declare export type PromiseDispatch<S, A> = <R>(action: PromiseAction<S, A, R>) => Promise<R>;
+  declare export type PayloadDispatch<S, A> = <R>(action: PayloadAction<S, A, R>) => R;
   declare export type PlainDispatch<A: {type: $Subtype<string>}> = DispatchAPI<A>;
   /* NEW: Dispatch is now a combination of these different dispatch types */
-  declare export type ReduxDispatch<S, A> = PlainDispatch<A> & ThunkDispatch<S, A> & AsyncDispatch<S, A> & PromiseDispatch<S, A>;
+  declare export type ReduxDispatch<S, A> = PlainDispatch<A> & ThunkDispatch<S, A> & AsyncDispatch<S, A> & PromiseDispatch<S, A> & PayloadDispatch<S, A>;
 
   declare export type MiddlewareAPI<S, A> = {
-    // dispatch: Dispatch<S, A>;
-    // dispatch: (action: A | ThunkAction<S, A>) => A | void;
-    // dispatch: PlainDispatch<A> | () => A;
-    // dispatch: ( A | ThunkAction<S, A> | void ) => void;
     dispatch: ReduxDispatch<S, A>;
-    // dispatch: Dispatch<S, A>;
-    // dispatch: D;
     getState(): S;
   };
 
+  declare export type ReduxDispatchAPI<A> = (action: A) => Promise<A>;
+
   declare export type Middleware<S, A> =
     (api: MiddlewareAPI<S, A>) =>
-      (next: PlainDispatch<A>) => PlainDispatch<A>;
+      (next: PlainDispatch<A>) =>
+        (PlainDispatch<A> | (action: A) => Promise<A>);
 
   declare export type Store<S, A, D = ReduxDispatch<S, A>> = {
     // rewrite MiddlewareAPI members in order to get nicer error messages (intersections produce long messages)