@cclr/model 0.1.9 → 0.1.11

package/lib/cjs/index.js

@@ -1,10 +1,114 @@
 'use strict';
 
-var immer = require('immer');
 var lang = require('@cclr/lang');
+var immer = require('immer');
+
+var middlewareConfig = {
+  showLog: true
+};
+var handleModelMiddlewareConfig = function handleModelMiddlewareConfig(config) {
+  Reflect.ownKeys(config).forEach(function (key) {
+    if (lang.isString(key)) {
+      lang.set(middlewareConfig, key, config[key]);
+    }
+  });
+};
+
+var gatter = function gatter(ctx) {
+  return function (next) {
+    return function (params) {
+      return new Promise(function ($return, $error) {
+        var action, payload, state, actions;
+        action = ctx.action, payload = ctx.payload, state = ctx.state, actions = ctx.actions;
+        return Promise.resolve(action(payload, {
+          state: state,
+          actions: actions
+        })).then(function ($await_1) {
+          try {
+            ctx.newState = $await_1;
+            return $return(next(params));
+          } catch ($boundEx) {
+            return $error($boundEx);
+          }
+        }, $error);
+      });
+    };
+  };
+};
+var gatterSync = function gatterSync(ctx) {
+  return function (next) {
+    return function (params) {
+      var action = ctx.action,
+        payload = ctx.payload,
+        state = ctx.state,
+        actions = ctx.actions;
+      ctx.newState = action(payload, {
+        state: state,
+        actions: actions
+      });
+      return next(params);
+    };
+  };
+};
+
+var logger = function logger(ctx) {
+  return function (next) {
+    return function (params) {
+      return new Promise(function ($return, $error) {
+        var showLog, r;
+        showLog = middlewareConfig.showLog;
+        if (!showLog) {
+          return $return(next(params));
+        }
+        console.log(ctx.modelName, '- action -start: ', ctx.action.name);
+        return Promise.resolve(next(params)).then(function ($await_1) {
+          try {
+            r = $await_1;
+            console.log(ctx.modelName, '- action -end: ', ctx.action.name);
+            return $return(r);
+          } catch ($boundEx) {
+            return $error($boundEx);
+          }
+        }, $error);
+      });
+    };
+  };
+};
+var loggerSync = function loggerSync(ctx) {
+  return function (next) {
+    return function (params) {
+      var showLog = middlewareConfig.showLog;
+      if (!showLog) {
+        return next(params);
+      }
+      console.log(ctx.modelName, '- action -start: ', ctx.action.name);
+      var r = next(params);
+      console.log(ctx.modelName, '- action -end: ', ctx.action.name);
+      return r;
+    };
+  };
+};
+
+/**
+ * 发布函数
+ * @param ctx
+ * @returns
+ */
+var publish = function publish(ctx) {
+  return function (next) {
+    return function (params) {
+      var subscribes = ctx.subscribes;
+      subscribes === null || subscribes === void 0 || subscribes.forEach(function (callback) {
+        callback();
+      });
+      return next(params);
+    };
+  };
+};
 
 var State = {};
 var Actions = {};
