Skip to content

Apply middleware API function earlier #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 28, 2017
Merged

Apply middleware API function earlier #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b012c8
Apply middleware API function earlier
felixSchl Aug 22, 2017
62e0651
Inline `actionType`
felixSchl Aug 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions src/React/Redux.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ var Redux = require('redux');

var ReactRedux = require('react-redux');

var actionType = '@@PURESCRIPT_REACT_REDUX';

function startsWithActionType(actionForeign) {
var index = actionForeign.type.indexOf(actionType);
var index = actionForeign.type.indexOf('@@PURESCRIPT_REACT_REDUX');

return index === 0;
}
Expand All @@ -16,7 +14,7 @@ function makeActionForeign(action) {
var constructorName = action.constructor && action.constructor.name ? action.constructor.name : 'UnknownConstructorName';

var actionForeign = {
type: actionType + '/' + constructorName,
type: '@@PURESCRIPT_REACT_REDUX/' + constructorName,
action: action
};

Expand Down Expand Up @@ -76,21 +74,24 @@ exports.dispatch_ = function dispatch_(thisForeign, action){
exports.applyMiddleware = function applyMiddleware(middlewares){
var middlewaresForeign = middlewares.map(function(middleware){
return function(middlewareAPIForeign){
return function(nextForeign){
return function(actionForeign){
function getState(){
return middlewareAPIForeign.getState();
}
function getState(){
return middlewareAPIForeign.getState();
}

function dispatch(action){
return function(){
var actionForeignResult = makeActionForeign(action);
function dispatch(action){
return function(){
var actionForeignResult = makeActionForeign(action);

var result = middlewareAPIForeign.dispatch(actionForeignResult);
var result = middlewareAPIForeign.dispatch(actionForeignResult);

return result;
};
}
return result;
};
}

var cont = middleware({ getState: getState, dispatch: dispatch })

return function(nextForeign){
return function(actionForeign){

function next(action){
return function(){
Expand All @@ -102,11 +103,9 @@ exports.applyMiddleware = function applyMiddleware(middlewares){
};
}

var middlewareAPI = {getState: getState, dispatch: dispatch};

var action = actionForeign.action;

var result = middleware(middlewareAPI)(next)(action)();
var result = cont(next)(action)();

return result;
};
Expand Down