@resolveio/client-lib-core 1.1.35 → 1.1.37

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

@@ -397,45 +397,35 @@ function toDataURL(url, callback) {
     xhr.send();
 }
 function getDeepDiffDetails(obj1, obj2) {
-    let diff = detailedDiff(obj1, obj2);
+    let diff = detailedDiff(obj2, obj1);
     let diffString = '';
     const formatObjectDiff = (obj1, obj2) => {
-        let str = '';
-        Object.keys(obj1).forEach(key => {
+        if (!obj1 || !obj2)
+            return '';
+        return Object.keys(obj1)
+            .map(key => {
             if (Array.isArray(obj1[key]) && Array.isArray(obj2[key])) {
-                const arrayDiff = obj1[key].map((item, index) => {
-                    if (typeof item === 'object' && obj2[key][index] && typeof obj2[key][index] === 'object') {
-                        return `{${formatObjectDiff(item, obj2[key][index])}}`;
-                    }
-                    return `"${item}" to "${obj2[key][index]}"`;
-                }).join(', ');
-                str += `${toTitleCase(key.replace(/_/g, ' '))}: [${arrayDiff}], `;
-            }
-            else if (typeof obj1[key] === 'object' && obj1[key] !== null && obj2[key] !== null) {
-                str += `${toTitleCase(key.replace(/_/g, ' '))}: {${formatObjectDiff(obj1[key], obj2[key])}}, `;
+                const arrayDiff = obj1[key].map((item, index) => typeof item === 'object' && obj2[key][index]
+                    ? `{${formatObjectDiff(item, obj2[key][index])}}`
+                    : `"${item}" to "${obj2[key][index]}"`).join(', ');
+                return `${toTitleCase(key)}: [${arrayDiff}]`;
             }
-            else {
-                str += `${toTitleCase(key.replace(/_/g, ' '))}: "${obj1[key]}" to "${obj2[key]}", `;
+            if (typeof obj1[key] === 'object' && obj2[key]) {
+                return `${toTitleCase(key)}: {${formatObjectDiff(obj1[key], obj2[key])}}`;
             }
-        });
-        return str.slice(0, -2);
+            return `${toTitleCase(key)}: "${obj1[key]}" to "${obj2[key]}"`;
+        })
+            .join(', ');
     };
     if (Object.keys(diff.updated).length > 0) {
         diffString += 'Updated:\n';
-        Object.keys(diff.updated).forEach(key => {
-            if (key.substr(0, 2) !== 'id' && diff.updated[key] !== obj2[key]) { // Avoid repeating the same values
-                if (moment.isDate(diff.updated[key])) {
-                    diffString += `${toTitleCase(key.replace(/_/g, ' '))}: "${moment(diff.updated[key]).format('llll')}" to "${moment(obj2[key]).format('llll')}",\n`;
-                }
-                else if (typeof diff.updated[key] === 'object' && diff.updated[key] !== null && obj2[key] !== null) {
-                    diffString += `${toTitleCase(key.replace(/_/g, ' '))}: {${formatObjectDiff(diff.updated[key], obj2[key])}},\n`;
-                }
-                else {
-                    diffString += `${toTitleCase(key.replace(/_/g, ' '))}: "${diff.updated[key]}" to "${obj2[key]}",\n`;
-                }
-            }
-        });
-        diffString = diffString.slice(0, -2) + '\n'; // Remove the last comma and newline
+        const updates = Object.keys(diff.updated)
+            .filter(key => key.substr(0, 2) !== 'id' && diff.updated[key] !== obj2[key])
+            .map(key => moment.isDate(diff.updated[key])
+            ? `${toTitleCase(key)}: "${moment(diff.updated[key]).format('llll')}" to "${moment(obj2[key]).format('llll')}"`
+            : `${toTitleCase(key)}: {${formatObjectDiff(diff.updated[key], obj2[key])}}`)
+            .join(',\n');
+        diffString += updates ? `${updates}\n` : '';
     }
     return diffString;
 }