@resolveio/client-lib-core 15.0.1 → 15.0.2

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

@@ -466,31 +466,28 @@ function toDataURL(url, callback) {
 function getDeepDiffDetails(obj1, obj2) {
     let diff = detailedDiff(obj2, obj1);
     let diffString = '';
+    const formatValue = (value) => {
+        if (moment.isDate(value) || moment(value, moment.ISO_8601, true).isValid()) {
+            return moment(value).format('llll');
+        }
+        return typeof value === 'string' ? `"${value}"` : String(value);
+    };
     const formatObjectDiff = (obj1, obj2) => {
-        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) => typeof item === 'object' && obj2[key][index]
-                    ? `{${formatObjectDiff(item, obj2[key][index])}}`
-                    : `"${item}" to "${obj2[key][index]}"`).join(', ');
-                return `${toTitleCase(key)}: [${arrayDiff}]`;
-            }
-            if (typeof obj1[key] === 'object' && obj2[key]) {
+        if (obj1 === null || obj2 === null || typeof obj1 !== 'object' || typeof obj2 !== 'object') {
+            return `from: ${formatValue(obj1)} to: ${formatValue(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 `${toTitleCase(key)}: "${obj1[key]}" to "${obj2[key]}"`;
-        })
-            .join(', ');
+            return `${toTitleCase(key)}: from: ${formatValue(obj1[key])} to: ${formatValue(obj2[key])}`;
+        }).join(', ');
     };
-    if (Object.keys(diff['updated']).length > 0) {
+    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 => 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])}}`)
+        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` : '';
     }