@resolveio/client-lib-core 15.0.3 → 15.0.5

package/fesm2020/resolveio-client-lib-core.mjs

@@ -473,22 +473,13 @@ function deepDiffDetails(obj1, obj2) {
         return typeof value === 'string' ? `"${value}"` : String(value);
     };
     const formatArrayDiff = (arr1, arr2) => {
-        let maxLength = Math.max(arr1.length, arr2.length);
-        let arrayDiff = [];
-        for (let i = 0; i < maxLength; i++) {
-            if (i >= arr1.length) {
-                arrayDiff.push(`added: ${formatValue(arr2[i])}`);
-                continue;
+        return arr1.map((item, index) => {
+            const arr2Item = arr2[index];
+            if (typeof item === 'object' && item !== null && arr2Item !== undefined) {
+                return `{${formatObjectDiff(item, arr2Item)}}`;
             }
-            if (i >= arr2.length) {
-                arrayDiff.push(`removed: ${formatValue(arr1[i])}`);
-                continue;
-            }
-            if (arr1[i] !== arr2[i]) {
-                arrayDiff.push(`from: ${formatValue(arr1[i])} to: ${formatValue(arr2[i])}`);
-            }
-        }
-        return `[${arrayDiff.join(', ')}]`;
+            return arr2Item !== undefined ? `from: ${formatValue(item)} to: ${formatValue(arr2Item)}` : `removed: ${formatValue(item)}`;
+        }).join(', ');
     };
     const formatObjectDiff = (obj1, obj2) => {
         if (obj1 === null || obj2 === null || typeof obj1 !== 'object' || typeof obj2 !== 'object') {
@@ -497,21 +488,26 @@ function deepDiffDetails(obj1, obj2) {
         if (Array.isArray(obj1) && Array.isArray(obj2)) {
             return formatArrayDiff(obj1, obj2);
         }
-        return Object.keys(obj1).map(key => {
-            if (typeof obj1[key] === 'object' && obj1[key] !== null && obj2[key] !== null) {
-                return `${toTitleCase(key)}: {${formatObjectDiff(obj1[key], obj2[key])}}`;
+        return Object.keys({ ...obj1, ...obj2 }).map(key => {
+            const obj1Val = obj1[key], obj2Val = obj2[key];
+            if (typeof obj1Val === 'object' && obj1Val !== null && obj2Val !== null) {
+                return `${toTitleCase(key)}: {${formatObjectDiff(obj1Val, obj2Val)}}`;
             }
-            return `${toTitleCase(key)}: from: ${formatValue(obj1[key])} to: ${formatValue(obj2[key])}`;
+            return `${toTitleCase(key)}: from: ${formatValue(obj1Val)} to: ${formatValue(obj2Val)}`;
         }).join(', ');
     };
-    if (Object.keys(diff.updated).length > 0) {
-        diffString += 'Updated:\n';
-        const updates = Object.keys(diff.updated)
-            .filter(key => key.substr(0, 2) !== 'id' && diff.updated[key] !== obj2[key])
-            .map(key => `${toTitleCase(key)}: {${formatObjectDiff(diff.updated[key], obj2[key])}}`)
-            .join(',\n');
-        diffString += updates ? `${updates}\n` : '';
-    }
+    ['added', 'deleted', 'updated'].forEach(diffType => {
+        if (Object.keys(diff[diffType]).length > 0) {
+            diffString += `${toTitleCase(diffType)}:\n`;
+            const updates = Object.keys(diff[diffType])
+                .map(key => {
+                const currentValue = diffType === 'deleted' ? obj1[key] : obj2[key];
+                return `${toTitleCase(key)}: {${formatObjectDiff(diff[diffType][key], currentValue)}}`;
+            })
+                .join(',\n');
+            diffString += updates ? `${updates}\n` : '';
+        }
+    });
     return diffString;
 }
 function generateCronStringFromDate(date) {