@mic-rexjs/usecases-react 2.13.4 → 2.14.0

package/es/usecases/valueUseCase/index.js

@@ -82,14 +82,12 @@ export const valueUseCase = createUseCase(() => {
         const hasOldField = hasField(oldValue, key);
         const hasNewField = hasField(newValue, key);
         if (hasOldField || hasNewField) {
-          const oldFieldDescriptor = Object.getOwnPropertyDescriptor(hasOldField ? oldValue : {}, key) || {};
-          const newFieldDescriptor = Object.getOwnPropertyDescriptor(hasNewField ? newValue : {}, key) || {};
-          const oldSubValue = oldFieldDescriptor.value,
-            oldFieldGet = oldFieldDescriptor.get,
-            oldFieldSet = oldFieldDescriptor.set;
-          const newSubValue = newFieldDescriptor.value,
-            newFieldGet = newFieldDescriptor.get,
-            newFieldSet = newFieldDescriptor.set;
+          const _ref3 = hasOldField ? [oldValue[key]] : [],
+            _ref4 = _slicedToArray(_ref3, 1),
+            oldSubValue = _ref4[0];
+          const _ref5 = hasNewField ? [newValue[key]] : [],
+            _ref6 = _slicedToArray(_ref5, 1),
+            newSubValue = _ref6[0];
           const result = {
             fieldPaths: [...fieldPaths, key],
             newEntity: value,
@@ -102,16 +100,6 @@ export const valueUseCase = createUseCase(() => {
             list.push(result);
             continue;
           }
-          const hasOldFieldGet = typeof oldFieldGet === 'function';
-          const hasOldFieldSet = typeof oldFieldSet === 'function';
-          const hasNewFieldGet = typeof newFieldGet === 'function';
-          const hasNewFieldSet = typeof newFieldSet === 'function';
-          const hasOldFieldAccessor = hasOldFieldGet || hasOldFieldSet;
-          const hasNewFieldAccessor = hasNewFieldGet || hasNewFieldSet;
-          // 如果都是访问器
-          if (hasOldFieldAccessor && hasNewFieldAccessor) {
-            continue;
-          }
           if (newSubValue === oldSubValue) {
             continue;
           }

package/lib/hooks/useEntity/index.js

@@ -5,26 +5,97 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useEntity = void 0;
 var _useConstantEntityReducers = require("../useConstantEntityReducers");
+var _useExec = require("../useExec");
+var _ahooks = require("ahooks");
+var _react = require("react");
 var _Statuses = require("../../enums/Statuses");
+var _triggerWatchers = require("../../methods/triggerWatchers");
 var _valueUseCase = require("../../usecases/valueUseCase");
-var useEntity = exports.useEntity = function useEntity(store, entityArg, statuses) {
+var useEntity = exports.useEntity = function useEntity(entityArg, store, reducers, statuses, options) {
+  var update = (0, _ahooks.useUpdate)();
+  var isFunction = typeof entityArg === 'function';
+  var entity = store.value;
+  var isFirstRef = (0, _react.useRef)(true);
+  var optionsRef = (0, _ahooks.useLatest)(options);
+  var prevEntityRef = (0, _react.useRef)(entity);
+  var entityEnabled = (statuses & _Statuses.Statuses.EntityEnabled) === _Statuses.Statuses.EntityEnabled;
+  var entityRootEnabled = (statuses & _Statuses.Statuses.EntityRootEnabled) === _Statuses.Statuses.EntityRootEnabled;
+  var bindEntity = reducers.bindEntity,
+    unbindEntity = reducers.unbindEntity;
   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;
-  var isFunction = typeof entityArg === 'function';
-  var value = store.value;
-  switch (true) {
-    case entityRootDisabled:
-    case isFunction:
-    case !changed:
-      return value;
-  }
-  recordValue(entityArg);
-  store.disableWatchers();
-  // 执行同步操作
-  store.setValue(entityArg);
-  store.enableWatchers();
-  return entityArg;
+  var onTriggerWatchers = (0, _ahooks.useMemoizedFn)(function (newEntity, oldEntity) {
+    var watch = optionsRef.current.watch;
+    if (!watch) {
+      return;
+    }
+    (0, _triggerWatchers.triggerWatchers)(watch, newEntity, oldEntity);
+  });
+  var onEntityChange = (0, _ahooks.useMemoizedFn)(function (newEntity, oldEntity) {
+    var onChange = optionsRef.current.onChange;
+    prevEntityRef.current = newEntity;
+    onTriggerWatchers(newEntity, oldEntity);
+    onChange === null || onChange === void 0 || onChange(newEntity, oldEntity);
+    if (!entityRootEnabled) {
+      return;
+    }
+    update();
+  });
+  var onValueChange = (0, _ahooks.useMemoizedFn)(function () {
+    if (!entityEnabled) {
+      return;
+    }
+    var prevEntity = prevEntityRef.current;
+    if (entity === prevEntity) {
+      return;
+    }
+    prevEntityRef.current = entity;
+    onTriggerWatchers(entity, prevEntity);
+  });
+  (0, _useExec.useExec)(function () {
+    var currentEntity = entityArg;
+    var isFirst = isFirstRef.current;
+    isFirstRef.current = false;
+    if (isFirst) {
+      var _bindEntity;
+      currentEntity = (_bindEntity = bindEntity === null || bindEntity === void 0 ? void 0 : bindEntity()) !== null && _bindEntity !== void 0 ? _bindEntity : currentEntity;
+    }
+    switch (true) {
+      case !entityRootEnabled:
+      case isFunction:
+      case !isValueChanged(currentEntity):
+        return;
+    }
+    recordValue(currentEntity);
+    store.disableWatchers();
+    // 执行同步操作
+    store.setValue(currentEntity);
+    store.enableWatchers();
+  });
+  /**
+   * 需要马上 `watch`，因为 `useEffect` 在子组件内优先执行，
+   * 如果使用了 `setEntity` 则无法监控到变化
+   */
+  (0, _useExec.useExec)(function () {
+    if (!entityEnabled) {
+      return;
+    }
+    store.watch(onEntityChange);
+  }, [entityEnabled, store, onEntityChange]);
+  /**
+   * 在变化时候，组件更新前，使用 `unwatch`
+   */
+  (0, _react.useEffect)(function () {
+    return function () {
+      store.unwatch(onEntityChange);
+    };
+  }, [entityEnabled, store, onEntityChange]);
+  (0, _ahooks.useUnmount)(function () {
+    unbindEntity === null || unbindEntity === void 0 || unbindEntity();
+  });
+  (0, _ahooks.useUpdateEffect)(function () {
+    onValueChange();
+  }, [entity, onValueChange]);
+  return store.value;
 };

package/lib/hooks/useExec/index.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useExec = void 0;
+var _useDepsKey = require("../useDepsKey");
+var _ahooks = require("ahooks");
+var useExec = exports.useExec = function useExec(callback) {
+  var deps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [callback];
+  var depsKey = (0, _useDepsKey.useDepsKey)(deps);
+  var execCallback = (0, _ahooks.useMemoizedFn)(function () {
+    callback();
+  });
+  (0, _ahooks.useCreation)(function () {
+    void depsKey;
+    execCallback();
+  }, [depsKey, execCallback]);
+};

package/lib/hooks/useReducers/index.js

@@ -27,7 +27,7 @@ var useReducers = exports.useReducers = function useReducers(usecase, context, s
     contextReducers = _ref$reducers === void 0 ? null : _ref$reducers;
   var _useConstantReducers = (0, _useConstantReducers2.useConstantReducers)(_methodUseCase.methodUseCase),
     captureCalls = _useConstantReducers.captureCalls;
-  return (0, _useContextualItem.useContextualItem)(contextReducers, statuses, function () {
+  var reducers = (0, _useContextualItem.useContextualItem)(contextReducers, statuses, function () {
     var opts = captureCalls(options, function (key, callArgs) {
       var _optionsRef$current$k2;
       var _optionsRef$current$k, _optionsRef$current;
@@ -47,4 +47,5 @@ var useReducers = exports.useReducers = function useReducers(usecase, context, s
       }
     }));
   }, deps);
+  return reducers;
 };

package/lib/hooks/useStore/index.js

@@ -9,18 +9,13 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _useConstantEntityReducers = require("../useConstantEntityReducers");
 var _useContextualItem = require("../useContextualItem");
 var _usecases = require("@mic-rexjs/usecases");
-var _ahooks = require("ahooks");
 var _react = require("react");
 var _Statuses = require("../../enums/Statuses");
 var _initStore = require("../../methods/initStore");
-var _triggerWatchers = require("../../methods/triggerWatchers");
 var _valueUseCase = require("../../usecases/valueUseCase");
-var useStore = exports.useStore = function useStore(context, entity, statuses, options) {
+var useStore = exports.useStore = function useStore(entityArg, context, statuses, options) {
   var deps = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
-  var update = (0, _ahooks.useUpdate)();
-  var optionsRef = (0, _ahooks.useLatest)(options);
   var storeRef = (0, _react.useRef)(null);
-  var entityEnabled = (statuses & _Statuses.Statuses.EntityEnabled) === _Statuses.Statuses.EntityEnabled;
   var entityRootEnabled = (statuses & _Statuses.Statuses.EntityRootEnabled) === _Statuses.Statuses.EntityRootEnabled;
   var contextValue = (0, _react.useContext)(context);
   var _ref = contextValue || {},
@@ -28,7 +23,7 @@ var useStore = exports.useStore = function useStore(context, entity, statuses, o
     contextStore = _ref$store === void 0 ? null : _ref$store;
   var _useConstantEntityRed = (0, _useConstantEntityReducers.useConstantEntityReducers)([], _valueUseCase.valueUseCase),
     recordValueDiff = _useConstantEntityRed.recordValueDiff;
-  var store = (0, _useContextualItem.useContextualItem)(contextStore, statuses, function () {
+  return (0, _useContextualItem.useContextualItem)(contextStore, statuses, function () {
     if (!entityRootEnabled) {
       return new _usecases.EntityStore(null);
     }
@@ -36,60 +31,8 @@ var useStore = exports.useStore = function useStore(context, entity, statuses, o
     var _recordValueDiff = recordValueDiff(deps),
       _recordValueDiff2 = (0, _slicedToArray2["default"])(_recordValueDiff, 2),
       changedDeps = _recordValueDiff2[1];
-    var newStore = (0, _initStore.initStore)(entity, current, changedDeps);
+    var newStore = (0, _initStore.initStore)(entityArg, current, changedDeps);
     storeRef.current = newStore;
     return newStore;
   }, deps);
-  var value = store.value;
-  var prevValueRef = (0, _react.useRef)(value);
-  var onTriggerWatchers = (0, _ahooks.useMemoizedFn)(function (newEntity, oldEntity) {
-    var watch = optionsRef.current.watch;
-    if (!watch) {
-      return;
-    }
-    (0, _triggerWatchers.triggerWatchers)(watch, newEntity, oldEntity);
-  });
-  var onEntityChange = (0, _ahooks.useMemoizedFn)(function (newEntity, oldEntity) {
-    var onChange = optionsRef.current.onChange;
-    prevValueRef.current = newEntity;
-    onTriggerWatchers(newEntity, oldEntity);
-    onChange === null || onChange === void 0 || onChange(newEntity, oldEntity);
-    if (!entityRootEnabled) {
-      return;
-    }
-    update();
-  });
-  var onValueChange = (0, _ahooks.useMemoizedFn)(function () {
-    if (!entityRootEnabled) {
-      return;
-    }
-    var prevValue = prevValueRef.current;
-    if (value === prevValue) {
-      return;
-    }
-    prevValueRef.current = value;
-    onTriggerWatchers(value, prevValue);
-  });
-  (0, _ahooks.useUpdateEffect)(function () {
-    onValueChange();
-  }, [value, onValueChange]);
-  /**
-   * 需要马上 `watch`，因为 `useEffect` 在子组件内优先执行，
-   * 如果使用了 `setEntity` 则无法监控到变化
-   */
-  (0, _ahooks.useCreation)(function () {
-    if (!entityEnabled) {
-      return;
-    }
-    store.watch(onEntityChange);
-  }, [entityEnabled, store, onEntityChange]);
-  /**
-   * 在变化时候，组件更新前，使用 `unwatch`
-   */
-  (0, _react.useEffect)(function () {
-    return function () {
-      store.unwatch(onEntityChange);
-    };
-  }, [entityEnabled, store, onEntityChange]);
-  return store;
 };

package/lib/hooks/useUseCase/index.js

@@ -42,9 +42,9 @@ var useUseCase = exports.useUseCase = function useUseCase() {
   var context = (0, _useContext.useContext)(usecase, argumentTypes);
   var entityContext = context;
   var statuses = (0, _useStatuses.useStatuses)(context, argumentTypes);
-  var store = (0, _useStore.useStore)(entityContext, unsafeEntity, statuses, options, deps);
-  var entity = (0, _useEntity.useEntity)(store, unsafeEntity, statuses);
+  var store = (0, _useStore.useStore)(unsafeEntity, entityContext, statuses, options, deps);
   var reducers = (0, _useReducers.useReducers)(usecase, context, store, statuses, options, deps);
+  var entity = (0, _useEntity.useEntity)(unsafeEntity, store, reducers, statuses, options);
   var Provider = (0, _useProvider.useProvider)(statuses, context, store, reducers);
   return (0, _ahooks.useCreation)(function () {
     if ((statuses & _Statuses.Statuses.EntityEnabled) !== _Statuses.Statuses.EntityEnabled) {