Add & test createReducer

packages/jsonrpc/src/redux.test.ts

@@ -6,11 +6,12 @@ import bodyParser from 'body-parser'
 import express from 'express'
 import {AddressInfo} from 'net'
 import {Server} from 'http'
+import {TPendingActions, TAllActions} from './types'
 import {createReduxClient, createReducer} from './redux'
 import {createRemoteClient} from './remote'
+import {createStore} from '@rondo/client'
 import {jsonrpc} from './express'
 import {keys} from 'ts-transformer-keys'
-import {TPendingActions, TAllActions} from './types'
 
 describe('createReduxClient', () => {
 
@@ -77,29 +78,37 @@ describe('createReduxClient', () => {
     type AllActions = TAllActions<typeof client>
 
     const defaultState = {
-      sum: 1,
+      loading: 0,
+      error: '',
+      add: 0,
+      addStringsAsync: '',
     }
 
-    const create = createReducer('myService', defaultState)
+    const reducer = createReducer('myService', defaultState)
     <typeof client>((state, action) => {
       switch (action.method) {
         case 'add':
-          const r1: number = action.payload
-          return state
         case 'addAsync':
-          const r2: number = action.payload
-          return state
-        case 'addStringsAsync':
-          const r3: string = action.payload
-          return state
         case 'addWithContext':
-          const r4: number = action.payload
+        case 'addAsyncWithContext':
-          return state
+          const r1: number = action.payload
+          return {
+            ...state,
+            add: r1,
+          }
+        case 'addStringsAsync':
+          const r2: string = action.payload
+          return {
+            ...state,
+            addStringsAsync: r2,
+          }
         default:
           return state
       }
     })
 
+    const store = createStore({reducer})()
+
     function handleAction(state: any, action: AllActions) {
       if (action.type !== 'myService') {
         return
@@ -123,60 +132,56 @@ describe('createReduxClient', () => {
       }
     }
 
-    return client
+    return {client, store}
   }
 
   describe('action creators', () => {
     describe('add', () => {
       it('creates a redux action with type, method and status', async () => {
-        const client = getClient()
+        const {client, store} = getClient()
         const action = client.add(3, 7)
         expect(action.method).toEqual('add')
         expect(action.type).toEqual('myService')
         expect(action.status).toEqual('pending')
-        const result = await action.payload
+        const result: number = await store.dispatch(action).payload
         expect(result).toEqual(3 + 7)
-        // compilation test
+        expect(store.getState().add).toEqual(10)
-        expect(result + 2).toEqual(12)
       })
     })
     describe('addAsync', () => {
       it('creates a redux action with type, method and status', async () => {
-        const client = getClient()
+        const {client, store} = getClient()
         const action = client.addAsync(3, 7)
         expect(action.method).toEqual('addAsync')
         expect(action.type).toEqual('myService')
         expect(action.status).toEqual('pending')
-        const result = await action.payload
+        const result: number = await store.dispatch(action).payload
         expect(result).toEqual(3 + 7)
-        // compilation test
+        expect(store.getState().add).toEqual(10)
-        expect(result + 2).toEqual(12)
       })
     })
     describe('addWithContext', () => {
       it('creates a redux action with type, method and status', async () => {
-        const client = getClient()
+        const {client, store} = getClient()
         const action = client.addWithContext(3, 7)
         expect(action.method).toEqual('addWithContext')
         expect(action.type).toEqual('myService')
         expect(action.status).toEqual('pending')
-        const result = await action.payload
+        const result: number = await store.dispatch(action).payload
         expect(result).toEqual(3 + 7 + 1000)
-        // compilation test
+        expect(store.getState().add).toEqual(1010)
-        expect(result + 2).toEqual(1012)
       })
     })
     describe('addAsyncWithContext', () => {
       it('creates a redux action with type, method and status', async () => {
-        const client = getClient()
+        const {client, store} = getClient()
         const action = client.addAsyncWithContext(3, 7)
         expect(action.method).toEqual('addAsyncWithContext')
         expect(action.type).toEqual('myService')
         expect(action.status).toEqual('pending')
-        const result = await action.payload
+        const result: number = await store.dispatch(action).payload
         expect(result).toEqual(3 + 7 + 1000)
-        // compilation test
+        expect(store.getState().add).toEqual(1010)
-        expect(result + 2).toEqual(1012)
       })
     })
   })

packages/jsonrpc/src/redux.ts

@@ -27,25 +27,38 @@ export function createReduxClient<T, ActionType extends string>(
   return service as TReduxed<T, ActionType>
 }
 
-export const createReducer = <ActionType extends string, State>(
+export interface IState {
+  loading: number
+  error: string
+}
+
+export const createReducer = <ActionType extends string, State extends IState>(
   actionType: ActionType,
   defaultState: State,
 ) => <R extends IReduxed<ActionType>>(
   handleAction: (state: State, action: TResolvedActions<R>) => State,
-) => (state: State = defaultState, action?: TAllActions<R>): State => {
+) => (state: State = defaultState, action: TAllActions<R>): State => {
-  if (!action) {
-    return state
-  }
   if (action.type !== actionType) {
     return state
   }
   if (action.status === 'pending') {
-    // TODO handle loading
+    return {
+      ...state,
+      loading: state.loading + 1,
+      error: '',
+    }
     return state
   }
   if (action.status === 'rejected') {
-    // TODO handle rejected
+    return {
-    return state
+      ...state,
+      loading: state.loading - 1,
+      error: action.payload.message,
+    }
   }
-  return handleAction(state, action)
+  return handleAction({
+    ...state,
+    loading: state.loading - 1,
+    error: '',
+  }, action)
 }