feat: support setValue & setValues pass function

src/core/Model.tsx

@@ -132,12 +132,9 @@ export class Model<C extends ModelConfig> {
     )
 
     const state = mapStateToModel(model.state)
+    model.state = state
 
-    return {
-      state,
-      reducers: model.reducers,
-      effects: model.effects,
-    }
+    return model
   }
 
   private produceState(state: C['state'], reducer: ConfigReducer, payload: any = []): C['state'] {
@@ -184,9 +181,17 @@ export class Model<C extends ModelConfig> {
     // internal reducer setValue
     if (!reducers.setValue) {
       reducers.setValue = (key, value): void => {
-        const newState = this.produceState(this.model.state, draft => {
-          draft[key] = value
-        })
+        let newState
+
+        if (isFunction(value)) {
+          newState = this.produceState(this.model.state, draft => {
+            draft[key] = value(this.model.state[key])
+          })
+        } else {
+          newState = this.produceState(this.model.state, draft => {
+            draft[key] = value
+          })
+        }
 
         this.model.state = newState
         this.notify('setValue', newState)
@@ -196,11 +201,17 @@ export class Model<C extends ModelConfig> {
     // internal reducer setValues
     if (!reducers.setValues) {
       reducers.setValues = (partialState): void => {
-        const newState = this.produceState(this.model.state, draft => {
-          Object.keys(partialState).forEach(key => {
-            draft[key] = partialState[key]
+        let newState
+
+        if (isFunction(partialState)) {
+          newState = partialState(this.model.state)
+        } else {
+          newState = this.produceState(this.model.state, draft => {
+            Object.keys(partialState).forEach(key => {
+              draft[key] = partialState[key]
+            })
           })
-        })
+        }
 
         this.model.state = newState
 

src/core/Store.tsx

@@ -192,6 +192,7 @@ export class Store<C extends Configs> {
       return WithModels
     }
   }
+
   public getState(): ModelState<C>
   public getState<K extends keyof C>(modelName: K): C[K]['state']
   public getState<K extends keyof C>(modelName?: K) {

src/types.ts

@@ -66,9 +66,19 @@ interface ModelEffectState {
   readonly loading: boolean
 }
 
+interface BuildInReducerSetValue<S = any> {
+  <K extends keyof S>(key: K, value: (prevState: S[K]) => S[K]): void
+  <K extends keyof S>(key: K, value: S[K]): void
+}
+
+interface BuildInReducerSetValues<S = any> {
+  (state: (prevState: S) => S): void
+  (partialState: Partial<S>): void
+}
+
 interface BuildInReducers<S = any> {
-  setValue: <K extends keyof S>(key: K, value: S[K]) => void
-  setValues: (state: Partial<S>) => void
+  setValue: <K extends keyof S>(key: K, value: S[K] | ((prevState: S[K]) => S[K])) => void
+  setValues: (state: Partial<S> | ((prevState: S) => S)) => void
   reset: <K extends keyof S>(key?: K) => void
 }
 

test/reducer.spec.ts

@@ -61,7 +61,7 @@ describe('reducer test', () => {
       result.current.reducers.setValue('data', 1)
     })
 
-    expect(result.current.state.data).toBeUndefined()
+    expect(result.current.state.data).toBe(1)
   })
 
   it('should provider build-in reducers when no customize passed', () => {