docxmlater 10.2.2 → 10.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docxmlater",
-  "version": "10.2.2",
+  "version": "10.2.3",
   "description": "A comprehensive DOCX editing framework for creating, reading, and manipulating Microsoft Word documents",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/core/DocumentParser.ts

@@ -2689,6 +2689,7 @@ export class DocumentParser {
     let fieldRuns: Run[] = [];
     let fieldRevisions: Revision[] = []; // Track revisions inside field result section
     let instructionRevisions: Revision[] = []; // Track revisions in instruction area
+    let orderedResultItems: Array<Run | Revision> = []; // Track interleaved order of result runs + revisions
     let fieldState: 'begin' | 'instruction' | 'separate' | 'result' | 'end' | null = null;
     let nestingDepth = 0;
     let hasNestedFields = false;
@@ -2749,6 +2750,7 @@ export class DocumentParser {
                     fieldRuns = [];
                     instructionRevisions = [];
                     fieldRevisions = [];
+                    orderedResultItems = [];
                     fieldState = null;
                     hasNestedFields = false;
                     fieldStartIndex = -1;
@@ -2801,6 +2803,7 @@ export class DocumentParser {
                     fieldRuns = [];
                     instructionRevisions = [];
                     fieldRevisions = [];
+                    orderedResultItems = [];
                     fieldState = null;
                     break;
                   }
@@ -2840,6 +2843,39 @@ export class DocumentParser {
                       if (fieldRevisions.length > 0) {
                         const complexField = this.createComplexFieldFromRuns(fieldRuns);
                         if (complexField) {
+                          // Build ordered resultContent for correct round-trip serialization
+                          if (orderedResultItems.length > 0) {
+                            const orderedContent: XMLElement[] = [];
+                            for (const resultItem of orderedResultItems) {
+                              if (resultItem instanceof Run) {
+                                orderedContent.push(resultItem.toXML());
+                              } else if (resultItem instanceof Revision) {
+                                const xml = resultItem.toXML();
+                                if (xml) orderedContent.push(xml);
+                              }
+                            }
+                            // Compute accepted text (non-revision runs + insertion text)
+                            let acceptedText = '';
+                            for (const resultItem of orderedResultItems) {
+                              if (resultItem instanceof Run) {
+                                acceptedText += resultItem.getText() || '';
+                              } else if (
+                                resultItem instanceof Revision &&
+                                resultItem.getType() === 'insert'
+                              ) {
+                                for (const child of resultItem.getRuns()) {
+                                  acceptedText += child.getText() || '';
+                                }
+                              }
+                            }
+                            // Set accepted text as the result (for getResult() API)
+                            complexField.setResult(acceptedText || complexField.getResult() || '');
+                            // Add ordered content for serialization (overrides the text-based path)
+                            for (const xmlEl of orderedContent) {
+                              complexField.addResultContent(xmlEl);
+                            }
+                          }
+                          // Attach revisions for tracking/acceptance
                           for (const rev of fieldRevisions) {
                             rev.setFieldContext({
                               field: complexField,
@@ -2858,6 +2894,7 @@ export class DocumentParser {
                         fieldRuns = [];
                         instructionRevisions = [];
                         fieldRevisions = [];
+                        orderedResultItems = [];
                         fieldState = null;
                         break;
                       }
@@ -2905,6 +2942,7 @@ export class DocumentParser {
                         fieldRuns = [];
                         instructionRevisions = [];
                         fieldRevisions = [];
+                        orderedResultItems = [];
                         fieldState = null;
                         break;
                       }
@@ -2924,6 +2962,7 @@ export class DocumentParser {
                       fieldRuns = [];
                       instructionRevisions = [];
                       fieldRevisions = [];
+                      orderedResultItems = [];
                       fieldState = null;
                       break;
                     }
@@ -2958,6 +2997,7 @@ export class DocumentParser {
                   fieldRuns = [];
                   instructionRevisions = [];
                   fieldRevisions = [];
+                  orderedResultItems = [];
                   fieldState = null;
                 }
                 break;
@@ -2971,11 +3011,16 @@ export class DocumentParser {
         } else {
           // Regular run - check if we're inside a field result section
           if (nestingDepth > 0) {
-            // Inside a nested field - collect all runs to preserve raw structure
+            // Inside a field - collect all runs to preserve raw structure
             fieldRuns.push(item);
+            // Track result runs for interleaved ordering (only outer field level)
+            if (nestingDepth === 1 && (fieldState === 'separate' || fieldState === 'result')) {
+              orderedResultItems.push(item);
+            }
           } else if (fieldState === 'separate' || fieldState === 'result') {
             // This run is part of the field result - collect it
             fieldRuns.push(item);
+            orderedResultItems.push(item);
             fieldState = 'result';
           } else if (fieldState === 'begin' || fieldState === 'instruction') {
             // We're in the middle of parsing field instruction
@@ -2994,6 +3039,7 @@ export class DocumentParser {
             fieldRuns = [];
             instructionRevisions = [];
             fieldRevisions = [];
+            orderedResultItems = [];
             fieldState = null;
             groupedContent.push(item);
           } else {
@@ -3010,6 +3056,7 @@ export class DocumentParser {
           // Set preliminary field context (field reference will be set when ComplexField is created)
           item.setFieldContext({ position: 'result' });
           fieldRevisions.push(item);
+          orderedResultItems.push(item);
           fieldState = 'result';
           defaultLogger.debug(
             `Found revision inside complex field result: type=${item.getType()}, id=${item.getId()}`
@@ -3038,6 +3085,7 @@ export class DocumentParser {
           fieldRuns = [];
           instructionRevisions = [];
           fieldRevisions = [];
+          orderedResultItems = [];
           fieldState = null;
           groupedContent.push(item);
         } else {
@@ -3061,6 +3109,7 @@ export class DocumentParser {
           fieldRuns = [];
           instructionRevisions = [];
           fieldRevisions = [];
+          orderedResultItems = [];
           fieldState = null;
         }
         groupedContent.push(item);

package/src/elements/Field.ts

@@ -970,13 +970,16 @@ export class ComplexField {
       });
     }
 
-    // 4a. Result revisions (tracked changes within the result section)
-    // These MUST appear between the separator and end marker per ECMA-376
-    // The revisions contain the actual field result content wrapped in w:ins or w:del
-    for (const revision of this.resultRevisions) {
-      const revisionXml = revision.toXML();
-      if (revisionXml) {
-        runs.push(revisionXml);
+    // 4a. Result revisions — only when NOT using resultContent
+    // When resultContent is populated (e.g., by DocumentParser with interleaved revision XML),
+    // it already includes revision elements in the correct interleaved position.
+    // Emitting them again here would cause duplication.
+    if (this.resultContent.length === 0) {
+      for (const revision of this.resultRevisions) {
+        const revisionXml = revision.toXML();
+        if (revisionXml) {
+          runs.push(revisionXml);
+        }
       }
     }
 

package/src/utils/InMemoryRevisionAcceptor.ts

@@ -547,15 +547,42 @@ function acceptRevisionsInParagraph(
       newContent.push(item);
     } else if (item instanceof ComplexField && item.hasResultRevisions()) {
       // Accept revisions nested inside ComplexField result sections
+      // Merge insertion/moveTo text into the result before clearing
       const fieldRevisions = item.getResultRevisions();
+      let mergedResult = item.getResult() || '';
+      const revisionsToKeep: Revision[] = [];
+
       for (const rev of fieldRevisions) {
         const revType = rev.getType();
-        if (revType === 'insert' && options.acceptInsertions) result.insertionsAccepted++;
-        else if (revType === 'delete' && options.acceptDeletions) result.deletionsAccepted++;
-        else if ((revType === 'moveFrom' || revType === 'moveTo') && options.acceptMoves)
+        if (revType === 'insert' && options.acceptInsertions) {
+          // Merge insertion text into result
+          for (const child of rev.getRuns()) {
+            mergedResult += child.getText() || '';
+          }
+          result.insertionsAccepted++;
+        } else if (revType === 'delete' && options.acceptDeletions) {
+          // Deleted text was never in result — just count it
+          result.deletionsAccepted++;
+        } else if (revType === 'moveTo' && options.acceptMoves) {
+          // Merge moveTo text into result
+          for (const child of rev.getRuns()) {
+            mergedResult += child.getText() || '';
+          }
+          result.movesAccepted++;
+        } else if (revType === 'moveFrom' && options.acceptMoves) {
           result.movesAccepted++;
+        } else {
+          // Revision type not being accepted — keep it
+          revisionsToKeep.push(rev);
+        }
+      }
+
+      // setResult() clears both resultRevisions and resultContent
+      item.setResult(mergedResult);
+      // Restore any unaccepted revisions
+      if (revisionsToKeep.length > 0) {
+        item.setResultRevisions(revisionsToKeep);
       }
-      item.setResultRevisions([]); // Clear after acceptance
       newContent.push(item);
     } else {
       // Non-revision content - keep as-is