@mic-rexjs/usecases-react 2.10.2 → 2.11.0

package/lib/hooks/useEntity/index.js

@@ -1,36 +1,47 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useEntity = void 0;
-var _react = require("react");
-var _usecases = require("@mic-rexjs/usecases");
-var _Statuses = require("../../enums/Statuses");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _useConstantEntityReducers = require("../useConstantEntityReducers");
 var _useContextualItem = require("../useContextualItem");
+var _useRuntimeEntity = require("../useRuntimeEntity");
+var _usecases = require("@mic-rexjs/usecases");
 var _ahooks = require("ahooks");
+var _react = require("react");
+var _Statuses = require("../../enums/Statuses");
 var _triggerWatchers = require("../../methods/triggerWatchers");
-var _useRuntimeEntity = require("../useRuntimeEntity");
-var useEntity = exports.useEntity = function useEntity(statuses, entityArg, contextStore, options, depsKey) {
+var _valueUseCase = require("../../usecases/valueUseCase");
+var useEntity = exports.useEntity = function useEntity(statuses, entityArg, contextStore, options, deps) {
   var update = (0, _ahooks.useUpdate)();
-  var storeRef = (0, _react.useRef)();
+  var storeRef = (0, _react.useRef)(null);
   var optionsRef = (0, _ahooks.useLatest)(options);
   var contextEntity = contextStore ? contextStore.value : null;
   var entityEnabled = (statuses & _Statuses.Statuses.EntityEnabled) === _Statuses.Statuses.EntityEnabled;
   var entityRootEnabled = (statuses & _Statuses.Statuses.EntityRootEnabled) === _Statuses.Statuses.EntityRootEnabled;
+  var _useConstantEntityRed = (0, _useConstantEntityReducers.useConstantEntityReducers)(deps, _valueUseCase.valueUseCase),
+    recordValueDiff = _useConstantEntityRed.recordValueDiff;
   var store = (0, _useContextualItem.useContextualItem)(contextStore, statuses, function () {
     var newStore;
     if (entityRootEnabled) {
-      var _storeRef$current;
       var isFunction = typeof entityArg === 'function';
-      var initailEntity = isFunction ? entityArg((_storeRef$current = storeRef.current) === null || _storeRef$current === void 0 ? void 0 : _storeRef$current.value) : entityArg;
+      var current = storeRef.current;
+      var _ref = current || {},
+        value = _ref.value;
+      var _recordValueDiff = recordValueDiff(deps),
+        _recordValueDiff2 = (0, _slicedToArray2["default"])(_recordValueDiff, 2),
+        depsDiff = _recordValueDiff2[1];
+      var initailEntity = isFunction ? entityArg(value, depsDiff) : entityArg;
       newStore = new _usecases.EntityStore(initailEntity);
     } else {
       newStore = new _usecases.EntityStore(null);
     }
     storeRef.current = newStore;
     return newStore;
-  }, depsKey);
+  }, deps);
   var runtimeEntity = (0, _useRuntimeEntity.useRuntimeEntity)(store, entityArg, contextEntity, statuses);
   var onEntityChange = (0, _ahooks.useMemoizedFn)(function (newEntity, oldEntity) {
     var _optionsRef$current = optionsRef.current,
@@ -47,7 +58,7 @@ var useEntity = exports.useEntity = function useEntity(statuses, entityArg, cont
   });
   if (entityRootEnabled) {
     // 执行同步操作
-    store.value = runtimeEntity;
+    store.setValue(runtimeEntity, true);
   }
   /**
    * 需要马上 `watch`，因为 `useEffect` 在子组件内优先执行，

package/lib/hooks/useIsRenderingRef/index.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useIsRenderingRef = void 0;
+var _ahooks = require("ahooks");
 var _react = require("react");
 var useIsRenderingRef = exports.useIsRenderingRef = function useIsRenderingRef() {
-  var ref = (0, _react.useRef)(true);
-  ref.current = true;
+  var ref = (0, _ahooks.useLatest)(true);
   (0, _react.useEffect)(function () {
     ref.current = false;
   });

package/lib/hooks/useProvider/index.js

@@ -1,19 +1,17 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useProvider = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _ahooks = require("ahooks");
 var _useConstantFn = require("../useConstantFn");
+var _ahooks = require("ahooks");
+var _react = _interopRequireDefault(require("react"));
 var _contextUseCase2 = require("../../usecases/contextUseCase");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var useProvider = exports.useProvider = function useProvider(statuses, context, store, reducers) {
   var entity = store.value;
-  var contextValue = (0, _react.useMemo)(function () {
+  var contextValue = (0, _ahooks.useCreation)(function () {
     var _contextUseCase = (0, _contextUseCase2.contextUseCase)(),
       createContextValue = _contextUseCase.createContextValue;
     void entity;

package/lib/hooks/useRuntimeEntity/index.js

@@ -4,21 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useRuntimeEntity = void 0;
+var _useConstantEntityReducers = require("../useConstantEntityReducers");
 var _Statuses = require("../../enums/Statuses");
-var _react = require("react");
+var _valueUseCase = require("../../usecases/valueUseCase");
 var useRuntimeEntity = exports.useRuntimeEntity = function useRuntimeEntity(store, entityArg, contextEntity, statuses) {
-  var prevEntityArgRef = (0, _react.useRef)(entityArg);
+  var _useConstantEntityRed = (0, _useConstantEntityReducers.useConstantEntityReducers)(entityArg, _valueUseCase.valueUseCase),
+    isValueChanged = _useConstantEntityRed.isValueChanged,
+    recordValue = _useConstantEntityRed.recordValue;
+  var changed = isValueChanged(entityArg);
   var entityRootDisabled = (statuses & _Statuses.Statuses.EntityRootEnabled) !== _Statuses.Statuses.EntityRootEnabled;
   if (entityRootDisabled) {
     return contextEntity;
   }
   var isFunction = typeof entityArg === 'function';
-  var prevEntityArg = prevEntityArgRef.current;
+  var value = store.value;
   switch (true) {
     case isFunction:
-    case prevEntityArg === entityArg:
-      return store.value;
+    case !changed:
+      return value;
   }
-  prevEntityArgRef.current = entityArg;
+  recordValue(entityArg);
   return entityArg;
 };

package/lib/hooks/useStatuses/index.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useStatuses = void 0;
+var _ahooks = require("ahooks");
 var _ArgumentTypes = require("../../enums/ArgumentTypes");
 var _Statuses = require("../../enums/Statuses");
-var _ahooks = require("ahooks");
 var useStatuses = exports.useStatuses = function useStatuses(argumentTypes, contextValue) {
   return (0, _ahooks.useCreation)(function () {
     var statuses = _Statuses.Statuses.None;

package/lib/hooks/useUseCase/index.js

@@ -5,26 +5,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useUseCase = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _ahooks = require("ahooks");
-var _react = require("react");
+var _useArgumentTypes = require("../useArgumentTypes");
 var _useConstantFn = require("../useConstantFn");
-var _useProvider = require("../useProvider");
-var _initEntityReducers = require("../../methods/initEntityReducers");
+var _useConstantReducers2 = require("../useConstantReducers");
 var _useContext = require("../useContext");
+var _useContextualItem = require("../useContextualItem");
+var _useEntity3 = require("../useEntity");
+var _useFullArguments = require("../useFullArguments");
 var _useIsRenderingRef = require("../useIsRenderingRef");
-var _useArgumentTypes = require("../useArgumentTypes");
+var _useProvider = require("../useProvider");
 var _useStatuses = require("../useStatuses");
+var _usecases = require("@mic-rexjs/usecases");
+var _ahooks = require("ahooks");
+var _react = require("react");
 var _Statuses = require("../../enums/Statuses");
-var _useEntity3 = require("../useEntity");
-var _useContextualItem = require("../useContextualItem");
-var _cacheCalls = require("../../methods/cacheCalls");
-var _useCompareDeps = require("../useCompareDeps");
-var _captureCalls = require("../../methods/captureCalls");
-var _useFullArguments = require("../useFullArguments");
+var _methodUseCase = require("../../usecases/methodUseCase");
+var _excluded = ["watch", "onChange", "options"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useUseCase = exports.useUseCase = function useUseCase() {
@@ -47,19 +48,21 @@ var useUseCase = exports.useUseCase = function useUseCase() {
   var entityContextValue = contextValue;
   var statuses = (0, _useStatuses.useStatuses)(argumentTypes, contextValue);
   var optionsRef = (0, _ahooks.useLatest)(options);
-  var depsKey = (0, _useCompareDeps.useCompareDeps)(deps);
   var _ref = contextValue || {},
     _ref$reducers = _ref.reducers,
     contextReducers = _ref$reducers === void 0 ? null : _ref$reducers;
   var _ref2 = entityContextValue || {},
     _ref2$store = _ref2.store,
     contextStore = _ref2$store === void 0 ? null : _ref2$store;
-  var _useEntity = (0, _useEntity3.useEntity)(statuses, unsafeEntity, contextStore, options, depsKey),
+  var _useEntity = (0, _useEntity3.useEntity)(statuses, unsafeEntity, contextStore, options, deps),
     _useEntity2 = (0, _slicedToArray2["default"])(_useEntity, 2),
     entity = _useEntity2[0],
     store = _useEntity2[1];
+  var _useConstantReducers = (0, _useConstantReducers2.useConstantReducers)(_methodUseCase.methodUseCase),
+    cacheCalls = _useConstantReducers.cacheCalls,
+    captureCalls = _useConstantReducers.captureCalls;
   var reducers = (0, _useContextualItem.useContextualItem)(contextReducers, statuses, function () {
-    var opts = (0, _captureCalls.captureCalls)(options, function (key, callArgs) {
+    var opts = captureCalls(options, function (key, callArgs) {
       var _optionsRef$current$k, _optionsRef$current;
       return (_optionsRef$current$k = (_optionsRef$current = optionsRef.current)[key]) === null || _optionsRef$current$k === void 0 ? void 0 : _optionsRef$current$k.call.apply(_optionsRef$current$k, [_optionsRef$current].concat((0, _toConsumableArray2["default"])(callArgs)));
     });
@@ -67,15 +70,23 @@ var useUseCase = exports.useUseCase = function useUseCase() {
       return usecase(opts);
     }
     var hookOptions = opts;
-    return (0, _initEntityReducers.initEntityReducers)(entityUseCase, store, hookOptions);
-  }, depsKey);
+    var watch = hookOptions.watch,
+      onChange = hookOptions.onChange,
+      usecaseOptions = hookOptions.options,
+      restUseCaseOptions = (0, _objectWithoutProperties2["default"])(hookOptions, _excluded);
+    return (0, _usecases.createEntityReducers)(store, entityUseCase, _objectSpread(_objectSpread(_objectSpread({}, restUseCaseOptions), usecaseOptions), {}, {
+      onGenerate: function onGenerate(newEntity, result) {
+        return result;
+      }
+    }));
+  }, deps);
   var Provider = (0, _useProvider.useProvider)(statuses, context, store, reducers);
   return (0, _ahooks.useCreation)(function () {
     if ((statuses & _Statuses.Statuses.EntityEnabled) !== _Statuses.Statuses.EntityEnabled) {
       return reducers;
     }
     var rootEnabled = (statuses & _Statuses.Statuses.RootEnabled) === _Statuses.Statuses.RootEnabled;
-    var cachedReducers = (0, _cacheCalls.cacheCalls)(reducers, {
+    var cachedReducers = cacheCalls(reducers, {
       onShouldCache: function onShouldCache() {
         return isRenderingRef.current;
       }
@@ -90,5 +101,5 @@ var useUseCase = exports.useUseCase = function useUseCase() {
       return [newEntity, cachedReducers, Provider];
     }
     return [newEntity, cachedReducers];
-  }, [statuses, entity, reducers, Provider, isRenderingRef]);
+  }, [statuses, entity, reducers, Provider, isRenderingRef, cacheCalls]);
 };