docxmlater 10.0.1 → 10.0.3

package/dist/core/Document.js

@@ -49,6 +49,8 @@ const RangeMarker_1 = require("../elements/RangeMarker");
 const Revision_1 = require("../elements/Revision");
 const RevisionManager_1 = require("../elements/RevisionManager");
 const Run_1 = require("../elements/Run");
+const Shape_1 = require("../elements/Shape");
+const TextBox_1 = require("../elements/TextBox");
 const validation_1 = require("../validation");
 const Section_1 = require("../elements/Section");
 const StructuredDocumentTag_1 = require("../elements/StructuredDocumentTag");
@@ -93,7 +95,7 @@ class Document {
         this.numberingManager = NumberingManager_1.NumberingManager.create();
         this.section = new Section_1.Section();
         this.imageManager = ImageManager_1.ImageManager.create();
-        this.relationshipManager = RelationshipManager_1.RelationshipManager.createForDocument();
+        this.relationshipManager = initDefaults ? RelationshipManager_1.RelationshipManager.createForDocument() : RelationshipManager_1.RelationshipManager.create();
         this.headerFooterManager = HeaderFooterManager_1.HeaderFooterManager.create();
         this.bookmarkManager = BookmarkManager_1.BookmarkManager.create();
         this.revisionManager = RevisionManager_1.RevisionManager.create();
@@ -164,6 +166,7 @@ class Document {
     _originalCommentsXml;
     _commentsModified = false;
     _originalCommentCompanionFiles = new Map();
+    _removedParts = new Set();
     _appPropsModified = false;
     _footnotesModified = false;
     _endnotesModified = false;
@@ -308,11 +311,11 @@ class Document {
         return doc;
     }
     parseSettingsFromXml(settingsXml) {
-        const trackRevisionsMatch = settingsXml.match(/<w:trackRevisions\b([^>]*)\/?>/);
+        const trackRevisionsMatch = /<w:trackRevisions\b([^>]*)\/?>/.exec(settingsXml);
         if (trackRevisionsMatch) {
             const attrs = trackRevisionsMatch[1] ?? '';
-            const valMatch = attrs.match(/w:val\s*=\s*"([^"]*)"/);
-            if (valMatch && valMatch[1] !== undefined) {
+            const valMatch = /w:val\s*=\s*"([^"]*)"/.exec(attrs);
+            if (valMatch?.[1] !== undefined) {
                 const val = valMatch[1].toLowerCase();
                 this.trackChangesEnabled = val !== 'false' && val !== '0' && val !== 'off';
             }
@@ -328,12 +331,12 @@ class Document {
         if (hasTrackFormatting) {
             this.trackFormatting = true;
         }
-        const revisionViewMatch = settingsXml.match(/<w:revisionView\b([^>]*)\/?>/);
+        const revisionViewMatch = /<w:revisionView\b([^>]*)\/?>/.exec(settingsXml);
         if (revisionViewMatch) {
             const attrs = revisionViewMatch[1] || '';
-            const insDelMatch = attrs.match(/w:insDel\s*=\s*"([^"]*)"/);
-            const formattingMatch = attrs.match(/w:formatting\s*=\s*"([^"]*)"/);
-            const inkMatch = attrs.match(/w:inkAnnotations\s*=\s*"([^"]*)"/);
+            const insDelMatch = /w:insDel\s*=\s*"([^"]*)"/.exec(attrs);
+            const formattingMatch = /w:formatting\s*=\s*"([^"]*)"/.exec(attrs);
+            const inkMatch = /w:inkAnnotations\s*=\s*"([^"]*)"/.exec(attrs);
             if (insDelMatch?.[1] !== undefined) {
                 this.revisionViewSettings.showInsertionsAndDeletions = insDelMatch[1] !== '0';
             }
@@ -344,22 +347,22 @@ class Document {
                 this.revisionViewSettings.showInkAnnotations = inkMatch[1] !== '0';
             }
         }
