docx-diff-editor 1.0.26 → 1.0.28

package/dist/index.d.mts

@@ -228,12 +228,16 @@ declare function mergeDocuments(docA: ProseMirrorNode, docB: ProseMirrorNode, di
 
 /**
  * Create a trackInsert mark.
+ * @param author - The author of the change
+ * @param id - Optional ID to use (for linking with corresponding delete in replacements)
  */
-declare function createTrackInsertMark(author?: TrackChangeAuthor): ProseMirrorMark;
+declare function createTrackInsertMark(author?: TrackChangeAuthor, id?: string): ProseMirrorMark;
 /**
  * Create a trackDelete mark.
+ * @param author - The author of the change
+ * @param id - Optional ID to use (for linking with corresponding insert in replacements)
  */
-declare function createTrackDeleteMark(author?: TrackChangeAuthor): ProseMirrorMark;
+declare function createTrackDeleteMark(author?: TrackChangeAuthor, id?: string): ProseMirrorMark;
 /**
  * Create a trackFormat mark.
  */

package/dist/index.d.ts

@@ -228,12 +228,16 @@ declare function mergeDocuments(docA: ProseMirrorNode, docB: ProseMirrorNode, di
 
 /**
  * Create a trackInsert mark.
+ * @param author - The author of the change
+ * @param id - Optional ID to use (for linking with corresponding delete in replacements)
  */
-declare function createTrackInsertMark(author?: TrackChangeAuthor): ProseMirrorMark;
+declare function createTrackInsertMark(author?: TrackChangeAuthor, id?: string): ProseMirrorMark;
 /**
  * Create a trackDelete mark.
+ * @param author - The author of the change
+ * @param id - Optional ID to use (for linking with corresponding insert in replacements)
  */
-declare function createTrackDeleteMark(author?: TrackChangeAuthor): ProseMirrorMark;
+declare function createTrackDeleteMark(author?: TrackChangeAuthor, id?: string): ProseMirrorMark;
 /**
  * Create a trackFormat mark.
  */

package/dist/index.js

@@ -193,6 +193,18 @@ function getMarksAtPosition(spans, pos) {
   }
   return [];
 }
+function hasDefinedAttributes(marks) {
+  if (!marks || marks.length === 0) return false;
+  for (const mark of marks) {
+    if (!mark.attrs) continue;
+    for (const value of Object.values(mark.attrs)) {
+      if (value !== void 0 && value !== null) {
+        return true;
+      }
+    }
+  }
+  return marks.some((m) => !m.attrs);
+}
 function detectFormatChanges(spansA, spansB, segments) {
   const formatChanges = [];
   let posA = 0;
@@ -216,13 +228,17 @@ function detectFormatChanges(spansA, spansB, segments) {
               break;
             }
           }
-          formatChanges.push({
-            from: posA + startI,
-            to: posA + i,
-            text: segment.text.substring(startI, i),
-            before: startMarksA,
-            after: startMarksB
-          });
+          if (hasDefinedAttributes(startMarksB) || hasDefinedAttributes(startMarksA)) {
+            if (hasDefinedAttributes(startMarksB)) {
+              formatChanges.push({
+                from: posA + startI,
+                to: posA + i,
+                text: segment.text.substring(startI, i),
+                before: startMarksA,
+                after: startMarksB
+              });
+            }
+          }
         } else {
           i++;
         }
@@ -280,11 +296,11 @@ function diffDocuments(docA, docB) {
     summary
   };
 }
-function createTrackInsertMark(author = DEFAULT_AUTHOR) {
+function createTrackInsertMark(author = DEFAULT_AUTHOR, id) {
   return {
     type: "trackInsert",
     attrs: {
-      id: uuid.v4(),
+      id: id ?? uuid.v4(),
       author: author.name,
       authorEmail: author.email,
       authorImage: "",
@@ -292,11 +308,11 @@ function createTrackInsertMark(author = DEFAULT_AUTHOR) {
     }
   };
 }
-function createTrackDeleteMark(author = DEFAULT_AUTHOR) {
+function createTrackDeleteMark(author = DEFAULT_AUTHOR, id) {
   return {
     type: "trackDelete",
     attrs: {
-      id: uuid.v4(),
+      id: id ?? uuid.v4(),
       author: author.name,
       authorEmail: author.email,
       authorImage: "",
@@ -337,17 +353,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 ? uuid.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,
@@ -368,7 +397,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);
@@ -384,7 +413,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(
@@ -408,7 +437,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(
@@ -453,7 +482,7 @@ function mergeDocuments(docA, docB, diffResult, author = DEFAULT_AUTHOR) {
               {
                 type: "text",
                 text: ins.text,
-                marks: [createTrackInsertMark(author)]
+                marks: [createTrackInsertMark(author, ins.replacementId)]
               }
             ]
           }