deps: npm update

* path-scurry@1.6.3 * just-diff@6.0.2
npm · Apr 3, 2023 · f1388b4 · f1388b4
1 parent 7dd0129
commit f1388b4
Show file tree

Hide file tree

Showing 5 changed files with 264 additions and 247 deletions.
diff --git a/node_modules/just-diff/index.cjs b/node_modules/just-diff/index.cjs
@@ -79,55 +79,43 @@ function diff(obj1, obj2, pathConverter) {
       return arr;
     });
 
-  // we will gather all permutations and return the one with the fewest diffs
-  var permutations = [{remove: [], replace: [], add: []}];
-
-  function getDiff({obj1, obj2, basePath, basePathForRemoves, permutation}) {
+  function getDiff({obj1, obj2, basePath, basePathForRemoves, diffs}) {
     var obj1Keys = Object.keys(obj1);
     var obj1KeysLength = obj1Keys.length;
     var obj2Keys = Object.keys(obj2);
     var obj2KeysLength = obj2Keys.length;
     var path;
 
-    var newPermutation;
-
     var lengthDelta = obj1.length - obj2.length;
-    // if both objects are arrays and obj1 length > obj2 length
-    // we create an additional permutation that trims obj1 from left
-    if (Array.isArray(obj1) && Array.isArray(obj2) && lengthDelta > 0) {
-      newPermutation = clonePermutation(permutation);
-      permutations.push(newPermutation);
-    }
 
-    // trim from right
-    for (var i = 0; i < obj1KeysLength; i++) {
-      var key = Array.isArray(obj1) ? Number(obj1Keys[i]) : obj1Keys[i];
-      if (!(key in obj2)) {
-        path = basePathForRemoves.concat(key);
-        permutation.remove.push({
-          op: 'remove',
-          path: pathConverter(path),
-        });
+    if (trimFromRight(obj1, obj2)) {
+      for (var i = 0; i < obj1KeysLength; i++) {
+        var key = Array.isArray(obj1) ? Number(obj1Keys[i]) : obj1Keys[i];
+        if (!(key in obj2)) {
+          path = basePathForRemoves.concat(key);
+          diffs.remove.push({
+            op: 'remove',
+            path: pathConverter(path),
+          });
+        }
       }
-    }
 
-    for (var i = 0; i < obj2KeysLength; i++) {
-      var key = Array.isArray(obj2) ? Number(obj2Keys[i]) : obj2Keys[i];
-      pushReplaces({
-        key,
-        obj1,
-        obj2,
-        path: basePath.concat(key),
-        pathForRemoves: basePath.concat(key),
-        permutation,
-      });
-    }
-
-    // if we created a new permutation above it means we should also try trimming from left
-    if (newPermutation) {
+      for (var i = 0; i < obj2KeysLength; i++) {
+        var key = Array.isArray(obj2) ? Number(obj2Keys[i]) : obj2Keys[i];
+        pushReplaces({
+          key,
+          obj1,
+          obj2,
+          path: basePath.concat(key),
+          pathForRemoves: basePath.concat(key),
+          diffs,
+        });
+      }
+    } else {
+      // trim from left, objects are both arrays
       for (var i = 0; i < lengthDelta; i++) {
         path = basePathForRemoves.concat(i);
-        newPermutation.remove.push({
+        diffs.remove.push({
           op: 'remove',
           path: pathConverter(path),
         });
@@ -144,38 +132,34 @@ function diff(obj1, obj2, pathConverter) {
           // since list of removes are reversed before presenting result,
           // we need to ignore existing parent removes when doing nested removes
           pathForRemoves: basePath.concat(i + lengthDelta),
-          permutation: newPermutation,
+          diffs,
         });
       }
     }
   }
 
+  var diffs = {remove: [], replace: [], add: []};
   getDiff({
     obj1,
     obj2,
     basePath: [],
     basePathForRemoves: [],
-    permutation: permutations[0],
+    diffs,
   });
 
-  // find the shortest permutation
-  var finalDiffs = permutations.sort(
-    (a, b) => diffStepCount(a) > diffStepCount(b) ? 1 : -1
-  )[0];
-
   // reverse removes since we want to maintain indexes
-  return finalDiffs.remove
+  return diffs.remove
     .reverse()
-    .concat(finalDiffs.replace)
-    .concat(finalDiffs.add);
+    .concat(diffs.replace)
+    .concat(diffs.add);
 
-  function pushReplaces({key, obj1, obj2, path, pathForRemoves, permutation}) {
+  function pushReplaces({key, obj1, obj2, path, pathForRemoves, diffs}) {
     var obj1AtKey = obj1[key];
     var obj2AtKey = obj2[key];
 
-    if(!(key in obj1) && obj2AtKey) {
+    if(!(key in obj1) && (key in obj2)) {
       var obj2Value = obj2AtKey;
-      permutation.add.push({
+      diffs.add.push({
         op: 'add',
         path: pathConverter(path),
         value: obj2Value,
@@ -184,19 +168,19 @@ function diff(obj1, obj2, pathConverter) {
       if(Object(obj1AtKey) !== obj1AtKey ||
         Object(obj2AtKey) !== obj2AtKey || differentTypes(obj1AtKey, obj2AtKey)
       ) {
-        pushReplace(path, permutation, obj2AtKey);
+        pushReplace(path, diffs, obj2AtKey);
       } else {
         if(!Object.keys(obj1AtKey).length &&
           !Object.keys(obj2AtKey).length &&
           String(obj1AtKey) != String(obj2AtKey)) {
-          pushReplace(path, permutation, obj2AtKey);
+          pushReplace(path, diffs, obj2AtKey);
         } else {
           getDiff({
             obj1: obj1[key],
             obj2: obj2[key],
             basePath: path,
             basePathForRemoves: pathForRemoves,
-            permutation});
+            diffs});
         }
       }
     }
@@ -211,22 +195,36 @@ function diff(obj1, obj2, pathConverter) {
   }
 }
 
-function clonePermutation(permutation) {
-  return {
-    remove: permutation.remove.slice(0),
-    replace: permutation.replace.slice(0),
-    add: permutation.add.slice(0),
-  };
-}
-
-function diffStepCount(permutation) {
-  return permutation.remove.length + permutation.replace.length + permutation.add.length;
-}
-
 function jsonPatchPathConverter(arrayPath) {
   return [''].concat(arrayPath).join('/');
 }
 
 function differentTypes(a, b) {
   return Object.prototype.toString.call(a) != Object.prototype.toString.call(b);
 }
+
+function trimFromRight(obj1, obj2) {
+  var lengthDelta = obj1.length - obj2.length;
+  if (Array.isArray(obj1) && Array.isArray(obj2) && lengthDelta > 0) {
+    var leftMatches = 0;
+    var rightMatches = 0;
+    for (var i = 0; i < obj2.length; i++) {
+      if (String(obj1[i]) === String(obj2[i])) {
+        leftMatches++;
+      } else {
+        break;
+      }
+    }
+    for (var j = obj2.length; j > 0; j--) {
+      if (String(obj1[j + lengthDelta]) === String(obj2[j])) {
+        rightMatches++;
+      } else {
+        break;
+      }
+    }
+
+    // bias to trim right becase it requires less index shifting
+    return leftMatches >= rightMatches;
+  }
+  return true;
+}