feat(model): remove v2 warning and support v3 schema as model

Author: ArrayZoneYour

__test__/Model/mixed.spec.ts

@@ -5,14 +5,18 @@ import { Model } from '../../src'
 
 describe('useStore', () => {
   test('create by single model definition', async () => {
-    let state: any
-    let actions: any
+    let state: any, nextState: any
+    let actions: any, nextActions: any
     let count = 0
+    let nextCount = 0
     const Home = Model(NextCounter)
-    const { useStore, subscribe, unsubscribe } = Model({ Home })
+    const { useStore, subscribe, unsubscribe } = Model({ Home, NextCounter })
     renderHook(() => {
       ;[state, actions] = useStore('Home')
+      ;[nextState, nextActions] = useStore('NextCounter')
     })
+
+    // Home
     expect(state).toEqual({ count: 0 })
     await actions.increment(3)
     expect(state).toEqual({ count: 3 })
@@ -26,5 +30,20 @@ describe('useStore', () => {
     await actions.increment(3)
     expect(state.count).toBe(10)
     expect(count).toBe(1)
+
+    // NextCounter
+    expect(nextState).toEqual({ count: 0 })
+    await nextActions.increment(3)
+    expect(nextState).toEqual({ count: 3 })
+    // test subscribe
+    subscribe('NextCounter', 'increment', () => (nextCount += 1))
+    await nextActions.increment(4)
+    expect(nextCount).toBe(1)
+    expect(nextState.count).toBe(7)
+    // test unsubscribe
+    unsubscribe('NextCounter', 'increment')
+    await nextActions.increment(3)
+    expect(nextState.count).toBe(10)
+    expect(nextCount).toBe(1)
   })
 })

__test__/index.ts

@@ -124,7 +124,7 @@ export const AsyncNull: ModelType<CounterState, CounterActionParams> = {
   state: { count: 0 }
 }
 
-export const TimeoutCounter: ModelType<CounterState, CounterActionParams> = {
+const timeoutCounter: ModelType<CounterState, CounterActionParams> = {
   actions: {
     increment: async (params, { state: _ }) => {
       await timeout(4000, {})
@@ -139,6 +139,8 @@ export const TimeoutCounter: ModelType<CounterState, CounterActionParams> = {
   state: { count: 0 }
 }
 
+export const TimeoutCounter = Model(timeoutCounter)
+
 export const ErrorCounter: ModelType<CounterState, CounterActionParams> = {
   actions: {
     increment: async () => {
@@ -153,7 +155,10 @@ const delayMiddleware: Middleware = async (context, restMiddlewares) => {
   context.next(restMiddlewares)
 }
 
-const nextCounterModel: ModelType<CounterState, NextCounterActionParams> = {
+export const NextCounterModel: ModelType<
+  CounterState,
+  NextCounterActionParams
+> = {
   actions: {
     add: num => {
       return state => {
@@ -170,5 +175,3 @@ const nextCounterModel: ModelType<CounterState, NextCounterActionParams> = {
     count: 0
   }
 }
-
-export const NextCounterModel = Model(nextCounterModel)

src/index.tsx

@@ -65,12 +65,12 @@ function Model<M extends Models, MT extends ModelType, E>(
     extContext && (Global.Context['__global'] = extContext)
     Object.entries(models).forEach(([name, model]) => {
       if (!isAPI(model)) {
-        console.warn(
-          'we recommend you to use NextModel now, document link: https://github.com/byte-fe/react-model#model'
-        )
         if (!Global.State[name]) {
           Global.State[name] = model.state
         }
+        if (model.middlewares) {
+          Global.Middlewares[name] = model.middlewares
+        }
         Global.Actions[name] = model.actions
         Global.AsyncState[name] = model.asyncState
       } else {