docxmlater 8.0.0 → 8.1.0

package/dist/core/DocumentParser.d.ts

@@ -1,4 +1,5 @@
 import { BookmarkManager } from "../elements/BookmarkManager";
+import { Comment } from "../elements/Comment";
 import { ImageManager } from "../elements/ImageManager";
 import { Paragraph } from "../elements/Paragraph";
 import { Section } from "../elements/Section";
@@ -46,6 +47,8 @@ export declare class DocumentParser {
     private parseParagraphWithOrder;
     private parseOrderedParagraphChildren;
     private parseRevisionFromXml;
+    parseCommentsXml(commentsXml: string): Comment[];
+    private parseCommentFromXml;
     private parseBookmarkStart;
     private parseBookmarkEnd;
     private parseParagraphFromObject;

package/dist/core/DocumentParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../src/core/DocumentParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../src/core/DocumentParser.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAM9C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAyC,MAAM,uBAAuB,CAAC;AAGzF,OAAO,EAEL,OAAO,EAGR,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,EAA8B,MAAM,qBAAqB,CAAC;AAexE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;CACd;AAKD,KAAK,WAAW,GACZ,SAAS,GACT,KAAK,GACL,sBAAsB,GACtB,qBAAqB,CAAC;AAK1B,qBAAa,cAAc;IACzB,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,eAAe,CAAgC;gBAE3C,aAAa,GAAE,OAAe;IAO1C,cAAc,IAAI,UAAU,EAAE;IAO9B,gBAAgB,IAAI,IAAI;IAWlB,aAAa,CACjB,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,YAAY,EAC1B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC;QACT,YAAY,EAAE,WAAW,EAAE,CAAC;QAC5B,UAAU,EAAE,kBAAkB,CAAC;QAC/B,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,MAAM,EAAE,KAAK,EAAE,CAAC;QAChB,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;QACxC,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;QACxC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;QACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACpC,CAAC;YAyFY,iBAAiB;IAyM/B,OAAO,CAAC,4BAA4B;IAsCpC,OAAO,CAAC,8BAA8B;IA2BtC,OAAO,CAAC,WAAW;IAmCnB,OAAO,CAAC,mBAAmB;IAkC3B,OAAO,CAAC,qBAAqB;IAwB7B,OAAO,CAAC,mBAAmB;IAoD3B,OAAO,CAAC,kBAAkB;IAyC1B,OAAO,CAAC,oBAAoB;IAuB5B,OAAO,CAAC,qBAAqB;YAwEf,uBAAuB;YAuFvB,6BAA6B;YAgW7B,oBAAoB;IA8HlC,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,EAAE;IAqBhD,OAAO,CAAC,mBAAmB;IA6D3B,OAAO,CAAC,kBAAkB;IAmD1B,OAAO,CAAC,gBAAgB;YA8BV,wBAAwB;IAoLtC,OAAO,CAAC,kCAAkC;IAugB1C,OAAO,CAAC,qBAAqB;IAsP7B,OAAO,CAAC,4BAA4B;IAiHpC,OAAO,CAAC,oBAAoB;IAiC5B,OAAO,CAAC,0BAA0B;IA8IlC,OAAO,CAAC,wCAAwC;IA0EhD,OAAO,CAAC,0BAA0B;IAmHlC,OAAO,CAAC,kBAAkB;IA+O1B,OAAO,CAAC,wBAAwB;IA2LhC,OAAO,CAAC,0BAA0B;IAsGlC,OAAO,CAAC,8BAA8B;IAatC,OAAO,CAAC,0BAA0B;IAwClC,OAAO,CAAC,4BAA4B;YA4ZtB,sBAAsB;IAqNpC,OAAO,CAAC,iBAAiB;IA4CzB,OAAO,CAAC,kBAAkB;IA6D1B,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,iBAAiB;YAuBX,oBAAoB;IAwHlC,OAAO,CAAC,8BAA8B;YAuFxB,uBAAuB;IAoErC,OAAO,CAAC,iCAAiC;IAyDzC,OAAO,CAAC,sCAAsC;IA4D9C,OAAO,CAAC,2BAA2B;YAgCrB,wBAAwB;IAkOtC,OAAO,CAAC,yBAAyB;IA0GjC,OAAO,CAAC,UAAU;IAmBlB,OAAO,CAAC,cAAc;YAsCR,kBAAkB;IAsPhC,OAAO,CAAC,6BAA6B;IAwCrC,OAAO,CAAC,4BAA4B;IA6JpC,OAAO,CAAC,4BAA4B;IA6FpC,OAAO,CAAC,sBAAsB;IAmI9B,OAAO,CAAC,cAAc;IA2BtB,OAAO,CAAC,WAAW;IAgHnB,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,eAAe;IAuEvB,OAAO,CAAC,qBAAqB;IA8D7B,OAAO,CAAC,WAAW;IA8CnB,OAAO,CAAC,cAAc;IAqEtB,OAAO,CAAC,sBAAsB;IAoP9B,OAAO,CAAC,UAAU;IAwMlB,OAAO,CAAC,+BAA+B;IAqHvC,OAAO,CAAC,yBAAyB;IA2JjC,OAAO,CAAC,yBAAyB;IA+EjC,OAAO,CAAC,2BAA2B;IAqEnC,OAAO,CAAC,+BAA+B;IAmDvC,OAAO,CAAC,8BAA8B;IA8CtC,OAAO,CAAC,iCAAiC;IA6FzC,OAAO,CAAC,mBAAmB;IAqF3B,OAAO,CAAC,mBAAmB;IAqB3B,OAAO,CAAC,uBAAuB;IA6B/B,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IA+BzE,MAAM,CAAC,SAAS,CACd,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO;IAwBV,MAAM,CAAC,gBAAgB,CACrB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,MAAM,GACf,KAAK,CAAC;QACP,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IAmFF,OAAO,CAAC,eAAe;IA4BjB,sBAAsB,CAC1B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC;QACT,OAAO,EAAE,KAAK,CAAC;YACb,MAAM,EAAE,OAAO,oBAAoB,EAAE,MAAM,CAAC;YAC5C,cAAc,EAAE,MAAM,CAAC;YACvB,QAAQ,EAAE,MAAM,CAAC;SAClB,CAAC,CAAC;QACH,OAAO,EAAE,KAAK,CAAC;YACb,MAAM,EAAE,OAAO,oBAAoB,EAAE,MAAM,CAAC;YAC5C,cAAc,EAAE,MAAM,CAAC;YACvB,QAAQ,EAAE,MAAM,CAAC;SAClB,CAAC,CAAC;KACJ,CAAC;YA4FY,WAAW;YA6DX,WAAW;CAmD1B"}

package/dist/core/DocumentParser.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentParser = void 0;
 const Bookmark_1 = require("../elements/Bookmark");
+const Comment_1 = require("../elements/Comment");
 const Field_1 = require("../elements/Field");
 const FieldHelpers_1 = require("../elements/FieldHelpers");
 const Footer_1 = require("../elements/Footer");
@@ -56,6 +57,7 @@ const NumberingInstance_1 = require("../formatting/NumberingInstance");
 const Style_1 = require("../formatting/Style");
 const diagnostics_1 = require("../utils/diagnostics");
 const logger_1 = require("../utils/logger");
+const parsingHelpers_1 = require("../utils/parsingHelpers");
 function getLogger() {
     return (0, logger_1.createScopedLogger)((0, logger_1.getGlobalLogger)(), 'DocumentParser');
 }
@@ -460,10 +462,6 @@ class DocumentParser {
                 return null;
             }
             const pPr = pElement["w:pPr"];
-            if (paraXml.includes('Bullet 3') || paraXml.includes('Bullet 4') || paraXml.includes('Bullet 5')) {
-                console.log(`[DEBUG parseParagraphWithOrder] RAW XML: ${paraXml.substring(0, 400)}...`);
-                console.log(`[DEBUG parseParagraphWithOrder] pPr.w:numPr: ${JSON.stringify(pPr?.["w:numPr"])?.substring(0, 200)}`);
-            }
             this.parseParagraphPropertiesFromObject(pPr, paragraph);
             const paraId = pElement["w14:paraId"];
             if (paraId) {
@@ -827,6 +825,7 @@ class DocumentParser {
                 }
             }
             if (content.length === 0) {
+                logger_1.defaultLogger.debug("[DocumentParser] Empty revision content skipped", { tagName, id: idAttr, author });
                 return null;
             }
             const revision = new Revision_1.Revision({
@@ -846,6 +845,59 @@ class DocumentParser {
             return null;
         }
     }
+    parseCommentsXml(commentsXml) {
+        const comments = [];
+        const commentXmls = XMLParser_1.XMLParser.extractElements(commentsXml, "w:comment");
+        for (const commentXml of commentXmls) {
+            const comment = this.parseCommentFromXml(commentXml);
+            if (comment) {
+                comments.push(comment);
+            }
+        }
+        return comments;
+    }
+    parseCommentFromXml(commentXml) {
+        try {
+            const idAttr = XMLParser_1.XMLParser.extractAttribute(commentXml, "w:id");
+            const author = XMLParser_1.XMLParser.extractAttribute(commentXml, "w:author") || "Unknown";
+            const dateAttr = XMLParser_1.XMLParser.extractAttribute(commentXml, "w:date");
+            const initials = XMLParser_1.XMLParser.extractAttribute(commentXml, "w:initials");
+            const parentIdAttr = XMLParser_1.XMLParser.extractAttribute(commentXml, "w:parentId");
+            const doneAttr = XMLParser_1.XMLParser.extractAttribute(commentXml, "w:done");
+            if (!idAttr) {
+                return null;
+            }
+            const id = parseInt(idAttr, 10);
+            const date = dateAttr ? new Date(dateAttr) : new Date();
+            const parentId = parentIdAttr ? parseInt(parentIdAttr, 10) : undefined;
+            const done = doneAttr === "1" || doneAttr === "true";
+            const runs = [];
+            const runXmls = XMLParser_1.XMLParser.extractElements(commentXml, "w:r");
+            for (const runXml of runXmls) {
+                const runObj = XMLParser_1.XMLParser.parseToObject(runXml, { trimValues: false });
+                const run = this.parseRunFromObject(runObj["w:r"]);
+                if (run) {
+                    runs.push(run);
+                }
+            }
+            const comment = new Comment_1.Comment({
+                id,
+                author,
+                initials: initials || undefined,
+                date,
+                content: runs.length > 0 ? runs : "",
+                parentId,
+                done,
+            });
+            return comment;
+        }
+        catch (error) {
+            logger_1.defaultLogger.warn("[DocumentParser] Failed to parse comment:", error instanceof Error
+                ? { message: error.message }
+                : { error: String(error) });
+            return null;
+        }
+    }
     parseBookmarkStart(bookmarkXml) {
         try {
             const idAttr = XMLParser_1.XMLParser.extractAttribute(bookmarkXml, "w:id");
@@ -1045,21 +1097,21 @@ class DocumentParser {
         }
         if (pPrObj["w:ind"]) {
             const ind = pPrObj["w:ind"];
-            if (ind["@_w:left"] !== undefined)
-                paragraph.setLeftIndent(parseInt(String(ind["@_w:left"]), 10));
-            if (ind["@_w:right"] !== undefined)
-                paragraph.setRightIndent(parseInt(String(ind["@_w:right"]), 10));
-            if (ind["@_w:firstLine"] !== undefined)
-                paragraph.setFirstLineIndent(parseInt(String(ind["@_w:firstLine"]), 10));
+            if ((0, parsingHelpers_1.isExplicitlySet)(ind["@_w:left"]))
+                paragraph.setLeftIndent((0, parsingHelpers_1.safeParseInt)(ind["@_w:left"]));
+            if ((0, parsingHelpers_1.isExplicitlySet)(ind["@_w:right"]))
+                paragraph.setRightIndent((0, parsingHelpers_1.safeParseInt)(ind["@_w:right"]));
+            if ((0, parsingHelpers_1.isExplicitlySet)(ind["@_w:firstLine"]))
+                paragraph.setFirstLineIndent((0, parsingHelpers_1.safeParseInt)(ind["@_w:firstLine"]));
         }
         if (pPrObj["w:spacing"]) {
             const spacing = pPrObj["w:spacing"];
-            if (spacing["@_w:before"])
-                paragraph.setSpaceBefore(parseInt(spacing["@_w:before"], 10));
-            if (spacing["@_w:after"])
-                paragraph.setSpaceAfter(parseInt(spacing["@_w:after"], 10));
-            if (spacing["@_w:line"]) {
-                paragraph.setLineSpacing(parseInt(spacing["@_w:line"], 10), spacing["@_w:lineRule"]);
+            if ((0, parsingHelpers_1.isExplicitlySet)(spacing["@_w:before"]))
+                paragraph.setSpaceBefore((0, parsingHelpers_1.safeParseInt)(spacing["@_w:before"]));
+            if ((0, parsingHelpers_1.isExplicitlySet)(spacing["@_w:after"]))
+                paragraph.setSpaceAfter((0, parsingHelpers_1.safeParseInt)(spacing["@_w:after"]));
+            if ((0, parsingHelpers_1.isExplicitlySet)(spacing["@_w:line"])) {
+                paragraph.setLineSpacing((0, parsingHelpers_1.safeParseInt)(spacing["@_w:line"]), spacing["@_w:lineRule"]);
             }
         }
         if (pPrObj["w:pageBreakBefore"])
@@ -1207,16 +1259,16 @@ class DocumentParser {
         if (pPrObj["w:framePr"]) {
             const framePr = pPrObj["w:framePr"];
             const frameProps = {};
-            if (framePr["@_w:w"])
-                frameProps.w = parseInt(framePr["@_w:w"], 10);
-            if (framePr["@_w:h"])
-                frameProps.h = parseInt(framePr["@_w:h"], 10);
+            if ((0, parsingHelpers_1.isExplicitlySet)(framePr["@_w:w"]))
+                frameProps.w = (0, parsingHelpers_1.safeParseInt)(framePr["@_w:w"]);
+            if ((0, parsingHelpers_1.isExplicitlySet)(framePr["@_w:h"]))
+                frameProps.h = (0, parsingHelpers_1.safeParseInt)(framePr["@_w:h"]);
             if (framePr["@_w:hRule"])
                 frameProps.hRule = framePr["@_w:hRule"];
-            if (framePr["@_w:x"])
-                frameProps.x = parseInt(framePr["@_w:x"], 10);
-            if (framePr["@_w:y"])
-                frameProps.y = parseInt(framePr["@_w:y"], 10);
+            if ((0, parsingHelpers_1.isExplicitlySet)(framePr["@_w:x"]))
+                frameProps.x = (0, parsingHelpers_1.safeParseInt)(framePr["@_w:x"]);
+            if ((0, parsingHelpers_1.isExplicitlySet)(framePr["@_w:y"]))
+                frameProps.y = (0, parsingHelpers_1.safeParseInt)(framePr["@_w:y"]);
             if (framePr["@_w:xAlign"])
                 frameProps.xAlign = framePr["@_w:xAlign"];
             if (framePr["@_w:yAlign"])
@@ -1225,23 +1277,19 @@ class DocumentParser {
                 frameProps.hAnchor = framePr["@_w:hAnchor"];
             if (framePr["@_w:vAnchor"])
                 frameProps.vAnchor = framePr["@_w:vAnchor"];
-            if (framePr["@_w:hSpace"])
-                frameProps.hSpace = parseInt(framePr["@_w:hSpace"], 10);
-            if (framePr["@_w:vSpace"])
-                frameProps.vSpace = parseInt(framePr["@_w:vSpace"], 10);
+            if ((0, parsingHelpers_1.isExplicitlySet)(framePr["@_w:hSpace"]))
+                frameProps.hSpace = (0, parsingHelpers_1.safeParseInt)(framePr["@_w:hSpace"]);
+            if ((0, parsingHelpers_1.isExplicitlySet)(framePr["@_w:vSpace"]))
+                frameProps.vSpace = (0, parsingHelpers_1.safeParseInt)(framePr["@_w:vSpace"]);
             if (framePr["@_w:wrap"])
                 frameProps.wrap = framePr["@_w:wrap"];
             if (framePr["@_w:dropCap"])
                 frameProps.dropCap = framePr["@_w:dropCap"];
-            if (framePr["@_w:lines"])
-                frameProps.lines = parseInt(framePr["@_w:lines"], 10);
-            if (framePr["@_w:anchorLock"] !== undefined) {
-                const anchorLockVal = framePr["@_w:anchorLock"];
-                frameProps.anchorLock =
-                    anchorLockVal === "1" ||
-                        anchorLockVal === "true" ||
-                        anchorLockVal === true ||
-                        anchorLockVal === 1;
+            if ((0, parsingHelpers_1.isExplicitlySet)(framePr["@_w:lines"]))
+                frameProps.lines = (0, parsingHelpers_1.safeParseInt)(framePr["@_w:lines"]);
+            if ((0, parsingHelpers_1.isExplicitlySet)(framePr["@_w:anchorLock"])) {
+                const val = framePr["@_w:anchorLock"];
+                frameProps.anchorLock = val === "1" || val === 1 || val === "true" || val === true || val === "on";
             }
             if (Object.keys(frameProps).length > 0) {
                 paragraph.setFrameProperties(frameProps);
@@ -1333,6 +1381,97 @@ class DocumentParser {
                 if (prevPPr["w:pageBreakBefore"]) {
                     previousProperties.pageBreakBefore = prevPPr["w:pageBreakBefore"]["@_w:val"] !== "0";
                 }
+                if (prevPPr["w:widowControl"]) {
+                    previousProperties.widowControl = prevPPr["w:widowControl"]["@_w:val"] !== "0";
+                }
+                if (prevPPr["w:suppressAutoHyphens"]) {
+                    previousProperties.suppressAutoHyphens = prevPPr["w:suppressAutoHyphens"]["@_w:val"] !== "0";
+                }
+                if (prevPPr["w:contextualSpacing"]) {
+                    previousProperties.contextualSpacing = prevPPr["w:contextualSpacing"]["@_w:val"] !== "0";
+                }
+                if (prevPPr["w:mirrorIndents"]) {
+                    previousProperties.mirrorIndents = prevPPr["w:mirrorIndents"]["@_w:val"] !== "0";
+                }
+                if (prevPPr["w:outlineLvl"]?.["@_w:val"] !== undefined) {
+                    previousProperties.outlineLevel = parseInt(prevPPr["w:outlineLvl"]["@_w:val"], 10);
+                }
+                if (prevPPr["w:bidi"]) {
+                    previousProperties.bidi = prevPPr["w:bidi"]["@_w:val"] !== "0";
+                }
+                if (prevPPr["w:suppressLineNumbers"]) {
+                    previousProperties.suppressLineNumbers = prevPPr["w:suppressLineNumbers"]["@_w:val"] !== "0";
+                }
+                if (prevPPr["w:adjustRightInd"]) {
+                    previousProperties.adjustRightInd = prevPPr["w:adjustRightInd"]["@_w:val"] !== "0";
+                }
+                if (prevPPr["w:snapToGrid"]) {
+                    previousProperties.snapToGrid = prevPPr["w:snapToGrid"]["@_w:val"] !== "0";
+                }
+                if (prevPPr["w:wordWrap"]) {
+                    previousProperties.wordWrap = prevPPr["w:wordWrap"]["@_w:val"] !== "0";
+                }
+                if (prevPPr["w:autoSpaceDE"]) {
+                    previousProperties.autoSpaceDE = prevPPr["w:autoSpaceDE"]["@_w:val"] !== "0";
+                }
+                if (prevPPr["w:autoSpaceDN"]) {
+                    previousProperties.autoSpaceDN = prevPPr["w:autoSpaceDN"]["@_w:val"] !== "0";
+                }
+                if (prevPPr["w:textDirection"]?.["@_w:val"]) {
+                    previousProperties.textDirection = String(prevPPr["w:textDirection"]["@_w:val"]);
+                }
+                if (prevPPr["w:pBdr"]) {
+                    const pBdr = prevPPr["w:pBdr"];
+                    previousProperties.borders = {};
+                    const parseBorder = (borderObj) => {
+                        if (!borderObj)
+                            return undefined;
+                        return {
+                            val: borderObj["@_w:val"],
+                            sz: borderObj["@_w:sz"] !== undefined ? parseInt(borderObj["@_w:sz"], 10) : undefined,
+                            space: borderObj["@_w:space"] !== undefined ? parseInt(borderObj["@_w:space"], 10) : undefined,
+                            color: borderObj["@_w:color"],
+                            themeColor: borderObj["@_w:themeColor"],
+                        };
+                    };
+                    if (pBdr["w:top"])
+                        previousProperties.borders.top = parseBorder(pBdr["w:top"]);
+                    if (pBdr["w:bottom"])
+                        previousProperties.borders.bottom = parseBorder(pBdr["w:bottom"]);
+                    if (pBdr["w:left"])
+                        previousProperties.borders.left = parseBorder(pBdr["w:left"]);
+                    if (pBdr["w:right"])
+                        previousProperties.borders.right = parseBorder(pBdr["w:right"]);
+                    if (pBdr["w:between"])
+                        previousProperties.borders.between = parseBorder(pBdr["w:between"]);
+                    if (pBdr["w:bar"])
+                        previousProperties.borders.bar = parseBorder(pBdr["w:bar"]);
+                    if (Object.keys(previousProperties.borders).length === 0) {
+                        delete previousProperties.borders;
+                    }
+                }
+                if (prevPPr["w:shd"]) {
+                    const shd = prevPPr["w:shd"];
+                    previousProperties.shading = {
+                        fill: shd["@_w:fill"],
+                        color: shd["@_w:color"],
+                        val: shd["@_w:val"],
+                        themeFill: shd["@_w:themeFill"],
+                        themeColor: shd["@_w:themeColor"],
+                    };
+                }
+                if (prevPPr["w:tabs"]) {
+                    const tabsObj = prevPPr["w:tabs"];
+                    const tabArray = tabsObj["w:tab"];
+                    if (tabArray) {
+                        const tabs = Array.isArray(tabArray) ? tabArray : [tabArray];
+                        previousProperties.tabs = tabs.map((tab) => ({
+                            val: tab["@_w:val"],
+                            pos: tab["@_w:pos"] !== undefined ? parseInt(tab["@_w:pos"], 10) : undefined,
+                            leader: tab["@_w:leader"],
+                        }));
+                    }
+                }
                 if (Object.keys(previousProperties).length > 0) {
                     change.previousProperties = previousProperties;
                 }
@@ -1877,6 +2016,10 @@ class DocumentParser {
                     switch (elementType) {
                         case "w:t": {
                             const textElements = toArray(runObj["w:t"]);
+                            if (elementIndex >= textElements.length) {
+                                logger_1.defaultLogger.debug("[DocumentParser] Invalid _orderedChildren index for w:t", { index: elementIndex, arrayLength: textElements.length });
+                                break;
+                            }
                             const te = textElements[elementIndex];
                             if (te !== undefined && te !== null) {
                                 const text = extractTextValue(te);
@@ -1888,6 +2031,10 @@ class DocumentParser {
                         }
                         case "w:instrText": {
                             const instrElements = toArray(runObj["w:instrText"]);
+                            if (elementIndex >= instrElements.length) {
+                                logger_1.defaultLogger.debug("[DocumentParser] Invalid _orderedChildren index for w:instrText", { index: elementIndex, arrayLength: instrElements.length });
+                                break;
+                            }
                             const instr = instrElements[elementIndex];
                             if (instr !== undefined && instr !== null) {
                                 const text = extractTextValue(instr);
@@ -1897,6 +2044,10 @@ class DocumentParser {
                         }
                         case "w:fldChar": {
                             const fldChars = toArray(runObj["w:fldChar"]);
+                            if (elementIndex >= fldChars.length) {
+                                logger_1.defaultLogger.debug("[DocumentParser] Invalid _orderedChildren index for w:fldChar", { index: elementIndex, arrayLength: fldChars.length });
+                                break;
+                            }
                             const fldChar = fldChars[elementIndex];
                             if (fldChar && typeof fldChar === "object") {
                                 const charType = (fldChar["@_w:fldCharType"] ||
@@ -1937,6 +2088,7 @@ class DocumentParser {
                 }
             }
             else {
+                console.warn('[DocumentParser] _orderedChildren missing - using fallback element ordering which may affect tab/break positions');
                 const textElement = runObj["w:t"];
                 if (textElement !== undefined && textElement !== null) {
                     const textElements = toArray(textElement);
@@ -2203,7 +2355,6 @@ class DocumentParser {
     }
     getStandardHyperlinkFormatting() {
         return {
-            font: "Verdana",
             color: "0000FF",
             underline: "single",
         };
@@ -2295,29 +2446,21 @@ class DocumentParser {
             run.setVanish(true);
         if (rPrObj["w:specVanish"])
             run.setSpecVanish(true);
-        const checkBooleanProp = (prop) => {
-            if (!prop)
-                return false;
-            const val = prop["@_w:val"];
-            if (val === undefined)
-                return true;
-            return val === "1" || val === 1 || val === "true" || val === true;
-        };
-        if (checkBooleanProp(rPrObj["w:rtl"]))
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj["w:rtl"]))
             run.setRTL(true);
-        if (checkBooleanProp(rPrObj["w:b"]))
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj["w:b"]))
             run.setBold(true);
-        if (checkBooleanProp(rPrObj["w:bCs"]))
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj["w:bCs"]))
             run.setComplexScriptBold(true);
-        if (checkBooleanProp(rPrObj["w:i"]))
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj["w:i"]))
             run.setItalic(true);
-        if (checkBooleanProp(rPrObj["w:iCs"]))
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj["w:iCs"]))
             run.setComplexScriptItalic(true);
-        if (checkBooleanProp(rPrObj["w:strike"]))
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj["w:strike"]))
             run.setStrike(true);
-        if (checkBooleanProp(rPrObj["w:smallCaps"]))
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj["w:smallCaps"]))
             run.setSmallCaps(true);
-        if (checkBooleanProp(rPrObj["w:caps"]))
+        if ((0, parsingHelpers_1.parseOoxmlBoolean)(rPrObj["w:caps"]))
             run.setAllCaps(true);
         if (rPrObj["w:u"]) {
             const uVal = rPrObj["w:u"]["@_w:val"];
@@ -2397,6 +2540,179 @@ class DocumentParser {
         if (rPrObj["w:highlight"]) {
             run.setHighlight(rPrObj["w:highlight"]["@_w:val"]);
         }
+        if (rPrObj["w:rPrChange"]) {
+            const changeObj = rPrObj["w:rPrChange"];
+            const propChange = {
+                id: changeObj["@_w:id"] !== undefined ? parseInt(String(changeObj["@_w:id"]), 10) : 0,
+                author: changeObj["@_w:author"] ? String(changeObj["@_w:author"]) : "",
+                date: changeObj["@_w:date"] ? new Date(String(changeObj["@_w:date"])) : new Date(),
+                previousProperties: {},
+            };
+            if (changeObj["w:rPr"]) {
+                const prevRPr = changeObj["w:rPr"];
+                const prevProps = {};
+                if (prevRPr["w:b"]) {
+                    prevProps.bold = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:b"]);
+                }
+                if (prevRPr["w:i"]) {
+                    prevProps.italic = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:i"]);
+                }
+                if (prevRPr["w:u"]) {
+                    const uVal = prevRPr["w:u"]["@_w:val"];
+                    prevProps.underline = uVal || true;
+                }
+                if (prevRPr["w:strike"]) {
+                    prevProps.strike = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:strike"]);
+                }
+                if (prevRPr["w:rFonts"]) {
+                    prevProps.font = prevRPr["w:rFonts"]["@_w:ascii"];
+                }
+                if (prevRPr["w:sz"]) {
+                    prevProps.size = (0, parsingHelpers_1.safeParseInt)(prevRPr["w:sz"]["@_w:val"]) / 2;
+                }
+                if (prevRPr["w:color"]) {
+                    const colorVal = prevRPr["w:color"]["@_w:val"];
+                    if (colorVal && colorVal !== "auto") {
+                        prevProps.color = colorVal;
+                    }
+                }
+                if (prevRPr["w:highlight"]) {
+                    prevProps.highlight = prevRPr["w:highlight"]["@_w:val"];
+                }
+                if (prevRPr["w:vertAlign"]) {
+                    const val = prevRPr["w:vertAlign"]["@_w:val"];
+                    if (val === "subscript")
+                        prevProps.subscript = true;
+                    if (val === "superscript")
+                        prevProps.superscript = true;
+                }
+                if (prevRPr["w:smallCaps"]) {
+                    prevProps.smallCaps = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:smallCaps"]);
+                }
+                if (prevRPr["w:caps"]) {
+                    prevProps.allCaps = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:caps"]);
+                }
+                if (prevRPr["w:dstrike"]) {
+                    prevProps.dstrike = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:dstrike"]);
+                }
+                if (prevRPr["w:outline"]) {
+                    prevProps.outline = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:outline"]);
+                }
+                if (prevRPr["w:shadow"]) {
+                    prevProps.shadow = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:shadow"]);
+                }
+                if (prevRPr["w:emboss"]) {
+                    prevProps.emboss = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:emboss"]);
+                }
+                if (prevRPr["w:imprint"]) {
+                    prevProps.imprint = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:imprint"]);
+                }
+                if (prevRPr["w:vanish"]) {
+                    prevProps.vanish = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:vanish"]);
+                }
+                if (prevRPr["w:specVanish"]) {
+                    prevProps.specVanish = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:specVanish"]);
+                }
+                if (prevRPr["w:rtl"]) {
+                    prevProps.rtl = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:rtl"]);
+                }
+                if (prevRPr["w:noProof"]) {
+                    prevProps.noProof = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:noProof"]);
+                }
+                if (prevRPr["w:snapToGrid"]) {
+                    prevProps.snapToGrid = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:snapToGrid"]);
+                }
+                if (prevRPr["w:bCs"]) {
+                    prevProps.complexScriptBold = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:bCs"]);
+                }
+                if (prevRPr["w:iCs"]) {
+                    prevProps.complexScriptItalic = (0, parsingHelpers_1.parseOoxmlBoolean)(prevRPr["w:iCs"]);
+                }
+                if (prevRPr["w:spacing"]) {
+                    const spacingVal = prevRPr["w:spacing"]["@_w:val"];
+                    if (spacingVal !== undefined) {
+                        prevProps.characterSpacing = (0, parsingHelpers_1.safeParseInt)(spacingVal);
+                    }
+                }
+                if (prevRPr["w:w"]) {
+                    const scaleVal = prevRPr["w:w"]["@_w:val"];
+                    if (scaleVal !== undefined) {
+                        prevProps.scaling = (0, parsingHelpers_1.safeParseInt)(scaleVal);
+                    }
+                }
+                if (prevRPr["w:position"]) {
+                    const posVal = prevRPr["w:position"]["@_w:val"];
+                    if (posVal !== undefined) {
+                        prevProps.position = (0, parsingHelpers_1.safeParseInt)(posVal);
+                    }
+                }
+                if (prevRPr["w:kern"]) {
+                    const kernVal = prevRPr["w:kern"]["@_w:val"];
+                    if (kernVal !== undefined) {
+                        prevProps.kerning = (0, parsingHelpers_1.safeParseInt)(kernVal);
+                    }
+                }
+                if (prevRPr["w:lang"]) {
+                    const langVal = prevRPr["w:lang"]["@_w:val"];
+                    if (langVal) {
+                        prevProps.language = String(langVal);
+                    }
+                }
+                if (prevRPr["w:rStyle"]) {
+                    const styleVal = prevRPr["w:rStyle"]["@_w:val"];
+                    if (styleVal) {
+                        prevProps.characterStyle = String(styleVal);
+                    }
+                }
+                if (prevRPr["w:effect"]) {
+                    const effectVal = prevRPr["w:effect"]["@_w:val"];
+                    if (effectVal) {
+                        prevProps.effect = effectVal;
+                    }
+                }
+                if (prevRPr["w:fitText"]) {
+                    const fitVal = prevRPr["w:fitText"]["@_w:val"];
+                    if (fitVal !== undefined) {
+                        prevProps.fitText = (0, parsingHelpers_1.safeParseInt)(fitVal);
+                    }
+                }
+                if (prevRPr["w:em"]) {
+                    const emVal = prevRPr["w:em"]["@_w:val"];
+                    if (emVal) {
+                        prevProps.emphasis = emVal;
+                    }
+                }
+                if (prevRPr["w:bdr"]) {
+                    const bdrObj = prevRPr["w:bdr"];
+                    prevProps.border = {
+                        style: bdrObj["@_w:val"],
+                        size: bdrObj["@_w:sz"] !== undefined ? (0, parsingHelpers_1.safeParseInt)(bdrObj["@_w:sz"]) : undefined,
+                        space: bdrObj["@_w:space"] !== undefined ? (0, parsingHelpers_1.safeParseInt)(bdrObj["@_w:space"]) : undefined,
+                        color: bdrObj["@_w:color"],
+                    };
+                }
+                if (prevRPr["w:shd"]) {
+                    const shdObj = prevRPr["w:shd"];
+                    prevProps.shading = {
+                        fill: shdObj["@_w:fill"],
+                        color: shdObj["@_w:color"],
+                        val: shdObj["@_w:val"],
+                    };
+                }
+                if (prevRPr["w:eastAsianLayout"]) {
+                    const eaObj = prevRPr["w:eastAsianLayout"];
+                    prevProps.eastAsianLayout = {
+                        id: eaObj["@_w:id"] !== undefined ? (0, parsingHelpers_1.safeParseInt)(eaObj["@_w:id"]) : undefined,
+                        combine: eaObj["@_w:combine"] ? (0, parsingHelpers_1.parseOoxmlBoolean)({ "@_w:val": eaObj["@_w:combine"] }) : undefined,
+                        combineBrackets: eaObj["@_w:combineBrackets"],
+                        vert: eaObj["@_w:vert"] ? (0, parsingHelpers_1.parseOoxmlBoolean)({ "@_w:val": eaObj["@_w:vert"] }) : undefined,
+                        vertCompress: eaObj["@_w:vertCompress"] ? (0, parsingHelpers_1.parseOoxmlBoolean)({ "@_w:val": eaObj["@_w:vertCompress"] }) : undefined,
+                    };
+                }
+                propChange.previousProperties = prevProps;
+            }
+            run.setPropertyChangeRevision(propChange);
+        }
     }
     async parseDrawingFromObject(drawingObj, zipHandler, relationshipManager, imageManager) {
         try {
@@ -2656,7 +2972,7 @@ class DocumentParser {
                 const gridColArray = Array.isArray(gridCols) ? gridCols : [gridCols];
                 const widths = gridColArray.map((col) => {
                     const w = col["@_w:w"];
-                    return w ? parseInt(w, 10) : 2880;
+                    return (0, parsingHelpers_1.isExplicitlySet)(w) ? (0, parsingHelpers_1.safeParseInt)(w, 2880) : 2880;
                 });
                 if (widths.length > 0) {
                     table.setTableGrid(widths);
@@ -2666,10 +2982,6 @@ class DocumentParser {
             const rowChildren = Array.isArray(rows) ? rows : rows ? [rows] : [];
             let rowXmls = [];
             if (rawTableXml) {
-                if (rawTableXml.includes('Bullet 3') && rawTableXml.includes('pPrChange')) {
-                    const pPrChangeIdx = rawTableXml.indexOf('pPrChange');
-                    console.log(`[DEBUG parseTableFromObject] rawTableXml around pPrChange:`, rawTableXml.substring(pPrChangeIdx - 100, pPrChangeIdx + 200));
-                }
                 rowXmls = XMLParser_1.XMLParser.extractElements(rawTableXml, "w:tr");
             }
             const rowPositions = [];
@@ -2814,10 +3126,6 @@ class DocumentParser {
             const cellChildren = Array.isArray(cells) ? cells : cells ? [cells] : [];
             let cellXmls = [];
             if (rawRowXml) {
-                if (rawRowXml.includes('Bullet 3') && rawRowXml.includes('pPrChange')) {
-                    const pPrChangeIdx = rawRowXml.indexOf('pPrChange');
-                    console.log(`[DEBUG parseTableRowFromObject] rawRowXml around pPrChange:`, rawRowXml.substring(pPrChangeIdx - 100, pPrChangeIdx + 200));
-                }
                 cellXmls = XMLParser_1.XMLParser.extractElements(rawRowXml, "w:tc");
             }
             for (let i = 0; i < cellChildren.length; i++) {
@@ -3269,22 +3577,22 @@ class DocumentParser {
                     properties.controlType = "datePicker";
                     const dateElement = sdtPr["w:date"];
                     properties.datePicker = {
-                        dateFormat: dateElement?.["w:dateFormat"]?.["@_w:val"],
-                        fullDate: dateElement?.["w:fullDate"]?.["@_w:val"]
-                            ? new Date(dateElement["w:fullDate"]["@_w:val"])
+                        dateFormat: dateElement?.["@_w:dateFormat"] || dateElement?.["w:dateFormat"]?.["@_w:val"],
+                        fullDate: (dateElement?.["@_w:fullDate"] || dateElement?.["w:fullDate"]?.["@_w:val"])
+                            ? new Date(dateElement["@_w:fullDate"] || dateElement["w:fullDate"]["@_w:val"])
                             : undefined,
-                        lid: dateElement?.["w:lid"]?.["@_w:val"],
-                        calendar: dateElement?.["w:calendar"]?.["@_w:val"],
+                        lid: dateElement?.["@_w:lid"] || dateElement?.["w:lid"]?.["@_w:val"],
+                        calendar: dateElement?.["@_w:calendar"] || dateElement?.["w:calendar"]?.["@_w:val"],
                     };
                 }
                 else if (sdtPr["w14:checkbox"]) {
                     properties.controlType = "checkbox";
                     const checkboxElement = sdtPr["w14:checkbox"];
+                    const checkedVal = checkboxElement?.["w14:checked"]?.["@_w14:val"];
                     properties.checkbox = {
-                        checked: checkboxElement?.["w14:checked"]?.["@_w14:val"] === "1" ||
-                            checkboxElement?.["w14:checked"]?.["@_w14:val"] === "true",
-                        checkedState: checkboxElement?.["w14:checkedState"]?.["@_w14:val"],
-                        uncheckedState: checkboxElement?.["w14:uncheckedState"]?.["@_w14:val"],
+                        checked: checkedVal === 1 || checkedVal === "1" || checkedVal === true || checkedVal === "true",
+                        checkedState: String(checkboxElement?.["w14:checkedState"]?.["@_w14:val"] ?? ""),
+                        uncheckedState: String(checkboxElement?.["w14:uncheckedState"]?.["@_w14:val"] ?? ""),
                     };
                 }
                 else if (sdtPr["w:picture"]) {