docxmlater 1.12.0 → 1.13.0

package/dist/core/DocumentParser.js

@@ -356,6 +356,7 @@ class DocumentParser {
             if (bidi) {
                 (0, diagnostics_1.logTextDirection)(`Paragraph has BiDi enabled`);
             }
+            this.mergeConsecutiveHyperlinks(paragraph);
             return paragraph;
         }
         catch (error) {
@@ -459,6 +460,7 @@ class DocumentParser {
                     }
                 }
             }
+            this.mergeConsecutiveHyperlinks(paragraph);
             return paragraph;
         }
         catch (error) {
@@ -811,16 +813,22 @@ class DocumentParser {
             const tooltip = hyperlinkObj["@_w:tooltip"];
             const runs = hyperlinkObj["w:r"];
             const runChildren = Array.isArray(runs) ? runs : (runs ? [runs] : []);
-            let parsedRun = null;
+            const parsedRuns = [];
             let text = '';
             let formatting = {};
             if (runChildren.length > 0) {
-                parsedRun = this.parseRunFromObject(runChildren[0]);
-                if (parsedRun) {
-                    text = parsedRun.getText();
-                    formatting = parsedRun.getFormatting();
+                for (const runChild of runChildren) {
+                    const parsedRun = this.parseRunFromObject(runChild);
+                    if (parsedRun) {
+                        parsedRuns.push(parsedRun);
+                        text += parsedRun.getText();
+                    }
+                }
+                if (parsedRuns.length > 0 && parsedRuns[0]) {
+                    formatting = parsedRuns[0].getFormatting();
                 }
             }
+            const parsedRun = parsedRuns.length > 0 ? parsedRuns[0] : null;
             let url;
             if (relationshipId) {
                 const relationship = relationshipManager.getRelationship(relationshipId);
@@ -852,6 +860,72 @@ class DocumentParser {
             return null;
         }
     }
+    mergeConsecutiveHyperlinks(paragraph) {
+        const content = paragraph.getContent();
+        if (!content || content.length < 2)
+            return;
+        const mergedContent = [];
+        let i = 0;
+        while (i < content.length) {
+            const currentItem = content[i];
+            if (currentItem.constructor.name === 'Hyperlink') {
+                const currentHyperlink = currentItem;
+                const currentUrl = currentHyperlink.getUrl();
+                const currentAnchor = currentHyperlink.getAnchor();
+                const consecutiveHyperlinks = [currentHyperlink];
+                let j = i + 1;
+                while (j < content.length) {
+                    const nextItem = content[j];
+                    if (nextItem.constructor.name !== 'Hyperlink')
+                        break;
+                    const nextHyperlink = nextItem;
+                    const nextUrl = nextHyperlink.getUrl();
+                    const nextAnchor = nextHyperlink.getAnchor();
+                    if (nextUrl !== currentUrl || nextAnchor !== currentAnchor)
+                        break;
+                    consecutiveHyperlinks.push(nextHyperlink);
+                    j++;
+                }
+                if (consecutiveHyperlinks.length > 1) {
+                    const mergedText = consecutiveHyperlinks
+                        .map(h => h.getText())
+                        .join('');
+                    const mergedHyperlink = new currentHyperlink.constructor({
+                        url: currentUrl,
+                        anchor: currentAnchor,
+                        text: mergedText,
+                        formatting: currentHyperlink.getFormatting(),
+                        tooltip: currentHyperlink.getTooltip(),
+                        relationshipId: currentHyperlink.getRelationshipId(),
+                    });
+                    mergedContent.push(mergedHyperlink);
+                    i = j;
+                }
+                else {
+                    mergedContent.push(currentHyperlink);
+                    i++;
+                }
+            }
+            else {
+                mergedContent.push(currentItem);
+                i++;
+            }
+        }
+        if (mergedContent.length !== content.length) {
+            paragraph.clearContent();
+            for (const item of mergedContent) {
+                if (item.constructor.name === 'Hyperlink') {
+                    paragraph.addHyperlink(item);
+                }
+                else if (item.constructor.name === 'Run') {
+                    paragraph.addRun(item);
+                }
+                else if (item.constructor.name === 'Field') {
+                    paragraph.addField(item);
+                }
+            }
+        }
+    }
     parseSimpleFieldFromObject(fieldObj) {
         try {
             const instruction = fieldObj["@_w:instr"];