ez-saga 17.1.0 → 18.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ez-saga",
-  "version": "17.1.0",
+  "version": "18.0.0",
   "description": "The ez-saga project is a project that imitates dva-js",
   "main": "src/index.js",
   "sideEffects": false,
@@ -26,8 +26,8 @@
     "lint": "eslint --ext .js src"
   },
   "dependencies": {
-    "@reduxjs/toolkit": "^1.9.7",
-    "redux": "^4.2.1",
+    "@reduxjs/toolkit": "^2.1.0",
+    "redux": "^5.0.1",
     "redux-saga": "^1.3.0",
     "global": "^4.4.0"
   },

package/src/redux/PromiseMiddleware.ts

@@ -1,4 +1,4 @@
-import { Dispatch, Middleware, MiddlewareAPI, Action, AnyAction } from 'redux';
+import { Dispatch, Middleware, MiddlewareAPI, Action } from 'redux';
 import { RegistedModel } from './typeDeclare';
 
 /** 
@@ -17,11 +17,8 @@ function createPromiseMiddleware<D extends Dispatch>(registedModel: RegistedMode
     }
     return false;
   }
-  // function isReduxAction(action: unknown): action is Action {
-  //   return (action as Action)?.type !== undefined;
-  // }
 
-  return (api: MiddlewareAPI<D, any>) => (next: (action: AnyAction) => any) => (action: AnyAction) => {
+  return (api: MiddlewareAPI<D, any>) => (next: (action: unknown) => any) => (action: unknown) => {
     let exeEffect = false;
     if ((action as Action)?.type !== undefined) {
       const { type } = action as Action;

package/src/redux/createApp.ts

@@ -3,23 +3,11 @@ import { createSlice, combineReducers } from '@reduxjs/toolkit';
 import createSagaMiddleware, { SagaMiddleware } from 'redux-saga';
 import { call, put, select, takeEvery, putResolve } from 'redux-saga/effects';
 import win from 'global/window';
-import { Reducer, AnyAction } from 'redux';
-import { ReduxModel, ReduxApp, RegistedModel, ReduxSagaModel, PayloadAction } from './typeDeclare';
-//import saveState from './defaultReducer';
+import { Reducer, Action } from 'redux';
+import { ReduxModel, ReduxApp, RegistedModel, ReduxSagaModel, EffectTool, PayloadAction } from './typeDeclare';
+import saveState from './defaultReducer';
 import createPromiseMiddleware from './PromiseMiddleware';
 
-const saveState: Reducer<any, PayloadAction> = (state: any, action: PayloadAction) => {
-  debugger;
-  if (!action.payload) {
-    return state;
-  }
-  let newStat = {
-    ...state,
-    ...action.payload
-  };
-  return newStat;
-};
-
 /** 
  * 获取注册model函数
  * @param store redux store
@@ -29,7 +17,7 @@ const saveState: Reducer<any, PayloadAction> = (state: any, action: PayloadActio
  * @returns 返回function regist(model)
  */
 function getRegistModelFunc(store: Store<any, ReduxAction>, registedModel: RegistedModel,
-  allReducers: { [x: string]: Reducer<any, AnyAction>; },
+  allReducers: { [x: string]: Reducer<any, Action>; },
   sagaMiddleware: SagaMiddleware<object>): (model: ReduxModel) => void {
   /** model函数注册函数
    * @param model 模块, 其格式为
@@ -72,7 +60,7 @@ function getRegistModelFunc(store: Store<any, ReduxAction>, registedModel: Regis
     for (let effect in model.effects) {
       let type: string = `${model.name}/${effect}`;
       let execFun = model.effects[effect];
-      function* loading(opFun: any, action: any) {
+      function* loading(opFun: EffectTool, action: PayloadAction) {
         // 开始异步任务设置loading状态
         yield putResolve({ type: `${model.name}/saveState`, payload: { loading: true } });
         let ret = yield call(execFun, action, opFun);

package/src/redux/defaultReducer.ts

@@ -3,7 +3,6 @@ import { Reducer } from 'redux';
 import { PayloadAction } from './typeDeclare';
 
 const saveState: Reducer<any, PayloadAction> = (state: any, action: PayloadAction) => {
-  debugger;
   if (!action.payload) {
     return state;
   }

package/src/redux/typeDeclare.ts

@@ -1,16 +1,17 @@
 /** 类型申明 */
 import {
-  Action as ReduxAction, Store, Reducer, AnyAction
+  Action as ReduxAction, Store, Reducer, UnknownAction
 } from 'redux';
 import { Action, SagaMiddleware } from 'redux-saga';
 import { PutEffect, SelectEffect } from 'redux-saga/effects';
 
 /** payload action类型 */
-export interface PayloadAction extends AnyAction, ReduxAction<string> {
+export interface PayloadAction extends UnknownAction, ReduxAction<string> {
   /** 类型 */
   type: string,
   /** 载体 */
-  payload?: any
+  payload?: any,
+  [extraProps: string]: any;
 }
 
 /** 工具 */