@mic-rexjs/usecases-react 2.14.0 → 3.0.1

package/lib/usecases/methodUseCase/index.js

@@ -9,7 +9,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _valueUseCase2 = require("../valueUseCase");
 var methodUseCase = exports.methodUseCase = function methodUseCase() {
   var _valueUseCase = (0, _valueUseCase2.valueUseCase)(),
-    isValueMatched = _valueUseCase.isValueMatched;
+    matchValue = _valueUseCase.matchValue;
   var cacheCall = function cacheCall(factory, options) {
     var cache;
     var _ref = options || {},
@@ -19,7 +19,7 @@ var methodUseCase = exports.methodUseCase = function methodUseCase() {
       } : _ref$onShouldCache,
       _ref$onCompare = _ref.onCompare,
       onCompare = _ref$onCompare === void 0 ? function (newArgs, oldArgs) {
-        return isValueMatched(newArgs, oldArgs);
+        return matchValue(newArgs, oldArgs);
       } : _ref$onCompare;
     return function () {
       var cacheable = onShouldCache();

package/lib/usecases/valueUseCase/index.js

@@ -28,21 +28,21 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
     var isValueChanged = function isValueChanged(entity, value) {
       return entity !== value;
     };
-    var isValueMatched = function isValueMatched(entity, value, onMatchFailed) {
+    var matchValue = function matchValue(entity, value, onMatchPropertyFailed) {
       if (entity === value) {
         return true;
       }
       var isObject1 = (0, _typeof2["default"])(entity) === 'object' && entity !== null;
       var isObject2 = (0, _typeof2["default"])(value) === 'object' && value !== null;
-      if (!isObject1 || !isObject2) {
+      var keys1 = isObject1 ? Object.keys(entity) : [];
+      var keys2 = isObject2 ? Object.keys(value) : [];
+      var hasCallback = typeof onMatchPropertyFailed === 'function';
+      if (!isObject1 && !isObject2) {
         return false;
       }
       var allMatched = true;
-      var keys1 = Object.keys(entity);
-      var keys2 = Object.keys(value);
       var length1 = keys1.length;
-      var keys = [].concat(keys1, keys2);
-      var hasCallback = typeof onMatchFailed === '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;
@@ -51,20 +51,20 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
         if (isUsed) {
           continue;
         }
-        var hasField1 = Object.hasOwn(entity, key);
-        var hasField2 = Object.hasOwn(value, key);
+        var hasField1 = hasField(entity, key);
+        var hasField2 = hasField(value, key);
         var onlyHasField1 = hasField1 && !hasField2;
         var onlyHasField2 = !hasField1 && hasField2;
         var onlyHasOneField = onlyHasField1 || onlyHasField2;
-        var value1 = entity[key];
-        var value2 = value[key];
+        var value1 = hasField1 ? entity[key] : void 0;
+        var value2 = hasField2 ? value[key] : void 0;
         var matched = value1 === value2;
         if (!onlyHasOneField && matched) {
           continue;
         }
         allMatched = false;
         if (hasCallback) {
-          onMatchFailed(key, value2, value1);
+          onMatchPropertyFailed(key, value2, value1);
           continue;
         }
         break;
@@ -140,6 +140,22 @@ 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) {
@@ -163,21 +179,13 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
       }, recordValue);
     });
     var recordValueDiff = /*#__PURE__*/_regenerator["default"].mark(function recordValueDiff(entity, value) {
-      var isArray1, isArray2, isArray, result, length1, length2, matched;
+      var matched, result;
       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;
+            matched = true;
+            result = diffValue(entity, value, function () {
+              matched = false;
             });
             if (matched) {
               _context2.next = 1;
@@ -198,7 +206,7 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
       return _regenerator["default"].wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            matched = isValueMatched(entity, value);
+            matched = matchValue(entity, value);
             if (!matched) {
               _context3.next = 1;
               break;
@@ -234,8 +242,9 @@ var valueUseCase = exports.valueUseCase = (0, _usecases.createUseCase)(function
       }, recordValueMatchWith);
     });
     return _objectSpread(_objectSpread({}, entityReducers), {}, {
+      diffValue: diffValue,
       isValueChanged: isValueChanged,
-      isValueMatched: isValueMatched,
+      matchValue: matchValue,
       matchProperty: matchProperty,
       recordValue: recordValue,
       recordValueDiff: recordValueDiff,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mic-rexjs/usecases-react",
-  "version": "2.14.0",
+  "version": "3.0.1",
   "description": "React-based solution for use usecases of Clean Architecture",
   "private": false,
   "sideEffects": false,
@@ -35,7 +35,7 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@mic-rexjs/usecases": "^3.0.4",
+    "@mic-rexjs/usecases": "^4.01",
     "react": ">=16.8.0"
   },
   "dependencies": {
@@ -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": "^3.0.4",
+    "@mic-rexjs/usecases": "^4.0.1",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^25.6.0",

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

@@ -1,3 +0,0 @@
-import { EntityStore } from '@mic-rexjs/usecases';
-import { Dependencies, EntityInitializer } from '../../types';
-export declare const initStore: <T, TDependencies extends Dependencies = Dependencies>(entity: T | EntityInitializer<T>, prevStore: EntityStore<T> | null, changedDeps: Partial<TDependencies>) => EntityStore<T>;

package/es/methods/initStore/index.js

@@ -1,23 +0,0 @@
-import { createEntityReducers, EntityStore } from '@mic-rexjs/usecases';
-import { entityRuntimeUseCase } from '../../usecases/entityRuntimeUseCase';
-export const initStore = (entity, prevStore, changedDeps) => {
-  const isFunction = typeof entity === 'function';
-  if (!isFunction) {
-    return new EntityStore(entity);
-  }
-  const _ref = prevStore || {},
-    value = _ref.value;
-  const store = new EntityStore(value);
-  const _createEntityReducers = createEntityReducers(store, entityRuntimeUseCase, {
-      onInit(currentValue) {
-        return entity(currentValue, changedDeps);
-      },
-      onReturn(result) {
-        store.setValue(result);
-        return result;
-      }
-    }),
-    initEntity = _createEntityReducers.initEntity;
-  initEntity();
-  return store;
-};

package/lib/methods/initStore/index.js

@@ -1,29 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.initStore = void 0;
-var _usecases = require("@mic-rexjs/usecases");
-var _entityRuntimeUseCase = require("../../usecases/entityRuntimeUseCase");
-var initStore = exports.initStore = function initStore(entity, prevStore, changedDeps) {
-  var isFunction = typeof entity === 'function';
-  if (!isFunction) {
-    return new _usecases.EntityStore(entity);
-  }
-  var _ref = prevStore || {},
-    value = _ref.value;
-  var store = new _usecases.EntityStore(value);
-  var _createEntityReducers = (0, _usecases.createEntityReducers)(store, _entityRuntimeUseCase.entityRuntimeUseCase, {
-      onInit: function onInit(currentValue) {
-        return entity(currentValue, changedDeps);
-      },
-      onReturn: function onReturn(result) {
-        store.setValue(result);
-        return result;
-      }
-    }),
-    initEntity = _createEntityReducers.initEntity;
-  initEntity();
-  return store;
-};