ez-saga 17.0.0 → 17.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ez-saga",
-  "version": "17.0.0",
+  "version": "17.0.2",
   "description": "The ez-saga project is a project that imitates dva-js",
   "main": "src/index.js",
   "sideEffects": false,

package/src/index.ts

@@ -0,0 +1,7 @@
+import createApp, { PayloadAction, EffectTool, Effect, ModelReducer, ModelEffect, ReduxModel, ReduxApp } from './redux/createApp';
+export {
+  PayloadAction, EffectTool, Effect, ModelReducer, ModelEffect, ReduxModel, ReduxApp
+};
+export default {
+  createApp: createApp
+};

package/src/redux/createApp.ts

@@ -1,9 +1,9 @@
 import { legacy_createStore as createStore, applyMiddleware, compose, Action as ReduxAction, Store } from 'redux';
 import { createSlice, combineReducers } from '@reduxjs/toolkit';
 import createSagaMiddleware, { Action, SagaMiddleware } from 'redux-saga';
+import { PutEffect, SelectEffect } from 'redux-saga/effects';
 import { call, put, select, takeEvery, putResolve } from 'redux-saga/effects';
 import win from 'global/window';
-import createPromiseMiddleware from './createPromiseMiddleware';
 import { Reducer, AnyAction } from 'redux';
 
 const saveState: Reducer<any, AnyAction> = (state: any, action: AnyAction) => {
@@ -17,20 +17,21 @@ const saveState: Reducer<any, AnyAction> = (state: any, action: AnyAction) => {
   return newStat;
 }
 
-/** payload action定义 */
+/** payload action类型 */
 export interface PayloadAction extends Action<string>, ReduxAction<string> {
   payload: any
 }
 
+/** 工具 */
 export interface EffectTool {
-  call: any,
-  put: any,
-  select: any
+  call: (...args: any[]) => any,
+  put: <A extends Action>(action: Action) => PutEffect<A>,
+  select: (selectFunc: (state: any) => any) => SelectEffect
 }
 
-/** Effect函数类型定义 */
+/** Effect函数类型 */
 export interface Effect {
-  (action: PayloadAction, tool: EffectTool): Promise<any>;
+  (action: PayloadAction, tool: EffectTool): Generator;
 }
 
 /** ModelReducer定义 */
@@ -52,6 +53,10 @@ export interface ReduxModel {
   effects: ModelEffect;
 }
 
+export interface RegistedModel {
+  [key: string]: ReduxModel;
+}
+
 /** app */
 export interface ReduxApp {
   store: Store<any, ReduxAction>,
@@ -59,6 +64,39 @@ export interface ReduxApp {
   regist: (model: ReduxModel) => void
 }
 
+/** 
+ * 创建中间层
+ * @param registedModel 已注册model
+ */
+function createPromiseMiddleware(registedModel: RegistedModel) {
+  function isEffect(type: string) {
+    if (!type || typeof type !== 'string') return false;
+    const [modelName, effect] = type.split('/');
+    const model = registedModel[modelName];
+    if (model) {
+      if (model.effects && model.effects[effect]) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  return () => (next: (arg: any) => any) => (action: ReduxAction) => {
+    const { type } = action;
+    if (isEffect(type)) {
+      return new Promise((resolve, reject) => {
+        next({
+          _dy_resolve: resolve,
+          _dy_reject: reject,
+          ...action,
+        });
+      });
+    } else {
+      return next(action);
+    }
+  };
+}
+
 
 /** 
  * 获取注册model函数
@@ -68,7 +106,7 @@ export interface ReduxApp {
  * @param sagaMiddleware saga中间件
  * @returns 返回function regist(model)
  */
-function getRegistModelFunc(store: Store<any, ReduxAction>, registedModel: { [x: string]: ReduxModel; },
+function getRegistModelFunc(store: Store<any, ReduxAction>, registedModel: RegistedModel,
   allReducers: { [x: string]: Reducer<any, AnyAction>; },
   sagaMiddleware: SagaMiddleware<object>): (model: ReduxModel) => void {
   /** model函数注册函数
@@ -130,12 +168,13 @@ function getRegistModelFunc(store: Store<any, ReduxAction>, registedModel: { [x:
   };
 }
 
+
 /** 创建store */
 export default function create(): ReduxApp {
   //已经注册的reducer, key是名字, value是reducer
   const allReducers = {};
   //已注册model
-  const registedModel = {};
+  const registedModel: RegistedModel = {};
 
   const sagaMiddleware = createSagaMiddleware();
 
@@ -161,7 +200,7 @@ export default function create(): ReduxApp {
   );
 
   const regist = getRegistModelFunc(store, registedModel, allReducers, sagaMiddleware);
-  
+
   let app: ReduxApp = {
     /** redux store */
     store: store,

package/src/index.js

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

package/src/redux/createPromiseMiddleware.js

@@ -1,31 +0,0 @@
-/** 
- * @param registedModel 已注册model
- */
-export default function createPromiseMiddleware(registedModel) {
-  return () => next => action => {
-    const { type } = action;
-    if (isEffect(type)) {
-      return new Promise((resolve, reject) => {
-        next({
-          _dy_resolve: resolve,
-          _dy_reject: reject,
-          ...action,
-        });
-      });
-    } else {
-      return next(action);
-    }
-  };
-
-  function isEffect(type) {
-    if (!type || typeof type !== 'string') return false;
-    const [modelName, effect] = type.split('/');
-    const model = registedModel[modelName];
-    if (model) {
-      if (model.effects && model.effects[effect]) {
-        return true;
-      }
-    }
-    return false;
-  }
-}