@mic-rexjs/usecases-react 2.10.3 → 2.11.1

package/lib/usecases/valueUseCase/index.js

@@ -14,9 +14,10 @@ var _usecases = require("@mic-rexjs/usecases");
 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 valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function () {
-  var keyIndex = 0;
   return function () {
-    var prevKeyIndex = keyIndex++;
+    var _utilsUseCase = (0, _usecases.utilsUseCase)(),
+      createKey = _utilsUseCase.createKey;
+    var prevKeyIndex = createKey();
     var entityReducers = (0, _usecases.entityUseCase)();
     var hasField = function hasField(entity, field) {
       if ((0, _typeof2["default"])(entity) !== 'object' || entity === null) {
@@ -27,7 +28,7 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
     var isValueChanged = function isValueChanged(entity, value) {
       return entity !== value;
     };
-    var isValueMatched = function isValueMatched(entity, value) {
+    var isValueMatched = function isValueMatched(entity, value, onMatchFailed) {
       if (entity === value) {
         return true;
       }
@@ -36,23 +37,39 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
       if (!isObject1 || !isObject2) {
         return false;
       }
+      var allMatched = true;
       var keys1 = Object.keys(entity);
       var keys2 = Object.keys(value);
       var length1 = keys1.length;
-      var length2 = keys2.length;
-      if (length1 !== length2) {
-        return false;
-      }
-      for (var _i = 0, _keys = keys1; _i < _keys.length; _i++) {
-        var key = _keys[_i];
+      var keys = [].concat(keys1, keys2);
+      var hasCallback = typeof onMatchFailed === 'function';
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
+        var isFromKeys2 = i >= length1;
+        var isInKey1 = keys1.includes(key);
+        var isUsed = isFromKeys2 && isInKey1;
+        if (isUsed) {
+          continue;
+        }
+        var hasField1 = Object.hasOwn(entity, key);
+        var hasField2 = Object.hasOwn(value, key);
+        var onlyHasField1 = hasField1 && !hasField2;
+        var onlyHasField2 = !hasField1 && hasField2;
+        var onlyHasOneField = onlyHasField1 || onlyHasField2;
         var value1 = entity[key];
         var value2 = value[key];
-        if (value1 === value2) {
+        var matched = value1 === value2;
+        if (!onlyHasOneField && matched) {
           continue;
         }
-        return false;
+        allMatched = false;
+        if (hasCallback) {
+          onMatchFailed(key, value2, value1);
+          continue;
+        }
+        break;
       }
-      return true;
+      return allMatched;
     };
     var matchProperty = function matchProperty(entity, value, fieldPath, onFailed) {
       var allMatched = true;
@@ -141,56 +158,83 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
         }
       }, recordValue);
     });
-    var recordValueMatch = /*#__PURE__*/_regenerator["default"].mark(function recordValueMatch(entity, value) {
-      var matched;
+    var recordValueDiff = /*#__PURE__*/_regenerator["default"].mark(function recordValueDiff(entity, value) {
+      var isArray1, isArray2, isArray, result, length1, length2, matched;
       return _regenerator["default"].wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            isArray1 = Array.isArray(entity);
+            isArray2 = Array.isArray(value);
+            isArray = isArray1 && isArray2;
+            result = isArray ? [] : {};
+            if (isArray) {
+              length1 = entity.length;
+              length2 = value.length;
+              result.length = Math.max(length1, length2);
+            }
+            matched = isValueMatched(entity, value, function (key, newValue) {
+              result[key] = newValue;
+            });
+            if (matched) {
+              _context2.next = 1;
+              break;
+            }
+            _context2.next = 1;
+            return value;
+          case 1:
+            return _context2.abrupt("return", result);
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }, recordValueDiff);
+    });
+    var recordValueMatch = /*#__PURE__*/_regenerator["default"].mark(function recordValueMatch(entity, value) {
+      var matched;
+      return _regenerator["default"].wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             matched = isValueMatched(entity, value);
             if (!matched) {
-              _context2.next = 1;
+              _context3.next = 1;
               break;
             }
-            return _context2.abrupt("return", true);
+            return _context3.abrupt("return", true);
           case 1:
-            _context2.next = 2;
+            _context3.next = 2;
             return value;
           case 2:
-            return _context2.abrupt("return", false);
+            return _context3.abrupt("return", false);
           case 3:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
       }, recordValueMatch);
     });
