ez-saga 18.0.4 → 18.0.6

package/lib/index.d.ts

@@ -0,0 +1,7 @@
+export { PayloadAction, EffectTool, Effect, ModelReducer, ModelEffect, ReduxModel, ReduxApp } from './redux/typeDeclare';
+export { Dispatch, Action } from 'redux';
+import createApp from './redux/createApp';
+declare const _default: {
+    createApp: typeof createApp;
+};
+export default _default;

package/lib/index.js

@@ -0,0 +1,5 @@
+import createApp from './redux/createApp';
+export default {
+    createApp: createApp
+};
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAC1C,eAAe;IACb,SAAS,EAAE,SAAS;CACrB,CAAC"}

package/lib/redux/PromiseMiddleware.d.ts

@@ -0,0 +1,8 @@
+import { Dispatch, Middleware } from 'redux';
+import { RegistedModel } from './typeDeclare';
+/**
+ * 创建中间层
+ * @param registedModel 已注册model
+ */
+declare function createPromiseMiddleware<D extends Dispatch>(registedModel: RegistedModel): Middleware<any, any, any>;
+export default createPromiseMiddleware;

package/lib/redux/PromiseMiddleware.js

@@ -0,0 +1,39 @@
+/**
+ * 判断是否为标准Action
+ */
+function isAction(action) {
+    return typeof action === 'object' && action !== null && 'type' in action;
+}
+/**
+ * 创建中间层
+ * @param registedModel 已注册model
+ */
+function createPromiseMiddleware(registedModel) {
+    function isEffect(type) {
+        if (!type || typeof type !== 'string')
+            return false;
+        // 性能优化：快速排除不包含 '/' 的普通 Action
+        if (type.indexOf('/') === -1)
+            return false;
+        const [modelName, effect] = type.split('/');
+        const model = registedModel[modelName];
+        if (model && model.effects && model.effects[effect]) {
+            return true;
+        }
+        return false;
+    }
+    return (api) => (next) => (action) => {
+        if (isAction(action) && isEffect(action.type)) {
+            return new Promise((resolve, reject) => {
+                next({
+                    _dy_resolve: resolve,
+                    _dy_reject: reject,
+                    ...action,
+                });
+            });
+        }
+        return next(action);
+    };
+}
+export default createPromiseMiddleware;
+//# sourceMappingURL=PromiseMiddleware.js.map

package/lib/redux/PromiseMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PromiseMiddleware.js","sourceRoot":"","sources":["../../src/redux/PromiseMiddleware.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,SAAS,QAAQ,CAAC,MAAe;IAC/B,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,IAAI,MAAM,CAAC;AAC3E,CAAC;AAED;;;GAGG;AACH,SAAS,uBAAuB,CAAqB,aAA4B;IAC/E,SAAS,QAAQ,CAAC,IAAY;QAC5B,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAEpD,8BAA8B;QAC9B,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QAE3C,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;QACvC,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CAAC,GAA0B,EAAE,EAAE,CAAC,CAAC,IAA8B,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,EAAE;QAC7F,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,IAAI,CAAC;oBACH,WAAW,EAAE,OAAO;oBACpB,UAAU,EAAE,MAAM;oBAClB,GAAG,MAAM;iBACV,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC;AAED,eAAe,uBAAuB,CAAC"}

package/lib/redux/createApp.d.ts

@@ -0,0 +1,3 @@
+import { ReduxApp } from './typeDeclare';
+/** 创建store */
+export default function create(): ReduxApp;

package/lib/redux/createApp.js

