Skip to content
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.

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

createStoreWith accepts either a function or an object with reducers #76

Merged
Merged
Changes from 1 commit
Commits
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
24 changes: 21 additions & 3 deletions src/components/ngRedux.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
import Connector from './connector';
import invariant from 'invariant';
import {createStore, applyMiddleware, compose} from 'redux';
import {createStore, applyMiddleware, compose, combineReducers} from 'redux';
import digestMiddleware from './digestMiddleware';

import assign from 'lodash.assign';
import isArray from 'lodash.isarray';
import isFunction from 'lodash.isfunction';
import isObejct from 'lodash.isobject';

Choose a reason for hiding this comment

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

You have a big typo here


export default function ngReduxProvider() {
let _reducer = undefined;
let _middlewares = undefined;
let _storeEnhancers = undefined;
let _initialState = undefined;
let _reducerIsObejct = undefined;

Choose a reason for hiding this comment

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

You have the typo here too


this.createStoreWith = (reducer, middlewares, storeEnhancers, initialState) => {
invariant(
isFunction(reducer),
'The reducer parameter passed to createStoreWith must be a Function. Instead received %s.',
isFunction(reducer) || isObejct(reducer),
'The reducer parameter passed to createStoreWith must be a Function or an Object. Instead received %s.',
typeof reducer
);

Expand All @@ -27,6 +29,7 @@ export default function ngReduxProvider() {
);

_reducer = reducer;
_reducerIsObejct = isObejct(reducer);
_storeEnhancers = storeEnhancers
_middlewares = middlewares || [];
_initialState = initialState;
Expand All @@ -43,6 +46,21 @@ export default function ngReduxProvider() {
}
}

if(_reducerIsObejct) {
let reducersObj = {};
let reducKeys = Object.keys(_reducer);

reducKeys.forEach((key) => {
if(typeof _reducer[key] === 'string') {
reducersObj[key] = $injector.get(_reducer[key]);
} else {
reducersObj[key] = _reducer[key];
}
});

_reducer = combineReducers(reducersObj);
}

let finalCreateStore = _storeEnhancers ? compose(..._storeEnhancers)(createStore) : createStore;

//digestMiddleware needs to be the last one.
Expand Down