@mic-rexjs/usecases-react 3.1.1 → 3.1.2

package/lib/usecases/valueUseCase/index.js

@@ -19,11 +19,18 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
     var _utilsUseCase = (0, _usecases.utilsUseCase)(),
       createKey = _utilsUseCase.createKey;
     var prevKeyIndex = createKey();
-    var hasField = function hasField(entity, field) {
+    var isObjectValue = function isObjectValue(entity) {
       if ((0, _typeof2["default"])(entity) !== 'object' || entity === null) {
         return false;
       }
-      return Object.hasOwn(entity, field);
+      return true;
+    };
+    var hasField = function hasField(entity, field) {
+      var isObject = isObjectValue(entity);
+      if (isObject) {
+        return Object.hasOwn(entity, field);
+      }
+      return false;
     };
     var isValueChanged = function isValueChanged(entity, value) {
       return entity !== value;
@@ -32,8 +39,8 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
       if (entity === value) {
         return true;
       }
-      var isObject1 = (0, _typeof2["default"])(entity) === 'object' && entity !== null;
-      var isObject2 = (0, _typeof2["default"])(value) === 'object' && value !== null;
+      var isObject1 = isObjectValue(entity);
+      var isObject2 = isObjectValue(value);
       var keys1 = isObject1 ? Object.keys(entity) : [];
       var keys2 = isObject2 ? Object.keys(value) : [];
       var hasCallback = typeof onMatchPropertyFailed === 'function';
@@ -45,21 +52,18 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
       var keys = [].concat((0, _toConsumableArray2["default"])(keys1), (0, _toConsumableArray2["default"])(keys2));
       for (var i = 0, length = keys.length; i < length; i++) {
         var key = keys[i];
-        var isFromKeys2 = i >= length1;
         var isInKey1 = keys1.includes(key);
+        var isFromKeys2 = i >= length1;
         var isUsed = isFromKeys2 && isInKey1;
         if (isUsed) {
           continue;
         }
         var hasField1 = hasField(entity, key);
         var hasField2 = hasField(value, key);
-        var onlyHasField1 = hasField1 && !hasField2;
-        var onlyHasField2 = !hasField1 && hasField2;
-        var onlyHasOneField = onlyHasField1 || onlyHasField2;
         var value1 = hasField1 ? entity[key] : void 0;
         var value2 = hasField2 ? value[key] : void 0;
         var matched = value1 === value2;
-        if (!onlyHasOneField && matched) {
+        if (hasField1 && hasField2 && matched) {
           continue;
         }
         allMatched = false;
@@ -140,22 +144,6 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
       } while (list.length > 0);
       return allMatched;
     };
-    var diffValue = function diffValue(entity, value, onMatchPropertyFailed) {
-      var isArray1 = Array.isArray(entity);
-      var isArray2 = Array.isArray(value);
-      var isArray = isArray1 && isArray2;
-      var result = isArray ? [] : {};
-      if (isArray) {
-        var length1 = entity.length;
-        var length2 = value.length;
-        result.length = Math.max(length1, length2);
-      }
-      matchValue(entity, value, function (key, newSubValue, oldSubValue) {
-        result[key] = newSubValue;
-        onMatchPropertyFailed === null || onMatchPropertyFailed === void 0 || onMatchPropertyFailed(key, newSubValue, oldSubValue);
-      });
-      return result;
-    };
     var recordValue = /*#__PURE__*/_regenerator["default"].mark(function recordValue(entity, value) {
       var changed;
       return _regenerator["default"].wrap(function (_context) {
@@ -178,76 +166,52 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
         }
       }, recordValue);
     });
-    var recordValueDiff = /*#__PURE__*/_regenerator["default"].mark(function recordValueDiff(entity, value) {
-      var matched, result;
-      return _regenerator["default"].wrap(function (_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            matched = true;
-            result = diffValue(entity, value, function () {
-              matched = false;
-            });
-            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) {
+      return _regenerator["default"].wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             matched = matchValue(entity, value);
             if (!matched) {
-              _context3.next = 1;
+              _context2.next = 1;
               break;
             }
-            return _context3.abrupt("return", true);
+            return _context2.abrupt("return", true);
           case 1:
-            _context3.next = 2;
+            _context2.next = 2;
             return value;
           case 2:
-            return _context3.abrupt("return", false);
+            return _context2.abrupt("return", false);
           case 3:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
       }, recordValueMatch);
     });
     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) {
+      return _regenerator["default"].wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            return _context4.delegateYield(recordValueMatch(entity, value), "t0", 1);
+            return _context3.delegateYield(recordValueMatch(entity, value), "t0", 1);
           case 1:
-            matched = _context4.t0;
+            matched = _context3.t0;
             if (!matched) {
               prevKeyIndex = key !== null && key !== void 0 ? key : createKey();
             }
-            return _context4.abrupt("return", prevKeyIndex);
+            return _context3.abrupt("return", prevKeyIndex);
           case 2:
           case "end":
-            return _context4.stop();
+            return _context3.stop();
         }
       }, recordValueMatchWith);
     });
     return _objectSpread(_objectSpread({}, entityReducers), {}, {
-      diffValue: diffValue,
+      isObjectValue: isObjectValue,
       isValueChanged: isValueChanged,
       matchValue: matchValue,
       matchProperty: matchProperty,
       recordValue: recordValue,
-      recordValueDiff: recordValueDiff,
       recordValueMatch: recordValueMatch,
       recordValueMatchWith: recordValueMatchWith
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mic-rexjs/usecases-react",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "React-based solution for use usecases of Clean Architecture",
   "private": false,
   "sideEffects": false,