docxmlater 10.0.1 → 10.0.3

package/dist/core/DocumentParser.js

@@ -1052,7 +1052,7 @@ class DocumentParser {
             for (const runXml of runXmls) {
                 const runObj = XMLParser_1.XMLParser.parseToObject(runXml, { trimValues: false });
                 const runElement = runObj["w:r"];
-                if (runElement && runElement["w:drawing"]) {
+                if (runElement?.["w:drawing"]) {
                     if (zipHandler && imageManager) {
                         const imageRun = await this.parseDrawingFromObject(runElement["w:drawing"], zipHandler, relationshipManager, imageManager);
                         if (imageRun) {
@@ -1129,8 +1129,10 @@ class DocumentParser {
             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");
+            const parentIdAttr = XMLParser_1.XMLParser.extractAttribute(commentXml, "w15:parentId")
+                || XMLParser_1.XMLParser.extractAttribute(commentXml, "w:parentId");
+            const doneAttr = XMLParser_1.XMLParser.extractAttribute(commentXml, "w15:done")
+                || XMLParser_1.XMLParser.extractAttribute(commentXml, "w:done");
             if (!idAttr) {
                 return null;
             }
@@ -1333,7 +1335,7 @@ class DocumentParser {
                 paragraph.formatting.paraId = paraId;
             }
             this.parseParagraphPropertiesFromObject(paraObj["w:pPr"], paragraph);
-            const orderedChildren = paraObj["_orderedChildren"];
+            const orderedChildren = paraObj._orderedChildren;
             if (orderedChildren && orderedChildren.length > 0) {
                 for (const childInfo of orderedChildren) {
                     const elementType = childInfo.type;
@@ -2660,8 +2662,8 @@ class DocumentParser {
                 }
                 return Object.keys(ffd).length > 0 ? ffd : undefined;
             };
-            if (runObj["_orderedChildren"]) {
-                for (const child of runObj["_orderedChildren"]) {
+            if (runObj._orderedChildren) {
+                for (const child of runObj._orderedChildren) {
                     const elementType = child.type;
                     const elementIndex = child.index;
                     switch (elementType) {
@@ -3134,7 +3136,7 @@ class DocumentParser {
                 logger_1.defaultLogger.debug(`[DocumentParser] Skipping self-closing external hyperlink with no display text. URL: "${url}"`);
                 return result;
             }
-            let displayText = text || url || "[Link]";
+            const displayText = text || url || "[Link]";
             if (!text && finalAnchor) {
                 logger_1.defaultLogger.warn(`[DocumentParser] Hyperlink to anchor "${finalAnchor}" has no display text. ` +
                     `Using placeholder "[Link]" to prevent bookmark ID from appearing as visible text. ` +
@@ -4293,7 +4295,7 @@ class DocumentParser {
             if (tableObj["w:tblPr"]) {
                 this.parseTablePropertiesFromObject(tableObj["w:tblPr"], table);
             }
-            if (tableObj["w:tblGrid"] && tableObj["w:tblGrid"]["w:gridCol"]) {
+            if (tableObj["w:tblGrid"]?.["w:gridCol"]) {
                 const gridCols = tableObj["w:tblGrid"]["w:gridCol"];
                 const gridColArray = Array.isArray(gridCols) ? gridCols : [gridCols];
                 const widths = gridColArray.map((col) => {
@@ -4402,14 +4404,14 @@ class DocumentParser {
                 position.x = parseInt(tblpPr["@_w:tblpX"], 10);
             if (tblpPr["@_w:tblpY"])
                 position.y = parseInt(tblpPr["@_w:tblpY"], 10);
+            if (tblpPr["@_w:horzAnchor"])
+                position.horizontalAnchor = tblpPr["@_w:horzAnchor"];
+            if (tblpPr["@_w:vertAnchor"])
+                position.verticalAnchor = tblpPr["@_w:vertAnchor"];
             if (tblpPr["@_w:tblpXSpec"])
-                position.horizontalAnchor = tblpPr["@_w:tblpXSpec"];
+                position.horizontalAlignment = tblpPr["@_w:tblpXSpec"];
             if (tblpPr["@_w:tblpYSpec"])
-                position.verticalAnchor = tblpPr["@_w:tblpYSpec"];
-            if (tblpPr["@_w:tblpXAlign"])
-                position.horizontalAlignment = tblpPr["@_w:tblpXAlign"];
-            if (tblpPr["@_w:tblpYAlign"])
-                position.verticalAlignment = tblpPr["@_w:tblpYAlign"];
+                position.verticalAlignment = tblpPr["@_w:tblpYSpec"];
             if (tblpPr["@_w:leftFromText"])
                 position.leftFromText = parseInt(tblpPr["@_w:leftFromText"], 10);
             if (tblpPr["@_w:rightFromText"])
@@ -4862,6 +4864,7 @@ class DocumentParser {
                     const date = dateAttr ? new Date(dateAttr) : new Date();
                     const vMergeAttr = cellMerge["@_w:vMerge"];
                     const vMergeOrigAttr = cellMerge["@_w:vMergeOrig"];
+                    const mergeRevMap = { rest: "restart", cont: "continue" };
                     const revision = new Revision_1.Revision({
                         id,
                         author,
@@ -4869,8 +4872,8 @@ class DocumentParser {
                         type: "tableCellMerge",
                         content: [],
                         previousProperties: {
-                            vMerge: vMergeAttr,
-                            vMergeOrig: vMergeOrigAttr,
+                            vMerge: (vMergeAttr && mergeRevMap[vMergeAttr]) || vMergeAttr,
+                            vMergeOrig: (vMergeOrigAttr && mergeRevMap[vMergeOrigAttr]) || vMergeOrigAttr,
                         },
                     });
                     cell.setCellRevision(revision);
@@ -5053,19 +5056,19 @@ class DocumentParser {
             const sdtPr = sdtObj["w:sdtPr"];
             if (sdtPr) {
                 const idElement = sdtPr["w:id"];
-                if (idElement && idElement["@_w:val"]) {
+                if (idElement?.["@_w:val"]) {
                     properties.id = parseInt(idElement["@_w:val"], 10);
                 }
                 const tagElement = sdtPr["w:tag"];
-                if (tagElement && tagElement["@_w:val"]) {
+                if (tagElement?.["@_w:val"]) {
                     properties.tag = tagElement["@_w:val"];
                 }
                 const lockElement = sdtPr["w:lock"];
-                if (lockElement && lockElement["@_w:val"]) {
+                if (lockElement?.["@_w:val"]) {
                     properties.lock = lockElement["@_w:val"];
                 }
                 const aliasElement = sdtPr["w:alias"];
-                if (aliasElement && aliasElement["@_w:val"]) {
+                if (aliasElement?.["@_w:val"]) {
                     properties.alias = aliasElement["@_w:val"];
                 }
                 if (sdtPr["w:richText"]) {
@@ -5129,7 +5132,7 @@ class DocumentParser {
             const content = [];
             const sdtContent = sdtObj["w:sdtContent"];
             if (sdtContent) {
-                const orderedChildren = sdtContent["_orderedChildren"];
+                const orderedChildren = sdtContent._orderedChildren;
                 if (orderedChildren && orderedChildren.length > 0) {
                     for (const childInfo of orderedChildren) {
                         const elementType = childInfo.type;
@@ -5358,7 +5361,7 @@ class DocumentParser {
         }
         const headingLevels = styles
             .map((style) => {
-            const match = style.styleName.match(standardHeadingPattern);
+            const match = standardHeadingPattern.exec(style.styleName);
             return match ? parseInt(match[1], 10) : 0;
         })
             .filter((level) => level > 0)
@@ -5409,7 +5412,7 @@ class DocumentParser {
                 .replace(/>/g, ">")
                 .replace(/&/g, "&");
             logger_1.defaultLogger.debug(`[TOC Parser] Decoded instruction: "${decodedInstruction}"`);
-            let normalizedInstruction = this.normalizeTOCFieldInstruction(decodedInstruction);
+            const normalizedInstruction = this.normalizeTOCFieldInstruction(decodedInstruction);
             const tocOptions = {
                 title,
                 originalFieldInstruction: normalizedInstruction.trim(),
@@ -5423,7 +5426,7 @@ class DocumentParser {
             if (normalizedInstruction.includes("\\z")) {
                 tocOptions.hideInWebLayout = true;
             }
-            const outlineMatch = normalizedInstruction.match(/\\o\s+(?:"(\d+)-(\d+)"|'(\d+)-(\d+)'|(\d+)-(\d+))/);
+            const outlineMatch = /\\o\s+(?:"(\d+)-(\d+)"|'(\d+)-(\d+)'|(\d+)-(\d+))/.exec(normalizedInstruction);
             if (outlineMatch) {
                 const minLevel = outlineMatch[1] || outlineMatch[3] || outlineMatch[5];
                 const maxLevel = outlineMatch[2] || outlineMatch[4] || outlineMatch[6];
@@ -5432,8 +5435,8 @@ class DocumentParser {
                     tocOptions.maxLevel = parseInt(maxLevel, 10);
                 }
             }
-            const stylesMatch = normalizedInstruction.match(/\\t\s+"([^"]+)"/);
-            if (stylesMatch && stylesMatch[1]) {
+            const stylesMatch = /\\t\s+"([^"]+)"/.exec(normalizedInstruction);
+            if (stylesMatch?.[1]) {
                 const stylesStr = stylesMatch[1];
                 const styles = [];
                 const parts = stylesStr.split(",").filter((p) => p.trim());
@@ -5504,16 +5507,16 @@ class DocumentParser {
             const hasChildren = element &&
                 typeof element === "object" &&
                 Object.keys(element).some((k) => !k.startsWith("@_") && k !== "#text" && k !== "_orderedChildren");
-            if (!hasChildren && (!element || !element["#text"])) {
+            if (!hasChildren && (!element?.["#text"])) {
                 xml += "/>";
             }
             else {
                 xml += ">";
-                if (element && element["#text"]) {
+                if (element?.["#text"]) {
                     xml += element["#text"];
                 }
                 if (element && typeof element === "object") {
-                    const orderedChildren = element["_orderedChildren"];
+                    const orderedChildren = element._orderedChildren;
                     if (orderedChildren && orderedChildren.length > 0) {
                         for (const childInfo of orderedChildren) {
                             const childType = childInfo.type;
@@ -5617,8 +5620,8 @@ class DocumentParser {
         const customProps = {};
         const propertyElements = XMLParser_1.XMLParser.extractElements(xml, "property");
         for (const propXml of propertyElements) {
-            const nameMatch = propXml.match(/name="([^"]+)"/);
-            if (!nameMatch || !nameMatch[1])
+            const nameMatch = /name="([^"]+)"/.exec(propXml);
+            if (!nameMatch?.[1])
                 continue;
             const name = XMLBuilder_1.XMLBuilder.unescapeXml(nameMatch[1]);
             if (propXml.includes("<vt:lpwstr>")) {
@@ -5981,7 +5984,10 @@ class DocumentParser {
                 if (textDir) {
                     const val = XMLParser_1.XMLParser.extractAttribute(textDir, "w:val");
                     if (val) {
-                        sectionProps.textDirection = val;
+                        const reverseTextDirMap = {
+                            lrTb: "ltr",
+                        };
+                        sectionProps.textDirection = (reverseTextDirMap[val] || val);
                     }
                 }
             }
@@ -6151,12 +6157,12 @@ class DocumentParser {
             const numPrXml = XMLParser_1.XMLParser.extractBetweenTags(pPrXml, "<w:numPr>", "</w:numPr>");
             if (numPrXml) {
                 styleNumPr = {};
-                const numIdMatch = numPrXml.match(/<w:numId[^>]*w:val="(\d+)"/);
-                if (numIdMatch && numIdMatch[1]) {
+                const numIdMatch = /<w:numId[^>]*w:val="(\d+)"/.exec(numPrXml);
+                if (numIdMatch?.[1]) {
                     styleNumPr.numId = parseInt(numIdMatch[1], 10);
                 }
-                const ilvlMatch = numPrXml.match(/<w:ilvl[^>]*w:val="(\d+)"/);
-                if (ilvlMatch && ilvlMatch[1]) {
+                const ilvlMatch = /<w:ilvl[^>]*w:val="(\d+)"/.exec(numPrXml);
+                if (ilvlMatch?.[1]) {
                     styleNumPr.ilvl = parseInt(ilvlMatch[1], 10);
                 }
             }
@@ -6759,10 +6765,10 @@ class DocumentParser {
                 if (!attrs)
                     continue;
                 const rel = {};
-                const idMatch = attrs.match(/Id="([^"]+)"/);
-                const typeMatch = attrs.match(/Type="([^"]+)"/);
-                const targetMatch = attrs.match(/Target="([^"]+)"/);
-                const modeMatch = attrs.match(/TargetMode="([^"]+)"/);
+                const idMatch = /Id="([^"]+)"/.exec(attrs);
+                const typeMatch = /Type="([^"]+)"/.exec(attrs);
+                const targetMatch = /Target="([^"]+)"/.exec(attrs);
+                const modeMatch = /TargetMode="([^"]+)"/.exec(attrs);
                 if (idMatch)
                     rel.id = idMatch[1];
                 if (typeMatch)
@@ -6781,8 +6787,8 @@ class DocumentParser {
     }
     parseNamespaces(docXml) {
         const namespaces = {};
-        const docTagMatch = docXml.match(/<w:document([^>]+)>/);
-        if (docTagMatch && docTagMatch[1]) {
+        const docTagMatch = /<w:document([^>]+)>/.exec(docXml);
+        if (docTagMatch?.[1]) {
             const attributes = docTagMatch[1];
             const nsPattern = /xmlns:([^=]+)="([^"]+)"/g;
             let match;
@@ -6791,30 +6797,30 @@ class DocumentParser {
                     namespaces[`xmlns:${match[1]}`] = match[2];
                 }
             }
-            const ignorableMatch = attributes.match(/mc:Ignorable="([^"]+)"/);
-            if (ignorableMatch && ignorableMatch[1]) {
+            const ignorableMatch = /mc:Ignorable="([^"]+)"/.exec(attributes);
+            if (ignorableMatch?.[1]) {
                 namespaces["mc:Ignorable"] = ignorableMatch[1];
             }
         }
         return namespaces;
     }
     parseDocumentBackground(docXml) {
-        const bgMatch = docXml.match(/<w:background([^>]*?)\/>/);
-        if (!bgMatch || !bgMatch[1])
+        const bgMatch = /<w:background([^>]*?)\/>/.exec(docXml);
+        if (!bgMatch?.[1])
             return undefined;
         const attrStr = bgMatch[1];
         const result = {};
-        const colorMatch = attrStr.match(/w:color="([^"]+)"/);
-        if (colorMatch && colorMatch[1])
+        const colorMatch = /w:color="([^"]+)"/.exec(attrStr);
+        if (colorMatch?.[1])
             result.color = colorMatch[1];
-        const themeColorMatch = attrStr.match(/w:themeColor="([^"]+)"/);
-        if (themeColorMatch && themeColorMatch[1])
+        const themeColorMatch = /w:themeColor="([^"]+)"/.exec(attrStr);
+        if (themeColorMatch?.[1])
             result.themeColor = themeColorMatch[1];
-        const themeTintMatch = attrStr.match(/w:themeTint="([^"]+)"/);
-        if (themeTintMatch && themeTintMatch[1])
+        const themeTintMatch = /w:themeTint="([^"]+)"/.exec(attrStr);
+        if (themeTintMatch?.[1])
             result.themeTint = themeTintMatch[1];
-        const themeShadeMatch = attrStr.match(/w:themeShade="([^"]+)"/);
-        if (themeShadeMatch && themeShadeMatch[1])
+        const themeShadeMatch = /w:themeShade="([^"]+)"/.exec(attrStr);
+        if (themeShadeMatch?.[1])
             result.themeShade = themeShadeMatch[1];
         return Object.keys(result).length > 0 ? result : undefined;
     }