docxmlater 9.7.2 → 9.7.3

package/dist/core/DocumentParser.js

@@ -105,6 +105,7 @@ class DocumentParser {
             instanceCount: numbering.numberingInstances.length
         });
         const section = this.parseSectionProperties(docXml);
+        const documentBackground = this.parseDocumentBackground(docXml);
         const namespaces = this.parseNamespaces(docXml);
         let paragraphCount = 0;
         let tableCount = 0;
@@ -131,6 +132,7 @@ class DocumentParser {
             numberingInstances: numbering.numberingInstances,
             section,
             namespaces,
+            documentBackground,
         };
     }
     async parseBodyElements(docXml, relationshipManager, zipHandler, imageManager) {
@@ -179,19 +181,10 @@ class DocumentParser {
                             }
                         }
                         else if (prevElement instanceof Table_1.Table) {
-                            const rows = prevElement.getRows();
-                            const lastRow = rows[rows.length - 1];
-                            if (lastRow) {
-                                const cells = lastRow.getCells();
-                                const lastCell = cells[cells.length - 1];
-                                if (lastCell) {
-                                    const cellParas = lastCell.getParagraphs();
-                                    const lastPara = cellParas[cellParas.length - 1];
-                                    if (lastPara) {
-                                        for (const bookmark of bookmarkEnds) {
-                                            lastPara.addBookmarkEnd(bookmark);
-                                        }
-                                    }
+                            const lastPara = prevElement.getLastParagraph();
+                            if (lastPara) {
+                                for (const bookmark of bookmarkEnds) {
+                                    lastPara.addBookmarkEnd(bookmark);
                                 }
                             }
                         }
@@ -303,19 +296,10 @@ class DocumentParser {
                         }
                     }
                     else if (currentElement instanceof Table_1.Table) {
-                        const rows = currentElement.getRows();
-                        const firstRow = rows[0];
-                        if (firstRow) {
-                            const cells = firstRow.getCells();
-                            const firstCell = cells[0];
-                            if (firstCell) {
-                                const cellParas = firstCell.getParagraphs();
-                                const firstPara = cellParas[0];
-                                if (firstPara) {
-                                    for (const bookmark of pendingBookmarkStarts) {
-                                        firstPara.addBookmarkStart(bookmark);
-                                    }
-                                }
+                        const firstPara = currentElement.getFirstParagraph();
+                        if (firstPara) {
+                            for (const bookmark of pendingBookmarkStarts) {
+                                firstPara.addBookmarkStart(bookmark);
                             }
                         }
                     }
@@ -333,19 +317,10 @@ class DocumentParser {
                     }
                 }
                 else if (lastElement instanceof Table_1.Table) {
-                    const rows = lastElement.getRows();
-                    const lastRow = rows[rows.length - 1];
-                    if (lastRow) {
-                        const cells = lastRow.getCells();
-                        const lastCell = cells[cells.length - 1];
-                        if (lastCell) {
-                            const cellParas = lastCell.getParagraphs();
-                            const lastPara = cellParas[cellParas.length - 1];
-                            if (lastPara) {
-                                for (const bookmark of trailingBookmarkEnds) {
-                                    lastPara.addBookmarkEnd(bookmark);
-                                }
-                            }
+                    const lastPara = lastElement.getLastParagraph();
+                    if (lastPara) {
+                        for (const bookmark of trailingBookmarkEnds) {
+                            lastPara.addBookmarkEnd(bookmark);
                         }
                     }
                 }
@@ -361,19 +336,10 @@ class DocumentParser {
                     }
                 }
                 else if (lastElement instanceof Table_1.Table) {
-                    const rows = lastElement.getRows();
-                    const lastRow = rows[rows.length - 1];
-                    if (lastRow) {
-                        const cells = lastRow.getCells();
-                        const lastCell = cells[cells.length - 1];
-                        if (lastCell) {
-                            const cellParas = lastCell.getParagraphs();
-                            const lastPara = cellParas[cellParas.length - 1];
-                            if (lastPara) {
-                                for (const bookmark of trailingBookmarkStarts) {
-                                    lastPara.addBookmarkStart(bookmark);
-                                }
-                            }
+                    const lastPara = lastElement.getLastParagraph();
+                    if (lastPara) {
+                        for (const bookmark of trailingBookmarkStarts) {
+                            lastPara.addBookmarkStart(bookmark);
                         }
                     }
                 }
@@ -1572,6 +1538,24 @@ class DocumentParser {
         if (pPrObj["w:suppressAutoHyphens"]) {
             paragraph.setSuppressAutoHyphens(true);
         }
+        if (pPrObj["w:kinsoku"]) {
+            paragraph.setKinsoku((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj["w:kinsoku"]));
+        }
+        if (pPrObj["w:wordWrap"]) {
+            paragraph.setWordWrap((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj["w:wordWrap"]));
+        }
+        if (pPrObj["w:overflowPunct"]) {
+            paragraph.setOverflowPunct((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj["w:overflowPunct"]));
+        }
+        if (pPrObj["w:topLinePunct"]) {
+            paragraph.setTopLinePunct((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj["w:topLinePunct"]));
+        }
+        if (pPrObj["w:autoSpaceDE"]) {
+            paragraph.setAutoSpaceDE((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj["w:autoSpaceDE"]));
+        }
+        if (pPrObj["w:autoSpaceDN"]) {
+            paragraph.setAutoSpaceDN((0, parsingHelpers_1.parseOoxmlBoolean)(pPrObj["w:autoSpaceDN"]));
+        }
         if (pPrObj["w:suppressOverlap"]) {
             paragraph.setSuppressOverlap(true);
         }
@@ -2308,6 +2292,7 @@ class DocumentParser {
         let hasBegin = false;
         let hasEnd = false;
         let hasSeparate = false;
+        let formFieldData = undefined;
         for (const run of fieldRuns) {
             const runContent = run.getContent();
             const fieldCharToken = runContent.find((c) => c.type === "fieldChar");
@@ -2316,6 +2301,9 @@ class DocumentParser {
                     case "begin":
                         hasBegin = true;
                         instructionFormatting = run.getFormatting();
+                        if (fieldCharToken.formFieldData) {
+                            formFieldData = fieldCharToken.formFieldData;
+                        }
                         break;
                     case "separate":
                         hasSeparate = true;
@@ -2374,6 +2362,7 @@ class DocumentParser {
             resultFormatting,
             multiParagraph: false,
             hasResult: hasSeparate,
+            formFieldData,
         };
         return new Field_1.ComplexField(properties);
     }
@@ -2400,6 +2389,79 @@ class DocumentParser {
                 }
                 return (value === "1" || value === 1 || value === true || value === "true");
             };
+            const parseFormFieldData = (fldCharObj) => {
+                const ffDataObj = fldCharObj["w:ffData"];
+                if (!ffDataObj || typeof ffDataObj !== "object")
+                    return undefined;
+                const ffd = {};
+                if (ffDataObj["w:name"]?.["@_w:val"] !== undefined) {
+                    ffd.name = String(ffDataObj["w:name"]["@_w:val"]);
+                }
+                if (ffDataObj["w:enabled"] !== undefined) {
+                    const enabledVal = ffDataObj["w:enabled"]?.["@_w:val"];
+                    ffd.enabled = enabledVal === "0" || enabledVal === 0 ? false : true;
+                }
+                if (ffDataObj["w:calcOnExit"] !== undefined) {
+                    const calcVal = ffDataObj["w:calcOnExit"]?.["@_w:val"];
+                    ffd.calcOnExit = calcVal === "1" || calcVal === 1 || calcVal === true;
+                }
+                if (ffDataObj["w:helpText"]?.["@_w:val"] !== undefined) {
+                    ffd.helpText = String(ffDataObj["w:helpText"]["@_w:val"]);
+                }
+                if (ffDataObj["w:statusText"]?.["@_w:val"] !== undefined) {
+                    ffd.statusText = String(ffDataObj["w:statusText"]["@_w:val"]);
+                }
+                if (ffDataObj["w:entryMacro"]?.["@_w:val"] !== undefined) {
+                    ffd.entryMacro = String(ffDataObj["w:entryMacro"]["@_w:val"]);
+                }
+                if (ffDataObj["w:exitMacro"]?.["@_w:val"] !== undefined) {
+                    ffd.exitMacro = String(ffDataObj["w:exitMacro"]["@_w:val"]);
+                }
+                if (ffDataObj["w:textInput"] !== undefined) {
+                    const ti = ffDataObj["w:textInput"];
+                    const textInput = { type: 'textInput' };
+                    if (ti["w:type"]?.["@_w:val"] !== undefined)
+                        textInput.inputType = String(ti["w:type"]["@_w:val"]);
+                    if (ti["w:default"]?.["@_w:val"] !== undefined)
+                        textInput.defaultValue = String(ti["w:default"]["@_w:val"]);
+                    if (ti["w:maxLength"]?.["@_w:val"] !== undefined)
+                        textInput.maxLength = Number(ti["w:maxLength"]["@_w:val"]);
+                    if (ti["w:format"]?.["@_w:val"] !== undefined)
+                        textInput.format = String(ti["w:format"]["@_w:val"]);
+                    ffd.fieldType = textInput;
+                }
+                if (ffDataObj["w:checkBox"] !== undefined) {
+                    const cb = ffDataObj["w:checkBox"];
+                    const checkBox = { type: 'checkBox' };
+                    if (cb["w:default"]?.["@_w:val"] !== undefined) {
+                        checkBox.defaultChecked = cb["w:default"]["@_w:val"] === "1" || cb["w:default"]["@_w:val"] === 1;
+                    }
+                    if (cb["w:checked"]?.["@_w:val"] !== undefined) {
+                        checkBox.checked = cb["w:checked"]["@_w:val"] === "1" || cb["w:checked"]["@_w:val"] === 1;
+                    }
+                    if (cb["w:size"]?.["@_w:val"] !== undefined) {
+                        checkBox.size = Number(cb["w:size"]["@_w:val"]);
+                    }
+                    else if (cb["w:sizeAuto"] !== undefined) {
+                        checkBox.size = 'auto';
+                    }
+                    ffd.fieldType = checkBox;
+                }
+                if (ffDataObj["w:ddList"] !== undefined) {
+                    const dd = ffDataObj["w:ddList"];
+                    const ddList = { type: 'dropDownList' };
+                    if (dd["w:result"]?.["@_w:val"] !== undefined)
+                        ddList.result = Number(dd["w:result"]["@_w:val"]);
+                    if (dd["w:default"]?.["@_w:val"] !== undefined)
+                        ddList.defaultResult = Number(dd["w:default"]["@_w:val"]);
+                    if (dd["w:listEntry"] !== undefined) {
+                        const entries = Array.isArray(dd["w:listEntry"]) ? dd["w:listEntry"] : [dd["w:listEntry"]];
+                        ddList.listEntries = entries.map((e) => String(e?.["@_w:val"] ?? e ?? ""));
+                    }
+                    ffd.fieldType = ddList;
+                }
+                return Object.keys(ffd).length > 0 ? ffd : undefined;
+            };
             if (runObj["_orderedChildren"]) {
                 for (const child of runObj["_orderedChildren"]) {
                     const elementType = child.type;
@@ -2472,12 +2534,18 @@ class DocumentParser {
                                 const charType = (fldChar["@_w:fldCharType"] ||
                                     fldChar["@_fldCharType"]);
                                 if (charType) {
-                                    content.push({
+                                    const fldContent = {
                                         type: "fieldChar",
                                         fieldCharType: charType,
                                         fieldCharDirty: parseBooleanAttr(fldChar["@_w:dirty"]),
                                         fieldCharLocked: parseBooleanAttr(fldChar["@_w:fldLock"] ?? fldChar["@_w:lock"]),
-                                    });
+                                    };
+                                    if (charType === "begin") {
+                                        const ffData = parseFormFieldData(fldChar);
+                                        if (ffData)
+                                            fldContent.formFieldData = ffData;
+                                    }
+                                    content.push(fldContent);
                                 }
                             }
                             break;
@@ -2516,6 +2584,26 @@ class DocumentParser {
                         case "w:annotationRef":
                             content.push({ type: "annotationRef" });
                             break;
+                        case "w:footnoteReference": {
+                            const fnRefElements = toArray(runObj["w:footnoteReference"]);
+                            const fnRef = fnRefElements[elementIndex] || fnRefElements[0];
+                            const fnId = fnRef?.["@_w:id"];
+                            content.push({
+                                type: "footnoteReference",
+                                footnoteId: fnId !== undefined ? parseInt(fnId, 10) : undefined,
+                            });
+                            break;
+                        }
+                        case "w:endnoteReference": {
+                            const enRefElements = toArray(runObj["w:endnoteReference"]);
+                            const enRef = enRefElements[elementIndex] || enRefElements[0];
+                            const enId = enRef?.["@_w:id"];
+                            content.push({
+                                type: "endnoteReference",
+                                endnoteId: enId !== undefined ? parseInt(enId, 10) : undefined,
+                            });
+                            break;
+                        }
                         case "w:dayShort":
                             content.push({ type: "dayShort" });
                             break;
@@ -2616,12 +2704,18 @@ class DocumentParser {
                             const charType = (fldChar["@_w:fldCharType"] ||
                                 fldChar["@_fldCharType"]);
                             if (charType) {
-                                content.push({
+                                const fldContent = {
                                     type: "fieldChar",
                                     fieldCharType: charType,
                                     fieldCharDirty: parseBooleanAttr(fldChar["@_w:dirty"]),
                                     fieldCharLocked: parseBooleanAttr(fldChar["@_w:fldLock"] ?? fldChar["@_w:lock"]),
-                                });
+                                };
+                                if (charType === "begin") {
+                                    const ffData = parseFormFieldData(fldChar);
+                                    if (ffData)
+                                        fldContent.formFieldData = ffData;
+                                }
+                                content.push(fldContent);
                             }
                         }
                     }
@@ -2658,6 +2752,26 @@ class DocumentParser {
                 if (runObj["w:annotationRef"] !== undefined) {
                     content.push({ type: "annotationRef" });
                 }
+                if (runObj["w:footnoteReference"] !== undefined) {
+                    const fnRefElements = toArray(runObj["w:footnoteReference"]);
+                    for (const fnRef of fnRefElements) {
+                        const fnId = fnRef?.["@_w:id"];
+                        content.push({
+                            type: "footnoteReference",
+                            footnoteId: fnId !== undefined ? parseInt(fnId, 10) : undefined,
+                        });
+                    }
+                }
+                if (runObj["w:endnoteReference"] !== undefined) {
+                    const enRefElements = toArray(runObj["w:endnoteReference"]);
+                    for (const enRef of enRefElements) {
+                        const enId = enRef?.["@_w:id"];
+                        content.push({
+                            type: "endnoteReference",
+                            endnoteId: enId !== undefined ? parseInt(enId, 10) : undefined,
+                        });
+                    }
+                }
                 if (runObj["w:dayShort"] !== undefined) {
                     content.push({ type: "dayShort" });
                 }
@@ -3074,6 +3188,12 @@ class DocumentParser {
         if (rPrObj["w:u"]) {
             const uVal = rPrObj["w:u"]["@_w:val"];
             run.setUnderline(uVal || true);
+            const uColor = rPrObj["w:u"]["@_w:color"];
+            if (uColor)
+                run.setUnderlineColor(uColor);
+            const uThemeColor = rPrObj["w:u"]["@_w:themeColor"];
+            if (uThemeColor)
+                run.setUnderlineThemeColor(uThemeColor, rPrObj["w:u"]["@_w:themeTint"] ? parseInt(rPrObj["w:u"]["@_w:themeTint"], 16) : undefined, rPrObj["w:u"]["@_w:themeShade"] ? parseInt(rPrObj["w:u"]["@_w:themeShade"], 16) : undefined);
         }
         if (rPrObj["w:spacing"]) {
             const val = rPrObj["w:spacing"]["@_w:val"];
@@ -3146,6 +3266,14 @@ class DocumentParser {
                 run.setFontCs(rFonts["@_w:cs"]);
             if (rFonts["@_w:hint"])
                 run.setFontHint(rFonts["@_w:hint"]);
+            if (rFonts["@_w:asciiTheme"])
+                run.setFontAsciiTheme(rFonts["@_w:asciiTheme"]);
+            if (rFonts["@_w:hAnsiTheme"])
+                run.setFontHAnsiTheme(rFonts["@_w:hAnsiTheme"]);
+            if (rFonts["@_w:eastAsiaTheme"])
+                run.setFontEastAsiaTheme(rFonts["@_w:eastAsiaTheme"]);
+            if (rFonts["@_w:cstheme"])
+                run.setFontCsTheme(rFonts["@_w:cstheme"]);
         }
         if (rPrObj["w:sz"]) {
             run.setSize((0, units_1.halfPointsToPoints)(parseInt(rPrObj["w:sz"]["@_w:val"], 10)));
@@ -3176,6 +3304,14 @@ class DocumentParser {
         if (rPrObj["w:highlight"]) {
             run.setHighlight(rPrObj["w:highlight"]["@_w:val"]);
         }
+        for (const key of Object.keys(rPrObj)) {
+            if (key.startsWith("w14:")) {
+                const rawXml = this.objectToXml({ [key]: rPrObj[key] });
+                if (rawXml) {
+                    run.addRawW14Property(rawXml);
+                }
+            }
+        }
         if (rPrObj["w:rPrChange"]) {
             const changeObj = rPrObj["w:rPrChange"];
             const propChange = {
@@ -4017,8 +4153,8 @@ class DocumentParser {
                                 const cells = row.getCells();
                                 const lastCell = cells[cells.length - 1];
                                 if (lastCell) {
-                                    const cellParas = lastCell.getParagraphs();
-                                    const lastPara = cellParas[cellParas.length - 1];
+                                    const paras = lastCell.getParagraphs();
+                                    const lastPara = paras[paras.length - 1];
                                     if (lastPara) {
                                         for (const bookmark of bookmarkEnds) {
                                             lastPara.addBookmarkEnd(bookmark);
@@ -4130,6 +4266,12 @@ class DocumentParser {
                 table.setCellSpacingType(spacingType);
             }
         }
+        if (tblPrObj["w:tblLayout"]) {
+            const layoutType = tblPrObj["w:tblLayout"]["@_w:type"];
+            if (layoutType) {
+                table.setLayout(layoutType);
+            }
+        }
         if (tblPrObj["w:tblCellMar"]) {
             const cellMar = tblPrObj["w:tblCellMar"];
             const margins = {};
@@ -4484,6 +4626,15 @@ class DocumentParser {
                         cell.setVerticalMerge("continue");
                     }
                 }
+                if (tcPr["w:hMerge"]) {
+                    const hMergeVal = tcPr["w:hMerge"]["@_w:val"];
+                    if (hMergeVal === "restart") {
+                        cell.setHorizontalMerge("restart");
+                    }
+                    else {
+                        cell.setHorizontalMerge("continue");
+                    }
+                }
                 if (tcPr["w:cellIns"]) {
                     const cellIns = tcPr["w:cellIns"];
                     const id = parseInt(cellIns["@_w:id"] || "0", 10);
@@ -5451,6 +5602,64 @@ class DocumentParser {
                     }
                 }
             }
+            const pgBordersElements = XMLParser_1.XMLParser.extractElements(sectPr, "w:pgBorders");
+            if (pgBordersElements.length > 0) {
+                const pgBordersXml = pgBordersElements[0];
+                if (pgBordersXml) {
+                    const pageBorders = {};
+                    const offsetFrom = XMLParser_1.XMLParser.extractAttribute(pgBordersXml, "w:offsetFrom");
+                    if (offsetFrom)
+                        pageBorders.offsetFrom = offsetFrom;
+                    const display = XMLParser_1.XMLParser.extractAttribute(pgBordersXml, "w:display");
+                    if (display)
+                        pageBorders.display = display;
+                    const zOrder = XMLParser_1.XMLParser.extractAttribute(pgBordersXml, "w:zOrder");
+                    if (zOrder)
+                        pageBorders.zOrder = zOrder;
+                    const parseBorder = (sideXml) => {
+                        if (!sideXml)
+                            return undefined;
+                        const border = {};
+                        const val = XMLParser_1.XMLParser.extractAttribute(sideXml, "w:val");
+                        if (val)
+                            border.style = val;
+                        const sz = XMLParser_1.XMLParser.extractAttribute(sideXml, "w:sz");
+                        if (sz)
+                            border.size = parseInt(sz.toString(), 10);
+                        const color = XMLParser_1.XMLParser.extractAttribute(sideXml, "w:color");
+                        if (color)
+                            border.color = color;
+                        const space = XMLParser_1.XMLParser.extractAttribute(sideXml, "w:space");
+                        if (space)
+                            border.space = parseInt(space.toString(), 10);
+                        const shadow = XMLParser_1.XMLParser.extractAttribute(sideXml, "w:shadow");
+                        if (shadow === "1" || shadow === "true")
+                            border.shadow = true;
+                        const frame = XMLParser_1.XMLParser.extractAttribute(sideXml, "w:frame");
+                        if (frame === "1" || frame === "true")
+                            border.frame = true;
+                        const themeColor = XMLParser_1.XMLParser.extractAttribute(sideXml, "w:themeColor");
+                        if (themeColor)
+                            border.themeColor = themeColor;
+                        const artId = XMLParser_1.XMLParser.extractAttribute(sideXml, "w:id");
+                        if (artId)
+                            border.artId = parseInt(artId.toString(), 10);
+                        return Object.keys(border).length > 0 ? border : undefined;
+                    };
+                    const sides = ["top", "left", "bottom", "right"];
+                    for (const side of sides) {
+                        const sideElements = XMLParser_1.XMLParser.extractElements(pgBordersXml, `w:${side}`);
+                        if (sideElements.length > 0 && sideElements[0]) {
+                            const border = parseBorder(sideElements[0]);
+                            if (border)
+                                pageBorders[side] = border;
+                        }
+                    }
+                    if (Object.keys(pageBorders).length > 0) {
+                        sectionProps.pageBorders = pageBorders;
+                    }
+                }
+            }
             const colsElements = XMLParser_1.XMLParser.extractElements(sectPr, "w:cols");
             if (colsElements.length > 0) {
                 const cols = colsElements[0];
@@ -6328,6 +6537,26 @@ class DocumentParser {
         }
         return namespaces;
     }
+    parseDocumentBackground(docXml) {
+        const bgMatch = docXml.match(/<w:background([^>]*?)\/>/);
+        if (!bgMatch || !bgMatch[1])
+            return undefined;
+        const attrStr = bgMatch[1];
+        const result = {};
+        const colorMatch = attrStr.match(/w:color="([^"]+)"/);
+        if (colorMatch && colorMatch[1])
+            result.color = colorMatch[1];
+        const themeColorMatch = attrStr.match(/w:themeColor="([^"]+)"/);
+        if (themeColorMatch && themeColorMatch[1])
+            result.themeColor = themeColorMatch[1];
+        const themeTintMatch = attrStr.match(/w:themeTint="([^"]+)"/);
+        if (themeTintMatch && themeTintMatch[1])
+            result.themeTint = themeTintMatch[1];
+        const themeShadeMatch = attrStr.match(/w:themeShade="([^"]+)"/);
+        if (themeShadeMatch && themeShadeMatch[1])
+            result.themeShade = themeShadeMatch[1];
+        return Object.keys(result).length > 0 ? result : undefined;
+    }
     async parseHeadersAndFooters(zipHandler, section, relationshipManager, imageManager) {
         const headers = [];
         const footers = [];