RFE angus-c#520 purposal (keep oldValue in diff)

eviltik · Dec 5, 2022 · 6b0d905 · 6b0d905
1 parent 3c9d3fb
commit 6b0d905
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/collection-diff/index.js b/packages/collection-diff/index.js
@@ -114,14 +114,14 @@ function diff(obj1, obj2, pathConverter) {
           Object(obj1AtKey) !== obj1AtKey ||
           Object(obj2AtKey) !== obj2AtKey
         ) {
-          path = pushReplace(path, basePath, key, diffs, pathConverter, obj2);
+          path = pushReplace(path, basePath, key, diffs, pathConverter, obj2, obj1);
         } else {
           if (
             !Object.keys(obj1AtKey).length &&
             !Object.keys(obj2AtKey).length &&
             String(obj1AtKey) != String(obj2AtKey)
           ) {
-            path = pushReplace(path, basePath, key, diffs, pathConverter, obj2);
+            path = pushReplace(path, basePath, key, diffs, pathConverter, obj2, obj1);
           } else {
             getDiff(obj1[key], obj2[key], basePath.concat(key), diffs);
           }
@@ -138,11 +138,12 @@ function diff(obj1, obj2, pathConverter) {
     .concat(finalDiffs.add);
 }
 
-function pushReplace(path, basePath, key, diffs, pathConverter, obj2) {
+function pushReplace(path, basePath, key, diffs, pathConverter, obj2, obj1) {
   path = basePath.concat(key);
   diffs.replace.push({
     op: 'replace',
     path: pathConverter(path),
+    oldValue: obj1[key],
     value: obj2[key],
   });
   return path;

diff --git a/packages/collection-diff/index.mjs b/packages/collection-diff/index.mjs
@@ -109,14 +109,14 @@ function diff(obj1, obj2, pathConverter) {
           Object(obj1AtKey) !== obj1AtKey ||
           Object(obj2AtKey) !== obj2AtKey
         ) {
-          path = pushReplace(path, basePath, key, diffs, pathConverter, obj2);
+          path = pushReplace(path, basePath, key, diffs, pathConverter, obj2, obj1);
         } else {
           if (
             !Object.keys(obj1AtKey).length &&
             !Object.keys(obj2AtKey).length &&
             String(obj1AtKey) != String(obj2AtKey)
           ) {
-            path = pushReplace(path, basePath, key, diffs, pathConverter, obj2);
+            path = pushReplace(path, basePath, key, diffs, pathConverter, obj2, obj1);
           } else {
             getDiff(obj1[key], obj2[key], basePath.concat(key), diffs);
           }
@@ -133,11 +133,12 @@ function diff(obj1, obj2, pathConverter) {
     .concat(finalDiffs.add);
 }
 
-function pushReplace(path, basePath, key, diffs, pathConverter, obj2) {
+function pushReplace(path, basePath, key, diffs, pathConverter, obj2, obj1) {
   path = basePath.concat(key);
   diffs.replace.push({
     op: 'replace',
     path: pathConverter(path),
+    oldValue: obj1[key],
     value: obj2[key],
   });
   return path;