@mic-rexjs/usecases-react 2.11.2 → 2.12.1

package/es/usecases/valueUseCase/index.js

@@ -1,170 +1,178 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { createUseCase, entityUseCase, utilsUseCase } from '@mic-rexjs/usecases';
 export const valueUseCase = createUseCase(() => {
-    return () => {
-        const { createKey } = utilsUseCase();
-        let prevKeyIndex = createKey();
-        const entityReducers = entityUseCase();
-        const hasField = (entity, field) => {
-            if (typeof entity !== 'object' || entity === null) {
-                return false;
-            }
-            return Object.hasOwn(entity, field);
-        };
-        const isValueChanged = (entity, value) => {
-            return entity !== value;
-        };
-        const isValueMatched = (entity, value, onMatchFailed) => {
-            if (entity === value) {
-                return true;
-            }
-            const isObject1 = typeof entity === 'object' && entity !== null;
-            const isObject2 = typeof value === 'object' && value !== null;
-            if (!isObject1 || !isObject2) {
-                return false;
-            }
-            let allMatched = true;
-            const keys1 = Object.keys(entity);
-            const keys2 = Object.keys(value);
-            const { length: length1 } = keys1;
-            const keys = [...keys1, ...keys2];
-            const hasCallback = typeof onMatchFailed === 'function';
-            for (let i = 0, { length } = keys; i < length; i++) {
-                const key = keys[i];
-                const isFromKeys2 = i >= length1;
-                const isInKey1 = keys1.includes(key);
-                const isUsed = isFromKeys2 && isInKey1;
-                if (isUsed) {
-                    continue;
-                }
-                const hasField1 = Object.hasOwn(entity, key);
-                const hasField2 = Object.hasOwn(value, key);
-                const onlyHasField1 = hasField1 && !hasField2;
-                const onlyHasField2 = !hasField1 && hasField2;
-                const onlyHasOneField = onlyHasField1 || onlyHasField2;
-                const value1 = entity[key];
-                const value2 = value[key];
-                const matched = value1 === value2;
-                if (!onlyHasOneField && matched) {
-                    continue;
-                }
-                allMatched = false;
-                if (hasCallback) {
-                    onMatchFailed(key, value2, value1);
-                    continue;
-                }
-                break;
-            }
-            return allMatched;
-        };
-        const matchProperty = (entity, value, fieldPath, onFailed) => {
-            let allMatched = true;
-            let currentFieldPath = fieldPath;
-            const list = [
-                {
-                    fieldPaths: [],
-                    newEntity: value,
-                    newValue: value,
-                    oldEntity: entity,
-                    oldValue: entity,
-                },
-            ];
-            do {
-                const { oldValue, newValue, fieldPaths } = list.shift();
-                const [, key = currentFieldPath, subFieldPath = ''] = currentFieldPath.match(/^([^.]+)\.(.+)$/) || [];
-                const hasOldField = hasField(oldValue, key);
-                const hasNewField = hasField(newValue, key);
-                if (hasOldField || hasNewField) {
-                    const subOldValue = hasOldField ? oldValue[key] : void 0;
-                    const subNewValue = hasNewField ? newValue[key] : void 0;
-                    const result = {
-                        fieldPaths: [...fieldPaths, key],
-                        newEntity: value,
-                        newValue: subNewValue,
-                        oldEntity: entity,
-                        oldValue: subOldValue,
-                    };
-                    if (subFieldPath) {
-                        currentFieldPath = subFieldPath;
-                        list.push(result);
-                        continue;
-                    }
-                    if (subOldValue === subNewValue) {
-                        continue;
-                    }
-                    allMatched = false;
-                    onFailed?.(result);
-                    continue;
-                }
-                if (/^\d+^/.test(key)) {
-                    continue;
-                }
-                const oldArray = Array.isArray(oldValue) ? oldValue : [];
-                const newArray = Array.isArray(newValue) ? newValue : [];
-                const { length: oldLength } = oldArray;
-                const { length: newLength } = newArray;
-                const length = Math.max(oldLength, newLength);
-                for (let i = 0; i < length; i++) {
-                    list.push({
-                        fieldPaths: [...fieldPaths, `${i}`],
-                        newEntity: value,
-                        newValue: newArray[i],
-                        oldEntity: entity,
-                        oldValue: oldArray[i],
-                    });
-                }
-            } while (list.length > 0);
-            return allMatched;
-        };
-        const recordValue = function* (entity, value) {
-            const changed = isValueChanged(entity, value);
-            if (!changed) {
-                return false;
-            }
-            yield value;
-            return true;
-        };
-        const recordValueDiff = function* (entity, value) {
-            const isArray1 = Array.isArray(entity);
-            const isArray2 = Array.isArray(value);
-            const isArray = isArray1 && isArray2;
-            const result = (isArray ? [] : {});
-            if (isArray) {
-                const { length: length1 } = entity;
-                const { length: length2 } = value;
-                result.length = Math.max(length1, length2);
-            }
-            const matched = isValueMatched(entity, value, (key, newValue) => {
-                result[key] = newValue;
-            });
-            if (!matched) {
-                yield value;
-            }
-            return result;
-        };
-        const recordValueMatch = function* (entity, value) {
-            const matched = isValueMatched(entity, value);
-            if (matched) {
-                return true;
-            }
-            yield value;
-            return false;
-        };
-        const recordValueMatchWith = function* (entity, value, key) {
-            const matched = yield* recordValueMatch(entity, value);
-            if (!matched) {
-                prevKeyIndex = key ?? createKey();
-            }
-            return prevKeyIndex;
-        };
-        return {
-            ...entityReducers,
-            isValueChanged,
-            isValueMatched,
-            matchProperty,
-            recordValue,
-            recordValueDiff,
-            recordValueMatch,
-            recordValueMatchWith,
-        };
+  return () => {
+    const _utilsUseCase = utilsUseCase(),
+      createKey = _utilsUseCase.createKey;
+    let prevKeyIndex = createKey();
+    const entityReducers = entityUseCase();
+    const hasField = (entity, field) => {
+      if (typeof entity !== 'object' || entity === null) {
+        return false;
+      }
+      return Object.hasOwn(entity, field);
     };
-});
+    const isValueChanged = (entity, value) => {
+      return entity !== value;
+    };
+    const isValueMatched = (entity, value, onMatchFailed) => {
+      if (entity === value) {
+        return true;
+      }
+      const isObject1 = typeof entity === 'object' && entity !== null;
+      const isObject2 = typeof value === 'object' && value !== null;
+      if (!isObject1 || !isObject2) {
+        return false;
+      }
+      let allMatched = true;
+      const keys1 = Object.keys(entity);
+      const keys2 = Object.keys(value);
+      const length1 = keys1.length;
+      const keys = [...keys1, ...keys2];
+      const hasCallback = typeof onMatchFailed === 'function';
+      for (let i = 0, length = keys.length; i < length; i++) {
+        const key = keys[i];
+        const isFromKeys2 = i >= length1;
+        const isInKey1 = keys1.includes(key);
+        const isUsed = isFromKeys2 && isInKey1;
+        if (isUsed) {
+          continue;
+        }
+        const hasField1 = Object.hasOwn(entity, key);
+        const hasField2 = Object.hasOwn(value, key);
+        const onlyHasField1 = hasField1 && !hasField2;
+        const onlyHasField2 = !hasField1 && hasField2;
+        const onlyHasOneField = onlyHasField1 || onlyHasField2;
+        const value1 = entity[key];
+        const value2 = value[key];
+        const matched = value1 === value2;
+        if (!onlyHasOneField && matched) {
+          continue;
+        }
+        allMatched = false;
+        if (hasCallback) {
+          onMatchFailed(key, value2, value1);
+          continue;
+        }
+        break;
+      }
+      return allMatched;
+    };
+    const matchProperty = (entity, value, fieldPath, onFailed) => {
+      let allMatched = true;
+      let currentFieldPath = fieldPath;
+      const list = [{
+        fieldPaths: [],
+        newEntity: value,
+        newValue: value,
+        oldEntity: entity,
+        oldValue: entity
+      }];
+      do {
+        const _list$shift = list.shift(),
+          oldValue = _list$shift.oldValue,
+          newValue = _list$shift.newValue,
+          fieldPaths = _list$shift.fieldPaths;
+        const _ref = currentFieldPath.match(/^([^.]+)\.(.+)$/) || [],
+          _ref2 = _slicedToArray(_ref, 3),
+          _ref2$ = _ref2[1],
+          key = _ref2$ === void 0 ? currentFieldPath : _ref2$,
+          _ref2$2 = _ref2[2],
+          subFieldPath = _ref2$2 === void 0 ? '' : _ref2$2;
+        const hasOldField = hasField(oldValue, key);
+        const hasNewField = hasField(newValue, key);
+        if (hasOldField || hasNewField) {
+          const subOldValue = hasOldField ? oldValue[key] : void 0;
+          const subNewValue = hasNewField ? newValue[key] : void 0;
+          const result = {
+            fieldPaths: [...fieldPaths, key],
+            newEntity: value,
+            newValue: subNewValue,
+            oldEntity: entity,
+            oldValue: subOldValue
+          };
+          if (subFieldPath) {
+            currentFieldPath = subFieldPath;
+            list.push(result);
+            continue;
+          }
+          if (subOldValue === subNewValue) {
+            continue;
+          }
+          allMatched = false;
+          onFailed === null || onFailed === void 0 || onFailed(result);
+          continue;
+        }
+        if (/^\d+^/.test(key)) {
+          continue;
+        }
+        const oldArray = Array.isArray(oldValue) ? oldValue : [];
+        const newArray = Array.isArray(newValue) ? newValue : [];
+        const oldLength = oldArray.length;
+        const newLength = newArray.length;
+        const length = Math.max(oldLength, newLength);
+        for (let i = 0; i < length; i++) {
+          list.push({
+            fieldPaths: [...fieldPaths, `${i}`],
+            newEntity: value,
+            newValue: newArray[i],
+            oldEntity: entity,
+            oldValue: oldArray[i]
+          });
+        }
+      } while (list.length > 0);
+      return allMatched;
+    };
+    const recordValue = function* (entity, value) {
+      const changed = isValueChanged(entity, value);
+      if (!changed) {
+        return false;
+      }
+      yield value;
+      return true;
+    };
+    const recordValueDiff = function* (entity, value) {
+      const isArray1 = Array.isArray(entity);
+      const isArray2 = Array.isArray(value);
+      const isArray = isArray1 && isArray2;
+      const result = isArray ? [] : {};
+      if (isArray) {
+        const length1 = entity.length;
+        const length2 = value.length;
+        result.length = Math.max(length1, length2);
+      }
+      const matched = isValueMatched(entity, value, (key, newValue) => {
+        result[key] = newValue;
+      });
+      if (!matched) {
+        yield value;
+      }
+      return result;
+    };
+    const recordValueMatch = function* (entity, value) {
+      const matched = isValueMatched(entity, value);
+      if (matched) {
+        return true;
+      }
+      yield value;
+      return false;
+    };
+    const recordValueMatchWith = function* (entity, value, key) {
+      const matched = yield* recordValueMatch(entity, value);
+      if (!matched) {
+        prevKeyIndex = key !== null && key !== void 0 ? key : createKey();
+      }
+      return prevKeyIndex;
+    };
+    return {
+      ...entityReducers,
+      isValueChanged,
+      isValueMatched,
+      matchProperty,
+      recordValue,
+      recordValueDiff,
+      recordValueMatch,
+      recordValueMatchWith
+    };
+  };
+});

