@resolveio/client-lib-core 15.0.5 → 15.0.7

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

@@ -463,49 +463,63 @@ function toDataURL(url, callback) {
     xhr.responseType = 'blob';
     xhr.send();
 }
-function deepDiffDetails(obj1, obj2) {
-    let diff = detailedDiff(obj2, obj1);
-    let diffString = '';
+function deepDiffDetails(object1, object2) {
+    let obj1 = deepCopy(object1);
+    let obj2 = deepCopy(object2);
+    let diff = detailedDiff(obj1, obj2);
+    let diffString = '\n';
     const formatValue = (value) => {
-        if (moment.isDate(value) || moment(value, moment.ISO_8601, true).isValid()) {
+        if (value instanceof Date) {
             return moment(value).format('llll');
         }
-        return typeof value === 'string' ? `"${value}"` : String(value);
+        else if (typeof value === 'object' && value !== null) {
+            Object.keys(value).filter(a => a.startsWith('_id') || a.startsWith('id_')).forEach(key => {
+                delete value[key];
+            });
+            return JSON.stringify(value); // Pretty print objects
+        }
+        else {
+            return typeof value === 'string' ? `"${value}"` : String(value);
+        }
     };
-    const formatArrayDiff = (arr1, arr2) => {
-        return arr1.map((item, index) => {
-            const arr2Item = arr2[index];
-            if (typeof item === 'object' && item !== null && arr2Item !== undefined) {
-                return `{${formatObjectDiff(item, arr2Item)}}`;
+    const customArrayDiff = (arr1, arr2) => {
+        let arrayDiffResults = [];
+        const maxLength = Math.max(arr1.length, arr2.length);
+        for (let i = 0; i < maxLength; i++) {
+            if (arr1[i] && !arr2[i]) {
+                arrayDiffResults.push(`Removed at index ${i}: ${formatValue(arr1[i])}`);
             }
-            return arr2Item !== undefined ? `from: ${formatValue(item)} to: ${formatValue(arr2Item)}` : `removed: ${formatValue(item)}`;
-        }).join(', ');
+            else if (!arr1[i] && arr2[i]) {
+                arrayDiffResults.push(`Added at index ${i}: ${formatValue(arr2[i])}`);
+            }
+            else if (arr1[i] && arr2[i] && JSON.stringify(arr1[i]) !== JSON.stringify(arr2[i])) {
+                arrayDiffResults.push(`Changed at index ${i}: {${formatObjectDiff(arr1[i], arr2[i])}}`);
+            }
+        }
+        return arrayDiffResults.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);
+        if (Array.isArray(obj1) || Array.isArray(obj2)) {
+            return customArrayDiff(Array.isArray(obj1) ? obj1 : [], Array.isArray(obj2) ? obj2 : []);
         }
-        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(obj1Val)} to: ${formatValue(obj2Val)}`;
+        return Object.keys({ ...obj1, ...obj2 }).filter(a => !a.startsWith('_id') && !a.startsWith('id_')).map(key => {
+            const obj1Val = obj1 ? obj1[key] : undefined;
+            const obj2Val = obj2 ? obj2[key] : undefined;
+            return `${toTitleCase(key)}: ${formatObjectDiff(obj1Val, obj2Val)}`;
         }).join(', ');
     };
+    // Handle each diff type
     ['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)}}`;
-            })
+                .filter(key => diffType === 'added' ? true : (diffType === 'deleted' ? !diff['added'][key] : !diff['added'][key] && !diff['deleted'][key]))
+                .filter(key => !key.startsWith('_id') && !key.startsWith('id_'))
+                .map(key => `\n${toTitleCase(key)}: ${formatObjectDiff(obj1[key], obj2[key])}`)
                 .join(',\n');
-            diffString += updates ? `${updates}\n` : '';
+            diffString += updates ? `${updates}` : '';
         }
     });
     return diffString;