ez-saga 17.0.9 → 17.1.0

package/package.json

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

package/src/index.d.ts

@@ -1 +1 @@
-export { PayloadAction, EffectTool, Effect, ModelReducer, ModelEffect, ReduxModel, ReduxApp } from './redux/createApp';
+export { PayloadAction, EffectTool, Effect, ModelReducer, ModelEffect, ReduxModel, ReduxApp } from './redux/typeDeclare';

package/src/index.ts

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

package/src/redux/PromiseMiddleware.ts

@@ -0,0 +1,44 @@
+import { Dispatch, Middleware, MiddlewareAPI, Action, AnyAction } from 'redux';
+import { RegistedModel } from './typeDeclare';
+
+/** 
+ * 创建中间层
+ * @param registedModel 已注册model
+ */
+function createPromiseMiddleware<D extends Dispatch>(registedModel: RegistedModel): Middleware<any, any, any> {
+  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;
+  }
+  // function isReduxAction(action: unknown): action is Action {
+  //   return (action as Action)?.type !== undefined;
+  // }
+
+  return (api: MiddlewareAPI<D, any>) => (next: (action: AnyAction) => any) => (action: AnyAction) => {
+    let exeEffect = false;
+    if ((action as Action)?.type !== undefined) {
+      const { type } = action as Action;
+      exeEffect = isEffect(type);
+    }
+    if (exeEffect) {
+      return new Promise((resolve, reject) => {
+        next({
+          _dy_resolve: resolve,
+          _dy_reject: reject,
+          ...action as Action,
+        });
+      });
+    } else {
+      return next(action);
+    }
+  };
+}
+
+export default createPromiseMiddleware;

package/src/redux/createApp.ts

@@ -1,12 +1,15 @@
 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 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 createPromiseMiddleware from './PromiseMiddleware';
 
-const saveState: Reducer<any, AnyAction> = (state: any, action: AnyAction) => {
+const saveState: Reducer<any, PayloadAction> = (state: any, action: PayloadAction) => {
+  debugger;
   if (!action.payload) {
     return state;
   }
@@ -15,92 +18,7 @@ const saveState: Reducer<any, AnyAction> = (state: any, action: AnyAction) => {
     ...action.payload
   };
   return newStat;
-}
-
-/** payload action类型 */
-export interface PayloadAction extends Action<string>, ReduxAction<string> {
-  payload: any
-}
-
-/** 工具 */
-export interface EffectTool {
-  call: (...args: any[]) => any,
-  put: <A extends Action>(action: A) => PutEffect<A>,
-  select: ((selectFunc: (state: any) => any) => SelectEffect) | (() => SelectEffect)
-}
-
-/** Effect函数类型 */
-export interface Effect {
-  (action: PayloadAction, tool: EffectTool): Generator | any;
-}
-
-/** ModelReducer定义 */
-export interface ModelReducer {
-  [key: string]: Reducer<any, AnyAction>;
-}
-
-
-/** ModelEffect定义 */
-export interface ModelEffect {
-  [key: string]: Effect;
-}
-
-export interface ReduxModel {
-  name: string,
-  state?: any;
-  reducers?: ModelReducer
-  effects?: ModelEffect;
-}
-
-interface ReduxSagaModel extends ReduxModel {
-  initialState: any,
-  reducers: ModelReducer
-}
-
-export interface RegistedModel {
-  [key: string]: ReduxModel;
-}
-
-/** app */
-export interface ReduxApp {
-  store: Store<any, ReduxAction>,
-  sagaMiddleware: SagaMiddleware<object>;
-  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函数

package/src/redux/defaultReducer.ts

@@ -0,0 +1,17 @@
+/** 默认reducer */
+import { Reducer } from 'redux';
+import { PayloadAction } from './typeDeclare';
+
+const saveState: Reducer<any, PayloadAction> = (state: any, action: PayloadAction) => {
+  debugger;
+  if (!action.payload) {
+    return state;
+  }
+  let newStat = {
+    ...state,
+    ...action.payload
+  };
+  return newStat;
+};
+
+export default saveState;

package/src/redux/typeDeclare.ts

@@ -0,0 +1,72 @@
+/** 类型申明 */
+import {
+  Action as ReduxAction, Store, Reducer, AnyAction
+} from 'redux';
+import { Action, SagaMiddleware } from 'redux-saga';
+import { PutEffect, SelectEffect } from 'redux-saga/effects';
+
+/** payload action类型 */
+export interface PayloadAction extends AnyAction, ReduxAction<string> {
+  /** 类型 */
+  type: string,
+  /** 载体 */
+  payload?: any
+}
+
+/** 工具 */
+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 | 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
+}