@mic-rexjs/usecases-react 2.3.6 → 2.5.0

package/lib/hooks/useEntity/index.js

@@ -9,17 +9,17 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _usecases = require("@mic-rexjs/usecases");
 var _UseCaseStatuses = require("../../enums/UseCaseStatuses");
-var _getRenderingEntity = require("../../methods/getRenderingEntity");
 var _useContextualItem = require("../useContextualItem");
 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 contextEntity = contextStore ? contextStore.value : null;
-  var renderingEntity = (0, _getRenderingEntity.getRenderingEntity)(statuses, entityState, rootEntity, contextEntity);
+  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);
@@ -27,19 +27,15 @@ var useEntity = exports.useEntity = function useEntity(statuses, rootEntity, con
     if (!entityRootEnabled) {
       return new _usecases.EntityStore(null);
     }
-    var stateless = (statuses & _UseCaseStatuses.UseCaseStatuses.StatelessEnabled) === _UseCaseStatuses.UseCaseStatuses.StatelessEnabled;
-    return new _usecases.EntityStore(renderingEntity, {
+    return new _usecases.EntityStore(runtimeEntity, {
       onChange: function onChange(newEntity) {
-        if (stateless) {
-          return;
-        }
         setEntityState(newEntity);
       }
     });
   });
   if (entityRootEnabled) {
     // 执行同步操作
-    store.value = renderingEntity;
+    store.value = runtimeEntity;
   }
   (0, _react.useEffect)(function () {
     if (!entityEnabled) {
@@ -60,6 +56,6 @@ var useEntity = exports.useEntity = function useEntity(statuses, rootEntity, con
     };
   }, [entityEnabled, store, depsKey, optionsRef]);
   return (0, _ahooks.useCreation)(function () {
-    return [renderingEntity, store];
-  }, [renderingEntity, store]);
+    return [runtimeEntity, store];
+  }, [runtimeEntity, store]);
 };

package/lib/hooks/useRuntimeEntity/index.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useRuntimeEntity = void 0;
+var _UseCaseStatuses = require("../../enums/UseCaseStatuses");
+var _react = require("react");
+var useRuntimeEntity = exports.useRuntimeEntity = function useRuntimeEntity(statuses, entityState, rootEntity, contextEntity) {
+  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 prevRootEntity = prevRootEntityRef.current;
+  switch (true) {
+    case isFunction:
+    case prevRootEntity === rootEntity:
+      return entityState;
+  }
+  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 || {},