@@ -0,0 +1,96 @@
+import { configureStore, createSlice, combineReducers } from '@reduxjs/toolkit';
+import createSagaMiddleware from 'redux-saga';
+import { call, put, select, takeEvery, putResolve } from 'redux-saga/effects';
+import saveState from './defaultReducer';
+import createPromiseMiddleware from './PromiseMiddleware';
+// 提取公共的 Effect 工具对象，避免在循环中重复创建
+const opFun = { call, put, putResolve, select };
+/**
+ * 统一处理 Effect 的 Generator 函数
+ * 提取到外部以减少闭包创建，提升性能
+ */
+function* handleEffect(modelName, effectFunc, tools, action) {
+    // 开始异步任务设置loading状态
+    yield putResolve({ type: `${modelName}/saveState`, payload: { loading: true } });
+    // 执行 Effect (支持 Generator 或 Promise)
+    const ret = yield call(effectFunc, action, tools);
+    // 结束异步任务关闭loading状态
+    yield putResolve({ type: `${modelName}/saveState`, payload: { loading: false } });
+    // 处理 PromiseMiddleware 的回调
+    if (action._dy_resolve) {
+        action._dy_resolve(ret);
+    }
+}
+/**
+ * 获取注册model函数
+ */
+function getRegistModelFunc(store, registedModel, allReducers, sagaMiddleware) {
+    return function regist(reduxModel) {
+        const model = {
+            ...reduxModel,
+            initialState: {}
+        };
+        if (registedModel[model.name]) {
+            return;
+        }
+        // 初始化模型属性
+        if (!model.state)
+            model.state = {};
+        model.initialState = model.state;
+        if (!model.reducers)
+            model.reducers = {};
+        // 注入默认的 saveState reducer
+        if (!model.reducers.saveState)
+            model.reducers.saveState = saveState;
+        if (!model.effects)
+            model.effects = {};
+        // 使用 Redux Toolkit 创建 Slice
+        const modelSlice = createSlice({
+            name: model.name,
+            initialState: model.initialState,
+            reducers: model.reducers
+        });
+        // 注册 Reducer
+        allReducers[model.name] = modelSlice.reducer;
+        registedModel[model.name] = model;
+        // 动态更新 Store 的 Reducers
+        const newReducer = combineReducers(allReducers);
+        store.replaceReducer(newReducer);
+        // 注册 Effects
+        for (const effectKey in model.effects) {
+            const type = `${model.name}/${effectKey}`;
+            const effectFunc = model.effects[effectKey];
+            sagaMiddleware.run(function* () {
+                // 使用 takeEvery 的参数传递功能，将上下文传入 handleEffect
+                // handleEffect(modelName, effectFunc, tools, action)
+                yield takeEvery(type, handleEffect, model.name, effectFunc, opFun);
+            });
+        }
+    };
+}
+/** 创建store */
+export default function create() {
+    const allReducers = {};
+    const registedModel = {};
+    const sagaMiddleware = createSagaMiddleware();
+    const promiseMiddleware = createPromiseMiddleware(registedModel);
+    // 使用 configureStore 替代 createStore
+    // 自动集成 Redux DevTools，自动组合中间件
+    const store = configureStore({
+        reducer: saveState, // 初始 Reducer
+        middleware: (getDefaultMiddleware) => getDefaultMiddleware({
+            thunk: false, // 禁用默认的 thunk，因为我们使用 saga
+            serializableCheck: false, // 禁用序列化检查，因为 action 中可能包含回调函数 (_dy_resolve)
+            immutableCheck: false // 禁用不可变检查，提升开发环境性能
+        }).concat(promiseMiddleware, sagaMiddleware),
+        devTools: process.env.NODE_ENV !== 'production',
+        preloadedState: {}
+    });
+    const regist = getRegistModelFunc(store, registedModel, allReducers, sagaMiddleware);
+    return {
+        store,
+        sagaMiddleware,
+        regist
+    };
+}
+//# sourceMappingURL=createApp.js.map

package/lib/redux/createApp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createApp.js","sourceRoot":"","sources":["../../src/redux/createApp.ts"],"names":[],"mappings":"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"}

package/lib/redux/defaultReducer.d.ts

@@ -0,0 +1,5 @@
+/** 默认reducer */
+import { Reducer } from 'redux';
+import { PayloadAction } from './typeDeclare';
+declare const saveState: Reducer<any, PayloadAction>;
+export default saveState;

package/lib/redux/defaultReducer.js

