@resolveio/client-lib-core 15.0.4 → 15.0.6

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

@@ -472,54 +472,34 @@ 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;
-            }
-            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(', ')}]`;
-    };
     const formatObjectDiff = (obj1, obj2) => {
         if (obj1 === null || obj2 === null || typeof obj1 !== 'object' || typeof obj2 !== 'object') {
             return `from: ${formatValue(obj1)} to: ${formatValue(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])}}`;
+        if (Array.isArray(obj1) || Array.isArray(obj2)) {
+            const arr1 = Array.isArray(obj1) ? obj1 : [];
+            const arr2 = Array.isArray(obj2) ? obj2 : [];
+            const maxLength = Math.max(arr1.length, arr2.length);
+            const arrayDiff = [];
+            for (let i = 0; i < maxLength; i++) {
+                arrayDiff.push(formatObjectDiff(arr1[i], arr2[i]));
             }
-            return `${toTitleCase(key)}: from: ${formatValue(obj1[key])} to: ${formatValue(obj2[key])}`;
-        }).join(', ');
-    };
-    const handleDiffType = (diffObj, obj, key) => {
-        if (Array.isArray(diffObj[key])) {
-            return `${toTitleCase(key)}: ${formatArrayDiff(obj1[key] || [], obj2[key] || [])}`;
-        }
-        else if (typeof diffObj[key] === 'object') {
-            return `${toTitleCase(key)}: {${formatObjectDiff(obj1[key], obj2[key])}}`;
-        }
-        else {
-            return `${toTitleCase(key)}: from: ${formatValue(obj1[key])} to: ${formatValue(obj2[key])}`;
+            return `[${arrayDiff.join(', ')}]`;
         }
+        return Object.keys({ ...obj1, ...obj2 }).map(key => {
+            const obj1Val = obj1 ? obj1[key] : undefined;
+            const obj2Val = obj2 ? obj2[key] : undefined;
+            return `${toTitleCase(key)}: ${formatObjectDiff(obj1Val, obj2Val)}`;
+        }).join(', ');
     };
     ['added', 'deleted', 'updated'].forEach(diffType => {
         if (Object.keys(diff[diffType]).length > 0) {
             diffString += `${toTitleCase(diffType)}:\n`;
             const updates = Object.keys(diff[diffType])
-                .map(key => handleDiffType(diff[diffType], diffType === 'deleted' ? obj1 : obj2, key))
+                .map(key => {
+                const currentValue = diffType === 'deleted' ? obj1[key] : obj2[key];
+                return `${toTitleCase(key)}: ${formatObjectDiff(diff[diffType][key], currentValue)}`;
+            })
                 .join(',\n');
             diffString += updates ? `${updates}\n` : '';
         }