docxmlater 1.14.0 → 1.15.1

package/dist/core/DocumentParser.js

@@ -860,58 +860,92 @@ class DocumentParser {
             return null;
         }
     }
-    mergeConsecutiveHyperlinks(paragraph) {
+    mergeConsecutiveHyperlinks(paragraph, resetFormatting = false) {
         const content = paragraph.getContent();
         if (!content || content.length < 2)
             return;
+        const hyperlinkGroups = new Map();
+        const nonHyperlinkItems = [];
+        const hyperlinkIndices = new Map();
+        for (let i = 0; i < content.length; i++) {
+            const item = content[i];
+            if (item.constructor.name === 'Hyperlink') {
+                const hyperlink = item;
+                const url = hyperlink.getUrl() || '';
+                const anchor = hyperlink.getAnchor() || '';
+                const key = `${url}|${anchor}`;
+                if (!hyperlinkGroups.has(key)) {
+                    hyperlinkGroups.set(key, []);
+                }
+                hyperlinkGroups.get(key).push(hyperlink);
+                hyperlinkIndices.set(hyperlink, i);
+            }
+            else {
+                nonHyperlinkItems.push({ item, index: i });
+            }
+        }
+        let needsMerge = false;
+        for (const group of hyperlinkGroups.values()) {
+            if (group.length > 1) {
+                needsMerge = true;
+                break;
+            }
+        }
+        if (!needsMerge && !resetFormatting) {
+            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,
+        const processedIndices = new Set();
+        for (let i = 0; i < content.length; i++) {
+            if (processedIndices.has(i)) {
+                continue;
+            }
+            const item = content[i];
+            if (item.constructor.name === 'Hyperlink') {
+                const hyperlink = item;
+                const url = hyperlink.getUrl() || '';
+                const anchor = hyperlink.getAnchor() || '';
+                const key = `${url}|${anchor}`;
+                const group = hyperlinkGroups.get(key);
+                if (group.length > 1 && group[0] === hyperlink) {
+                    const mergedText = group.map(h => h.getText()).join('');
+                    const mergedHyperlink = new hyperlink.constructor({
+                        url: hyperlink.getUrl(),
+                        anchor: hyperlink.getAnchor(),
                         text: mergedText,
-                        formatting: currentHyperlink.getFormatting(),
-                        tooltip: currentHyperlink.getTooltip(),
-                        relationshipId: currentHyperlink.getRelationshipId(),
+                        formatting: resetFormatting ? this.getStandardHyperlinkFormatting() : hyperlink.getFormatting(),
+                        tooltip: hyperlink.getTooltip(),
+                        relationshipId: hyperlink.getRelationshipId(),
                     });
+                    for (const h of group) {
+                        processedIndices.add(hyperlinkIndices.get(h));
+                    }
                     mergedContent.push(mergedHyperlink);
-                    i = j;
                 }
-                else {
-                    mergedContent.push(currentHyperlink);
-                    i++;
+                else if (group.length === 1) {
+                    if (resetFormatting) {
+                        const resetHyperlink = new hyperlink.constructor({
+                            url: hyperlink.getUrl(),
+                            anchor: hyperlink.getAnchor(),
+                            text: hyperlink.getText(),
+                            formatting: this.getStandardHyperlinkFormatting(),
+                            tooltip: hyperlink.getTooltip(),
+                            relationshipId: hyperlink.getRelationshipId(),
+                        });
+                        mergedContent.push(resetHyperlink);
+                    }
+                    else {
+                        mergedContent.push(hyperlink);
+                    }
+                    processedIndices.add(i);
                 }
             }
             else {
-                mergedContent.push(currentItem);
-                i++;
+                mergedContent.push(item);
+                processedIndices.add(i);
             }
         }
-        if (mergedContent.length !== content.length) {
+        if (needsMerge || resetFormatting) {
             paragraph.clearContent();
             for (const item of mergedContent) {
                 if (item.constructor.name === 'Hyperlink') {
@@ -926,6 +960,13 @@ class DocumentParser {
             }
         }
     }
+    getStandardHyperlinkFormatting() {
+        return {
+            font: 'Calibri',
+            color: '0563C1',
+            underline: 'single'
+        };
+    }
     parseSimpleFieldFromObject(fieldObj) {
         try {
             const instruction = fieldObj["@_w:instr"];