Next (#13)

Next

.gitignore

@@ -2,3 +2,4 @@ lib/
 node_modules/
 *.swp
 package-lock.json
+.idea/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-dynamic",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Allow add or remove redux modules dynamically",
   "main": "lib/index.js",
   "scripts": {

src/create-instance-flat.js

@@ -0,0 +1,66 @@
+import { createDynamicMiddlewares } from 'redux-dynamic-middlewares'
+import { combineReducers } from 'redux';
+
+import { configureStore } from './configure-store'
+import { reloadState } from './reload-state'
+import { createAttach } from './create-attach'
+import { createDetach } from './create-detach'
+
+const emptyMiddleware = () => next => action => next(action)
+const emptyReducer = (state = {}) => state
+
+const createInstanceFlat = ({
+  name = 'redux-dynamic',
+  key = '__EMPTY__',
+  initial = {},
+  thunk = {},
+  reducer = emptyReducer,
+  middleware = emptyMiddleware,
+  withDevTools,
+} = {}) => {
+  const dynamicMiddlewares = createDynamicMiddlewares()
+  const reducerWrapper = reducer.wrapper ? reducer.wrapper : combineReducers
+  const reducerInitial = reducer.wrapper ? reducer.wrapper(reducer.reducers) : emptyReducer
+  const reducers = reducer.reducers ? { ...reducer.reducers } : { [key]: (state = initial, action) => reducer(state, action) }
+
+  dynamicMiddlewares.addMiddleware(middleware)
+
+  const registry = {
+    keys: {
+      [key]: true,
+    },
+    reducers,
+    reducerWrapper,
+    thunks: {
+      [key]: thunk,
+    },
+    middlewares: {
+      [key]: middleware,
+    },
+  }
+
+  const store = configureStore({
+    name,
+    withDevTools,
+    key,
+    initial,
+    reducer: reducerInitial,
+    dynamicMiddlewares: dynamicMiddlewares.enhancer,
+  })
+
+  reloadState(registry, store, dynamicMiddlewares)
+
+  const getStore = () => store
+  const attach = createAttach(registry, store, dynamicMiddlewares)
+  const detach = createDetach(registry, store, dynamicMiddlewares)
+
+  return {
+    getStore,
+    attach,
+    detach,
+  }
+}
+
+export {
+  createInstanceFlat,
+}

src/create-instance.js

@@ -1,3 +1,4 @@
+import { combineReducers } from 'redux'
 import { createDynamicMiddlewares } from 'redux-dynamic-middlewares'
 
 import { configureStore } from './configure-store'
@@ -25,6 +26,7 @@ const createInstance = ({
     reducers: {
       [key]: (state = initial, action) => reducer(state, action),
     },
+    reducerWrapper: combineReducers,
     thunks: {
       [key]: thunk,
     },

src/index-flat.test.js

@@ -0,0 +1,82 @@
+/* eslint-disable no-console */
+import { createInstanceFlat } from './index'
+
+const reducer = (state = {}, action) => {
+  if (action.type === 'foo') return { ...state, foo: 'bar' }
+  return state
+}
+
+const complexReducer = {
+  reducers: {
+    one: reducer,
+  },
+}
+
+test('flat - without params', () => {
+  console.error = jest.fn()
+
+  const dynamicStore = createInstanceFlat()
+
+  const store = dynamicStore.getStore()
+  expect(store.getState()).toEqual({ __EMPTY__: {} })
+
+  store.dispatch({ type: 'foo' })
+  expect(console.error).not.toBeCalled()
+})
+
+test('flat - one module with simple reducer', () => {
+  console.error = jest.fn()
+
+  const dynamicStore = createInstanceFlat({ key: 'key', reducer })
+
+  const store = dynamicStore.getStore()
+  expect(store.getState()).toEqual({ key: {} })
+
+  store.dispatch({ type: 'foo' })
+  expect(console.error).not.toBeCalled()
+  expect(store.getState()).toEqual({ key: { foo: 'bar' } })
+})
+
+test('flat - one module with complex reducer', () => {
+  console.error = jest.fn()
+
+  const dynamicStore = createInstanceFlat({ key: 'key', reducer: complexReducer })
+
+  const store = dynamicStore.getStore()
+  expect(store.getState()).toEqual({ one: {} })
+
+  store.dispatch({ type: 'foo' })
+  expect(console.error).not.toBeCalled()
+  expect(store.getState()).toEqual({ one: { foo: 'bar' } })
+})
+
+test('flat - attach and detach module', () => {
+  console.error = jest.fn()
+
+  const dynamicStore = createInstanceFlat({ key: 'key', reducer: complexReducer })
+  dynamicStore.attach({ key: 'two', reducer })
+
+  const store = dynamicStore.getStore()
+  expect(store.getState()).toEqual({ one: {}, two: {} })
+
+  store.dispatch({ type: 'foo' })
+  expect(console.error).not.toBeCalled()
+  expect(store.getState()).toEqual({ one: { foo: 'bar' }, two: { foo: 'bar' } })
+
+  dynamicStore.detach({ key: 'two' })
+  expect(store.getState()).toEqual({ one: { foo: 'bar' } })
+})
+
+test('flat - initials', () => {
+  const initial = { one: 'bar' }
+  const initial2 = { foo: 'bar' }
+
+  const dynamicStore = createInstanceFlat({ key: 'key', initial, reducer: complexReducer })
+  dynamicStore.attach({ key: 'two', initial: initial2 })
+
+  const store = dynamicStore.getStore()
+  expect(store.getState()).toEqual({ one: 'bar', two: { foo: 'bar' } })
+
+  dynamicStore.detach({ key: 'two' })
+  expect(store.getState()).toEqual({ one: 'bar' })
+})

src/index.js

@@ -1,7 +1,9 @@
 import { createInstance } from './create-instance'
+import { createInstanceFlat } from './create-instance-flat'
 import { prepareActions } from './prepare-actions'
 
 export {
   createInstance,
+  createInstanceFlat,
   prepareActions,
 }

src/reload-state.js

@@ -1,8 +1,7 @@
-import { combineReducers } from 'redux'
 import thunkMiddleware from 'redux-thunk'
 
 const reloadState = (registry, store, dynamicMiddlewares) => {
-  store.replaceReducer(combineReducers(registry.reducers))
+  store.replaceReducer(registry.reducerWrapper(registry.reducers))
   dynamicMiddlewares.resetMiddlewares()
 
   const thunkObject = thunkMiddleware.withExtraArgument(registry.thunks)