docxmlater 4.5.4 → 4.8.0

package/dist/core/DocumentParser.d.ts

@@ -38,6 +38,7 @@ export declare class DocumentParser {
     private extractSingleElement;
     private validateLoadedContent;
     private parseParagraphWithOrder;
+    private parseOrderedParagraphChildren;
     private parseParagraphFromObject;
     private parseParagraphPropertiesFromObject;
     private assembleComplexFields;

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":"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"}

package/dist/core/DocumentParser.js

@@ -267,127 +267,126 @@ class DocumentParser {
             if (paraId) {
                 paragraph.formatting.paraId = paraId;
             }
-            const orderedChildren = pElement["_orderedChildren"];
-            if (orderedChildren && orderedChildren.length > 0) {
-                for (const childInfo of orderedChildren) {
-                    const elementType = childInfo.type;
-                    const elementIndex = childInfo.index;
-                    if (elementType === "w:r") {
-                        const runs = pElement["w:r"];
-                        const runArray = Array.isArray(runs) ? runs : runs ? [runs] : [];
-                        if (elementIndex < runArray.length) {
-                            const child = runArray[elementIndex];
-                            if (child["w:drawing"]) {
-                                if (zipHandler && imageManager) {
-                                    const imageRun = await this.parseDrawingFromObject(child["w:drawing"], zipHandler, relationshipManager, imageManager);
-                                    if (imageRun) {
-                                        paragraph.addRun(imageRun);
-                                    }
-                                }
-                            }
-                            else {
-                                const run = this.parseRunFromObject(child);
-                                if (run) {
-                                    paragraph.addRun(run);
-                                }
-                            }
-                        }
-                    }
-                    else if (elementType === "w:hyperlink") {
-                        const hyperlinks = pElement["w:hyperlink"];
-                        const hyperlinkArray = Array.isArray(hyperlinks)
-                            ? hyperlinks
-                            : hyperlinks
-                                ? [hyperlinks]
-                                : [];
-                        if (elementIndex < hyperlinkArray.length) {
-                            const hyperlink = this.parseHyperlinkFromObject(hyperlinkArray[elementIndex], relationshipManager);
-                            if (hyperlink) {
-                                paragraph.addHyperlink(hyperlink);
-                            }
-                        }
-                    }
-                    else if (elementType === "w:fldSimple") {
-                        const fields = pElement["w:fldSimple"];
-                        const fieldArray = Array.isArray(fields)
-                            ? fields
-                            : fields
-                                ? [fields]
-                                : [];
-                        if (elementIndex < fieldArray.length) {
-                            const field = this.parseSimpleFieldFromObject(fieldArray[elementIndex]);
-                            if (field) {
-                                paragraph.addField(field);
-                            }
-                        }
-                    }
-                }
+            await this.parseOrderedParagraphChildren(paraXml, pElement, paragraph, relationshipManager, zipHandler, imageManager);
+            this.assembleComplexFields(paragraph);
+            const runs = paragraph.getRuns();
+            const runData = runs.map((run) => ({
+                text: run.getText(),
+                rtl: run.getFormatting().rtl,
+            }));
+            const bidi = paragraph.getFormatting().bidi;
+            (0, diagnostics_1.logParagraphContent)("parsing", -1, runData, bidi);
+            if (bidi) {
+                (0, diagnostics_1.logTextDirection)(`Paragraph has BiDi enabled`);
+            }
+            this.mergeConsecutiveHyperlinks(paragraph);
+            return paragraph;
+        }
+        catch (error) {
+            const err = error instanceof Error ? error : new Error(String(error));
+            this.parseErrors.push({ element: "paragraph", error: err });
+            if (this.strictParsing) {
+                throw new Error(`Failed to parse paragraph: ${err.message}`);
+            }
+            return null;
+        }
+    }
+    async parseOrderedParagraphChildren(paraXml, pElement, paragraph, relationshipManager, zipHandler, imageManager) {
+        const pPrEnd = paraXml.indexOf("</w:pPr>");
+        const contentStart = pPrEnd !== -1 ? pPrEnd + 8 : paraXml.indexOf(">") + 1;
+        const contentEnd = paraXml.lastIndexOf("</w:p>");
+        if (contentEnd <= contentStart) {
+            return;
+        }
+        const paraContent = paraXml.substring(contentStart, contentEnd);
+        const children = [];
+        let runIndex = 0;
+        let hyperlinkIndex = 0;
+        let fieldIndex = 0;
+        let searchPos = 0;
+        while (searchPos < paraContent.length) {
+            const tagStart = paraContent.indexOf("<", searchPos);
+            if (tagStart === -1)
+                break;
+            const tagEnd = paraContent.indexOf(">", tagStart);
+            if (tagEnd === -1)
+                break;
+            const tagContent = paraContent.substring(tagStart + 1, tagEnd);
+            const tagName = tagContent.split(/[\s\/>]/)[0];
+            if (tagName === "w:r") {
+                children.push({ type: "w:r", pos: tagStart, index: runIndex++ });
+                searchPos = tagEnd + 1;
+            }
+            else if (tagName === "w:hyperlink") {
+                children.push({
+                    type: "w:hyperlink",
+                    pos: tagStart,
+                    index: hyperlinkIndex++,
+                });
+                searchPos = tagEnd + 1;
+            }
+            else if (tagName === "w:fldSimple") {
+                children.push({
+                    type: "w:fldSimple",
+                    pos: tagStart,
+                    index: fieldIndex++,
+                });
+                searchPos = tagEnd + 1;
             }
             else {
+                searchPos = tagEnd + 1;
+            }
+        }
+        for (const child of children) {
+            if (child.type === "w:r") {
                 const runs = pElement["w:r"];
-                const runChildren = Array.isArray(runs) ? runs : runs ? [runs] : [];
-                for (const child of runChildren) {
-                    if (child["w:drawing"]) {
+                const runArray = Array.isArray(runs) ? runs : runs ? [runs] : [];
+                if (child.index < runArray.length) {
+                    const runObj = runArray[child.index];
+                    if (runObj["w:drawing"]) {
                         if (zipHandler && imageManager) {
-                            const imageRun = await this.parseDrawingFromObject(child["w:drawing"], zipHandler, relationshipManager, imageManager);
+                            const imageRun = await this.parseDrawingFromObject(runObj["w:drawing"], zipHandler, relationshipManager, imageManager);
                             if (imageRun) {
                                 paragraph.addRun(imageRun);
                             }
                         }
                     }
                     else {
-                        const run = this.parseRunFromObject(child);
+                        const run = this.parseRunFromObject(runObj);
                         if (run) {
                             paragraph.addRun(run);
                         }
                     }
                 }
+            }
+            else if (child.type === "w:hyperlink") {
                 const hyperlinks = pElement["w:hyperlink"];
-                const hyperlinkChildren = Array.isArray(hyperlinks)
+                const hyperlinkArray = Array.isArray(hyperlinks)
                     ? hyperlinks
                     : hyperlinks
                         ? [hyperlinks]
                         : [];
-                for (const hyperlinkObj of hyperlinkChildren) {
-                    const hyperlink = this.parseHyperlinkFromObject(hyperlinkObj, relationshipManager);
+                if (child.index < hyperlinkArray.length) {
+                    const hyperlink = this.parseHyperlinkFromObject(hyperlinkArray[child.index], relationshipManager);
                     if (hyperlink) {
                         paragraph.addHyperlink(hyperlink);
                     }
                 }
+            }
+            else if (child.type === "w:fldSimple") {
                 const fields = pElement["w:fldSimple"];
-                const fieldChildren = Array.isArray(fields)
+                const fieldArray = Array.isArray(fields)
                     ? fields
                     : fields
                         ? [fields]
                         : [];
-                for (const fieldObj of fieldChildren) {
-                    const field = this.parseSimpleFieldFromObject(fieldObj);
+                if (child.index < fieldArray.length) {
+                    const field = this.parseSimpleFieldFromObject(fieldArray[child.index]);
                     if (field) {
                         paragraph.addField(field);
                     }
                 }
             }
-            this.assembleComplexFields(paragraph);
-            const runs = paragraph.getRuns();
-            const runData = runs.map((run) => ({
-                text: run.getText(),
-                rtl: run.getFormatting().rtl,
-            }));
-            const bidi = paragraph.getFormatting().bidi;
-            (0, diagnostics_1.logParagraphContent)("parsing", -1, runData, bidi);
-            if (bidi) {
-                (0, diagnostics_1.logTextDirection)(`Paragraph has BiDi enabled`);
-            }
-            this.mergeConsecutiveHyperlinks(paragraph);
-            return paragraph;
-        }
-        catch (error) {
-            const err = error instanceof Error ? error : new Error(String(error));
-            this.parseErrors.push({ element: "paragraph", error: err });
-            if (this.strictParsing) {
-                throw new Error(`Failed to parse paragraph: ${err.message}`);
-            }
-            return null;
         }
     }
     async parseParagraphFromObject(paraObj, relationshipManager, zipHandler, imageManager) {