package/es/usecases/valueUseCase/types.js

@@ -1 +1 @@
-export {};
+export {};

package/lib/components/UseCaseFragment/index.js

@@ -12,9 +12,9 @@ var _useUseCase2 = require("../../hooks/useUseCase");
 var _SafeUseCaseFragment = require("../SafeUseCaseFragment");
 var _react = require("react");
 var _contextUseCase = require("../../usecases/contextUseCase");
-var _excluded = ["usecase"];
 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 _excluded = ["usecase"];
 var UseCaseFragment = exports.UseCaseFragment = function UseCaseFragment(_ref) {
   var usecase = _ref.usecase,
     props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);

package/lib/hooks/useUseCase/index.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.useUseCase = void 0;
 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 _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _useArgumentTypes = require("../useArgumentTypes");
 var _useConstantFn = require("../useConstantFn");
@@ -25,9 +25,9 @@ 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 _excluded = ["watch", "onChange", "options"];
 var useUseCase = exports.useUseCase = function useUseCase() {
   var isRenderingRef = (0, _useIsRenderingRef.useIsRenderingRef)();
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -63,8 +63,9 @@ var useUseCase = exports.useUseCase = function useUseCase() {
     captureCalls = _useConstantReducers.captureCalls;
   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;
-      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)));
+      return (_optionsRef$current$k = (_optionsRef$current = optionsRef.current)[key]) === null || _optionsRef$current$k === void 0 ? void 0 : (_optionsRef$current$k2 = _optionsRef$current$k).call.apply(_optionsRef$current$k2, [_optionsRef$current].concat((0, _toConsumableArray2["default"])(callArgs)));
     });
     if ((statuses & _Statuses.Statuses.EntityEnabled) !== _Statuses.Statuses.EntityEnabled) {
       return usecase(opts);
@@ -85,7 +86,6 @@ var useUseCase = exports.useUseCase = function useUseCase() {
     if ((statuses & _Statuses.Statuses.EntityEnabled) !== _Statuses.Statuses.EntityEnabled) {
       return reducers;
     }
-    var rootEnabled = (statuses & _Statuses.Statuses.RootEnabled) === _Statuses.Statuses.RootEnabled;
     var cachedReducers = cacheCalls(reducers, {
       onShouldCache: function onShouldCache() {
         return isRenderingRef.current;
@@ -97,9 +97,6 @@ var useUseCase = exports.useUseCase = function useUseCase() {
     var isObjectEntity = isObjectType && !isNull && !isArray;
     // 这里是为了让访问器 `getter` 的值保持唯一性，否则每次 `getter` 返回的对象都是新对象，无法用于 `deps`
     var newEntity = isObjectEntity ? _objectSpread({}, entity) : entity;
-    if (rootEnabled) {
-      return [newEntity, cachedReducers, Provider];
-    }
-    return [newEntity, cachedReducers];
+    return [newEntity, cachedReducers, Provider];
   }, [statuses, entity, reducers, Provider, isRenderingRef, cacheCalls]);
 };