@@ -0,0 +1,12 @@
+const saveState = (state, action) => {
+    if (!action.payload) {
+        return state;
+    }
+    let newStat = {
+        ...state,
+        ...action.payload
+    };
+    return newStat;
+};
+export default saveState;
+//# sourceMappingURL=defaultReducer.js.map

package/lib/redux/defaultReducer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultReducer.js","sourceRoot":"","sources":["../../src/redux/defaultReducer.ts"],"names":[],"mappings":"AAIA,MAAM,SAAS,GAAgC,CAAC,KAAU,EAAE,MAAqB,EAAE,EAAE;IACnF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,OAAO,GAAG;QACZ,GAAG,KAAK;QACR,GAAG,MAAM,CAAC,OAAO;KAClB,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/lib/redux/typeDeclare.d.ts

@@ -0,0 +1,64 @@
+/** 类型申明 */
+import { 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 UnknownAction, ReduxAction<string> {
+    /** 类型 */
+    type: string;
+    /** 载体 */
+    payload?: any;
+    [extraProps: string]: any;
+}
+declare module 'redux' {
+    interface Dispatch {
+        <R = any>(action: PayloadAction, ...extraArgs: any[]): Promise<R>;
+    }
+}
+/** 工具 */
+export interface EffectTool {
+    /** 调用异步函数, 并获得该异步函数的结果 */
+    call: (...args: any[]) => any;
+    /** 分发异步action */
+    put: <A extends Action>(action: A) => PutEffect<A>;
+    /** 分发同步action */
+    putResolve: <A extends Action>(action: A) => PutEffect<A>;
+    /** 从store从获取状态 */
+    select: ((selectFunc: (state: any) => any) => SelectEffect) | (() => SelectEffect);
+}
+/** Effect函数类型 */
+export interface Effect {
+    (action: PayloadAction, tool: EffectTool): Generator | Promise<any> | any;
+}
+/** ModelReducer定义 */
+export interface ModelReducer {
+    [key: string]: Reducer<any, PayloadAction>;
+}
+/** ModelEffect定义 */
+export interface ModelEffect {
+    [key: string]: Effect;
+}
+export interface ReduxModel {
+    name: string;
+    state?: any;
+    reducers?: ModelReducer;
+    effects?: ModelEffect;
+}
+export interface ReduxSagaModel extends ReduxModel {
+    initialState: any;
+    reducerPath: string;
+    reducers: ModelReducer;
+}
+export interface RegistedModel {
+    [key: string]: ReduxModel;
+}
+/** app */
+export interface ReduxApp {
+    store: Store<any, ReduxAction>;
+    sagaMiddleware: SagaMiddleware<object>;
+    regist: (model: ReduxModel) => void;
+}
+export interface ReduxSagaModel extends ReduxModel {
+    initialState: any;
+    reducers: ModelReducer;
+}

package/lib/redux/typeDeclare.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=typeDeclare.js.map

package/lib/redux/typeDeclare.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"typeDeclare.js","sourceRoot":"","sources":["../../src/redux/typeDeclare.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "ez-saga",
-  "version": "18.0.4",
+  "version": "18.0.6",
   "description": "The ez-saga project is a project that imitates dva-js",
-  "main": "src/index.js",
+  "main": "lib/index.js",
+  "typings": "lib/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -22,57 +23,25 @@
   ],
   "license": "MIT",
   "scripts": {
-    "build:prod": "cross-env NODE_ENV=production APP_ENV=prod node build/build.js",
+    "build:prod": "rimraf lib && tsc",
+    "build:types": "tsc",
     "lint": "eslint --ext .js src"
   },
   "dependencies": {
-    "@reduxjs/toolkit": "^2.1.0",
+    "@reduxjs/toolkit": "^2.11.2",
     "redux": "^5.0.1",
-    "redux-saga": "^1.3.0",
-    "global": "^4.4.0"
+    "redux-saga": "^1.4.2",
+    "tslib": "^2.8.1"
   },
-  "peerDependencies": {},
   "devDependencies": {
-    "@babel/core": "^7.23.7",
-    "@babel/eslint-parser": "^7.23.3",
-    "@babel/plugin-proposal-decorators": "^7.23.7",
-    "@babel/plugin-syntax-flow": "^7.23.3",
-    "@babel/plugin-transform-runtime": "^7.23.7",
-    "@babel/preset-env": "^7.23.8",
-    "@babel/preset-flow": "^7.23.3",
-    "@babel/preset-typescript": "^7.23.3",
-    "@babel/runtime-corejs3": "^7.23.8",
-    "@babel/plugin-transform-class-properties": "^7.23.3",
-    "@babel/plugin-transform-private-methods": "^7.23.3",
-    "@babel/plugin-transform-private-property-in-object": "^7.23.4",
-    "autoprefixer": "^10.4.17",
-    "babel-loader": "^9.1.3",
-    "babel-plugin-dynamic-import-webpack": "^1.1.0",
-    "babel-plugin-import": "^1.13.8",
-    "chalk": "^4.1.2",
-    "copy-webpack-plugin": "^12.0.2",
-    "core-js": "^3.35.1",
-    "cross-env": "^7.0.3",
-    "eslint": "^8.56.0",
-    "eslint-plugin-flowtype": "^8.0.3",
-    "eslint-plugin-import": "^2.29.1",
+    "@types/node": "^25.0.3",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-standard": "^4.1.0",
-    "eslint-webpack-plugin": "^4.0.1",
-    "rimraf": "^5.0.5",
-    "semver": "^7.5.4",
-    "shelljs": "^0.8.5",
-    "terser-webpack-plugin": "^5.3.10",
-    "webpack": "^5.89.0",
-    "webpack-bundle-analyzer": "^4.10.1",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.1",
-    "webpack-merge": "^5.10.0",
-    "ts-loader": "^9.5.1",
+    "rimraf": "^6.1.2",
     "typescript": "^5.3.3"
   },
   "engines": {
-    "node": ">= 14.0.0",
+    "node": ">= 18.0.0",
     "npm": ">= 6.0.0"
   },
   "browserslist": [
@@ -82,11 +51,9 @@
     "not op_mini all"
   ],
   "files": [
-    "dist",
     "lib",
     "src",
-    "index.js",
-    "tysconfig.json",
+    "tsconfig.json",
     "typing.d.ts"
   ]
 }