-    var recordValueMatchWith = function recordValueMatchWith(entity, value) {
-      var key = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : keyIndex + 1;
-      return /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        var matched;
-        return _regenerator["default"].wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              return _context3.delegateYield(recordValueMatch(entity, value), "t0", 1);
-            case 1:
-              matched = _context3.t0;
-              if (!matched) {
-                // 不管是不是使用 `keyIndex` 生成的 `key`，都自增一次，如果是，则可以保持一致
-                keyIndex++;
-                prevKeyIndex = key;
-              }
-              return _context3.abrupt("return", prevKeyIndex);
-            case 2:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee);
-      })();
-    };
+    var recordValueMatchWith = /*#__PURE__*/_regenerator["default"].mark(function recordValueMatchWith(entity, value, key) {
+      var matched;
+      return _regenerator["default"].wrap(function (_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            return _context4.delegateYield(recordValueMatch(entity, value), "t0", 1);
+          case 1:
+            matched = _context4.t0;
+            if (!matched) {
+              prevKeyIndex = key !== null && key !== void 0 ? key : createKey();
+            }
+            return _context4.abrupt("return", prevKeyIndex);
+          case 2:
+          case "end":
+            return _context4.stop();
+        }
+      }, recordValueMatchWith);
+    });
     return _objectSpread(_objectSpread({}, entityReducers), {}, {
       isValueChanged: isValueChanged,
       isValueMatched: isValueMatched,
       matchProperty: matchProperty,
       recordValue: recordValue,
+      recordValueDiff: recordValueDiff,
       recordValueMatch: recordValueMatch,
       recordValueMatchWith: recordValueMatchWith
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mic-rexjs/usecases-react",
-  "version": "2.10.3",
+  "version": "2.11.1",
   "description": "React-based solution for use usecases of Clean Architecture",
   "private": false,
   "sideEffects": false,
@@ -54,7 +54,7 @@
     "@eslint/js": "^10.0.1",
     "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
     "@jest/globals": "^30.3.0",
-    "@mic-rexjs/usecases": "^2.14.2",
+    "@mic-rexjs/usecases": "^2.15.1",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^25.6.0",

package/es/hooks/useEntityReducers/index.d.ts

@@ -1,4 +0,0 @@
-import { CreateEntityReducersOptions, ScopedEntityReducers } from '@mic-rexjs/usecases/es/methods/createEntityReducers/types';
-import { EntityReducerMap, EntityReducers, InferableEntityUseCase } from '@mic-rexjs/usecases/es/types';
-import { Dependencies } from '../../types';
-export declare const useEntityReducers: <T, TEntityReducers extends EntityReducerMap<T>, TUseCaseOptions extends object = object>(initailEntity: T, usecase: InferableEntityUseCase<T, TEntityReducers & EntityReducers<T>, TUseCaseOptions>, options?: CreateEntityReducersOptions<T, TUseCaseOptions>, deps?: Dependencies) => ScopedEntityReducers<T, EntityReducers<T, TEntityReducers>>;

package/es/hooks/useEntityReducers/index.js

@@ -1,18 +0,0 @@
-import { useConstant } from '../useConstant';
-import { createEntityReducers } from '@mic-rexjs/usecases';
-import { useCreation, useMemoizedFn } from 'ahooks';
-import { valueUseCase } from '../../usecases/valueUseCase';
-export const useEntityReducers = (initailEntity, usecase, options, deps = []) => {
-    const { recordValueMatchWith } = useConstant(() => {
-        return createEntityReducers(deps, valueUseCase);
-    });
-    const [, depsKey] = recordValueMatchWith(deps);
-    const onCreate = useMemoizedFn(() => {
-        return createEntityReducers(initailEntity, usecase, options);
-    });
-    return useCreation(() => {
-        void depsKey;
-        void usecase;
-        return onCreate();
-    }, [depsKey, usecase, onCreate]);
-};

package/es/hooks/useReducers/index.d.ts

@@ -1,4 +0,0 @@
-import { NonEntitySymbolSet } from '../useUseCase/types';
-import { ReducerMap, SymbolSetTarget, UseCase } from '@mic-rexjs/usecases/es/types';
-import { Dependencies } from '../../types';
-export declare const useReducers: <T extends ReducerMap, TUseCaseOptions extends object = object>(usecase: UseCase<T & SymbolSetTarget<NonEntitySymbolSet>, TUseCaseOptions>, options?: TUseCaseOptions, deps?: Dependencies) => T;

package/es/hooks/useReducers/index.js

@@ -1,13 +0,0 @@
-import { useDepsKey } from '../useDepsKey';
-import { useCreation, useMemoizedFn } from 'ahooks';
-export const useReducers = (usecase, options, deps = []) => {
-    const depsKey = useDepsKey(deps);
-    const onCreate = useMemoizedFn(() => {
-        return usecase(options);
-    });
-    return useCreation(() => {
-        void depsKey;
-        void usecase;
-        return onCreate();
-    }, [depsKey, usecase, onCreate]);
-};

package/es/methods/initEntityReducers/index.d.ts

@@ -1,5 +0,0 @@
-import { UseCaseHookOptions } from '../../hooks/useUseCase/types';
-import { EntityStore } from '@mic-rexjs/usecases';
-import { EntityReducerMap, InferableEntityUseCase } from '@mic-rexjs/usecases/es/types';
-import { ContextualEntityReducers } from '../../usecases/contextUseCase/types';
-export declare const initEntityReducers: <T, TEntityReducers extends EntityReducerMap<T>, TUseCaseOptions extends object = object>(usecase: InferableEntityUseCase<T, TEntityReducers, TUseCaseOptions>, store: EntityStore<T>, options: UseCaseHookOptions<T, TUseCaseOptions>) => ContextualEntityReducers<T, TEntityReducers>;

package/es/methods/initEntityReducers/index.js

@@ -1,11 +0,0 @@
-import { createEntityReducers } from '@mic-rexjs/usecases';
-export const initEntityReducers = (usecase, store, options) => {
-    const { watch, onChange, options: usecaseOptions, ...restUseCaseOptions } = options;
-    return createEntityReducers(store, usecase, {
-        ...restUseCaseOptions,
-        ...usecaseOptions,
-        onGenerate(newEntity, result) {
-            return result;
-        },
-    });
-};

package/lib/hooks/useEntityReducers/index.js

@@ -1,30 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useEntityReducers = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _useConstant2 = require("../useConstant");
-var _usecases = require("@mic-rexjs/usecases");
-var _ahooks = require("ahooks");
-var _valueUseCase = require("../../usecases/valueUseCase");
-var useEntityReducers = exports.useEntityReducers = function useEntityReducers(initailEntity, usecase, options) {
-  var deps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-  var _useConstant = (0, _useConstant2.useConstant)(function () {
-      return (0, _usecases.createEntityReducers)(deps, _valueUseCase.valueUseCase);
-    }),
-    recordValueMatchWith = _useConstant.recordValueMatchWith;
-  var _recordValueMatchWith = recordValueMatchWith(deps),
-    _recordValueMatchWith2 = (0, _slicedToArray2["default"])(_recordValueMatchWith, 2),
-    depsKey = _recordValueMatchWith2[1];
-  var onCreate = (0, _ahooks.useMemoizedFn)(function () {
-    return (0, _usecases.createEntityReducers)(initailEntity, usecase, options);
-  });
-  return (0, _ahooks.useCreation)(function () {
-    void depsKey;
-    void usecase;
-    return onCreate();
-  }, [depsKey, usecase, onCreate]);
-};

package/lib/hooks/useReducers/index.js

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

package/lib/methods/initEntityReducers/index.js

@@ -1,24 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.initEntityReducers = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _usecases = require("@mic-rexjs/usecases");
-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 initEntityReducers = exports.initEntityReducers = function initEntityReducers(usecase, store, options) {
-  var watch = options.watch,
-    onChange = options.onChange,
-    usecaseOptions = options.options,
-    restUseCaseOptions = (0, _objectWithoutProperties2["default"])(options, _excluded);
-  return (0, _usecases.createEntityReducers)(store, usecase, _objectSpread(_objectSpread(_objectSpread({}, restUseCaseOptions), usecaseOptions), {}, {
-    onGenerate: function onGenerate(newEntity, result) {
-      return result;
-    }
-  }));
-};