docx-diff-editor 1.0.26 → 1.0.27

package/dist/index.mjs

@@ -272,11 +272,11 @@ function diffDocuments(docA, docB) {
     summary
   };
 }
-function createTrackInsertMark(author = DEFAULT_AUTHOR) {
+function createTrackInsertMark(author = DEFAULT_AUTHOR, id) {
   return {
     type: "trackInsert",
     attrs: {
-      id: v4(),
+      id: id ?? v4(),
       author: author.name,
       authorEmail: author.email,
       authorImage: "",
@@ -284,11 +284,11 @@ function createTrackInsertMark(author = DEFAULT_AUTHOR) {
     }
   };
 }
-function createTrackDeleteMark(author = DEFAULT_AUTHOR) {
+function createTrackDeleteMark(author = DEFAULT_AUTHOR, id) {
   return {
     type: "trackDelete",
     attrs: {
-      id: v4(),
+      id: id ?? v4(),
       author: author.name,
       authorEmail: author.email,
       authorImage: "",
@@ -329,17 +329,30 @@ function mergeDocuments(docA, docB, diffResult, author = DEFAULT_AUTHOR) {
     return null;
   }
   let docAOffset = 0;
-  for (const segment of diffResult.segments) {
+  const segments = diffResult.segments;
+  for (let segIdx = 0; segIdx < segments.length; segIdx++) {
+    const segment = segments[segIdx];
     if (segment.type === "equal") {
       for (let i = 0; i < segment.text.length; i++) {
         charStates[docAOffset + i] = { type: "equal" };
       }
       docAOffset += segment.text.length;
     } else if (segment.type === "delete") {
+      const nextSegment = segments[segIdx + 1];
+      const isReplacement = nextSegment && nextSegment.type === "insert";
+      const replacementId = isReplacement ? v4() : void 0;
       for (let i = 0; i < segment.text.length; i++) {
-        charStates[docAOffset + i] = { type: "delete" };
+        charStates[docAOffset + i] = { type: "delete", replacementId };
       }
       docAOffset += segment.text.length;
+      if (isReplacement && nextSegment) {
+        insertions.push({
+          afterOffset: docAOffset,
+          text: nextSegment.text,
+          replacementId
+        });
+        segIdx++;
+      }
     } else if (segment.type === "insert") {
       insertions.push({
         afterOffset: docAOffset,
@@ -360,7 +373,7 @@ function mergeDocuments(docA, docB, diffResult, author = DEFAULT_AUTHOR) {
           result.push({
             type: "text",
             text: ins.text,
-            marks: [...node.marks || [], createTrackInsertMark(author)]
+            marks: [...node.marks || [], createTrackInsertMark(author, ins.replacementId)]
           });
         }
         const currentFormatChange = getFormatChangeAt(nodeOffset + i);
@@ -376,7 +389,7 @@ function mergeDocuments(docA, docB, diffResult, author = DEFAULT_AUTHOR) {
         const chunk = text.substring(i, j);
         let marks = [...node.marks || []];
         if (charState.type === "delete") {
-          marks.push(createTrackDeleteMark(author));
+          marks.push(createTrackDeleteMark(author, charState.replacementId));
         } else if (charState.type === "equal") {
           if (currentFormatChange) {
             const trackFormatMark = createTrackFormatMark(
@@ -400,7 +413,7 @@ function mergeDocuments(docA, docB, diffResult, author = DEFAULT_AUTHOR) {
         result.push({
           type: "text",
           text: ins.text,
-          marks: [...node.marks || [], createTrackInsertMark(author)]
+          marks: [...node.marks || [], createTrackInsertMark(author, ins.replacementId)]
         });
       }
       insertions = insertions.filter(
@@ -445,7 +458,7 @@ function mergeDocuments(docA, docB, diffResult, author = DEFAULT_AUTHOR) {
               {
                 type: "text",
                 text: ins.text,
-                marks: [createTrackInsertMark(author)]
+                marks: [createTrackInsertMark(author, ins.replacementId)]
               }
             ]
           }