@mic-rexjs/usecases-react 2.4.0 → 2.5.1

package/lib/hooks/useArgumentTypes/index.js

@@ -12,15 +12,11 @@ var _useConstant = require("../useConstant");
 var useArgumentTypes = exports.useArgumentTypes = function useArgumentTypes(args) {
   return (0, _useConstant.useConstant)(function () {
     var types = _UseCaseArgumentTypes.UseCaseArgumentTypes.None;
-    var _args = (0, _slicedToArray2["default"])(args, 3),
-      arg2 = _args[1],
-      arg3 = _args[2];
+    var _args = (0, _slicedToArray2["default"])(args, 2),
+      arg2 = _args[1];
     var type2 = (0, _typeof2["default"])(arg2);
     if (type2 === 'function') {
       types |= _UseCaseArgumentTypes.UseCaseArgumentTypes.Entity;
-      if (typeof arg3 === 'number') {
-        types |= _UseCaseArgumentTypes.UseCaseArgumentTypes.Mode;
-      }
     }
     return types;
   });

package/lib/hooks/useEntity/index.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useEntity = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _usecases = require("@mic-rexjs/usecases");
 var _UseCaseStatuses = require("../../enums/UseCaseStatuses");
@@ -14,29 +12,23 @@ var _ahooks = require("ahooks");
 var _triggerWatchers = require("../../methods/triggerWatchers");
 var _useRuntimeEntity = require("../useRuntimeEntity");
 var useEntity = exports.useEntity = function useEntity(statuses, rootEntity, contextStore, options, depsKey) {
-  var _useState = (0, _react.useState)(rootEntity),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    entityState = _useState2[0],
-    setEntityState = _useState2[1];
+  var update = (0, _ahooks.useUpdate)();
+  var optionsRef = (0, _ahooks.useLatest)(options);
   var contextEntity = contextStore ? contextStore.value : null;
-  var runtimeEntity = (0, _useRuntimeEntity.useRuntimeEntity)(statuses, entityState, rootEntity, contextEntity);
   var entityEnabled = (statuses & _UseCaseStatuses.UseCaseStatuses.EntityEnabled) === _UseCaseStatuses.UseCaseStatuses.EntityEnabled;
   var entityRootEnabled = (statuses & _UseCaseStatuses.UseCaseStatuses.EntityRootEnabled) === _UseCaseStatuses.UseCaseStatuses.EntityRootEnabled;
-  var optionsRef = (0, _ahooks.useLatest)(options);
   var store = (0, _useContextualItem.useContextualItem)(contextStore, statuses, function () {
     if (!entityRootEnabled) {
       return new _usecases.EntityStore(null);
     }
-    var stateless = (statuses & _UseCaseStatuses.UseCaseStatuses.StatelessEnabled) === _UseCaseStatuses.UseCaseStatuses.StatelessEnabled;
-    return new _usecases.EntityStore(runtimeEntity, {
-      onChange: function onChange(newEntity) {
-        if (stateless) {
-          return;
-        }
-        setEntityState(newEntity);
+    var isFunction = typeof rootEntity === 'function';
+    return new _usecases.EntityStore(isFunction ? rootEntity() : rootEntity, {
+      onChange: function onChange() {
+        update();
       }
     });
   });
+  var runtimeEntity = (0, _useRuntimeEntity.useRuntimeEntity)(store, rootEntity, contextEntity, statuses);
   if (entityRootEnabled) {
     // 执行同步操作
     store.value = runtimeEntity;

package/lib/hooks/useRuntimeEntity/index.js

@@ -6,27 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.useRuntimeEntity = void 0;
 var _UseCaseStatuses = require("../../enums/UseCaseStatuses");
 var _react = require("react");
-var useRuntimeEntity = exports.useRuntimeEntity = function useRuntimeEntity(statuses, entityState, rootEntity, contextEntity) {
+var useRuntimeEntity = exports.useRuntimeEntity = function useRuntimeEntity(store, rootEntity, contextEntity, statuses) {
   var prevRootEntityRef = (0, _react.useRef)(rootEntity);
   var entityRootDisabled = (statuses & _UseCaseStatuses.UseCaseStatuses.EntityRootEnabled) !== _UseCaseStatuses.UseCaseStatuses.EntityRootEnabled;
   if (entityRootDisabled) {
     return contextEntity;
   }
   var isFunction = typeof rootEntity === 'function';
-  var statelessEnable = (statuses & _UseCaseStatuses.UseCaseStatuses.StatelessEnabled) === _UseCaseStatuses.UseCaseStatuses.StatelessEnabled;
-  if (statelessEnable) {
-    if (isFunction) {
-      return rootEntity();
-    }
-    return rootEntity;
-  }
   var prevRootEntity = prevRootEntityRef.current;
-  var stateControllableDisabled = (statuses & _UseCaseStatuses.UseCaseStatuses.StateControllableEnabled) !== _UseCaseStatuses.UseCaseStatuses.StateControllableEnabled;
   switch (true) {
-    case stateControllableDisabled:
     case isFunction:
     case prevRootEntity === rootEntity:
-      return entityState;
+      return store.value;
   }
   prevRootEntityRef.current = rootEntity;
   return rootEntity;

package/lib/hooks/useUseCase/index.js

@@ -30,19 +30,18 @@ var useUseCase = exports.useUseCase = function useUseCase() {
   }
   var argumentTypes = (0, _useArgumentTypes.useArgumentTypes)(args);
   var fullArguments = (0, _fillArguments.fillArguments)(args, argumentTypes);
-  var _fullArguments = (0, _slicedToArray2["default"])(fullArguments, 5),
+  var _fullArguments = (0, _slicedToArray2["default"])(fullArguments, 4),
     unsafeEntity = _fullArguments[0],
     unsafeUsecase = _fullArguments[1],
-    mode = _fullArguments[2],
-    options = _fullArguments[3],
-    deps = _fullArguments[4];
+    options = _fullArguments[2],
+    deps = _fullArguments[3];
   var unkownUsecase = (0, _useConstantFn.useConstantFn)(unsafeUsecase);
   var usecase = unkownUsecase;
   var entityUseCase = unkownUsecase;
   var context = (0, _useUseCaseContext.useUseCaseContext)(unkownUsecase, argumentTypes);
   var contextValue = (0, _react.useContext)(context);
   var entityContextValue = contextValue;
-  var statuses = (0, _useUseCaseStatuses.useUseCaseStatuses)(argumentTypes, mode, contextValue);
+  var statuses = (0, _useUseCaseStatuses.useUseCaseStatuses)(argumentTypes, contextValue);
   var optionsRef = (0, _ahooks.useLatest)(options);
   var depsKey = (0, _useCompareDeps.useCompareDeps)(deps);
   var _ref = contextValue || {},