added default detection for update-update the same AND delete-move

Author: julia05

src/customisable/defaultConflictDetection.ts

@@ -3,6 +3,20 @@ import { CustomOp, DifferenceOperationKind } from "../interfaces/util.js";
 import { DiffWithUsedFlag } from "../interfaces/inputmodels.js";
 import { isDeepStrictEqual } from "node:util";
 
+
+export function isUpdateUpdateTheSameConflict(
+  diffL: DiffWithUsedFlag,
+  diffR: DiffWithUsedFlag,
+): boolean {
+
+  if (isDeepStrictEqual(diffL.opInfo.value, diffR.opInfo.value)) {
+    return true;
+  }
+
+  return false;
+}
+
+
 /* 
 both directions
 */
@@ -107,3 +121,27 @@ export function isMoveMoveConflict(
 
   // dann hab ich die zusammengehörigen Operations für move => delete und add
 }
+
+
+// special case if ref target got deleted
+export function isDeleteMoveConflict(
+  operationLeft: CustomOp,
+  operationRight: CustomOp,
+): boolean {
+
+  // TODO
+  if (
+    operationLeft.op === DifferenceOperationKind.MOVE
+  ) {
+    if (directRefExists(operationRight.path, operationLeft.value as object)) {
+      return true;
+    }
+  } else if (
+    operationRight.op === DifferenceOperationKind.MOVE
+  ) {
+    if (directRefExists(operationLeft.path, operationRight.value as object)) {
+      return true;
+    }
+  }
+  return false;
+}