json-diff-ts 5.0.0-alpha.8 → 5.0.0-alpha.9

package/dist/index.js

@@ -1297,7 +1297,8 @@ function walkChanges(changes, basePath, oldCtx, newCtx, ops, options) {
       const childOld = change.key === "$root" ? oldCtx : oldCtx?.[change.key];
       const childNew = change.key === "$root" ? newCtx : newCtx?.[change.key];
       if (change.embeddedKey) {
-        for (const childChange of change.changes) {
+        const orderedChildChanges = orderArrayChildChanges(change.changes, change.embeddedKey);
+        for (const childChange of orderedChildChanges) {
           const filterPath = buildCanonicalFilterPath(
             childPath,
             change.embeddedKey,
@@ -1324,6 +1325,46 @@ function walkChanges(changes, basePath, oldCtx, newCtx, ops, options) {
     }
   }
 }
+function orderArrayChildChanges(changes, embeddedKey) {
+  if (embeddedKey !== "$index") {
+    return changes;
+  }
+  const groups = [];
+  const pureRemoves = [];
+  for (let i = 0; i < changes.length; i++) {
+    const current = changes[i];
+    const next = changes[i + 1];
+    if (current.type === "REMOVE" /* REMOVE */ && next && next.type === "ADD" /* ADD */ && String(current.key) === String(next.key)) {
+      groups.push({ kind: "preserved", changes: [current, next] });
+      i++;
+      continue;
+    }
+    if (current.type === "REMOVE" /* REMOVE */) {
+      pureRemoves.push(current);
+      groups.push({ kind: "pure-remove" });
+      continue;
+    }
+    groups.push({ kind: "preserved", changes: [current] });
+  }
+  if (pureRemoves.length < 2) {
+    return changes;
+  }
+  const removeIndices = pureRemoves.map((change) => Number(change.key));
+  if (removeIndices.some((idx) => !Number.isInteger(idx))) {
+    return changes;
+  }
+  pureRemoves.sort((a, b) => Number(b.key) - Number(a.key));
+  const ordered = [];
+  let removeIndex = 0;
+  for (const group of groups) {
+    if (group.kind === "pure-remove") {
+      ordered.push(pureRemoves[removeIndex++]);
+    } else {
+      ordered.push(...group.changes);
+    }
+  }
+  return ordered;
+}
 function emitLeafOp(change, path, ops, options) {
   switch (change.type) {
     case "ADD" /* ADD */: {