+var Middlewares = {};
 var Subscribes = {
   /*******
   [modelName]: [
@@ -16,14 +120,16 @@ var GlobalModel = {
   __MId: 1,
   State: State,
   Actions: Actions,
-  Subscribes: Subscribes
+  Subscribes: Subscribes,
+  Middlewares: Middlewares
 };
 
 var getCtx = function getCtx(modelName) {
   return {
     state: GlobalModel.State[modelName],
     actions: GlobalModel.Actions[modelName],
-    subscribes: GlobalModel.Subscribes[modelName]
+    subscribes: GlobalModel.Subscribes[modelName],
+    middlewares: GlobalModel.Middlewares[modelName]
   };
 };
 var getState = function getState(modelName) {
@@ -33,6 +139,69 @@ var getActions = function getActions(modelName) {
   return GlobalModel.Actions[modelName];
 };
 
+/**
+ * action返回
+ * @param ctx
+ * @returns
+ */
+var returnState = function returnState(ctx) {
+  return function (_next) {
+    return function (_params) {
+      return getState(ctx.modelName);
+    };
+  };
+};
+
+var produceState = function produceState(base, recipe) {
+  return immer.produce(base, recipe);
+};
+
+var setter = function setter(ctx) {
+  return function (next) {
+    return function (params) {
+      var modelName = ctx.modelName;
+      var newState = ctx.newState;
+      if (!newState) {
+        return getState(modelName);
+      }
+      if (lang.isFunction(newState)) {
+        newState = produceState(getState(modelName), newState);
+      }
+      GlobalModel.State = immer.produce(GlobalModel.State, function (draft) {
+        draft[modelName] = newState;
+      });
+      return next(params);
+    };
+  };
+};
+
+var tryCatch = function tryCatch() {
+  return function (next) {
+    return function (params) {
+      return new Promise(function ($return, $error) {
+        var _next;
+        return Promise.resolve((_next = next(params)) === null || _next === void 0 ? void 0 : _next.catch(function (e) {
+          return console.log(e);
+        })).then($return, $error);
+      });
+    };
+  };
+};
+var tryCatchSync = function tryCatchSync() {
+  return function (next) {
+    return function (params) {
+      try {
+        return next(params);
+      } catch (e) {
+        console.log(e);
+      }
+    };
+  };
+};
+
+var presetMiddleware = [tryCatch, logger, gatter, setter, publish, returnState];
+var presetMiddlewareSync = [tryCatchSync, loggerSync, gatterSync, setter, publish, returnState];
+
 var applyMiddleware = function applyMiddleware() {};
 
 function _arrayLikeToArray(r, a) {
@@ -136,118 +305,6 @@ function _unsupportedIterableToArray(r, a) {
   }
 }
 
-var gatter = function gatter(ctx) {
-  return function (next) {
-    return function (params) {
-      return new Promise(function ($return, $error) {
-        var action, payload, state, actions;
-        action = ctx.action, payload = ctx.payload, state = ctx.state, actions = ctx.actions;
-        return Promise.resolve(action(payload, {
-          state: state,
-          actions: actions
-        })).then(function ($await_1) {
-          try {
-            ctx.newState = $await_1;
-            return $return(next(params));
-          } catch ($boundEx) {
-            return $error($boundEx);
-          }
-        }, $error);
-      });
-    };
-  };
-};
-
-var logger = function logger(ctx) {
-  return function (next) {
-    return function (params) {
-      return new Promise(function ($return, $error) {
-        var r;
-        console.log(ctx.modelName, '- action -start: ', ctx.action.name);
-        return Promise.resolve(next(params)).then(function ($await_1) {
-          try {
-            r = $await_1;
-            console.log(ctx.modelName, '- action -end: ', ctx.action.name);
-            return $return(r);
-          } catch ($boundEx) {
-            return $error($boundEx);
-          }
-        }, $error);
-      });
-    };
-  };
-};
-
-/**
- * 发布函数
- * @param ctx
- * @returns
- */
-var publish = function publish(ctx) {
-  return function (next) {
-    return function (params) {
-      var subscribes = ctx.subscribes;
-      subscribes === null || subscribes === void 0 || subscribes.forEach(function (callback) {
-        callback();
-      });
-      return next(params);
-    };
-  };
-};
-
-/**
- * action返回
- * @param ctx
- * @returns
- */
-var returnState = function returnState(ctx) {
-  return function (_next) {
-    return function (_params) {
-      return getState(ctx.modelName);
-    };
-  };
-};
-
-var produceState = function produceState(base, recipe) {
-  return immer.produce(base, recipe);
-};
-
-var setter = function setter(ctx) {
-  return function (next) {
-    return function (params) {
-      return new Promise(function ($return, $error) {
-        var modelName = ctx.modelName;
-        var newState = ctx.newState;
-        if (!newState) {
-          return $return(getState(modelName));
-        }
-        if (lang.isFunction(newState)) {
-          newState = produceState(getState(modelName), newState);
-        }
-        GlobalModel.State = immer.produce(GlobalModel.State, function (draft) {
-          draft[modelName] = newState;
-        });
-        return $return(next(params));
-      });
-    };
-  };
-};
-
-var tryCatch = function tryCatch() {
-  return function (next) {
-    return function (params) {
-      return new Promise(function ($return, $error) {
-        var _next;
-        return Promise.resolve((_next = next(params)) === null || _next === void 0 ? void 0 : _next.catch(function (e) {
-          return console.log(e);
-        })).then($return, $error);
-      });
-    };
-  };
-};
-
-var presetMiddleware = [tryCatch, logger, gatter, setter, publish, returnState];
-
 function compose() {
   for (var _len = arguments.length, funcs = new Array(_len), _key = 0; _key < _len; _key++) {
     funcs[_key] = arguments[_key];
@@ -267,7 +324,7 @@ function compose() {
   });
 }
 
-var rebuildActions = function rebuildActions(actions, modelName) {
+var rebuildActions = function rebuildActions(modelName, actions) {
   var updateActions = {};
   Object.entries(actions).forEach(function (_ref) {
     var _ref2 = _slicedToArray(_ref, 2),
@@ -282,7 +339,8 @@ var resetAction = function resetAction(action, modelName) {
     var _getCtx = getCtx(modelName),
       state = _getCtx.state,
       actions = _getCtx.actions,
-      subscribes = _getCtx.subscribes;
+      subscribes = _getCtx.subscribes,
+      middlewares = _getCtx.middlewares;
     var ctx = {
       payload: payload,
       state: state,
@@ -293,10 +351,10 @@ var resetAction = function resetAction(action, modelName) {
       newState: null,
       setterFun: undefined
     };
-    var middlewares = presetMiddleware.map(function (middleware) {
+    var middlewaresContent = middlewares.map(function (middleware) {
       return middleware(ctx);
     });
-    var composeFun = compose.apply(void 0, _toConsumableArray(middlewares));
+    var composeFun = compose.apply(void 0, _toConsumableArray(middlewaresContent));
     return composeFun(function () {
       return getState(modelName);
     })();
@@ -309,11 +367,15 @@ var initModel = function initModel(models) {
       modelName = _ref2[0],
       model = _ref2[1];
     GlobalModel.__MId++;
-    GlobalModel.State = produceState(GlobalModel.State, function (draft) {
-      draft[modelName] = model.state;
-    });
-    GlobalModel.Actions[modelName] = _objectSpread2({}, rebuildActions(model.actions, modelName));
+    initSingleModel(modelName, model);
+  });
+};
+var initSingleModel = function initSingleModel(modelName, model) {
+  GlobalModel.Middlewares[modelName] = model.middleware || presetMiddleware;
+  GlobalModel.State = produceState(GlobalModel.State, function (draft) {
+    draft[modelName] = model.state;
   });
+  GlobalModel.Actions[modelName] = _objectSpread2({}, rebuildActions(modelName, model.actions));
 };
 
 /**
@@ -362,11 +424,42 @@ var Model = function Model(models) {
   };
 };
 
+/**
+ * Model 类
+ */
+var ModelSingle = function ModelSingle(model) {
+  /** 初始化 */
+  var mId = GlobalModel.__MId++;
+  var modelName = "modelsName-".concat(mId);
+  initSingleModel(modelName, model);
+  return {
+    getState: function getState$1() {
+      return getState(modelName);
+    },
+    getActions: function getActions$1() {
+      return getActions(modelName);
+    },
+    subscribe: function subscribe$1(callback) {
+      return subscribe(modelName, callback);
+    },
+    unsubscribe: function unsubscribe$1(callback) {
+      return unsubscribe(modelName, callback);
+    },
+    applyMiddleware: applyMiddleware
+  };
+};
+
 exports.Model = Model;
+exports.ModelSingle = ModelSingle;
 exports.gatter = gatter;
+exports.gatterSync = gatterSync;
+exports.handleModelMiddlewareConfig = handleModelMiddlewareConfig;
 exports.logger = logger;
+exports.loggerSync = loggerSync;
 exports.presetMiddleware = presetMiddleware;
+exports.presetMiddlewareSync = presetMiddlewareSync;
 exports.publish = publish;
 exports.returnState = returnState;
 exports.setter = setter;
 exports.tryCatch = tryCatch;
+exports.tryCatchSync = tryCatchSync;

package/lib/esm/index.js

@@ -1,8 +1,112 @@
+import { isString, set, isFunction } from '@cclr/lang';
 import { produce } from 'immer';
-import { isFunction } from '@cclr/lang';
+
+var middlewareConfig = {
+  showLog: true
+};
+var handleModelMiddlewareConfig = function handleModelMiddlewareConfig(config) {
+  Reflect.ownKeys(config).forEach(function (key) {
+    if (isString(key)) {
+      set(middlewareConfig, key, config[key]);
+    }
+  });
+};
+
+var gatter = function gatter(ctx) {
+  return function (next) {
+    return function (params) {
+      return new Promise(function ($return, $error) {
+        var action, payload, state, actions;
+        action = ctx.action, payload = ctx.payload, state = ctx.state, actions = ctx.actions;
+        return Promise.resolve(action(payload, {
+          state: state,
+          actions: actions
+        })).then(function ($await_1) {
+          try {
+            ctx.newState = $await_1;
+            return $return(next(params));
+          } catch ($boundEx) {
+            return $error($boundEx);
+          }
+        }, $error);
+      });
+    };
+  };
+};
+var gatterSync = function gatterSync(ctx) {
+  return function (next) {
+    return function (params) {
+      var action = ctx.action,
+        payload = ctx.payload,
+        state = ctx.state,
+        actions = ctx.actions;
+      ctx.newState = action(payload, {
+        state: state,
+        actions: actions
+      });
+      return next(params);
+    };
+  };
+};
+
+var logger = function logger(ctx) {
+  return function (next) {
+    return function (params) {
+      return new Promise(function ($return, $error) {
+        var showLog, r;
+        showLog = middlewareConfig.showLog;
+        if (!showLog) {
+          return $return(next(params));
+        }
+        console.log(ctx.modelName, '- action -start: ', ctx.action.name);
+        return Promise.resolve(next(params)).then(function ($await_1) {
+          try {
+            r = $await_1;
+            console.log(ctx.modelName, '- action -end: ', ctx.action.name);
+            return $return(r);
+          } catch ($boundEx) {
+            return $error($boundEx);
+          }
+        }, $error);
+      });
+    };
+  };
+};
+var loggerSync = function loggerSync(ctx) {
+  return function (next) {
+    return function (params) {
+      var showLog = middlewareConfig.showLog;
+      if (!showLog) {
+        return next(params);
+      }
+      console.log(ctx.modelName, '- action -start: ', ctx.action.name);
+      var r = next(params);
+      console.log(ctx.modelName, '- action -end: ', ctx.action.name);
+      return r;
+    };
+  };
+};
+
+/**
+ * 发布函数
+ * @param ctx
+ * @returns
+ */
+var publish = function publish(ctx) {
+  return function (next) {
+    return function (params) {
+      var subscribes = ctx.subscribes;
+      subscribes === null || subscribes === void 0 || subscribes.forEach(function (callback) {
+        callback();
+      });
+      return next(params);
+    };
+  };
+};
 
 var State = {};
 var Actions = {};
+var Middlewares = {};
 var Subscribes = {
   /*******
   [modelName]: [
@@ -14,14 +118,16 @@ var GlobalModel = {
   __MId: 1,
   State: State,
   Actions: Actions,
-  Subscribes: Subscribes
+  Subscribes: Subscribes,
+  Middlewares: Middlewares
 };
 
 var getCtx = function getCtx(modelName) {
   return {
     state: GlobalModel.State[modelName],
     actions: GlobalModel.Actions[modelName],
-    subscribes: GlobalModel.Subscribes[modelName]
+    subscribes: GlobalModel.Subscribes[modelName],
+    middlewares: GlobalModel.Middlewares[modelName]
   };
 };
 var getState = function getState(modelName) {
@@ -31,6 +137,69 @@ var getActions = function getActions(modelName) {
   return GlobalModel.Actions[modelName];
 };
 
+/**
+ * action返回
+ * @param ctx
+ * @returns
+ */
+var returnState = function returnState(ctx) {
+  return function (_next) {
+    return function (_params) {
+      return getState(ctx.modelName);
+    };
+  };
+};
+
+var produceState = function produceState(base, recipe) {
+  return produce(base, recipe);
+};
+
+var setter = function setter(ctx) {
+  return function (next) {
+    return function (params) {
+      var modelName = ctx.modelName;
+      var newState = ctx.newState;
+      if (!newState) {
+        return getState(modelName);
+      }
+      if (isFunction(newState)) {
+        newState = produceState(getState(modelName), newState);
+      }
+      GlobalModel.State = produce(GlobalModel.State, function (draft) {
+        draft[modelName] = newState;
+      });
+      return next(params);
+    };
+  };
+};
+
+var tryCatch = function tryCatch() {
+  return function (next) {
+    return function (params) {
+      return new Promise(function ($return, $error) {
+        var _next;
+        return Promise.resolve((_next = next(params)) === null || _next === void 0 ? void 0 : _next.catch(function (e) {
+          return console.log(e);
+        })).then($return, $error);
+      });
+    };
+  };
+};
+var tryCatchSync = function tryCatchSync() {
+  return function (next) {
+    return function (params) {
+      try {
+        return next(params);
+      } catch (e) {
+        console.log(e);
+      }
+    };
+  };
+};
+
+var presetMiddleware = [tryCatch, logger, gatter, setter, publish, returnState];
+var presetMiddlewareSync = [tryCatchSync, loggerSync, gatterSync, setter, publish, returnState];
+
 var applyMiddleware = function applyMiddleware() {};
 
 function _arrayLikeToArray(r, a) {
@@ -134,118 +303,6 @@ function _unsupportedIterableToArray(r, a) {
   }
 }
 
-var gatter = function gatter(ctx) {
-  return function (next) {
-    return function (params) {
-      return new Promise(function ($return, $error) {
-        var action, payload, state, actions;
-        action = ctx.action, payload = ctx.payload, state = ctx.state, actions = ctx.actions;
-        return Promise.resolve(action(payload, {
-          state: state,
-          actions: actions
-        })).then(function ($await_1) {
-          try {
-            ctx.newState = $await_1;
-            return $return(next(params));
-          } catch ($boundEx) {
-            return $error($boundEx);
-          }
-        }, $error);
-      });
-    };
-  };
-};
-
-var logger = function logger(ctx) {
-  return function (next) {
-    return function (params) {
-      return new Promise(function ($return, $error) {
-        var r;
-        console.log(ctx.modelName, '- action -start: ', ctx.action.name);
-        return Promise.resolve(next(params)).then(function ($await_1) {
-          try {
-            r = $await_1;
-            console.log(ctx.modelName, '- action -end: ', ctx.action.name);
-            return $return(r);
-          } catch ($boundEx) {
-            return $error($boundEx);
-          }
-        }, $error);
-      });
-    };
-  };
-};
-
-/**
- * 发布函数
- * @param ctx
- * @returns
- */
-var publish = function publish(ctx) {
-  return function (next) {
-    return function (params) {
-      var subscribes = ctx.subscribes;
-      subscribes === null || subscribes === void 0 || subscribes.forEach(function (callback) {
-        callback();
-      });
-      return next(params);
-    };
-  };
-};
-
-/**
- * action返回
- * @param ctx
- * @returns
- */
-var returnState = function returnState(ctx) {
-  return function (_next) {
-    return function (_params) {
-      return getState(ctx.modelName);
-    };
-  };
-};
-
-var produceState = function produceState(base, recipe) {
-  return produce(base, recipe);
-};
-
-var setter = function setter(ctx) {
-  return function (next) {
-    return function (params) {
-      return new Promise(function ($return, $error) {
-        var modelName = ctx.modelName;
-        var newState = ctx.newState;
-        if (!newState) {
-          return $return(getState(modelName));
-        }
-        if (isFunction(newState)) {
-          newState = produceState(getState(modelName), newState);
-        }
-        GlobalModel.State = produce(GlobalModel.State, function (draft) {
-          draft[modelName] = newState;
-        });
-        return $return(next(params));
-      });
-    };
-  };
-};
-
-var tryCatch = function tryCatch() {
-  return function (next) {
-    return function (params) {
-      return new Promise(function ($return, $error) {
-        var _next;
-        return Promise.resolve((_next = next(params)) === null || _next === void 0 ? void 0 : _next.catch(function (e) {
-          return console.log(e);
-        })).then($return, $error);
-      });
-    };
-  };
-};
-
-var presetMiddleware = [tryCatch, logger, gatter, setter, publish, returnState];
-
 function compose() {
   for (var _len = arguments.length, funcs = new Array(_len), _key = 0; _key < _len; _key++) {
     funcs[_key] = arguments[_key];
@@ -265,7 +322,7 @@ function compose() {
   });
 }
 
-var rebuildActions = function rebuildActions(actions, modelName) {
+var rebuildActions = function rebuildActions(modelName, actions) {
   var updateActions = {};
   Object.entries(actions).forEach(function (_ref) {
     var _ref2 = _slicedToArray(_ref, 2),
@@ -280,7 +337,8 @@ var resetAction = function resetAction(action, modelName) {
     var _getCtx = getCtx(modelName),
       state = _getCtx.state,
       actions = _getCtx.actions,
-      subscribes = _getCtx.subscribes;
+      subscribes = _getCtx.subscribes,
+      middlewares = _getCtx.middlewares;
     var ctx = {
       payload: payload,
       state: state,
@@ -291,10 +349,10 @@ var resetAction = function resetAction(action, modelName) {
       newState: null,
       setterFun: undefined
     };
-    var middlewares = presetMiddleware.map(function (middleware) {
+    var middlewaresContent = middlewares.map(function (middleware) {
       return middleware(ctx);
     });
-    var composeFun = compose.apply(void 0, _toConsumableArray(middlewares));
+    var composeFun = compose.apply(void 0, _toConsumableArray(middlewaresContent));
     return composeFun(function () {
       return getState(modelName);
     })();
@@ -307,11 +365,15 @@ var initModel = function initModel(models) {
       modelName = _ref2[0],
       model = _ref2[1];
     GlobalModel.__MId++;
-    GlobalModel.State = produceState(GlobalModel.State, function (draft) {
-      draft[modelName] = model.state;
-    });
-    GlobalModel.Actions[modelName] = _objectSpread2({}, rebuildActions(model.actions, modelName));
+    initSingleModel(modelName, model);
+  });
+};
+var initSingleModel = function initSingleModel(modelName, model) {
+  GlobalModel.Middlewares[modelName] = model.middleware || presetMiddleware;
+  GlobalModel.State = produceState(GlobalModel.State, function (draft) {
+    draft[modelName] = model.state;
   });
+  GlobalModel.Actions[modelName] = _objectSpread2({}, rebuildActions(modelName, model.actions));
 };
 
 /**
@@ -360,4 +422,29 @@ var Model = function Model(models) {
   };
 };
 
-export { Model, gatter, logger, presetMiddleware, publish, returnState, setter, tryCatch };
+/**
+ * Model 类
+ */
+var ModelSingle = function ModelSingle(model) {
+  /** 初始化 */
+  var mId = GlobalModel.__MId++;
+  var modelName = "modelsName-".concat(mId);
+  initSingleModel(modelName, model);
+  return {
+    getState: function getState$1() {
+      return getState(modelName);
+    },
+    getActions: function getActions$1() {
+      return getActions(modelName);
+    },
+    subscribe: function subscribe$1(callback) {
+      return subscribe(modelName, callback);
+    },
+    unsubscribe: function unsubscribe$1(callback) {
+      return unsubscribe(modelName, callback);
+    },
+    applyMiddleware: applyMiddleware
+  };
+};
+
+export { Model, ModelSingle, gatter, gatterSync, handleModelMiddlewareConfig, logger, loggerSync, presetMiddleware, presetMiddlewareSync, publish, returnState, setter, tryCatch, tryCatchSync };

package/lib/type/index.d.ts

@@ -1,4 +1,4 @@
-import { TAny, TPlainObject } from '@cclr/lang';
+import { TAny, TPlainObject, TNoop } from '@cclr/lang';
 
 type IsOptional<T> = Extract<T, undefined> extends never ? false : true;
 type FirstArg<F> = F extends (arg1: infer A, ...args: any[]) => any ? A : never;
@@ -35,38 +35,6 @@ type TActionApi<A extends (...args: any[]) => any, S extends TState> = (arg: Fir
 
 type TSubscribesFun = () => any;
 
-/**
- * 获取model的api
- */
-type ModelsApi<MS extends ModelsType> = {
-    /** 获取state的值 */
-    getState<K extends keyof MS>(params: K): MS[K]['state'];
-    /** 获取actions */
-    getActions<K extends keyof MS>(params: K): TActionMapApi<MS[K]['actions'], MS[K]['state']>;
-    /** 订阅模块更新 */
-    subscribe<K extends keyof MS>(params: K, callback: TSubscribesFun): () => void;
-    /** 取消订阅 */
-    unsubscribe<K extends keyof MS>(params: K, callback: TSubscribesFun): void;
-};
-/**
- * models的类型
- */
-type ModelsType<S extends TState = TState, PM extends TPlainObject = TPlainObject> = {
-    [modelName: string]: ModelType<S, PM>;
-};
-/**
- * 单个model的类型
- */
-type ModelType<S extends TState = TState, PM extends TPlainObject = TPlainObject> = {
-    state: S;
-    actions: TActionMap<S, PM>;
-};
-
-/**
- * Model 类
- */
-declare const Model: <MS extends ModelsType>(models: MS) => ModelsApi<MS>;
-
 /** 中间件上下文 */
 interface IActionCtx {
     /** model的唯一索引 */
@@ -94,9 +62,57 @@ type TNextFun<P extends TActionParams = TActionParams, S extends TState = TState
 /** 中间件 */
 type TMiddleware<P extends TActionParams = TActionParams, S extends TState = TState, C extends IActionCtx = IActionCtx> = (ctx: C) => TNextFun<P, S>;
 
+/**
+ * 获取model的api
+ */
+type ModelsApi<MS extends ModelsType> = {
+    /** 获取state的值 */
+    getState<K extends keyof MS>(params: K): MS[K]['state'];
+    /** 获取actions */
+    getActions<K extends keyof MS>(params: K): TActionMapApi<MS[K]['actions'], MS[K]['state']>;
+    /** 订阅模块更新 */
+    subscribe<K extends keyof MS>(params: K, callback: TSubscribesFun): TNoop;
+    /** 取消订阅 */
+    unsubscribe<K extends keyof MS>(params: K, callback: TSubscribesFun): void;
+};
+/**
+ * 获取model的api
+ */
+type ModelsSingleApi<MT extends ModelType> = {
+    /** 获取state的值 */
+    getState(): MT['state'];
+    /** 获取actions */
+    getActions(): TActionMapApi<MT['actions'], MT['state']>;
+    /** 订阅模块更新 */
+    subscribe(callback: TSubscribesFun): TNoop;
+    /** 取消订阅 */
+    unsubscribe(callback: TSubscribesFun): void;
+};
+/**
+ * models的类型
+ */
+type ModelsType<S extends TState = TState, PM extends TPlainObject = TPlainObject> = {
+    [modelName: string]: ModelType<S, PM>;
+};
+/**
+ * 单个model的类型
+ */
+type ModelType<S extends TState = TState, PM extends TPlainObject = TPlainObject> = {
+    state: S;
+    actions: TActionMap<S, PM>;
+    middleware?: TMiddleware[];
+};
+
+declare const middlewareConfig: {
+    showLog: boolean;
+};
+declare const handleModelMiddlewareConfig: (config: Partial<typeof middlewareConfig>) => void;
+
 declare const gatter: TMiddleware;
+declare const gatterSync: TMiddleware;
 
 declare const logger: TMiddleware;
+declare const loggerSync: TMiddleware;
 
 /**
  * 发布函数
@@ -115,7 +131,18 @@ declare const returnState: TMiddleware;
 declare const setter: TMiddleware;
 
 declare const tryCatch: () => (next: any) => (params: any) => Promise<any>;
+declare const tryCatchSync: () => (next: any) => (params: any) => any;
 
 declare const presetMiddleware: TMiddleware[];
+declare const presetMiddlewareSync: TMiddleware[];
+
+/**
+ * Model 类
+ */
+declare const Model: <MS extends ModelsType>(models: MS) => ModelsApi<MS>;
+/**
+ * Model 类
+ */
+declare const ModelSingle: <MT extends ModelType>(model: MT) => ModelsSingleApi<MT>;
 
-export { Model, type ModelType, type ModelsApi, type ModelsType, type TAction, type TActionMapApi, type TMiddleware, type TSubscribesFun, gatter, logger, presetMiddleware, publish, returnState, setter, tryCatch };
+export { Model, ModelSingle, type ModelType, type ModelsApi, type ModelsSingleApi, type ModelsType, type TAction, type TActionMapApi, type TMiddleware, type TSubscribesFun, gatter, gatterSync, handleModelMiddlewareConfig, logger, loggerSync, presetMiddleware, presetMiddlewareSync, publish, returnState, setter, tryCatch, tryCatchSync };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cclr/model",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "前端开发状态管理",
   "author": "cclr <18843152354@163.com>",
   "homepage": "",
@@ -27,10 +27,10 @@
     "g:test": "vitest run",
     "g:build": "ccf build"
   },
-  "gitHead": "ebe5ad930f1ae38c11e885ee8d781235558928e9",
+  "gitHead": "e03c9c40bc86083ba49fe9f372375a50223191cc",
   "dependencies": {
-    "@cclr/lang": "^0.1.9",
-    "@cclr/utils": "^0.1.9",
+    "@cclr/lang": "0.1.11",
+    "@cclr/utils": "0.1.11",
     "immer": "^10.1.1"
   }
 }