docxmlater 10.1.8 → 10.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docxmlater",
-  "version": "10.1.8",
+  "version": "10.2.0",
   "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

@@ -1192,14 +1192,6 @@ export class DocumentParser {
       }
     }
 
-    // Extract revision XMLs from paragraph content for raw XML parsing
-    const insXmls = XMLParser.extractElements(paraContent, 'w:ins');
-    const delXmls = XMLParser.extractElements(paraContent, 'w:del');
-    const moveFromXmls = XMLParser.extractElements(paraContent, 'w:moveFrom');
-    const moveToXmls = XMLParser.extractElements(paraContent, 'w:moveTo');
-    const bookmarkStartXmls = XMLParser.extractElements(paraContent, 'w:bookmarkStart');
-    const bookmarkEndXmls = XMLParser.extractElements(paraContent, 'w:bookmarkEnd');
-
     // Helper to extract raw run XML from paraContent using position
     const extractRunXmlAtPosition = (pos: number): string | null => {
       // Find the end of this run element
@@ -1228,6 +1220,40 @@ export class DocumentParser {
       return null;
     };
 
+    // Helper to extract element XML at a known position, depth-aware
+    const extractElementXmlAtPosition = (pos: number, tagName: string): string => {
+      const openTag = `<${tagName}`;
+      const closeTag = `</${tagName}>`;
+      const openEnd = paraContent.indexOf('>', pos);
+      if (openEnd === -1) return '';
+      // Self-closing
+      if (paraContent[openEnd - 1] === '/') {
+        return paraContent.substring(pos, openEnd + 1);
+      }
+      let depth = 1;
+      let searchFrom = openEnd + 1;
+      while (depth > 0 && searchFrom < paraContent.length) {
+        const nextOpen = paraContent.indexOf(openTag, searchFrom);
+        const nextClose = paraContent.indexOf(closeTag, searchFrom);
+        if (nextClose === -1) break;
+        if (nextOpen !== -1 && nextOpen < nextClose) {
+          const charAfter = paraContent[nextOpen + openTag.length];
+          if (charAfter === '>' || charAfter === ' ' || charAfter === '/' ||
+              charAfter === '\t' || charAfter === '\n' || charAfter === '\r') {
+            depth++;
+          }
+          searchFrom = nextOpen + openTag.length;
+        } else {
+          depth--;
+          if (depth === 0) {
+            return paraContent.substring(pos, nextClose + closeTag.length);
+          }
+          searchFrom = nextClose + closeTag.length;
+        }
+      }
+      return '';
+    };
+
     // Now process children in the order they were found
     for (const child of children) {
       if (child.type === 'w:r') {
@@ -1321,82 +1347,20 @@ export class DocumentParser {
             paragraph.addField(field);
           }
         }
-      } else if (child.type === 'w:ins') {
-        if (child.index < insXmls.length) {
-          const revisionXml = insXmls[child.index];
-          if (revisionXml) {
-            const revResult = await this.parseRevisionFromXml(
-              revisionXml,
-              'w:ins',
-              relationshipManager,
-              zipHandler,
-              imageManager
-            );
-            if (revResult.revision) {
-              paragraph.addRevision(revResult.revision);
-            }
-            // Add any bookmarks found inside the revision to the paragraph
-            for (const bookmark of revResult.bookmarkStarts) {
-              paragraph.addBookmarkStart(bookmark);
-            }
-            for (const bookmark of revResult.bookmarkEnds) {
-              paragraph.addBookmarkEnd(bookmark);
-            }
-          }
-        }
-      } else if (child.type === 'w:del') {
-        if (child.index < delXmls.length) {
-          const revisionXml = delXmls[child.index];
-          if (revisionXml) {
-            const revResult = await this.parseRevisionFromXml(
-              revisionXml,
-              'w:del',
-              relationshipManager,
-              zipHandler,
-              imageManager
-            );
-            if (revResult.revision) {
-              paragraph.addRevision(revResult.revision);
-            }
-            // Add any bookmarks found inside the revision to the paragraph
-            for (const bookmark of revResult.bookmarkStarts) {
-              paragraph.addBookmarkStart(bookmark);
-            }
-            for (const bookmark of revResult.bookmarkEnds) {
-              paragraph.addBookmarkEnd(bookmark);
-            }
-          }
-        }
-      } else if (child.type === 'w:moveFrom') {
-        if (child.index < moveFromXmls.length) {
-          const revisionXml = moveFromXmls[child.index];
-          if (revisionXml) {
-            const revResult = await this.parseRevisionFromXml(
-              revisionXml,
-              'w:moveFrom',
-              relationshipManager,
-              zipHandler,
-              imageManager
-            );
-            if (revResult.revision) {
-              paragraph.addRevision(revResult.revision);
-            }
-            // Add any bookmarks found inside the revision to the paragraph
-            for (const bookmark of revResult.bookmarkStarts) {
-              paragraph.addBookmarkStart(bookmark);
-            }
-            for (const bookmark of revResult.bookmarkEnds) {
-              paragraph.addBookmarkEnd(bookmark);
-            }
-          }
-        }
-      } else if (child.type === 'w:moveTo') {
-        if (child.index < moveToXmls.length) {
-          const revisionXml = moveToXmls[child.index];
-          if (revisionXml) {
+      } else if (child.type === 'w:ins' || child.type === 'w:del' ||
+                 child.type === 'w:moveFrom' || child.type === 'w:moveTo') {
+        const revisionXml = extractElementXmlAtPosition(child.pos, child.type);
+        if (revisionXml) {
+          // Detect nested revision elements (e.g., w:del inside w:ins)
+          const innerContent = revisionXml.substring(revisionXml.indexOf('>') + 1);
+          const hasNestedRevision = /<w:(del|moveFrom|moveTo|ins)\s/.test(innerContent);
+          if (hasNestedRevision) {
+            // Preserve entire nested structure as raw XML for round-trip fidelity
+            paragraph.addContent(new PreservedElement(revisionXml, child.type, 'inline'));
+          } else {
             const revResult = await this.parseRevisionFromXml(
               revisionXml,
-              'w:moveTo',
+              child.type,
               relationshipManager,
               zipHandler,
               imageManager
@@ -1404,7 +1368,6 @@ export class DocumentParser {
             if (revResult.revision) {
               paragraph.addRevision(revResult.revision);
             }
-            // Add any bookmarks found inside the revision to the paragraph
             for (const bookmark of revResult.bookmarkStarts) {
               paragraph.addBookmarkStart(bookmark);
             }
@@ -1414,25 +1377,21 @@ export class DocumentParser {
           }
         }
       } else if (child.type === 'w:bookmarkStart') {
-        // Parse bookmark start element
-        if (child.index < bookmarkStartXmls.length) {
-          const bookmarkXml = bookmarkStartXmls[child.index];
-          if (bookmarkXml) {
-            const bookmark = this.parseBookmarkStart(bookmarkXml);
-            if (bookmark) {
-              paragraph.addBookmarkStart(bookmark);
-            }
+        const endPos = paraContent.indexOf('>', child.pos);
+        if (endPos !== -1) {
+          const bookmarkXml = paraContent.substring(child.pos, endPos + 1);
+          const bookmark = this.parseBookmarkStart(bookmarkXml);
+          if (bookmark) {
+            paragraph.addBookmarkStart(bookmark);
           }
         }
       } else if (child.type === 'w:bookmarkEnd') {
-        // Parse bookmark end element
-        if (child.index < bookmarkEndXmls.length) {
-          const bookmarkXml = bookmarkEndXmls[child.index];
-          if (bookmarkXml) {
-            const bookmark = this.parseBookmarkEnd(bookmarkXml);
-            if (bookmark) {
-              paragraph.addBookmarkEnd(bookmark);
-            }
+        const endPos = paraContent.indexOf('>', child.pos);
+        if (endPos !== -1) {
+          const bookmarkXml = paraContent.substring(child.pos, endPos + 1);
+          const bookmark = this.parseBookmarkEnd(bookmarkXml);
+          if (bookmark) {
+            paragraph.addBookmarkEnd(bookmark);
           }
         }
       } else if (child.type === 'w:commentRangeStart' || child.type === 'w:commentRangeEnd') {
@@ -4554,6 +4513,9 @@ export class DocumentParser {
           paragraph.addRun(item);
         } else if (item instanceof Field) {
           paragraph.addField(item);
+        } else {
+          // Preserve all other content types: Revision, RangeMarker, Shape, TextBox, PreservedElement
+          paragraph.addContent(item);
         }
       }
     }