-        const protMatch = settingsXml.match(/<w:documentProtection\b([^>]*)\/?>/);
+        const protMatch = /<w:documentProtection\b([^>]*)\/?>/.exec(settingsXml);
         if (protMatch) {
             const attrs = protMatch[1] || '';
-            const editMatch = attrs.match(/w:edit\s*=\s*"([^"]*)"/);
-            const enforcementMatch = attrs.match(/w:enforcement\s*=\s*"([^"]*)"/);
+            const editMatch = /w:edit\s*=\s*"([^"]*)"/.exec(attrs);
+            const enforcementMatch = /w:enforcement\s*=\s*"([^"]*)"/.exec(attrs);
             if (editMatch?.[1]) {
                 const edit = editMatch[1];
                 const enforcement = enforcementMatch?.[1] ? enforcementMatch[1] !== '0' : true;
                 this.documentProtection = { edit, enforcement };
-                const cryptProviderMatch = attrs.match(/w:cryptProviderType\s*=\s*"([^"]*)"/);
-                const cryptAlgClassMatch = attrs.match(/w:cryptAlgorithmClass\s*=\s*"([^"]*)"/);
-                const cryptAlgTypeMatch = attrs.match(/w:cryptAlgorithmType\s*=\s*"([^"]*)"/);
-                const cryptAlgSidMatch = attrs.match(/w:cryptAlgorithmSid\s*=\s*"([^"]*)"/);
-                const cryptSpinMatch = attrs.match(/w:cryptSpinCount\s*=\s*"([^"]*)"/);
-                const hashMatch = attrs.match(/w:hash\s*=\s*"([^"]*)"/);
-                const saltMatch = attrs.match(/w:salt\s*=\s*"([^"]*)"/);
+                const cryptProviderMatch = /w:cryptProviderType\s*=\s*"([^"]*)"/.exec(attrs);
+                const cryptAlgClassMatch = /w:cryptAlgorithmClass\s*=\s*"([^"]*)"/.exec(attrs);
+                const cryptAlgTypeMatch = /w:cryptAlgorithmType\s*=\s*"([^"]*)"/.exec(attrs);
+                const cryptAlgSidMatch = /w:cryptAlgorithmSid\s*=\s*"([^"]*)"/.exec(attrs);
+                const cryptSpinMatch = /w:cryptSpinCount\s*=\s*"([^"]*)"/.exec(attrs);
+                const hashMatch = /w:hash\s*=\s*"([^"]*)"/.exec(attrs);
+                const saltMatch = /w:salt\s*=\s*"([^"]*)"/.exec(attrs);
                 if (cryptProviderMatch?.[1])
                     this.documentProtection.cryptProviderType = cryptProviderMatch[1];
                 if (cryptAlgClassMatch?.[1])
@@ -376,10 +379,10 @@ class Document {
                     this.documentProtection.salt = saltMatch[1];
             }
         }
-        const rsidsBlockMatch = settingsXml.match(/<w:rsids>([\s\S]*?)<\/w:rsids>/);
+        const rsidsBlockMatch = /<w:rsids>([\s\S]*?)<\/w:rsids>/.exec(settingsXml);
         if (rsidsBlockMatch?.[1]) {
             const rsidsBlock = rsidsBlockMatch[1];
-            const rsidRootMatch = rsidsBlock.match(/<w:rsidRoot\s+w:val\s*=\s*"([^"]*)"\s*\/?>/);
+            const rsidRootMatch = /<w:rsidRoot\s+w:val\s*=\s*"([^"]*)"\s*\/?>/.exec(rsidsBlock);
             if (rsidRootMatch?.[1]) {
                 this.rsidRoot = rsidRootMatch[1].toUpperCase();
             }
@@ -402,11 +405,11 @@ class Document {
         if (/<w:autoHyphenation\b[^>]*\/?>/.test(settingsXml)) {
             this._autoHyphenation = true;
         }
-        const decimalMatch = settingsXml.match(/<w:decimalSymbol\s+w:val\s*=\s*"([^"]*)"\s*\/?>/);
+        const decimalMatch = /<w:decimalSymbol\s+w:val\s*=\s*"([^"]*)"\s*\/?>/.exec(settingsXml);
         if (decimalMatch?.[1]) {
             this._decimalSymbol = decimalMatch[1];
         }
-        const listSepMatch = settingsXml.match(/<w:listSeparator\s+w:val\s*=\s*"([^"]*)"\s*\/?>/);
+        const listSepMatch = /<w:listSeparator\s+w:val\s*=\s*"([^"]*)"\s*\/?>/.exec(settingsXml);
         if (listSepMatch?.[1]) {
             this._listSeparator = listSepMatch[1];
         }
