@mic-rexjs/usecases-react 2.10.3 → 2.11.0

package/lib/hooks/useEntity/index.js

@@ -1,9 +1,12 @@
 "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 _useConstantEntityReducers = require("../useConstantEntityReducers");
 var _useContextualItem = require("../useContextualItem");
 var _useRuntimeEntity = require("../useRuntimeEntity");
 var _usecases = require("@mic-rexjs/usecases");
@@ -11,26 +14,34 @@ var _ahooks = require("ahooks");
 var _react = require("react");
 var _Statuses = require("../../enums/Statuses");
 var _triggerWatchers = require("../../methods/triggerWatchers");
-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)(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,

package/lib/hooks/useRuntimeEntity/index.js

@@ -4,23 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useRuntimeEntity = void 0;
-var _useEntityReducers2 = require("../useEntityReducers");
+var _useConstantEntityReducers = require("../useConstantEntityReducers");
 var _Statuses = require("../../enums/Statuses");
 var _valueUseCase = require("../../usecases/valueUseCase");
 var useRuntimeEntity = exports.useRuntimeEntity = function useRuntimeEntity(store, entityArg, contextEntity, statuses) {
-  var _useEntityReducers = (0, _useEntityReducers2.useEntityReducers)(entityArg, _valueUseCase.valueUseCase),
-    isValueChanged = _useEntityReducers.isValueChanged,
-    recordValue = _useEntityReducers.recordValue;
+  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 value = store.value;
   switch (true) {
     case isFunction:
     case !changed:
-      return store.value;
+      return value;
   }
   recordValue(entityArg);
   return entityArg;

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 _initEntityReducers = require("../../methods/initEntityReducers");
 var _useArgumentTypes = require("../useArgumentTypes");
 var _useConstantFn = require("../useConstantFn");
+var _useConstantReducers2 = require("../useConstantReducers");
 var _useContext = require("../useContext");
 var _useContextualItem = require("../useContextualItem");
-var _useDepsKey = require("../useDepsKey");
 var _useEntity3 = require("../useEntity");
 var _useFullArguments = require("../useFullArguments");
 var _useIsRenderingRef = require("../useIsRenderingRef");
 var _useProvider = require("../useProvider");
-var _useReducers2 = require("../useReducers");
 var _useStatuses = require("../useStatuses");
+var _usecases = require("@mic-rexjs/usecases");
 var _ahooks = require("ahooks");
 var _react = require("react");
 var _Statuses = require("../../enums/Statuses");
 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,20 +48,19 @@ 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, _useDepsKey.useDepsKey)(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 _useReducers = (0, _useReducers2.useReducers)(_methodUseCase.methodUseCase),
-    cacheCalls = _useReducers.cacheCalls,
-    captureCalls = _useReducers.captureCalls;
+  var _useConstantReducers = (0, _useConstantReducers2.useConstantReducers)(_methodUseCase.methodUseCase),
+    cacheCalls = _useConstantReducers.cacheCalls,
+    captureCalls = _useConstantReducers.captureCalls;
   var reducers = (0, _useContextualItem.useContextualItem)(contextReducers, statuses, function () {
     var opts = captureCalls(options, function (key, callArgs) {
       var _optionsRef$current$k, _optionsRef$current;
@@ -70,8 +70,16 @@ 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) {