Added requestsPromiseMiddleware

Author: klis87

.gitignore

@@ -1,5 +1,6 @@
 node_modules
 yarn-error.log
+lerna-debug.log
 dist
 es
 lib

packages/redux-saga-requests/package.json

@@ -58,6 +58,7 @@
     "nodemon": "1.17.2",
     "npm-run-all": "4.1.2",
     "redux": "3.7.2",
+    "redux-mock-store": "1.5.1",
     "redux-saga": "0.16.0",
     "rimraf": "2.6.2",
     "sinon": "4.4.5",

packages/redux-saga-requests/src/index.js

@@ -1,6 +1,6 @@
 export { success, error, abort, getActionWithSuffix } from './actions';
 export { createRequestsReducer, requestsReducer } from './reducers';
-
+export { requestsPromiseMiddleware } from './middleware';
 export {
   createRequestInstance,
   getRequestInstance,

packages/redux-saga-requests/src/middleware.js

@@ -0,0 +1,28 @@
+import { isRequestAction } from './helpers';
+import { success } from './actions';
+
+export const requestsPromiseMiddleware = () => {
+  const requestMap = new Map();
+
+  return next => action => {
+    if (isRequestAction(action)) {
+      return new Promise((resolve, reject) => {
+        requestMap.set(
+          action,
+          (response, error) => (error ? reject(response) : resolve(response)),
+        );
+
+        next(action);
+      });
+    }
+
+    if (action.meta && action.meta.requestAction) {
+      const { requestAction } = action.meta;
+      const requestActionPromise = requestMap.get(requestAction);
+      requestActionPromise(action, action.type !== success(requestAction.type));
+      requestMap.delete(requestAction);
+    }
+
+    return next(action);
+  };
+};

packages/redux-saga-requests/src/middleware.spec.js

@@ -0,0 +1,88 @@
+import configureStore from 'redux-mock-store';
+
+import { success, error, abort } from './actions';
+import { requestsPromiseMiddleware } from './middleware';
+
+const mockStore = configureStore([requestsPromiseMiddleware]);
+
+describe('requestsPromiseMiddleware', () => {
+  it('doesnt affect non request actions', () => {
+    const action = { type: 'NOT_REQUEST' };
+    const { dispatch, getActions } = mockStore({});
+    const result = dispatch(action);
+    assert.deepEqual(result, action);
+    assert.deepEqual(getActions(), [action]);
+  });
+
+  it('promisify dispatch result and passes action for request actions', () => {
+    const action = { type: 'REQUEST', request: {} };
+    const { dispatch, getActions } = mockStore({});
+    const result = dispatch(action);
+    assert.instanceOf(result, Promise);
+    assert.deepEqual(getActions(), [action]);
+  });
+
+  it('resolves request dispatch promise for successful response', async () => {
+    const requestAction = { type: 'REQUEST', request: {} };
+    const responseAction = {
+      type: success('REQUEST'),
+      meta: { requestAction },
+    };
+    const { dispatch, getActions } = mockStore({});
+    const requestResultPromise = dispatch(requestAction);
+    const responseResult = dispatch(responseAction);
+    assert.instanceOf(requestResultPromise, Promise);
+    assert.deepEqual(responseResult, responseAction);
+    assert.deepEqual(getActions(), [requestAction, responseAction]);
+    const requestResult = await requestResultPromise;
+    assert.deepEqual(requestResult, responseAction);
+  });
+
+  it('rejects request dispatch promise for error response', async () => {
+    const requestAction = { type: 'REQUEST', request: {} };
+    const errorAction = {
+      type: error('REQUEST'),
+      meta: { requestAction },
+    };
+    const { dispatch, getActions } = mockStore({});
+    const requestResultPromise = dispatch(requestAction);
+    const errorResult = dispatch(errorAction);
+    assert.instanceOf(requestResultPromise, Promise);
+    assert.deepEqual(errorResult, errorAction);
+    assert.deepEqual(getActions(), [requestAction, errorAction]);
+
+    let requestResult;
+
+    try {
+      await requestResultPromise;
+    } catch (e) {
+      requestResult = e;
+    }
+
+    assert.deepEqual(requestResult, errorAction);
+  });
+
+  it('rejects request dispatch promise for abort response', async () => {
+    const requestAction = { type: 'REQUEST', request: {} };
+    const abortAction = {
+      type: abort('REQUEST'),
+      meta: { requestAction },
+    };
+    const { dispatch, getActions } = mockStore({});
+    const requestResultPromise = dispatch(requestAction);
+    const abortResult = dispatch(abortAction);
+    assert.instanceOf(requestResultPromise, Promise);
+    assert.deepEqual(abortResult, abortAction);
+    assert.deepEqual(getActions(), [requestAction, abortAction]);
+
+    let requestResult;
+
+    try {
+      await requestResultPromise;
+    } catch (e) {
+      requestResult = e;
+    }
+
+    assert.deepEqual(requestResult, abortAction);
+  });
+});

yarn.lock

@@ -3611,6 +3611,10 @@ lodash.isfunction@^3.0.8:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
 
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+
 lodash.isstring@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
@@ -4626,6 +4630,12 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
+[email protected]:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/redux-mock-store/-/redux-mock-store-1.5.1.tgz#fca4335392e66605420b5559fe02fc5b8bb6d63c"
+  dependencies:
+    lodash.isplainobject "^4.0.6"
+
 [email protected]:
   version "0.16.0"
   resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-0.16.0.tgz#0a231db0a1489301dd980f6f2f88d8ced418f724"