ez-saga 18.0.5 → 18.0.7

package/README.md

@@ -142,4 +142,55 @@ function stateMapProps(state, props) {
 export default connect(stateMapProps)(View);
 ```
 
-We can invoke reducers and effects using dispatch, and we can obtain the results returned by effects.
+We can invoke reducers and effects using dispatch, and we can obtain the results returned by effects.
+
+# Vite Plugin for HMR
+
+`ez-saga` provides a built-in Vite plugin to support Hot Module Replacement (HMR) for models. This allows you to modify effects and reducers during development without reloading the page.
+
+## Usage
+
+1. Import the plugin in your `vite.config.ts`:
+
+```typescript
+import { defineConfig } from 'vite';
+import ezSagaHmr from 'ez-saga/vite';
+
+export default defineConfig({
+  plugins: [
+    ezSagaHmr(), // Add ez-saga HMR plugin
+    // other plugins...
+  ]
+});
+```
+
+2. That's it! 
+
+The plugin automatically detects your model files and injects hot update logic. When you modify a model file, `ez-saga` will:
+- Cancel old saga tasks.
+- Re-register the model reducers (hot-swap logic).
+- Restart the effects.
+
+**Note**: This requires your model files to be exported using `export default` and contain a `name` property.
+
+# Webpack Plugin for HMR
+
+For Webpack 5 users, `ez-saga` also provides a compatible HMR plugin.
+
+## Usage
+
+1. Import the plugin in your `webpack.config.js`:
+
+```javascript
+const EzSagaWebpackPlugin = require('ez-saga/webpack').default; // Notice the .default for CJS
+
+module.exports = {
+  // ...
+  plugins: [
+    new EzSagaWebpackPlugin(),
+    // other plugins...
+  ]
+};
+```
+
+This plugin automatically configures the HMR loader for your model files.

package/lib/redux/PromiseMiddleware.js

@@ -1,3 +1,9 @@
+/**
+ * 判断是否为标准Action
+ */
+function isAction(action) {
+    return typeof action === 'object' && action !== null && 'type' in action;
+}
 /**
  * 创建中间层
  * @param registedModel 已注册model
@@ -6,22 +12,18 @@ 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) {
-            if (model.effects && model.effects[effect]) {
-                return true;
-            }
+        if (model && model.effects && model.effects[effect]) {
+            return true;
         }
         return false;
     }
     return (api) => (next) => (action) => {
-        let exeEffect = false;
-        if (action?.type !== undefined) {
-            const { type } = action;
-            exeEffect = isEffect(type);
-        }
-        if (exeEffect) {
+        if (isAction(action) && isEffect(action.type)) {
             return new Promise((resolve, reject) => {
                 next({
                     _dy_resolve: resolve,
@@ -30,9 +32,7 @@ function createPromiseMiddleware(registedModel) {
                 });
             });
         }
-        else {
-            return next(action);
-        }
+        return next(action);
     };
 }
 export default createPromiseMiddleware;

package/lib/redux/PromiseMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"PromiseMiddleware.js","sourceRoot":"","sources":["../../src/redux/PromiseMiddleware.ts"],"names":[],"mappings":"AAGA;;;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;QACpD,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,EAAE,CAAC;YACV,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3C,OAAO,IAAI,CAAC;YACd,CAAC;QACH,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,SAAS,GAAG,KAAK,CAAC;QACtB,IAAK,MAAiB,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAC3C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAgB,CAAC;YAClC,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,IAAI,CAAC;oBACH,WAAW,EAAE,OAAO;oBACpB,UAAU,EAAE,MAAM;oBAClB,GAAG,MAAgB;iBACpB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,eAAe,uBAAuB,CAAC"}
+{"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.js

@@ -1,28 +1,69 @@
-import { legacy_createStore as createStore, applyMiddleware, compose } from 'redux';
-import { createSlice, combineReducers } from '@reduxjs/toolkit';
+import { configureStore, createSlice, combineReducers } from '@reduxjs/toolkit';
 import createSagaMiddleware from 'redux-saga';
 import { call, put, select, takeEvery, putResolve } from 'redux-saga/effects';
-import win from 'global/window';
 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函数
- * @param store redux store
- * @param registedModel 已注册model, 对象, 属性为model名称, value为model
- * @param allReducers 所有的reducers
- * @param sagaMiddleware saga中间件
- * @returns 返回function regist(model)
  */
-function getRegistModelFunc(store, registedModel, allReducers, sagaMiddleware) {
-    /** model函数注册函数
-     * @param model 模块, 其格式为
-     * {
-     *    name: 'name',
-     *    state: {},
-     *    reducers: {},
-     *    effects: {}
-     * }
-     */
+function getRegistModelFunc(store, registedModel, allReducers, sagaMiddleware, runningEffects) {
+    // 提取的公共模型安装逻辑
+    function installModel(model) {
+        // 初始化模型属性
+        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
+        runningEffects[model.name] = [];
+        for (const effectKey in model.effects) {
+            const type = `${model.name}/${effectKey}`;
+            console.log('[ez-saga] regist effect:', type);
+            const effectFunc = model.effects[effectKey];
+            const task = sagaMiddleware.run(function* () {
+                // 使用 takeEvery 的参数传递功能，将上下文传入 handleEffect
+                // handleEffect(modelName, effectFunc, tools, action)
+                yield takeEvery(type, handleEffect, model.name, effectFunc, opFun);
+            });
+            runningEffects[model.name].push(task);
+        }
+    }
     return function regist(reduxModel) {
         const model = {
             ...reduxModel,
@@ -31,76 +72,52 @@ function getRegistModelFunc(store, registedModel, allReducers, sagaMiddleware) {
         if (registedModel[model.name]) {
             return;
         }
-        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;
-        registedModel[model.name] = model;
-        //获得一个新的reducer, 将所有的reducer整合成一个
-        let newReducer = combineReducers(allReducers);
-        store.replaceReducer(newReducer);
-        //注册effects
-        for (let effect in model.effects) {
-            let type = `${model.name}/${effect}`;
-            let execFun = model.effects[effect];
-            function* loading(opFun, action) {
-                // 开始异步任务设置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);
+        // 安装模型
+        installModel(model);
+        // 开发环境：注册热更新事件监听
+        if (process.env.NODE_ENV !== 'production' && typeof window !== 'undefined') {
+            const eventName = `EZ_SAGA_UPDATE_${model.name}`;
+            const hmrHandler = (e) => {
+                const newModel = e.detail;
+                console.log('[ez-saga] Hot updating model:', newModel.name);
+                // 1. 取消旧任务
+                const tasks = runningEffects[model.name];
+                if (tasks && tasks.length) {
+                    tasks.forEach(task => task.cancel());
                 }
-            }
-            function* runEffect() {
-                //yield takeLatest(type, loading, { call, put, putResolve, select });
-                yield takeEvery(type, loading, { call, put, putResolve, select });
-            }
-            sagaMiddleware.run(runEffect);
+                runningEffects[model.name] = [];
+                // 2. 安装新模型 (包含更新 Reducer 和重启 Effects)
+                installModel(newModel);
+            };
+            window.addEventListener(eventName, hmrHandler);
         }
     };
 }
 /** 创建store */
 export default function create() {
-    //已经注册的reducer, key是名字, value是reducer
     const allReducers = {};
-    //已注册model
     const 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));
-    const regist = getRegistModelFunc(store, registedModel, allReducers, sagaMiddleware);
-    let app = {
-        /** redux store */
-        store: store,
-        /** saga中间件 */
-        sagaMiddleware: sagaMiddleware,
-        /** model注册函数 */
-        regist: regist
+    // 使用 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: {}
+    });
+    // 存储运行中的 Effect 任务，用于热更新取消
+    const runningEffects = {};
+    const regist = getRegistModelFunc(store, registedModel, allReducers, sagaMiddleware, runningEffects);
+    return {
+        store,
+        sagaMiddleware,
+        regist
     };
-    return app;
 }
 //# sourceMappingURL=createApp.js.map

package/lib/redux/createApp.js.map

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

package/lib/vite/index.d.ts

@@ -0,0 +1,11 @@
+import { Plugin } from 'vite';
+/**
+ * ez-saga Vite 插件
+ *
+ * 自动为 ez-saga model 文件注入 HMR 代码。
+ * 约定：
+ * 1. Model 文件必须使用 export default 导出对象
+ * 2. 导出的对象必须包含 'name' 属性 (作为 Model 的唯一标识)
+ * 3. 项目中必须将 app 实例挂载到 window.app
+ */
+export default function ezSagaHmr(): Plugin;

package/lib/vite/index.js

@@ -0,0 +1,59 @@
+import MagicString from 'magic-string';
+/**
+ * ez-saga Vite 插件
+ *
+ * 自动为 ez-saga model 文件注入 HMR 代码。
+ * 约定：
+ * 1. Model 文件必须使用 export default 导出对象
+ * 2. 导出的对象必须包含 'name' 属性 (作为 Model 的唯一标识)
+ * 3. 项目中必须将 app 实例挂载到 window.app
+ */
+export default function ezSagaHmr() {
+    return {
+        name: 'vite-plugin-ez-saga-hmr',
+        apply: 'serve', // 仅在开发环境(serve)模式下应用
+        transform(code, id) {
+            // 过滤掉 node_modules 和非 JS/TS 文件
+            if (id.includes('node_modules') || !/\.(js|ts|tsx|jsx)$/.test(id)) {
+                return;
+            }
+            // 简单的特征检测：检查是否包含 ez-saga model 的关键属性
+            // 必须包含 name 属性，且通常包含 effects 或 reducers 或 state
+            // 宽容匹配:
+            // 1. export default ... (可能是对象字面量，也可能是变量)
+            // 2. name: ... (可能是字符串字面量，也可能是变量)
+            const hasDefaultExport = /export\s+default/.test(code);
+            const hasNameProp = /name\s*:/.test(code);
+            const hasModelKeywords = /(effects|reducers|state|initialState)\s*:\s*\{/.test(code);
+            if (hasDefaultExport && hasNameProp && hasModelKeywords) {
+                // console.log('ez-saga HMR: Injecting HMR code into', id);
+                // 注入 HMR 代码
+                // 使用 window 事件通信，解耦 app 实例引用
+                const hmrCode = `
+if (import.meta.hot) {
+  import.meta.hot.accept((newModule) => {
+    if (newModule && newModule.default) {
+      const model = newModule.default;
+      if (model.name) {
+        // console.log('[ez-saga] Hot updating model:', model.name);
+        if (window && window.dispatchEvent) {
+            window.dispatchEvent(new CustomEvent('EZ_SAGA_UPDATE_' + model.name, { 
+                detail: model 
+            }));
+        }
+      }
+    }
+  });
+}
+`;
+                const s = new MagicString(code);
+                s.append(hmrCode);
+                return {
+                    code: s.toString(),
+                    map: s.generateMap({ hires: true })
+                };
+            }
+        }
+    };
+}
+//# sourceMappingURL=index.js.map

package/lib/vite/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/vite/index.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,cAAc,CAAC;AAEvC;;;;;;;;GAQG;AAEH,MAAM,CAAC,OAAO,UAAU,SAAS;IAC7B,OAAO;QACH,IAAI,EAAE,yBAAyB;QAC/B,KAAK,EAAE,OAAO,EAAE,qBAAqB;QACrC,SAAS,CAAC,IAAI,EAAE,EAAE;YACd,+BAA+B;YAC/B,IAAI,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBAChE,OAAO;YACX,CAAC;YACD,qCAAqC;YACrC,gDAAgD;YAChD,QAAQ;YACR,0CAA0C;YAC1C,kCAAkC;YAClC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,gBAAgB,GAAG,gDAAgD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAErF,IAAI,gBAAgB,IAAI,WAAW,IAAI,gBAAgB,EAAE,CAAC;gBACtD,2DAA2D;gBAC3D,YAAY;gBACZ,6BAA6B;gBAC7B,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;CAgB/B,CAAC;gBACc,MAAM,CAAC,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;gBAChC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAElB,OAAO;oBACH,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE;oBAClB,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;iBACtC,CAAC;YACN,CAAC;QACL,CAAC;KACJ,CAAC;AACN,CAAC"}

package/lib/webpack/index.d.ts

@@ -0,0 +1,9 @@
+import { Compiler } from 'webpack';
+/**
+ * ez-saga Webpack Plugin (Webpack 5+)
+ *
+ * 自动配置 ez-saga-loader，实现 Model 热更新。
+ */
+export default class EzSagaWebpackPlugin {
+    apply(compiler: Compiler): void;
+}

package/lib/webpack/index.js

@@ -0,0 +1,28 @@
+import path from 'path';
+import { fileURLToPath } from 'url';
+// ESM 环境下模拟 __dirname
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+/**
+ * ez-saga Webpack Plugin (Webpack 5+)
+ *
+ * 自动配置 ez-saga-loader，实现 Model 热更新。
+ */
+export default class EzSagaWebpackPlugin {
+    apply(compiler) {
+        // 获取 loader 的绝对路径
+        const loaderPath = path.resolve(__dirname, './loader.js');
+        compiler.hooks.afterEnvironment.tap('EzSagaWebpackPlugin', () => {
+            // 注入 loader规则
+            compiler.options.module.rules.push({
+                test: /\.(js|ts|tsx|jsx)$/,
+                exclude: /node_modules/,
+                enforce: 'post', // 在编译后执行，避免影响 ts-loader 输入
+                use: [{
+                        loader: loaderPath
+                    }]
+            });
+        });
+    }
+}
+//# sourceMappingURL=index.js.map

package/lib/webpack/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/webpack/index.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,sBAAsB;AACtB,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAE3C;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,mBAAmB;IACpC,KAAK,CAAC,QAAkB;QACpB,kBAAkB;QAClB,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAE1D,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,qBAAqB,EAAE,GAAG,EAAE;YAC5D,cAAc;YACd,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;gBAC/B,IAAI,EAAE,oBAAoB;gBAC1B,OAAO,EAAE,cAAc;gBACvB,OAAO,EAAE,MAAM,EAAE,2BAA2B;gBAC5C,GAAG,EAAE,CAAC;wBACF,MAAM,EAAE,UAAU;qBACrB,CAAC;aACL,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ"}

package/lib/webpack/loader.d.ts

@@ -0,0 +1,5 @@
+/**
+ * ez-saga Webpack Loader
+ * 对应 src/vite/index.ts 的逻辑，用于 Webpack 场景
+ */
+export default function (this: any, source: string): void;

package/lib/webpack/loader.js

@@ -0,0 +1,68 @@
+import MagicString from 'magic-string';
+/**
+ * ez-saga Webpack Loader
+ * 对应 src/vite/index.ts 的逻辑，用于 Webpack 场景
+ */
+export default function (source) {
+    // 简单的特征检测
+    const hasDefaultExport = /export\s+default/.test(source) || /exports\.default\s*=/.test(source) || /module\.exports\s*=/.test(source);
+    // name属性检查 (宽松匹配: name: "foo" 或 name = "foo")
+    const hasNameProp = /(name\s*[:=])/.test(source);
+    // 关键字检查 (Loose due to compilation)
+    const hasModelKeywords = /(effects|reducers|state|initialState)\s*[:=]\s*\{/.test(source);
+    if (hasDefaultExport && hasNameProp && hasModelKeywords) {
+        const callback = this.async();
+        const s = new MagicString(source);
+        // Regular expressions to detect export patterns
+        const esmRegex = /export\s+default/;
+        const cjsDefaultRegex = /exports\.default\s*=/;
+        const cjsModuleRegex = /module\.exports\s*=/;
+        let match;
+        const modelVarName = '__ez_saga_model_def';
+        if ((match = esmRegex.exec(source)) !== null) {
+            // ESM: export default { ... }
+            const start = match.index;
+            const end = start + match[0].length;
+            s.overwrite(start, end, `const ${modelVarName} =`);
+            s.append(`\nexport default ${modelVarName};\n`);
+        }
+        else if ((match = cjsDefaultRegex.exec(source)) !== null) {
+            // CJS: exports.default = { ... }
+            const start = match.index;
+            const end = start + match[0].length;
+            s.overwrite(start, end, `const ${modelVarName} =`);
+            s.append(`\nexports.default = ${modelVarName};\n`);
+        }
+        else if ((match = cjsModuleRegex.exec(source)) !== null) {
+            // CJS: module.exports = { ... }
+            const start = match.index;
+            const end = start + match[0].length;
+            s.overwrite(start, end, `const ${modelVarName} =`);
+            s.append(`\nmodule.exports = ${modelVarName};\n`);
+        }
+        else {
+            // 匹配失败
+            this.callback(null, source);
+            return;
+        }
+        // 注入 HMR 逻辑
+        const hmrCode = `
+if (module.hot) {
+  module.hot.accept();
+  if (${modelVarName} && ${modelVarName}.name) {
+    if (typeof window !== 'undefined' && window.dispatchEvent) {
+        window.dispatchEvent(new CustomEvent('EZ_SAGA_UPDATE_' + ${modelVarName}.name, { 
+            detail: ${modelVarName} 
+        }));
+    }
+  }
+}
+`;
+        s.append(hmrCode);
+        // 禁用 SourceMap
+        callback(null, s.toString());
+        return;
+    }
+    this.callback(null, source);
+}
+//# sourceMappingURL=loader.js.map

package/lib/webpack/loader.js.map

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

package/package.json

@@ -1,9 +1,25 @@
 {
   "name": "ez-saga",
-  "version": "18.0.5",
+  "version": "18.0.7",
   "description": "The ez-saga project is a project that imitates dva-js",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
+  "exports": {
+    ".": "./lib/index.js",
+    "./vite": "./lib/vite/index.js",
+    "./webpack": "./lib/webpack/index.js",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "vite": [
+        "lib/vite/index.d.ts"
+      ],
+      "webpack": [
+        "lib/webpack/index.d.ts"
+      ]
+    }
+  },
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -29,34 +45,22 @@
   },
   "dependencies": {
     "@reduxjs/toolkit": "^2.11.2",
+    "magic-string": "^0.30.21",
     "redux": "^5.0.1",
     "redux-saga": "^1.4.2",
-    "global": "^4.4.0"
+    "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",
-    "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",
-    "typescript": "^5.3.3"
+    "rimraf": "^6.1.2",
+    "typescript": "^5.3.3",
+    "vite": "^7.3.0",
+    "webpack": "^5.104.1"
   },
   "engines": {
-    "node": ">= 14.0.0",
+    "node": ">= 18.0.0",
     "npm": ">= 6.0.0"
   },
   "browserslist": [
@@ -68,7 +72,6 @@
   "files": [
     "lib",
     "src",
-    "index.js",
     "tsconfig.json",
     "typing.d.ts"
   ]

package/src/index.ts

@@ -1,4 +1,4 @@
-/// <reference path="./global-shim.d.ts" />
+
 export { PayloadAction, EffectTool, Effect, ModelReducer, ModelEffect, ReduxModel, ReduxApp } from './redux/typeDeclare';
 export { Dispatch, Action } from 'redux';
 import createApp from './redux/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,152 @@
-import { legacy_createStore as createStore, applyMiddleware, compose, Action as ReduxAction, Store } from 'redux';
-import { createSlice, combineReducers } from '@reduxjs/toolkit';
-import createSagaMiddleware, { SagaMiddleware } from 'redux-saga';
+import { configureStore, createSlice, combineReducers } from '@reduxjs/toolkit';
+import createSagaMiddleware, { SagaMiddleware, Task } 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>,
+  runningEffects: Record<string, Task[]>
+): (model: ReduxModel) => void {
+  // 提取的公共模型安装逻辑
+  function installModel(model: ReduxSagaModel) {
+    // 初始化模型属性
+    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 as any
+    });
+
+    // 注册 Reducer
+    allReducers[model.name] = modelSlice.reducer;
+    registedModel[model.name] = model;
+
+    // 动态更新 Store 的 Reducers
+    const newReducer = combineReducers(allReducers);
+    store.replaceReducer(newReducer);
+
+    // 注册 Effects
+    runningEffects[model.name] = [];
+    for (const effectKey in model.effects) {
+      const type = `${model.name}/${effectKey}`;
+      console.log('[ez-saga] regist effect:', type);
+      const effectFunc = model.effects[effectKey];
+      const task = sagaMiddleware.run(function* () {
+        // 使用 takeEvery 的参数传递功能，将上下文传入 handleEffect
+        // handleEffect(modelName, effectFunc, tools, action)
+        yield takeEvery(type, handleEffect, model.name, effectFunc, opFun);
+      });
+      runningEffects[model.name].push(task);
+    }
+  }
+
   return function regist(reduxModel: ReduxModel): void {
     const model = {
       ...reduxModel,
       initialState: {}
     } as ReduxSagaModel;
+
     if (registedModel[model.name]) {
       return;
     }
-    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;
-    registedModel[model.name] = model;
-    //获得一个新的reducer, 将所有的reducer整合成一个
-    let 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 });
-      }
+    // 安装模型
+    installModel(model);
 
-      sagaMiddleware.run(runEffect);
+    // 开发环境：注册热更新事件监听
+    if (process.env.NODE_ENV !== 'production' && typeof window !== 'undefined') {
+      const eventName = `EZ_SAGA_UPDATE_${model.name}`;
+      const hmrHandler = (e: any) => {
+        const newModel = e.detail as ReduxSagaModel;
+        console.log('[ez-saga] Hot updating model:', newModel.name);
+        // 1. 取消旧任务
+        const tasks = runningEffects[model.name];
+        if (tasks && tasks.length) {
+          tasks.forEach(task => task.cancel());
+        }
+        runningEffects[model.name] = [];
+        // 2. 安装新模型 (包含更新 Reducer 和重启 Effects)
+        installModel(newModel);
+      };
+      window.addEventListener(eventName, hmrHandler);
     }
   };
 }
 
-
 /** 创建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)
-  );
-
-  const regist = getRegistModelFunc(store, registedModel, allReducers, sagaMiddleware);
-
-  let app: ReduxApp = {
-    /** redux store */
-    store: store,
-    /** saga中间件 */
-    sagaMiddleware: sagaMiddleware,
-    /** model注册函数 */
-    regist: regist
+  // 使用 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: {}
+  });
+
+  // 存储运行中的 Effect 任务，用于热更新取消
+  const runningEffects: Record<string, Task[]> = {};
+
+  const regist = getRegistModelFunc(store, registedModel, allReducers, sagaMiddleware, runningEffects);
+
+  return {
+    store,
+    sagaMiddleware,
+    regist
   };
-  return app;
 }

package/src/redux/typeDeclare.ts

@@ -20,11 +20,6 @@ declare module 'redux' {
   }
 }
 
-// /** 定义AsyncDispatch, 使其兼容redux promiseMiddleware中间件修改返回结果的情况 */
-// export interface AsyncDispatch {
-//   <R = any>(action: PayloadAction, ...extraArgs: any[]): Promise<R>;
-// }
-
 /** 工具 */
 export interface EffectTool {
   /** 调用异步函数, 并获得该异步函数的结果 */
@@ -74,7 +69,7 @@ export interface RegistedModel {
 export interface ReduxApp {
   store: Store<any, ReduxAction>,
   sagaMiddleware: SagaMiddleware<object>;
-  regist: (model: ReduxModel) => void
+  regist: (model: ReduxModel) => void;
 }
 
 

package/src/vite/index.ts

@@ -0,0 +1,63 @@
+import { Plugin } from 'vite';
+import MagicString from 'magic-string';
+
+/**
+ * ez-saga Vite 插件
+ * 
+ * 自动为 ez-saga model 文件注入 HMR 代码。
+ * 约定：
+ * 1. Model 文件必须使用 export default 导出对象
+ * 2. 导出的对象必须包含 'name' 属性 (作为 Model 的唯一标识)
+ * 3. 项目中必须将 app 实例挂载到 window.app
+ */
+
+export default function ezSagaHmr(): Plugin {
+    return {
+        name: 'vite-plugin-ez-saga-hmr',
+        apply: 'serve', // 仅在开发环境(serve)模式下应用
+        transform(code, id) {
+            // 过滤掉 node_modules 和非 JS/TS 文件
+            if (id.includes('node_modules') || !/\.(js|ts|tsx|jsx)$/.test(id)) {
+                return;
+            }
+            // 简单的特征检测：检查是否包含 ez-saga model 的关键属性
+            // 必须包含 name 属性，且通常包含 effects 或 reducers 或 state
+            // 宽容匹配:
+            // 1. export default ... (可能是对象字面量，也可能是变量)
+            // 2. name: ... (可能是字符串字面量，也可能是变量)
+            const hasDefaultExport = /export\s+default/.test(code);
+            const hasNameProp = /name\s*:/.test(code);
+            const hasModelKeywords = /(effects|reducers|state|initialState)\s*:\s*\{/.test(code);
+
+            if (hasDefaultExport && hasNameProp && hasModelKeywords) {
+                // console.log('ez-saga HMR: Injecting HMR code into', id);
+                // 注入 HMR 代码
+                // 使用 window 事件通信，解耦 app 实例引用
+                const hmrCode = `
+if (import.meta.hot) {
+  import.meta.hot.accept((newModule) => {
+    if (newModule && newModule.default) {
+      const model = newModule.default;
+      if (model.name) {
+        // console.log('[ez-saga] Hot updating model:', model.name);
+        if (window && window.dispatchEvent) {
+            window.dispatchEvent(new CustomEvent('EZ_SAGA_UPDATE_' + model.name, { 
+                detail: model 
+            }));
+        }
+      }
+    }
+  });
+}
+`;
+                const s = new MagicString(code);
+                s.append(hmrCode);
+
+                return {
+                    code: s.toString(),
+                    map: s.generateMap({ hires: true })
+                };
+            }
+        }
+    };
+}

package/src/webpack/index.ts

@@ -0,0 +1,31 @@
+import { Compiler } from 'webpack';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+// ESM 环境下模拟 __dirname
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+/**
+ * ez-saga Webpack Plugin (Webpack 5+)
+ * 
+ * 自动配置 ez-saga-loader，实现 Model 热更新。
+ */
+export default class EzSagaWebpackPlugin {
+    apply(compiler: Compiler) {
+        // 获取 loader 的绝对路径
+        const loaderPath = path.resolve(__dirname, './loader.js');
+
+        compiler.hooks.afterEnvironment.tap('EzSagaWebpackPlugin', () => {
+            // 注入 loader规则
+            compiler.options.module.rules.push({
+                test: /\.(js|ts|tsx|jsx)$/,
+                exclude: /node_modules/,
+                enforce: 'post', // 在编译后执行，避免影响 ts-loader 输入
+                use: [{
+                    loader: loaderPath
+                }]
+            });
+        });
+    }
+}

package/src/webpack/loader.ts

@@ -0,0 +1,72 @@
+import MagicString from 'magic-string';
+
+/**
+ * ez-saga Webpack Loader
+ * 对应 src/vite/index.ts 的逻辑，用于 Webpack 场景
+ */
+export default function (this: any, source: string) {
+    // 简单的特征检测
+    const hasDefaultExport = /export\s+default/.test(source) || /exports\.default\s*=/.test(source) || /module\.exports\s*=/.test(source);
+    // name属性检查 (宽松匹配: name: "foo" 或 name = "foo")
+    const hasNameProp = /(name\s*[:=])/.test(source);
+    // 关键字检查 (Loose due to compilation)
+    const hasModelKeywords = /(effects|reducers|state|initialState)\s*[:=]\s*\{/.test(source);
+
+    if (hasDefaultExport && hasNameProp && hasModelKeywords) {
+        const callback = this.async();
+        const s = new MagicString(source);
+
+        // Regular expressions to detect export patterns
+        const esmRegex = /export\s+default/;
+        const cjsDefaultRegex = /exports\.default\s*=/;
+        const cjsModuleRegex = /module\.exports\s*=/;
+
+        let match;
+        const modelVarName = '__ez_saga_model_def';
+
+        if ((match = esmRegex.exec(source)) !== null) {
+            // ESM: export default { ... }
+            const start = match.index;
+            const end = start + match[0].length;
+            s.overwrite(start, end, `const ${modelVarName} =`);
+            s.append(`\nexport default ${modelVarName};\n`);
+        } else if ((match = cjsDefaultRegex.exec(source)) !== null) {
+            // CJS: exports.default = { ... }
+            const start = match.index;
+            const end = start + match[0].length;
+            s.overwrite(start, end, `const ${modelVarName} =`);
+            s.append(`\nexports.default = ${modelVarName};\n`);
+        } else if ((match = cjsModuleRegex.exec(source)) !== null) {
+            // CJS: module.exports = { ... }
+            const start = match.index;
+            const end = start + match[0].length;
+            s.overwrite(start, end, `const ${modelVarName} =`);
+            s.append(`\nmodule.exports = ${modelVarName};\n`);
+        } else {
+            // 匹配失败
+            this.callback(null, source);
+            return;
+        }
+
+        // 注入 HMR 逻辑
+        const hmrCode = `
+if (module.hot) {
+  module.hot.accept();
+  if (${modelVarName} && ${modelVarName}.name) {
+    if (typeof window !== 'undefined' && window.dispatchEvent) {
+        window.dispatchEvent(new CustomEvent('EZ_SAGA_UPDATE_' + ${modelVarName}.name, { 
+            detail: ${modelVarName} 
+        }));
+    }
+  }
+}
+`;
+        s.append(hmrCode);
+
+        // 禁用 SourceMap
+        callback(null, s.toString());
+        return;
+    }
+
+    this.callback(null, source);
+}

package/tsconfig.json

@@ -18,7 +18,8 @@
     },
     "declaration": true,
     "outDir": "lib",
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true
   },
   "include": [
     "src/**/*",

package/src/global-shim.d.ts

@@ -1,10 +0,0 @@
-declare module 'global/window' {
-    const window: Window & typeof globalThis;
-    export default window;
-}
-
-interface Window {
-    app: any;
-    terminalType: string;
-    __REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: any;
-}

package/src/index.js

@@ -1,4 +0,0 @@
-import createApp from './redux/createApp';
-export default {
-  createApp: createApp
-};