package/src/index.ts

@@ -1,4 +1,6 @@
+
 export { PayloadAction, EffectTool, Effect, ModelReducer, ModelEffect, ReduxModel, ReduxApp } from './redux/typeDeclare';
+export { Dispatch, Action } from 'redux';
 import createApp from './redux/createApp';
 export default {
   createApp: createApp

package/src/redux/PromiseMiddleware.ts

@@ -1,6 +1,13 @@
-import { Dispatch, Middleware, MiddlewareAPI, Action } from 'redux';
+import { Dispatch, Middleware, MiddlewareAPI, Action, UnknownAction } from 'redux';
 import { RegistedModel } from './typeDeclare';
 
+/**
+ * 判断是否为标准Action
+ */
+function isAction(action: unknown): action is Action<string> {
+  return typeof action === 'object' && action !== null && 'type' in action;
+}
+
 /** 
  * 创建中间层
  * @param registedModel 已注册model
@@ -8,33 +15,29 @@ import { RegistedModel } from './typeDeclare';
 function createPromiseMiddleware<D extends Dispatch>(registedModel: RegistedModel): Middleware<any, any, any> {
   function isEffect(type: string) {
     if (!type || typeof type !== 'string') return false;
+
+    // 性能优化：快速排除不包含 '/' 的普通 Action
+    if (type.indexOf('/') === -1) return false;
+
     const [modelName, effect] = type.split('/');
     const model = registedModel[modelName];
-    if (model) {
-      if (model.effects && model.effects[effect]) {
-        return true;
-      }
+    if (model && model.effects && model.effects[effect]) {
+      return true;
     }
     return false;
   }
 
   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;
-      exeEffect = isEffect(type);
-    }
-    if (exeEffect) {
+    if (isAction(action) && isEffect(action.type)) {
       return new Promise((resolve, reject) => {
         next({
           _dy_resolve: resolve,
           _dy_reject: reject,
-          ...action as Action,
+          ...action,
         });
       });
-    } else {
-      return next(action);
     }
+    return next(action);
   };
 }
 

package/src/redux/createApp.ts

@@ -1,126 +1,122 @@
-import { legacy_createStore as createStore, applyMiddleware, compose, Action as ReduxAction, Store } from 'redux';
-import { createSlice, combineReducers } from '@reduxjs/toolkit';
+import { configureStore, 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, Action } from 'redux';
-import { ReduxModel, ReduxApp, RegistedModel, ReduxSagaModel, EffectTool, PayloadAction } from './typeDeclare';
+import { Reducer, Action, Store } from 'redux';
+import { ReduxModel, ReduxApp, RegistedModel, ReduxSagaModel, EffectTool, PayloadAction, Effect } from './typeDeclare';
 import saveState from './defaultReducer';
 import createPromiseMiddleware from './PromiseMiddleware';
 
+// 提取公共的 Effect 工具对象，避免在循环中重复创建
+const opFun: EffectTool = { call, put, putResolve, select };
+
+/**
+ * 统一处理 Effect 的 Generator 函数
+ * 提取到外部以减少闭包创建，提升性能
+ */
+function* handleEffect(
+  modelName: string,
+  effectFunc: Effect,
+  tools: EffectTool,
+  action: PayloadAction
+) {
+  // 开始异步任务设置loading状态
+  yield putResolve({ type: `${modelName}/saveState`, payload: { loading: true } });
+
+  // 执行 Effect (支持 Generator 或 Promise)
+  const ret: any = yield call(effectFunc, action, tools);
+
+  // 结束异步任务关闭loading状态
+  yield putResolve({ type: `${modelName}/saveState`, payload: { loading: false } });
+
+  // 处理 PromiseMiddleware 的回调
+  if (action._dy_resolve) {
+    action._dy_resolve(ret);
+  }
+}
+
 /** 
  * 获取注册model函数
- * @param store redux store
- * @param registedModel 已注册model, 对象, 属性为model名称, value为model
- * @param allReducers 所有的reducers
- * @param sagaMiddleware saga中间件
- * @returns 返回function regist(model)
  */
-function getRegistModelFunc(store: Store<any, ReduxAction>, registedModel: RegistedModel,
-  allReducers: { [x: string]: Reducer<any, Action>; },
-  sagaMiddleware: SagaMiddleware<object>): (model: ReduxModel) => void {
-  /** model函数注册函数
-   * @param model 模块, 其格式为
-   * {
-   *    name: 'name',
-   *    state: {},
-   *    reducers: {},
-   *    effects: {}
-   * }
-   */
+function getRegistModelFunc(
+  store: Store<any, Action<string>>,
+  registedModel: RegistedModel,
+  allReducers: { [x: string]: Reducer<any, any>; },
+  sagaMiddleware: SagaMiddleware<object>
+): (model: ReduxModel) => void {
   return function regist(reduxModel: ReduxModel): void {
     const model = {
       ...reduxModel,
       initialState: {}
     } as ReduxSagaModel;
+
     if (registedModel[model.name]) {
       return;
     }
-    if (!model.state) {
-      model.state = {};
-    }
+
+    // 初始化模型属性
+    if (!model.state) model.state = {};
     model.initialState = model.state;
-    if (!model.reducers) {
-      model.reducers = {};
-    }
-    if (!model.reducers.saveState) {
-      model.reducers.saveState = saveState;
-    }
-    if (!model.effects) {
-      model.effects = {};
-    }
-    const modelSlice = createSlice(model);
-    const reducer = modelSlice.reducer;
-    allReducers[model.name] = reducer;
+    if (!model.reducers) model.reducers = {};
+    // 注入默认的 saveState reducer
+    if (!model.reducers.saveState) model.reducers.saveState = saveState;
+    if (!model.effects) model.effects = {};
+
+    // 使用 Redux Toolkit 创建 Slice
+    const modelSlice = createSlice({
+      name: model.name,
+      initialState: model.initialState,
+      reducers: model.reducers as any
+    });
+
+    // 注册 Reducer
+    allReducers[model.name] = modelSlice.reducer;
     registedModel[model.name] = model;
-    //获得一个新的reducer, 将所有的reducer整合成一个
-    let newReducer = combineReducers(allReducers);
+
+    // 动态更新 Store 的 Reducers
+    const newReducer = combineReducers(allReducers);
     store.replaceReducer(newReducer);
-    //注册effects
-    for (let effect in model.effects) {
-      let type: string = `${model.name}/${effect}`;
-      let execFun = model.effects[effect];
-      function* loading(opFun: EffectTool, action: PayloadAction) {
-        // 开始异步任务设置loading状态
-        yield putResolve({ type: `${model.name}/saveState`, payload: { loading: true } });
-        let ret = yield call(execFun, action, opFun);
-        // 结束异步任务关闭loading状态
-        yield putResolve({ type: `${model.name}/saveState`, payload: { loading: false } });
-        if (action._dy_resolve) {
-          action._dy_resolve(ret);
-        }
-      }
-
-      function* runEffect() {
-        //yield takeLatest(type, loading, { call, put, putResolve, select });
-        yield takeEvery(type, loading, { call, put, putResolve, select });
-      }
-
-      sagaMiddleware.run(runEffect);
+
+    // 注册 Effects
+    for (const effectKey in model.effects) {
+      const type = `${model.name}/${effectKey}`;
+      const effectFunc = model.effects[effectKey];
+
+      sagaMiddleware.run(function* () {
+        // 使用 takeEvery 的参数传递功能，将上下文传入 handleEffect
+        // handleEffect(modelName, effectFunc, tools, action)
+        yield takeEvery(type, handleEffect, model.name, effectFunc, opFun);
+      });
     }
   };
 }
 
-
 /** 创建store */
 export default function create(): ReduxApp {
-  //已经注册的reducer, key是名字, value是reducer
   const allReducers = {};
-  //已注册model
   const registedModel: RegistedModel = {};
 
   const sagaMiddleware = createSagaMiddleware();
-
   const promiseMiddleware = createPromiseMiddleware(registedModel);
 
-  const middlewares = [
-    promiseMiddleware,
-    sagaMiddleware
-  ];
-
-  // eslint-disable-next-line no-undef
-  const composeEnhancers = process.env.NODE_ENV !== 'production'
-    && win.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ ?
-    win.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({ trace: true, maxAge: 30 }) : compose;
-
-  const enhancers = [applyMiddleware(...middlewares)];
-
-  //redux store
-  const store = createStore(
-    saveState,
-    {},
-    composeEnhancers(...enhancers)
-  );
+  // 使用 configureStore 替代 createStore
+  // 自动集成 Redux DevTools，自动组合中间件
+  const store = configureStore({
+    reducer: saveState, // 初始 Reducer
+    middleware: (getDefaultMiddleware) =>
+      getDefaultMiddleware({
+        thunk: false, // 禁用默认的 thunk，因为我们使用 saga
+        serializableCheck: false, // 禁用序列化检查，因为 action 中可能包含回调函数 (_dy_resolve)
+        immutableCheck: false // 禁用不可变检查，提升开发环境性能
+      }).concat(promiseMiddleware, sagaMiddleware),
+    devTools: process.env.NODE_ENV !== 'production',
+    preloadedState: {}
+  });
 
   const regist = getRegistModelFunc(store, registedModel, allReducers, sagaMiddleware);
 
-  let app: ReduxApp = {
-    /** redux store */
-    store: store,
-    /** saga中间件 */
-    sagaMiddleware: sagaMiddleware,
-    /** model注册函数 */
-    regist: regist
+  return {
+    store,
+    sagaMiddleware,
+    regist
   };
-  return app;
 }