@@ -416,16 +419,16 @@ class Document {
         const compatSettings = [];
         const legacyFlags = [];
         let mode = compatibility_types_1.CompatibilityMode.Word2007;
-        const compatBlockMatch = settingsXml.match(/<w:compat>([\s\S]*?)<\/w:compat>/);
+        const compatBlockMatch = /<w:compat>([\s\S]*?)<\/w:compat>/.exec(settingsXml);
         if (compatBlockMatch?.[1]) {
             const compatBlock = compatBlockMatch[1];
             const settingRegex = /<w:compatSetting\s+([^>]*)\/?\s*>/g;
             let settingMatch;
             while ((settingMatch = settingRegex.exec(compatBlock)) !== null) {
                 const attrs = settingMatch[1] ?? '';
-                const nameMatch = attrs.match(/w:name\s*=\s*"([^"]*)"/);
-                const uriMatch = attrs.match(/w:uri\s*=\s*"([^"]*)"/);
-                const valMatch = attrs.match(/w:val\s*=\s*"([^"]*)"/);
+                const nameMatch = /w:name\s*=\s*"([^"]*)"/.exec(attrs);
+                const uriMatch = /w:uri\s*=\s*"([^"]*)"/.exec(attrs);
+                const valMatch = /w:val\s*=\s*"([^"]*)"/.exec(attrs);
                 if (nameMatch?.[1] && uriMatch?.[1] && valMatch?.[1]) {
                     const setting = {
                         name: nameMatch[1],
@@ -795,7 +798,7 @@ class Document {
         return { ...this.properties };
     }
     setProperty(key, value) {
-        this.properties[key] = value;
+        (this.properties[key]) = value;
         return this;
     }
     setTitle(title) {
@@ -895,6 +898,7 @@ class Document {
         }
         this.validateNumberingReferences();
         this.validateBookmarkPairs();
+        this.assignUniqueIds();
         if (this.skipDocumentXmlRegeneration) {
             this.logger.warn('skipDocumentXmlRegeneration is set: in-memory content modifications will NOT be saved. ' +
                 'Use acceptAllRevisions() instead of acceptAllRevisionsRawXml() if you need to modify the document after accepting revisions.');
@@ -1025,7 +1029,7 @@ class Document {
             if (runEnd === -1)
                 continue;
             const runContent = xml.substring(runStart, runEnd);
-            const fldCharMatch = runContent.match(/<w:fldChar\s+w:fldCharType\s*=\s*"(begin|separate|end)"/);
+            const fldCharMatch = /<w:fldChar\s+w:fldCharType\s*=\s*"(begin|separate|end)"/.exec(runContent);
             if (fldCharMatch) {
                 fieldTokens.push({
                     type: fldCharMatch[1],
@@ -1033,7 +1037,7 @@ class Document {
                     runEnd,
                 });
             }
-            const instrMatch = runContent.match(/<w:instrText[^>]*>([\s\S]*?)<\/w:instrText>/);
+            const instrMatch = /<w:instrText[^>]*>([\s\S]*?)<\/w:instrText>/.exec(runContent);
             if (instrMatch) {
                 instrTokens.push({
                     text: instrMatch[1].trim(),
@@ -1179,7 +1183,7 @@ class Document {
                             protectedBlocks.push(block);
                             return `\x00PROTECTED_${protectedBlocks.length - 1}\x00`;
                         });
-                        const styleMatch = safeInner.match(/<w:pStyle\s+w:val="([^"]+)"/);
+                        const styleMatch = /<w:pStyle\s+w:val="([^"]+)"/.exec(safeInner);
                         if (styleMatch && styleSet.has(styleMatch[1])) {
                             let cleaned = safeInner.replace(/<w:spacing\b[^/]*\/>\s*/g, '');
                             if (cleaned !== safeInner) {
@@ -1234,10 +1238,14 @@ class Document {
         }
     }
     updateCoreProps() {
+        if (this._removedParts.has(types_1.DOCX_PATHS.CORE_PROPS) || this._removedParts.has('docProps/core.xml'))
+            return;
         const xml = this.generator.generateCoreProps(this.properties);
         this.zipHandler.updateFile(types_1.DOCX_PATHS.CORE_PROPS, xml);
     }
     updateAppProps() {
+        if (this._removedParts.has(types_1.DOCX_PATHS.APP_PROPS) || this._removedParts.has('docProps/app.xml'))
+            return;
         if (this._originalAppPropsXml && !this._appPropsModified) {
             return;
         }
@@ -1292,11 +1300,11 @@ class Document {
         this._webSettings.doNotSaveAsSingleFile = /<w:doNotSaveAsSingleFile\b/.test(xml);
         this._webSettings.doNotOrganizeInFolder = /<w:doNotOrganizeInFolder\b/.test(xml);
         this._webSettings.doNotUseLongFileNames = /<w:doNotUseLongFileNames\b/.test(xml);
-        const pixelsMatch = xml.match(/<w:pixelsPerInch\b[^>]*w:val\s*=\s*"(\d+)"/);
+        const pixelsMatch = /<w:pixelsPerInch\b[^>]*w:val\s*=\s*"(\d+)"/.exec(xml);
         this._webSettings.pixelsPerInch = pixelsMatch?.[1] ? parseInt(pixelsMatch[1], 10) : undefined;
-        const screenMatch = xml.match(/<w:targetScreenSz\b[^>]*w:val\s*=\s*"([^"]*)"/);
+        const screenMatch = /<w:targetScreenSz\b[^>]*w:val\s*=\s*"([^"]*)"/.exec(xml);
         this._webSettings.targetScreenSz = screenMatch?.[1] ?? undefined;
-        const encodingMatch = xml.match(/<w:encoding\b[^>]*w:val\s*=\s*"([^"]*)"/);
+        const encodingMatch = /<w:encoding\b[^>]*w:val\s*=\s*"([^"]*)"/.exec(xml);
         this._webSettings.encoding = encodingMatch?.[1] ?? undefined;
     }
     updateWebSettingsXml() {
@@ -1429,7 +1437,7 @@ class Document {
         if (!relsXml)
             return;
         const usedRIds = new Set();
-        const rIdPattern = /r:(?:embed|link)="(rId\d+)"/g;
+        const rIdPattern = /r:(?:embed|link|id)="(rId\d+)"/g;
         let match;
         while ((match = rIdPattern.exec(mergedXml)) !== null) {
             if (match[1])
@@ -1660,7 +1668,7 @@ class Document {
             rsidsXml += `\n    <w:rsid w:val="${esc(rsid)}"/>`;
         }
         rsidsXml += '\n  </w:rsids>';
-        if (/<\/w:compat>/.test(xml)) {
+        if (xml.includes('</w:compat>')) {
             xml = xml.replace(/<\/w:compat>/, '</w:compat>' + rsidsXml);
         }
         else if (/<m:mathPr\b/.test(xml)) {
@@ -2450,6 +2458,50 @@ class Document {
         }
         return repairs;
     }
+    assignUniqueIds() {
+        const existingRevisions = this.revisionManager.getAllRevisions();
+        let maxRevId = 0;
+        for (const rev of existingRevisions) {
+            if (rev.getId() > maxRevId)
+                maxRevId = rev.getId();
+        }
+        const registeredSet = new Set(existingRevisions);
+        let docPrId = 1;
+        const processParagraph = (para) => {
+            for (const rev of para.getRevisions()) {
+                if (!registeredSet.has(rev)) {
+                    maxRevId++;
+                    rev.setId(maxRevId);
+                    registeredSet.add(rev);
+                }
+            }
+            for (const item of para.getContent()) {
+                if (item instanceof Shape_1.Shape) {
+                    item.setDocPrId(docPrId++);
+                }
+                else if (item instanceof TextBox_1.TextBox) {
+                    item.setDocPrId(docPrId++);
+                }
+                else if (item instanceof ImageRun_1.ImageRun) {
+                    item.getImageElement().setDocPrId(docPrId++);
+                }
+            }
+        };
+        for (const element of this.bodyElements) {
+            if (element instanceof Paragraph_1.Paragraph) {
+                processParagraph(element);
+            }
+            else if (element instanceof Table_1.Table) {
+                for (const row of element.getRows()) {
+                    for (const cell of row.getCells()) {
+                        for (const para of cell.getParagraphs()) {
+                            processParagraph(para);
+                        }
+                    }
+                }
+            }
+        }
+    }
     getLastParagraph() {
         for (let i = this.bodyElements.length - 1; i >= 0; i--) {
             const element = this.bodyElements[i];
@@ -2559,8 +2611,7 @@ class Document {
                     const nextElement = this.bodyElements[i + 1];
                     const isListEnd = !nextElement ||
                         !(nextElement instanceof Paragraph_1.Paragraph) ||
-                        !nextElement.getNumbering() ||
-                        nextElement.getNumbering().numId !== numbering.numId;
+                        nextElement.getNumbering()?.numId !== numbering.numId;
                     if (isListEnd) {
                         const alreadyHasBlank = nextElement instanceof Paragraph_1.Paragraph &&
                             nextElement.getText().trim() === '' &&
@@ -2587,7 +2638,7 @@ class Document {
             totalCount++;
         }
         const allFiles = this.zipHandler.getFilePaths();
-        const headerFooterFiles = allFiles.filter((path) => path.match(/^word\/(header|footer)\d+\.xml$/i));
+        const headerFooterFiles = allFiles.filter((path) => /^word\/(header|footer)\d+\.xml$/i.exec(path));
         for (const filePath of headerFooterFiles) {
             this.zipHandler.removeFile(filePath);
         }
@@ -2671,7 +2722,7 @@ class Document {
             if (!abstractNum)
                 continue;
             const level0 = abstractNum.getLevel(0);
-            if (!level0 || level0.getFormat() !== "bullet")
+            if (level0?.getFormat() !== "bullet")
                 continue;
             for (let levelIndex = 0; levelIndex < 9; levelIndex++) {
                 const numLevel = abstractNum.getLevel(levelIndex);
@@ -3688,7 +3739,7 @@ class Document {
             if (!abstractNum)
                 continue;
             const level0 = abstractNum.getLevel(0);
-            if (!level0 || level0.getFormat() !== "bullet")
+            if (level0?.getFormat() !== "bullet")
                 continue;
             for (let levelIndex = 0; levelIndex < 9; levelIndex++) {
                 const numLevel = abstractNum.getLevel(levelIndex);
@@ -3969,7 +4020,7 @@ class Document {
         let hasOutlineSwitch = false;
         let hasTableSwitch = false;
         const normalizedText = instrText.trim().replace(/&quot;/g, '"');
-        const outlineMatch = normalizedText.match(/\\o\s+(?:"(\d+)-(\d+)"|'(\d+)-(\d+)'|(\d+)-(\d+))/);
+        const outlineMatch = /\\o\s+(?:"(\d+)-(\d+)"|'(\d+)-(\d+)'|(\d+)-(\d+))/.exec(normalizedText);
         if (outlineMatch) {
             const start = parseInt(outlineMatch[1] || outlineMatch[3] || outlineMatch[5], 10);
             const end = parseInt(outlineMatch[2] || outlineMatch[4] || outlineMatch[6], 10);
@@ -3995,7 +4046,7 @@ class Document {
             const content = (match[1] || "").trim();
             if (!content)
                 continue;
-            const rangeMatch = content.match(/^(\d+)-(\d+)$/);
+            const rangeMatch = /^(\d+)-(\d+)$/.exec(content);
             if (rangeMatch?.[1] && rangeMatch?.[2]) {
                 const start = parseInt(rangeMatch[1], 10);
                 const end = parseInt(rangeMatch[2], 10);
@@ -4041,9 +4092,9 @@ class Document {
             const instrRegex = /<w:instrText[^>]*>([^<]*TOC[^<]*)<\/w:instrText>/g;
             const instrMatches = Array.from(modifiedXml.matchAll(instrRegex));
             for (const match of instrMatches) {
-                if (!match || !match[1])
+                if (!match?.[1])
                     continue;
-                let fieldInstruction = match[1]
+                const fieldInstruction = match[1]
                     .replace(/&amp;/g, "&")
                     .replace(/&lt;/g, "<")
                     .replace(/&gt;/g, ">")
@@ -4079,11 +4130,11 @@ class Document {
         }
     }
     syncTOCInstructionInXml(xml) {
-        const instrMatch = xml.match(/<w:instrText[^>]*>([\s\S]*?)<\/w:instrText>/);
+        const instrMatch = /<w:instrText[^>]*>([\s\S]*?)<\/w:instrText>/.exec(xml);
         if (!instrMatch?.[1]) {
             return { xml, changed: false };
         }
-        let fieldInstruction = instrMatch[1]
+        const fieldInstruction = instrMatch[1]
             .replace(/&amp;/g, "&")
             .replace(/&lt;/g, "<")
             .replace(/&gt;/g, ">")
@@ -4149,8 +4200,8 @@ class Document {
         return updatedInstruction;
     }
     resolveStyleNameForTOC(tocStyleName) {
-        const headingLevelMatch = tocStyleName.match(/^Heading\s*(\d+)$/i);
-        if (headingLevelMatch && headingLevelMatch[1]) {
+        const headingLevelMatch = /^Heading\s*(\d+)$/i.exec(tocStyleName);
+        if (headingLevelMatch?.[1]) {
             const level = parseInt(headingLevelMatch[1]);
             const usedStyles = this.findHeadingStylesUsedByParagraphs();
             const actualStyleName = usedStyles.get(level);
@@ -4231,7 +4282,7 @@ class Document {
             }
             const extractHeading = (para) => {
                 const pPr = para["w:pPr"];
-                if (!pPr || !pPr["w:pStyle"]) {
+                if (!pPr?.["w:pStyle"]) {
                     return;
                 }
                 const styleVal = pPr["w:pStyle"]["@_w:val"];
@@ -4239,7 +4290,7 @@ class Document {
                     return;
                 }
                 const headingMatch = styleVal.match(/^Heading(\d+)$/i);
-                if (!headingMatch || !headingMatch[1]) {
+                if (!headingMatch?.[1]) {
                     return;
                 }
                 const headingLevel = parseInt(headingMatch[1], 10);
@@ -4346,8 +4397,8 @@ class Document {
                 const para = element;
                 const formatting = para.getFormatting();
                 if (formatting.style) {
-                    const styleMatch = formatting.style.match(/Heading\s*(\d+)/i);
-                    if (styleMatch && styleMatch[1]) {
+                    const styleMatch = /Heading\s*(\d+)/i.exec(formatting.style);
+                    if (styleMatch?.[1]) {
                         const headingLevel = parseInt(styleMatch[1], 10);
                         if (levelSet.has(headingLevel)) {
                             const text = para.getText().trim();
@@ -4476,10 +4527,10 @@ class Document {
             for (const match of sdtMatches) {
                 try {
                     const tocXml = match[0];
-                    const instrMatch = tocXml.match(/<w:instrText[^>]*>([\s\S]*?)<\/w:instrText>/);
+                    const instrMatch = /<w:instrText[^>]*>([\s\S]*?)<\/w:instrText>/.exec(tocXml);
                     if (!instrMatch?.[1])
                         continue;
-                    let fieldInstruction = instrMatch[1]
+                    const fieldInstruction = instrMatch[1]
                         .replace(/&amp;/g, "&")
                         .replace(/&lt;/g, "<")
                         .replace(/&gt;/g, ">")
@@ -4509,7 +4560,7 @@ class Document {
                     const instrText = match[1];
                     if (!instrText)
                         continue;
-                    let fieldInstruction = instrText
+                    const fieldInstruction = instrText
                         .replace(/&amp;/g, "&")
                         .replace(/&lt;/g, "<")
                         .replace(/&gt;/g, ">")
@@ -4740,6 +4791,8 @@ class Document {
             const xml = entry.header.toXML();
             const path = `word/${entry.filename}`;
             this.zipHandler.addFile(path, xml);
+            const paragraphs = this.extractParagraphsFromElements(entry.header.getElements());
+            this.generatePartLevelHyperlinkRels(paragraphs, `word/_rels/${entry.filename}.rels`);
         }
     }
     saveFooters() {
@@ -4748,6 +4801,8 @@ class Document {
             const xml = entry.footer.toXML();
             const path = `word/${entry.filename}`;
             this.zipHandler.addFile(path, xml);
+            const paragraphs = this.extractParagraphsFromElements(entry.footer.getElements());
+            this.generatePartLevelHyperlinkRels(paragraphs, `word/_rels/${entry.filename}.rels`);
         }
     }
     updateRelationships() {
@@ -4812,6 +4867,7 @@ class Document {
             if (existingRels.length === 0) {
                 this.relationshipManager.addFootnotes();
             }
+            this.generatePartLevelHyperlinkRels(this.footnoteManager.getAllFootnotes().flatMap(fn => fn.getParagraphs()), 'word/_rels/footnotes.xml.rels');
         }
         else if (this._originalFootnotesXml) {
             this.zipHandler.addFile(types_1.DOCX_PATHS.FOOTNOTES, this._originalFootnotesXml);
@@ -4829,6 +4885,7 @@ class Document {
             if (existingRels.length === 0) {
                 this.relationshipManager.addEndnotes();
             }
+            this.generatePartLevelHyperlinkRels(this.endnoteManager.getAllEndnotes().flatMap(en => en.getParagraphs()), 'word/_rels/endnotes.xml.rels');
         }
         else if (this._originalEndnotesXml) {
             this.zipHandler.addFile(types_1.DOCX_PATHS.ENDNOTES, this._originalEndnotesXml);
@@ -4838,6 +4895,61 @@ class Document {
             }
         }
     }
+    extractParagraphsFromElements(elements) {
+        const result = [];
+        for (const el of elements) {
+            if (el instanceof Paragraph_1.Paragraph) {
+                result.push(el);
+            }
+            else if (el instanceof Table_1.Table) {
+                for (const row of el.getRows()) {
+                    for (const cell of row.getCells()) {
+                        result.push(...cell.getParagraphs());
+                    }
+                }
+            }
+        }
+        return result;
+    }
+    generatePartLevelHyperlinkRels(paragraphs, relsPath) {
+        const hyperlinkRels = [];
+        for (const para of paragraphs) {
+            for (const item of para.getContent()) {
+                if (item instanceof Hyperlink_1.Hyperlink && item.isExternal()) {
+                    const relId = item.getRelationshipId();
+                    const url = item.getUrl();
+                    if (relId && url) {
+                        hyperlinkRels.push({ id: relId, url });
+                    }
+                }
+                if (item instanceof Revision_1.Revision) {
+                    for (const revContent of item.getContent()) {
+                        if (revContent instanceof Hyperlink_1.Hyperlink && revContent.isExternal()) {
+                            const relId = revContent.getRelationshipId();
+                            const url = revContent.getUrl();
+                            if (relId && url) {
+                                hyperlinkRels.push({ id: relId, url });
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if (hyperlinkRels.length > 0) {
+            let xml = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n';
+            xml += '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">\n';
+            for (const rel of hyperlinkRels) {
+                const escapedId = XMLBuilder_1.XMLBuilder.escapeXmlAttribute(rel.id);
+                const escapedUrl = XMLBuilder_1.XMLBuilder.escapeXmlAttribute(rel.url);
+                xml += `  <Relationship Id="${escapedId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink" Target="${escapedUrl}" TargetMode="External"/>\n`;
+            }
+            xml += '</Relationships>';
+            this.zipHandler.addFile(relsPath, xml);
+            for (const rel of hyperlinkRels) {
+                this.relationshipManager.removeRelationship(rel.id);
+            }
+        }
+    }
     updatePeopleXml() {
         const authors = new Set();
         for (const para of this.getAllParagraphs()) {
@@ -5814,7 +5926,29 @@ class Document {
         this.zipHandler.addFile(partName, content, { binary: isBinary });
     }
     async removePart(partName) {
-        return this.zipHandler.removeFile(partName);
+        const removed = this.zipHandler.removeFile(partName);
+        if (removed) {
+            if (this._originalContentTypes?.overrides) {
+                const partKey = partName.startsWith('/') ? partName : `/${partName}`;
+                for (const entry of this._originalContentTypes.overrides) {
+                    if (entry.startsWith(`${partKey}|`)) {
+                        this._originalContentTypes.overrides.delete(entry);
+                        break;
+                    }
+                }
+            }
+            const relsXml = this.zipHandler.getFileAsString("_rels/.rels");
+            if (relsXml) {
+                const target = partName.replace(/^\//, '');
+                const relPattern = new RegExp(`\\s*<Relationship[^>]*Target="${target.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}"[^>]*/?>`, 'g');
+                const cleaned = relsXml.replace(relPattern, '');
+                if (cleaned !== relsXml) {
+                    this.zipHandler.updateFile("_rels/.rels", cleaned);
+                }
+            }
+            this._removedParts.add(partName);
+        }
+        return removed;
     }
     async listParts() {
         return this.zipHandler.getFilePaths();
@@ -5870,7 +6004,7 @@ class Document {
         try {
             const parts = await this.listParts();
             for (const partName of parts) {
-                if (partName.match(/\.(png|jpg|jpeg|gif|woff|woff2|ttf|otf|bin)$/i)) {
+                if (/\.(png|jpg|jpeg|gif|woff|woff2|ttf|otf|bin)$/i.exec(partName)) {
                     continue;
                 }
                 const xml = await this.getRawXml(partName);
@@ -6143,7 +6277,7 @@ class Document {
         for (const paragraph of this.getAllParagraphs()) {
             for (const run of paragraph.getRuns()) {
                 const formatting = run.getFormatting();
-                if (formatting.font && formatting.font.toLowerCase() === lowerFontName) {
+                if (formatting.font?.toLowerCase() === lowerFontName) {
                     results.push(run);
                 }
             }
@@ -6533,7 +6667,7 @@ class Document {
             throw new Error("insertTableAt: table must have at least one row");
         }
         const firstRow = rows[0];
-        if (firstRow && firstRow.getCells().length === 0) {
+        if (firstRow?.getCells().length === 0) {
             throw new Error("insertTableAt: table rows must have at least one cell");
         }
         const tableStyle = table.getFormatting().style;
@@ -6693,6 +6827,80 @@ class Document {
         }
         return hyperlinks;
     }
+    collectAllReferencedHyperlinkIds() {
+        const ids = new Set();
+        const scanParagraph = (para) => {
+            for (const item of para.getContent()) {
+                if (item instanceof Hyperlink_1.Hyperlink) {
+                    const relId = item.getRelationshipId();
+                    if (relId)
+                        ids.add(relId);
+                }
+                if (item instanceof Revision_1.Revision) {
+                    for (const revContent of item.getContent()) {
+                        if (revContent instanceof Hyperlink_1.Hyperlink) {
+                            const relId = revContent.getRelationshipId();
+                            if (relId)
+                                ids.add(relId);
+                        }
+                    }
+                }
+            }
+        };
+        const scanElement = (element) => {
+            if (element instanceof Paragraph_1.Paragraph) {
+                scanParagraph(element);
+            }
+            else if (element instanceof Table_1.Table) {
+                for (let row = 0; row < element.getRowCount(); row++) {
+                    for (let col = 0; col < element.getColumnCount(); col++) {
+                        const cell = element.getCell(row, col);
+                        if (cell) {
+                            for (const para of cell.getParagraphs()) {
+                                scanParagraph(para);
+                            }
+                            for (const nested of cell.getRawNestedContent()) {
+                                const rIdPattern = /r:id="(rId\d+)"/g;
+                                let rIdMatch;
+                                while ((rIdMatch = rIdPattern.exec(nested.xml)) !== null) {
+                                    ids.add(rIdMatch[1]);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            else if (element instanceof StructuredDocumentTag_1.StructuredDocumentTag) {
+                for (const item of element.getContent()) {
+                    scanElement(item);
+                }
+            }
+        };
+        for (const element of this.bodyElements) {
+            scanElement(element);
+        }
+        for (const header of this.headerFooterManager.getAllHeaders()) {
+            for (const el of header.header.getElements()) {
+                scanElement(el);
+            }
+        }
+        for (const footer of this.headerFooterManager.getAllFooters()) {
+            for (const el of footer.footer.getElements()) {
+                scanElement(el);
+            }
+        }
+        for (const fn of this.footnoteManager.getAllFootnotes()) {
+            for (const para of fn.getParagraphs()) {
+                scanParagraph(para);
+            }
+        }
+        for (const en of this.endnoteManager.getAllEndnotes()) {
+            for (const para of en.getParagraphs()) {
+                scanParagraph(para);
+            }
+        }
+        return ids;
+    }
     defragmentHyperlinks(options) {
         const { resetFormatting = false, cleanupRelationships = false } = options || {};
         if (this.trackChangesEnabled) {
@@ -6726,14 +6934,7 @@ class Document {
             }
         }
         if (cleanupRelationships && mergedCount > 0) {
-            const referencedIds = new Set();
-            const allHyperlinks = this.getHyperlinks();
-            for (const { hyperlink } of allHyperlinks) {
-                const relId = hyperlink.getRelationshipId();
-                if (relId) {
-                    referencedIds.add(relId);
-                }
-            }
+            const referencedIds = this.collectAllReferencedHyperlinkIds();
             const removedCount = this.relationshipManager.removeOrphanedHyperlinks(referencedIds);
             if (removedCount > 0) {
                 logger_1.defaultLogger.info(`Cleaned up ${removedCount} orphaned hyperlink relationship(s)`);
@@ -6845,7 +7046,7 @@ class Document {
             if (!path.endsWith('.rels') || path === 'word/_rels/document.xml.rels')
                 continue;
             const content = this.zipHandler.getFileAsString(path);
-            if (content && content.includes(oldTarget)) {
+            if (content?.includes(oldTarget)) {
                 const updated = content.replace(new RegExp(escapedOldTarget, 'g'), newTarget);
                 this.zipHandler.updateFile(path, updated);
             }
@@ -7072,7 +7273,7 @@ class Document {
         const results = [];
         this.clearCustom();
         this.addTopBookmark();
-        let docXml = this.zipHandler.getFileAsString('word/document.xml');
+        const docXml = this.zipHandler.getFileAsString('word/document.xml');
         if (!docXml) {
             return results;
         }
@@ -7084,12 +7285,12 @@ class Document {
         for (const match of tocMatches) {
             try {
                 const tocXml = match[0];
-                const instrMatch = tocXml.match(/<w:instrText[^>]*>([\s\S]*?)<\/w:instrText>/);
+                const instrMatch = /<w:instrText[^>]*>([\s\S]*?)<\/w:instrText>/.exec(tocXml);
                 if (!instrMatch?.[1]) {
                     continue;
                 }
                 const instrText = instrMatch[1];
-                let fieldInstruction = instrText
+                const fieldInstruction = instrText
                     .replace(/&/g, '&')
                     .replace(/</g, '<')
                     .replace(/>/g, '>')