@contrail/util 1.0.42 → 1.0.44

package/lib/object-util/applyChangesIfEqual/applyChangesIfEqual.d.ts

@@ -1,2 +1,4 @@
-export declare function applyChangesIfEqual(target: any, priorSourceValues: any, newSourceValues: any, propertyKeys: any): void;
-export declare function determineChangesIfEqual(target: any, priorSourceValues: any, newSourceValues: any, propertyKeys: any): any;
+import { TypeProperty } from "@contrail/types";
+export declare function applyChangesIfEqual(target: any, priorSourceValues: any, newSourceValues: any, properties: any): void;
+export declare function determineChangesIfEqual(target: any, priorSourceValues: any, newSourceValues: any, properties: any): any;
+export declare function areItemPropertyValuesEqual(property: TypeProperty, itemOne: any, itemTwo: any): boolean;

package/lib/object-util/applyChangesIfEqual/applyChangesIfEqual.js

@@ -1,23 +1,77 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.determineChangesIfEqual = exports.applyChangesIfEqual = void 0;
-function applyChangesIfEqual(target, priorSourceValues, newSourceValues, propertyKeys) {
-    const changes = determineChangesIfEqual(target, priorSourceValues, newSourceValues, propertyKeys);
+exports.areItemPropertyValuesEqual = exports.determineChangesIfEqual = exports.applyChangesIfEqual = void 0;
+const types_1 = require("@contrail/types");
+const compareDeep_1 = require("../compareDeep/compareDeep");
+function applyChangesIfEqual(target, priorSourceValues, newSourceValues, properties) {
+    const changes = determineChangesIfEqual(target, priorSourceValues, newSourceValues, properties);
     if (changes) {
         Object.assign(target, changes);
     }
 }
 exports.applyChangesIfEqual = applyChangesIfEqual;
-function determineChangesIfEqual(target, priorSourceValues, newSourceValues, propertyKeys) {
+function determineChangesIfEqual(target, priorSourceValues, newSourceValues, properties) {
     const changes = {};
-    for (const propKey of propertyKeys) {
-        if (newSourceValues[propKey] === undefined) {
+    for (const property of properties) {
+        const propertyKey = getPropertyKey(property);
+        if (newSourceValues[propertyKey] === undefined) {
             continue;
         }
-        if (!target.hasOwnProperty(propKey) || (priorSourceValues[propKey] === target[propKey])) {
-            changes[propKey] = newSourceValues[propKey];
+        if (areItemPropertyValuesEqual(property, priorSourceValues, target)) {
+            changes[propertyKey] = newSourceValues[propertyKey];
+            if ([types_1.PropertyType.ObjectReference, types_1.PropertyType.UserList, types_1.PropertyType.TypeReference].includes(property.propertyType)) {
+                changes[property.slug] = newSourceValues[property.slug];
+            }
         }
     }
     return changes;
 }
 exports.determineChangesIfEqual = determineChangesIfEqual;
+function areItemPropertyValuesEqual(property, itemOne, itemTwo) {
+    var _a, _b;
+    const propertyKey = getPropertyKey(property);
+    const propertyValueOne = itemOne[propertyKey];
+    const propertyValueTwo = itemTwo[propertyKey];
+    if (property.propertyType === types_1.PropertyType.MultiSelect) {
+        const propertyValueOneAsArray = typeof propertyValueOne === 'string' ? propertyValueOne.split(',') : propertyValueOne;
+        const propertyValueTwoAsArray = typeof propertyValueTwo === 'string' ? propertyValueTwo.split(',') : propertyValueTwo;
+        return areArraysEqualIgnoreOrder(propertyValueOneAsArray, propertyValueTwoAsArray);
+    }
+    if (property.propertyType === types_1.PropertyType.SizeRange) {
+        const isOfSameSizeRangeTemplate = ((_a = itemOne === null || itemOne === void 0 ? void 0 : itemOne.sizeRangeTemplate) === null || _a === void 0 ? void 0 : _a.id) === ((_b = itemTwo === null || itemTwo === void 0 ? void 0 : itemTwo.sizeRangeTemplate) === null || _b === void 0 ? void 0 : _b.id);
+        if (!isOfSameSizeRangeTemplate)
+            return false;
+        return areSizeRangesEqual(propertyValueOne, propertyValueTwo);
+    }
+    return propertyValueOne === propertyValueTwo;
+}
+exports.areItemPropertyValuesEqual = areItemPropertyValuesEqual;
+function areSizeRangesEqual(sizeRangeOne, sizeRangeTwo) {
+    var _a, _b;
+    if (!sizeRangeOne && !sizeRangeTwo) {
+        return true;
+    }
+    if (!sizeRangeOne || !sizeRangeTwo || ((_a = sizeRangeOne.sizes) === null || _a === void 0 ? void 0 : _a.length) !== ((_b = sizeRangeTwo.sizes) === null || _b === void 0 ? void 0 : _b.length)) {
+        return false;
+    }
+    const result = (0, compareDeep_1.getObjectDiffs)(sizeRangeOne, sizeRangeTwo, '');
+    return result.length === 0;
+}
+function areArraysEqualIgnoreOrder(arrayOne, arrayTwo) {
+    if (!arrayOne && !arrayTwo) {
+        return true;
+    }
+    if ((arrayOne === null || arrayOne === void 0 ? void 0 : arrayOne.length) !== (arrayTwo === null || arrayTwo === void 0 ? void 0 : arrayTwo.length)) {
+        return false;
+    }
+    const sortedArray1 = arrayOne.slice().sort();
+    const sortedArray2 = arrayTwo.slice().sort();
+    const areArraysEqual = sortedArray1.every((element, index) => element === sortedArray2[index]);
+    return areArraysEqual;
+}
+function getPropertyKey(property) {
+    if ([types_1.PropertyType.ObjectReference, types_1.PropertyType.UserList, types_1.PropertyType.TypeReference].includes(property.propertyType)) {
+        return property.slug + 'Id';
+    }
+    return property.slug;
+}

package/lib/object-util/object-util.d.ts

@@ -2,7 +2,7 @@ import { cloneDeep } from './cloneDeep/cloneDeep';
 import { isObject } from './isObject/isObject';
 import { mergeDeep } from './mergeDeep/mergeDeep';
 import { getObjectDiffs } from './compareDeep/compareDeep';
-import { applyChangesIfEqual, determineChangesIfEqual } from './applyChangesIfEqual/applyChangesIfEqual';
+import { applyChangesIfEqual, determineChangesIfEqual, areItemPropertyValuesEqual } from './applyChangesIfEqual/applyChangesIfEqual';
 export { ObjectDiff } from './compareDeep/compareDeep';
 export declare class ObjectUtil {
     static getByPath(obj: any, path: string, def?: any): any;
@@ -13,4 +13,5 @@ export declare class ObjectUtil {
     static compareDeep: typeof getObjectDiffs;
     static applyChangesIfEqual: typeof applyChangesIfEqual;
     static determineChangesIfEqual: typeof determineChangesIfEqual;
+    static areItemPropertyValuesEqual: typeof areItemPropertyValuesEqual;
 }

package/lib/object-util/object-util.js

@@ -41,3 +41,4 @@ ObjectUtil.cloneDeep = cloneDeep_1.cloneDeep;
 ObjectUtil.compareDeep = compareDeep_1.getObjectDiffs;
 ObjectUtil.applyChangesIfEqual = applyChangesIfEqual_1.applyChangesIfEqual;
 ObjectUtil.determineChangesIfEqual = applyChangesIfEqual_1.determineChangesIfEqual;
+ObjectUtil.areItemPropertyValuesEqual = applyChangesIfEqual_1.areItemPropertyValuesEqual;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/util",
-  "version": "1.0.42",
+  "version": "1.0.44",
   "description": "General javascript utilities",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -35,5 +35,8 @@
     },
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
+  },
+  "dependencies": {
+    "@contrail/types": "^3.0.45"
   }
 }