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

package/dist/index.js

@@ -427,12 +427,14 @@ var compareArray = (oldObj, newObj, path, keyPath, options) => {
   const isFunctionKey = typeof uniqKey === "function" && uniqKey.length === 2;
   if (diffs.length) {
     const resolvedKey = isFunctionKey ? uniqKey(newObj[0] ?? oldObj[0], true) : uniqKey;
+    const sampleEl = newObj[0] ?? oldObj[0];
+    const isNestedPath = typeof resolvedKey === "string" && resolvedKey.includes(".") && NESTED_PATH_RE.test(resolvedKey) && (isFunctionKey || !(sampleEl != null && typeof sampleEl === "object" && resolvedKey in sampleEl));
     return [
       {
         type: "UPDATE" /* UPDATE */,
         key: getKey(path),
         embeddedKey: resolvedKey,
-        ...isFunctionKey && typeof resolvedKey === "string" && NESTED_PATH_RE.test(resolvedKey) && resolvedKey.includes(".") ? { embeddedKeyIsPath: true } : {},
+        ...isNestedPath ? { embeddedKeyIsPath: true } : {},
         changes: diffs
       }
     ];
@@ -473,7 +475,8 @@ var convertArrayToObj = (arr, uniqKey) => {
       obj[i] = value;
     }
   } else {
-    const keyFunction = typeof uniqKey === "string" ? (item) => item[uniqKey] : uniqKey;
+    const maybeNestedPath = typeof uniqKey === "string" && uniqKey.includes(".") && NESTED_PATH_RE.test(uniqKey);
+    const keyFunction = typeof uniqKey === "string" ? maybeNestedPath ? (item) => item != null && typeof item === "object" && uniqKey in item ? item[uniqKey] : resolveProperty(item, uniqKey, true) : (item) => item[uniqKey] : uniqKey;
     obj = keyBy(arr, keyFunction);
   }
   return obj;
@@ -520,7 +523,7 @@ var indexOfItemInArray = (arr, key, value, isPath) => {
     const item = arr[i];
     if (item == null) continue;
     const resolved = resolveProperty(item, key, isPath);
-    if (resolved != null && String(resolved) === String(value)) {
+    if (resolved !== void 0 && String(resolved) === String(value)) {
       return i;
     }
   }
@@ -576,7 +579,7 @@ var applyArrayChange = (arr, change) => {
       } else {
         element = arr.find((el) => {
           const resolved = resolveProperty(el, change.embeddedKey, change.embeddedKeyIsPath);
-          return resolved != null && String(resolved) === String(subchange.key);
+          return resolved !== void 0 && String(resolved) === String(subchange.key);
         });
       }
       if (element) {
@@ -646,7 +649,7 @@ var revertArrayChange = (arr, change) => {
       } else {
         element = arr.find((el) => {
           const resolved = resolveProperty(el, change.embeddedKey, change.embeddedKeyIsPath);
-          return resolved != null && String(resolved) === String(subchange.key);
+          return resolved !== void 0 && String(resolved) === String(subchange.key);
         });
       }
       if (element) {
@@ -1294,14 +1297,16 @@ 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,
             childChange.key,
             childOld,
             childNew,
-            childChange
+            childChange,
+            change.embeddedKeyIsPath
           );
           if (childChange.changes) {
             const oldEl = findElement(childOld, change.embeddedKey, childChange.key);
@@ -1320,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 */: {
@@ -1344,7 +1389,7 @@ function emitLeafOp(change, path, ops, options) {
     }
   }
 }
-function buildCanonicalFilterPath(basePath, embeddedKey, changeKey, oldArr, newArr, change) {
+function buildCanonicalFilterPath(basePath, embeddedKey, changeKey, oldArr, newArr, change, embeddedKeyIsPath) {
   if (embeddedKey === "$index") {
     return `${basePath}[${changeKey}]`;
   }
@@ -1364,9 +1409,11 @@ function buildCanonicalFilterPath(basePath, embeddedKey, changeKey, oldArr, newA
     const memberAccess2 = typeof keyName === "string" && SIMPLE_PROPERTY_RE2.test(keyName) ? `.${keyName}` : `.${changeKey}`;
     return `${basePath}[?(@${memberAccess2}=='${changeKey}')]`;
   }
-  const element = findElementByKey(oldArr, newArr, embeddedKey, changeKey, change.type);
-  const typedVal = element ? element[embeddedKey] : changeKey;
-  const memberAccess = SIMPLE_PROPERTY_RE2.test(embeddedKey) ? `.${embeddedKey}` : `['${embeddedKey.replace(/'/g, "''")}']`;
+  const isNestedPath = embeddedKeyIsPath && NESTED_PATH_RE3.test(embeddedKey);
+  const element = findElementByKey(oldArr, newArr, embeddedKey, changeKey, change.type, isNestedPath);
+  const resolved = element !== void 0 ? resolveNestedKey(element, embeddedKey, !!isNestedPath) : void 0;
+  const typedVal = resolved !== void 0 ? resolved : changeKey;
+  const memberAccess = SIMPLE_PROPERTY_RE2.test(embeddedKey) || isNestedPath ? `.${embeddedKey}` : `['${embeddedKey.replace(/'/g, "''")}']`;
   return `${basePath}[?(@${memberAccess}==${formatFilterLiteral(typedVal)})]`;
 }
 function findActualValue(oldArr, newArr, stringKey, opType) {
@@ -1405,13 +1452,20 @@ function findElement(arr, embeddedKey, changeKey) {
   }
   return arr.find((item) => item && String(item[embeddedKey]) === changeKey);
 }
-function findElementByKey(oldArr, newArr, embeddedKey, changeKey, opType) {
+function resolveNestedKey(item, key, isPath) {
+  if (isPath) {
+    return key.split(".").reduce((c, s) => c?.[s], item);
+  }
+  return item?.[key];
+}
+function findElementByKey(oldArr, newArr, embeddedKey, changeKey, opType, isPath) {
+  const match = (item) => item && String(resolveNestedKey(item, embeddedKey, !!isPath)) === changeKey;
   if (opType === "REMOVE" /* REMOVE */ || opType === "UPDATE" /* UPDATE */) {
-    const el = oldArr?.find((item) => item && String(item[embeddedKey]) === changeKey);
+    const el = oldArr?.find(match);
     if (el) return el;
   }
   if (opType === "ADD" /* ADD */ || opType === "UPDATE" /* UPDATE */) {
-    const el = newArr?.find((item) => item && String(item[embeddedKey]) === changeKey);
+    const el = newArr?.find(match);
     if (el) return el;
   }
   return void 0;