Skip to content

Fix some typing #6

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

Closed
wants to merge 4 commits into from
Closed

Fix some typing #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e46aeaa
Parameterize ReduxReactClass by action
BartAdv Jan 18, 2017
ac99729
Change the order of type parameters for ReduxReactClass
BartAdv Jan 19, 2017
a5621f1
Fix Middleware types
BartAdv Jan 19, 2017
a1b0128
PR issues
BartAdv Jan 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
78 changes: 47 additions & 31 deletions src/React/Redux.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,54 +73,70 @@ 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 dispatch(action){
return function(){
var actionForeignResult = makeActionForeign(action);
function wrapMiddleware (middleware) {
return function (middlewareAPIForeign) {
return function(nextForeign) {
return function(actionForeign) {
function getState(){
return middlewareAPIForeign.getState();
}

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

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

function next(action){
return function(){
var actionForeignResult = makeActionForeign(action);
return result;
};
}

var result = nextForeign(actionForeignResult);
function next(action){
return function(){
var actionForeignResult = makeActionForeign(action);

return result;
};
}
var result = nextForeign(actionForeignResult);

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

var action = actionForeign.action;
var middlewareAPI = {getState: getState, dispatch: dispatch};

var result = middleware(middlewareAPI)(next)(action)();
var action = actionForeign.action;

return result;
};
var result = middleware(middlewareAPI)(next)(action)();

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

var middlewareEnhancerForeign = Redux.applyMiddleware.apply(Redux, middlewaresForeign);
exports.applyMiddleware = function applyMiddleware(middleware){
var middlewareEnhancerForeign = Redux.applyMiddleware.apply(Redux, [wrapMiddleware(middleware)]);

var result = exports.fromEnhancerForeign(middlewareEnhancerForeign);

return result;
};

exports.composeMiddleware = function composeMiddleware(middlewareA) {
return function(middlewareB) {
return function(middlewareAPI) {
return function(next) {
return function(action) {
var nextB = middlewareB(middlewareAPI)(next);
var nextA = middlewareA(middlewareAPI)(nextB);
var result = nextA(action);

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

exports.fromEnhancerForeign = function fromEnhancerForeign(enhancerForeign){
return function(createStore){
return function(reducerForeign){
Expand Down
38 changes: 22 additions & 16 deletions src/React/Redux.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ module React.Redux
, reducerOptic
, spec
, spec'
, composeMiddleware
, applyMiddleware
, fromEnhancerForeign
) where
Expand All @@ -48,7 +49,7 @@ import Unsafe.Coerce (unsafeCoerce)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'd like the React import towards the bottom here like it was. Usually, I try to keep all the non-core imports below the core ones. I am considering core imports to be Prelude, Control, Data, etc.

import React as React

type ReduxReactClass' state props = ReduxReactClass state Unit props
type ReduxReactClass' props state action = ReduxReactClass Unit props state action

type Reducer action state = action -> state -> state

Expand All @@ -58,9 +59,9 @@ type Enhancer eff action state = (Reducer action state -> state -> Eff (ReduxEff

type EnhancerForeign action state = (Fn2 (ReducerForeign action state) state (Store action state)) -> (Fn2 (ReducerForeign action state) state (Store action state))

type Middleware eff action state result = MiddlewareAPI eff action state result -> (action -> Eff (ReduxEffect eff) action) -> action -> Eff (ReduxEffect eff) result
type Middleware eff storeAction state result action action' = MiddlewareAPI eff state result storeAction -> (action' -> Eff (ReduxEffect eff) result) -> action -> Eff (ReduxEffect eff) result

type MiddlewareAPI eff action state result = { getState :: Eff (ReduxEffect eff) state, dispatch :: action -> Eff (ReduxEffect eff) result }
type MiddlewareAPI eff state result action = { getState :: Eff (ReduxEffect eff) state, dispatch :: action -> Eff (ReduxEffect eff) result }

type ReduxEffect eff = (redux :: REDUX | eff)

Expand Down Expand Up @@ -112,10 +113,13 @@ spec getInitialState render =
spec' :: forall props eff f action. Render props Unit eff f action -> Spec props Unit eff f action
spec' = spec (\_ _ -> pure unit)

createProviderElement :: forall action props state. Store action state -> ReduxReactClass' state props -> React.ReactElement
createProviderElement :: forall props state action. Store action state -> ReduxReactClass' props state action -> React.ReactElement
createProviderElement store reduxClass = React.createElement providerClass { store: store } [ createElement' reduxClass [] ]

createClass :: forall eff f action props props' state state'. MonadEff (ReduxEffect eff) f => Getter' (Tuple state props) props' -> Spec props' state' eff f action -> ReduxReactClass state props props'
createClass :: forall eff f props props' state state' action. MonadEff (ReduxEffect eff) f
=> Getter' (Tuple state props) props'
-> Spec props' state' eff f action
-> ReduxReactClass props props' state action
createClass slens spec_ = runFn3 connect_ Tuple (view slens) reactClass
where
reactClass :: React.ReactClass props'
Expand All @@ -135,25 +139,25 @@ createClass slens spec_ = runFn3 connect_ Tuple (view slens) reactClass
dispatch :: React.ReactThis props' state' -> f action -> f action
dispatch this action = action >>= liftEff <<< runFn2 dispatch_ this

createClass' :: forall eff f action props state. MonadEff (ReduxEffect eff) f => Getter' state props -> Spec props Unit eff f action -> ReduxReactClass' state props
createClass' :: forall eff f props state action. MonadEff (ReduxEffect eff) f => Getter' state props -> Spec props Unit eff f action -> ReduxReactClass' props state action
createClass' slens spec_ = createClass slens' spec_
where
slens' :: Getter' (Tuple state Unit) props
slens' = to (view slens <<< fst)

createElement :: forall state props props'. ReduxReactClass state props props' -> props -> Array React.ReactElement -> React.ReactElement
createElement :: forall props props' state action. ReduxReactClass props props' state action -> props -> Array React.ReactElement -> React.ReactElement
createElement reduxClass = React.createElement reactClass
where
reactClass :: React.ReactClass props
reactClass = unsafeCoerce reduxClass

createElement' :: forall state props. ReduxReactClass' state props -> Array React.ReactElement -> React.ReactElement
createElement' :: forall props state action. ReduxReactClass' props state action -> Array React.ReactElement -> React.ReactElement
createElement' reduxClass = createElement reduxClass unit

createStore :: forall eff action state. Reducer action state -> state -> Enhancer eff action state -> Eff (ReduxEffect eff) (Store action state)
createStore :: forall eff state action. Reducer action state -> state -> Enhancer eff action state -> Eff (ReduxEffect eff) (Store action state)
createStore = runFn3 createStore_

createStore' :: forall eff action state. Reducer action state -> state -> Eff (ReduxEffect eff) (Store action state)
createStore' :: forall eff state action. Reducer action state -> state -> Eff (ReduxEffect eff) (Store action state)
createStore' reducer state = createStore reducer state id

reducerOptic :: forall state state' action action'. Lens' state state' -> Prism' action action' -> Reducer action' state' -> Reducer action state
Expand All @@ -169,16 +173,18 @@ foreign import data REDUX :: !

foreign import data Store :: * -> * -> *

foreign import data ReduxReactClass :: * -> * -> * -> *
foreign import data ReduxReactClass :: * -> * -> * -> * -> *

foreign import connect_ :: forall state props props'. Fn3 (state -> props -> Tuple state props) (Tuple state props -> props') (React.ReactClass props') (ReduxReactClass state props props')
foreign import connect_ :: forall props props' state action. Fn3 (state -> props -> Tuple state props) (Tuple state props -> props') (React.ReactClass props') (ReduxReactClass props props' state action)

foreign import dispatch_ :: forall eff action props state. Fn2 (React.ReactThis props state) action (Eff (ReduxEffect eff) action)
foreign import dispatch_ :: forall eff props state action. Fn2 (React.ReactThis props state) action (Eff (ReduxEffect eff) action)

foreign import providerClass :: forall action state. React.ReactClass { store :: Store action state }
foreign import providerClass :: forall state action. React.ReactClass { store :: Store action state }

foreign import createStore_ :: forall eff action state. Fn3 (Reducer action state) state (Enhancer eff action state) (Eff (ReduxEffect eff) (Store action state))
foreign import createStore_ :: forall eff state action. Fn3 (Reducer action state) state (Enhancer eff action state) (Eff (ReduxEffect eff) (Store action state))

foreign import applyMiddleware :: forall eff action state result. Array (Middleware eff action state result) -> Enhancer eff action state
foreign import composeMiddleware :: forall eff state result storeAction actionA actionB actionC. Middleware eff storeAction state result actionA actionB -> Middleware eff storeAction state result actionB actionC -> Middleware eff storeAction state result actionA actionC

foreign import applyMiddleware :: forall eff state result action storeAction. Middleware eff storeAction state result action storeAction -> Enhancer eff storeAction state

foreign import fromEnhancerForeign :: forall eff action state. EnhancerForeign action state -> Enhancer eff action state