node-pptx-templater 1.1.8 → 2.0.0-alpha.0

package/README.md

@@ -13,7 +13,7 @@
   <a href="https://github.com/jsuyog2/node-pptx-templater/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/jsuyog2/node-pptx-templater/ci.yml?branch=main&style=flat-square&color=34d399" alt="CI"></a>
   <a href="https://www.npmjs.com/package/node-pptx-templater"><img src="https://img.shields.io/npm/dm/node-pptx-templater.svg?style=flat-square&color=a855f7" alt="Downloads"></a>
   <a href="./LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square" alt="MIT License"></a>
-  <a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-%3E%3D18.0.0-brightgreen?style=flat-square" alt="Node.js 18+"></a>
+  <a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-%3E%3D20.12.0-brightgreen?style=flat-square" alt="Node.js 20.12.0+"></a>
 </p>
 
 <p align="center">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-pptx-templater",
-  "version": "1.1.8",
+  "version": "2.0.0-alpha.0",
   "description": "High-performance, low-level PowerPoint (PPTX) OpenXML template engine for Node.js. Dynamically replace text, insert images, update charts (with Excel workbook data caching), and merge table cells without PowerPoint corruption or Repair Mode prompts.",
   "main": "./src/index.js",
   "module": "./src/index.mjs",
@@ -15,7 +15,7 @@
     }
   },
   "bin": {
-    "node-pptx-templater": "./src/cli/index.js"
+    "node-pptx-templater": "src/cli/index.js"
   },
   "scripts": {
     "test": "vitest run",
@@ -167,14 +167,14 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/jsuyog2/node-pptx-templater.git"
+    "url": "git+https://github.com/jsuyog2/node-pptx-templater.git"
   },
   "bugs": {
     "url": "https://github.com/jsuyog2/node-pptx-templater/issues"
   },
   "homepage": "https://jsuyog2.github.io/node-pptx-templater",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.12.0"
   },
   "dependencies": {
     "chalk": "^4.1.2",

package/src/managers/ChartManager.js

@@ -303,14 +303,14 @@ class ChartManager {
         const xlsxPath = relationshipManager.resolveTarget(chartZipPath, rel.target)
         const buffer = await this.#zipManager.readBinaryFile(xlsxPath)
         if (buffer) {
-          console.log(`Found embedded workbook: ${xlsxPath}`)
+          logger.debug(`Found embedded workbook: ${xlsxPath}`)
           const updatedXlsx = await ChartWorkbookUpdater.updateWorkbook(buffer, cleanNumericData)
           if (updatedXlsx) {
-            console.log(`Writing updated workbook to: ${xlsxPath}, size: ${updatedXlsx.length}`)
+            logger.debug(`Writing updated workbook to: ${xlsxPath}, size: ${updatedXlsx.length}`)
             this.#zipManager.writeBinaryFile(xlsxPath, updatedXlsx)
           }
         } else {
-          console.log(`Could not find workbook at: ${xlsxPath}`)
+          logger.debug(`Could not find workbook at: ${xlsxPath}`)
         }
       }
     }

package/src/managers/RelationshipManager.js

@@ -114,7 +114,8 @@ class RelationshipManager {
       relFiles.map(async relsPath => {
         const content = await zipManager.readFile(relsPath)
         if (content) {
-          this.#relationships.set(relsPath, this.#parseRels(content, relsPath))
+          const normalizedPath = this.#normalizeRelsPath(relsPath)
+          this.#relationships.set(normalizedPath, this.#parseRels(content, relsPath))
         }
       })
     )
@@ -122,6 +123,31 @@ class RelationshipManager {
     logger.debug(`Loaded ${this.#relationships.size} relationship files`)
   }
 
+  /**
+   * Normalizes path separators and strips leading slashes for robust lookup.
+   * @private
+   * @param {string} path
+   * @returns {string}
+   */
+  #normalizeRelsPath(path) {
+    if (!path) return ''
+    let normalized = path.replace(/\\/g, '/')
+    if (normalized.startsWith('/')) {
+      normalized = normalized.substring(1)
+    }
+    return normalized
+  }
+
+  /**
+   * Gets the normalized key for a part's relationships map.
+   * @private
+   * @param {string} partPath
+   * @returns {string}
+   */
+  #getNormalizedKey(partPath) {
+    return this.#normalizeRelsPath(this.getRelsPath(partPath))
+  }
+
   /**
    * Returns the relationship file path for a given part path.
    *
@@ -133,9 +159,10 @@ class RelationshipManager {
    * @returns {string} Path to the corresponding .rels file.
    */
   getRelsPath(partPath) {
-    const lastSlash = partPath.lastIndexOf('/')
-    const dir = lastSlash >= 0 ? partPath.substring(0, lastSlash) : ''
-    const file = lastSlash >= 0 ? partPath.substring(lastSlash + 1) : partPath
+    const normalizedPartPath = partPath.replace(/\\/g, '/')
+    const lastSlash = normalizedPartPath.lastIndexOf('/')
+    const dir = lastSlash >= 0 ? normalizedPartPath.substring(0, lastSlash) : ''
+    const file = lastSlash >= 0 ? normalizedPartPath.substring(lastSlash + 1) : normalizedPartPath
     return dir ? `${dir}/_rels/${file}.rels` : `_rels/${file}.rels`
   }
 
@@ -146,8 +173,8 @@ class RelationshipManager {
    * @returns {Relationship[]} Array of relationships.
    */
   getRelationships(partPath) {
-    const relsPath = this.getRelsPath(partPath)
-    return this.#relationships.get(relsPath) || []
+    const key = this.#getNormalizedKey(partPath)
+    return this.#relationships.get(key) || []
   }
 
   /**
@@ -184,20 +211,20 @@ class RelationshipManager {
    * @returns {string} The assigned relationship ID (e.g., 'rId3').
    */
   addRelationship(partPath, type, target, targetMode) {
-    const relsPath = this.getRelsPath(partPath)
+    const key = this.#getNormalizedKey(partPath)
 
-    if (!this.#relationships.has(relsPath)) {
-      this.#relationships.set(relsPath, [])
+    if (!this.#relationships.has(key)) {
+      this.#relationships.set(key, [])
     }
 
-    const existing = this.#relationships.get(relsPath)
+    const existing = this.#relationships.get(key)
     const newId = generateRelationshipId(existing.map(r => r.id))
 
     const rel = { id: newId, type, target }
     if (targetMode) rel.targetMode = targetMode
 
     existing.push(rel)
-    this.#flushRels(relsPath, partPath)
+    this.#flushRels(key, partPath)
 
     logger.debug(`Added relationship ${newId} (${type.split('/').pop()}) to ${partPath}`)
     return newId
@@ -210,11 +237,21 @@ class RelationshipManager {
    * @param {string} rId - Relationship ID to remove.
    */
   removeRelationship(partPath, rId) {
-    const relsPath = this.getRelsPath(partPath)
-    const existing = this.#relationships.get(relsPath) || []
+    const key = this.#getNormalizedKey(partPath)
+    const existing = this.#relationships.get(key) || []
     const filtered = existing.filter(r => r.id !== rId)
-    this.#relationships.set(relsPath, filtered)
-    this.#flushRels(relsPath, partPath)
+    this.#relationships.set(key, filtered)
+    this.#flushRels(key, partPath)
+  }
+
+  /**
+   * Completely removes all relationships for a part from the cache.
+   *
+   * @param {string} partPath - ZIP path of the part.
+   */
+  deleteRelationships(partPath) {
+    const key = this.#getNormalizedKey(partPath)
+    this.#relationships.delete(key)
   }
 
   /**
@@ -225,12 +262,12 @@ class RelationshipManager {
    * @param {string} newTarget - New target value.
    */
   updateRelationshipTarget(partPath, rId, newTarget) {
-    const relsPath = this.getRelsPath(partPath)
-    const existing = this.#relationships.get(relsPath) || []
+    const key = this.#getNormalizedKey(partPath)
+    const existing = this.#relationships.get(key) || []
     const rel = existing.find(r => r.id === rId)
     if (rel) {
       rel.target = newTarget
-      this.#flushRels(relsPath, partPath)
+      this.#flushRels(key, partPath)
     }
   }
 
@@ -245,14 +282,14 @@ class RelationshipManager {
    */
   copyRelationships(sourcePath, destPath, excludeTypes = []) {
     const sourceRels = this.getRelationships(sourcePath)
-    const destRelsPath = this.getRelsPath(destPath)
+    const destKey = this.#getNormalizedKey(destPath)
     const idMap = new Map()
 
-    if (!this.#relationships.has(destRelsPath)) {
-      this.#relationships.set(destRelsPath, [])
+    if (!this.#relationships.has(destKey)) {
+      this.#relationships.set(destKey, [])
     }
 
-    const destRels = this.#relationships.get(destRelsPath)
+    const destRels = this.#relationships.get(destKey)
 
     for (const rel of sourceRels) {
       if (excludeTypes.includes(rel.type)) continue
@@ -262,7 +299,7 @@ class RelationshipManager {
       idMap.set(rel.id, newId)
     }
 
-    this.#flushRels(destRelsPath, destPath)
+    this.#flushRels(destKey, destPath)
     return idMap
   }
 
@@ -329,10 +366,11 @@ class RelationshipManager {
    * @param {string} partPath - For logging.
    */
   #flushRels(relsPath, _partPath) {
-    const rels = this.#relationships.get(relsPath) || []
+    const key = this.#normalizeRelsPath(relsPath)
+    const rels = this.#relationships.get(key) || []
     const xml = this.#buildRelsXml(rels)
     if (this.#zipManager) {
-      this.#zipManager.writeFile(relsPath, xml)
+      this.#zipManager.writeFile(key, xml)
     }
   }
 

package/src/managers/ShapeManager.js

@@ -863,6 +863,10 @@ class ShapeManager {
       normalized.rotation !== undefined ? ` rot="${Math.round(normalized.rotation * 60000)}"` : ''
 
     // Text box body properties
+    // NOTE: p:txBody is REQUIRED on every p:sp element per the OOXML spec.
+    // PowerPoint will trigger a repair dialog if it is missing, even for purely
+    // graphical shapes (circles, rectangles used as visual indicators, etc.).
+    // When no text is provided we emit an empty body with an end-paragraph run.
     let txBodyXml = ''
     if (normalized.text !== undefined && normalized.text !== null) {
       const textStyle = normalized.textStyle || {}
@@ -886,46 +890,18 @@ class ShapeManager {
       const lines = String(normalized.text).split(/\r?\n/)
       const paragraphsXml = lines
         .map(line => {
-          return `<a:p>
-          ${alignAttr}
-          <a:r>
-            <a:rPr lang="en-US" sz="${fontSizeVal}"${boldAttr}${italicAttr}>
-              ${colorFill}
-            </a:rPr>
-            <a:t>${escapeXml(line)}</a:t>
-          </a:r>
-        </a:p>`
+          return `<a:p>${alignAttr}<a:r><a:rPr lang="en-US" sz="${fontSizeVal}"${boldAttr}${italicAttr}>${colorFill}</a:rPr><a:t>${escapeXml(line)}</a:t></a:r></a:p>`
         })
         .join('')
 
-      txBodyXml = `<p:txBody>
-        <a:bodyPr wrap="square" rtlCol="0">
-          <a:normAutofit/>
-        </a:bodyPr>
-        <a:lstStyle/>
-        ${paragraphsXml}
-      </p:txBody>`
+      txBodyXml = `<p:txBody><a:bodyPr wrap="square" rtlCol="0"><a:normAutofit/></a:bodyPr><a:lstStyle/>${paragraphsXml}</p:txBody>`
+    } else {
+      // Graphical-only shape: emit a minimal empty txBody to satisfy the OOXML schema
+      txBodyXml = `<p:txBody><a:bodyPr rtlCol="0"/><a:lstStyle/><a:p><a:endParaRPr lang="en-US" dirty="0"/></a:p></p:txBody>`
     }
 
     // Build shape XML block
-    const shapeXml = `<p:sp>
-      <p:nvSpPr>
-        <p:cNvPr id="${newId}" name="${escapeXml(name)}"/>
-        <p:cNvSpPr/>
-        <p:nvPr/>
-      </p:nvSpPr>
-      <p:spPr>
-        <a:xfrm${rotAttr}>
-          <a:off x="${xEmu}" y="${yEmu}"/>
-          <a:ext cx="${wEmu}" cy="${hEmu}"/>
-        </a:xfrm>
-        <a:prstGeom prst="${preset}">${avLstXml}</a:prstGeom>
-        ${fillXml}
-        ${borderXml}
-        ${shadowXml}
-      </p:spPr>
-      ${txBodyXml}
-    </p:sp>`
+    const shapeXml = `<p:sp><p:nvSpPr><p:cNvPr id="${newId}" name="${escapeXml(name)}"/><p:cNvSpPr/><p:nvPr/></p:nvSpPr><p:spPr><a:xfrm${rotAttr}><a:off x="${xEmu}" y="${yEmu}"/><a:ext cx="${wEmu}" cy="${hEmu}"/></a:xfrm><a:prstGeom prst="${preset}">${avLstXml}</a:prstGeom>${fillXml}${borderXml}${shadowXml}</p:spPr>${txBodyXml}</p:sp>`
 
     const parsed = this.#xmlParser.parse(shapeXml, 'shape.xml')['p:sp']
     const shapeObj = Array.isArray(parsed) ? parsed[0] : parsed

package/src/managers/SlideManager.js

@@ -433,6 +433,7 @@ class SlideManager {
   cloneSlide(sourceIndex, atPosition, relationshipManager) {
     this.#assertSlideExists(sourceIndex)
     const sourceInfo = this.#slides.get(sourceIndex)
+    logger.debug('Source Slide Info:', sourceInfo)
 
     const newIndex = this.#slides.size + 1
     let nextFileIndex = 1
@@ -444,11 +445,18 @@ class SlideManager {
 
     // Copy the source XML
     let sourceXml = this.getSlideXml(sourceIndex)
+    logger.debug('Source XML length:', sourceXml ? sourceXml.length : 0)
+
+    // Copy relationships
+    const sourceRels = relationshipManager.getRelationships(sourceInfo.zipPath)
+    logger.debug('Source Rels Path searched:', relationshipManager.getRelsPath(sourceInfo.zipPath))
+    logger.debug('Source Rels found:', sourceRels)
 
     // Copy relationships from source slide (excluding notes, which are slide-specific)
     const idMap = relationshipManager.copyRelationships(sourceInfo.zipPath, slideZipPath, [
       REL_TYPES.NOTES_SLIDE,
     ])
+    logger.debug('Copied relationship ID map:', Array.from(idMap.entries()))
 
     // Remap relationship IDs in the cloned XML to match the new targets
     sourceXml = remapRelationshipIds(sourceXml, idMap)
@@ -487,7 +495,7 @@ class SlideManager {
       tableMap: new Map(),
       chartMap: new Map(),
     })
-    this.#addSlideToPresentation(rId, newSlideId)
+    this.#addSlideToPresentation(rId, newSlideId, sourceInfo.slideId)
     this.#registerSlideContentType(slideFileName)
 
     logger.debug(`Cloned slide ${sourceIndex} to new slide ${newIndex}`)
@@ -516,6 +524,9 @@ class SlideManager {
     // Remove relationship from presentation.xml
     this.#relationshipManager.removeRelationship('ppt/presentation.xml', info.relationshipId)
 
+    // Remove relationships cache
+    this.#relationshipManager.deleteRelationships(info.zipPath)
+
     // Remove content type from [Content_Types].xml
     this.#contentTypesManager.removeOverride(info.zipPath)
 
@@ -898,11 +909,61 @@ class SlideManager {
     await Promise.all(this.getAllSlideIndices().map(i => this.getSlideXmlAsync(i)))
   }
 
+  /**
+   * Adds a slide ID to sections in presentation.xml.
+   * @private
+   */
+  #addSlideToSections(slideId, sourceSlideId = null) {
+    if (!this.#presentationObj) return
+    const extLst = this.#xmlParser.getNode(this.#presentationObj, 'p:presentation.p:extLst')
+    if (!extLst?.['p:ext']) return
+
+    const exts = Array.isArray(extLst['p:ext']) ? extLst['p:ext'] : [extLst['p:ext']]
+    for (const ext of exts) {
+      const sectionLst = ext['p14:sectionLst']
+      if (!sectionLst?.['p14:section']) continue
+
+      const sections = sectionLst['p14:section']
+      const targetIdStr = String(slideId)
+      const sourceIdStr = sourceSlideId ? String(sourceSlideId) : null
+
+      if (sourceIdStr) {
+        for (const section of sections) {
+          const sldIdLst = section['p14:sldIdLst']
+          if (!sldIdLst?.['p14:sldId']) continue
+
+          const sldIds = sldIdLst['p14:sldId']
+          const idx = sldIds.findIndex(s => String(s['@_id']) === sourceIdStr)
+          if (idx !== -1) {
+            logger.debug(
+              `Inserting slide ${targetIdStr} after slide ${sourceIdStr} in section "${section['@_name']}"`
+            )
+            sldIds.splice(idx + 1, 0, { '@_id': targetIdStr })
+            return
+          }
+        }
+      }
+
+      if (sections.length > 0) {
+        const lastSection = sections[sections.length - 1]
+        if (!lastSection['p14:sldIdLst']) {
+          lastSection['p14:sldIdLst'] = { 'p14:sldId': [] }
+        }
+        if (!lastSection['p14:sldIdLst']['p14:sldId']) {
+          lastSection['p14:sldIdLst']['p14:sldId'] = []
+        }
+        const sldIds = lastSection['p14:sldIdLst']['p14:sldId']
+        logger.debug(`Appending slide ${targetIdStr} to last section "${lastSection['@_name']}"`)
+        sldIds.push({ '@_id': targetIdStr })
+      }
+    }
+  }
+
   /**
    * Updates the presentation.xml sldIdLst with a new slide entry.
    * @private
    */
-  #addSlideToPresentation(rId, slideId) {
+  #addSlideToPresentation(rId, slideId, sourceSlideId = null) {
     if (!this.#presentationObj) return
 
     let sldIdLst = this.#xmlParser.getNode(this.#presentationObj, 'p:presentation.p:sldIdLst')
@@ -917,6 +978,7 @@ class SlideManager {
     }
 
     sldIdLst['p:sldId'].push({ '@_id': slideId, '@_r:id': rId })
+    this.#addSlideToSections(slideId, sourceSlideId)
     this.#flushPresentation()
   }
 

package/src/managers/TableManager.js

@@ -1166,8 +1166,8 @@ class TableManager {
     const tableX = xfrm?.['a:off']?.['@_x'] ? parseInt(xfrm['a:off']['@_x'], 10) : 0
     const tableY = xfrm?.['a:off']?.['@_y'] ? parseInt(xfrm['a:off']['@_y'], 10) : 0
 
-    const colWidths = this.#calculateColumnWidths(slideIndex, tableId, slideManager, tblObj, true)
-    const rowHeights = this.#calculateRowHeights(slideIndex, tableId, slideManager, tblObj, true)
+    const colWidths = this.#calculateColumnWidths(slideIndex, tableId, slideManager, tblObj, false)
+    const rowHeights = this.#calculateRowHeights(slideIndex, tableId, slideManager, tblObj, false)
 
     const R = this.getMergeRegion(slideIndex, tableId, rowIndex, colIndex, slideManager)
     let pr = rowIndex

package/src/managers/ZipManager.js

@@ -213,6 +213,19 @@ class ZipManager {
     logger.debug('Created blank PPTX structure')
   }
 
+  /**
+   * Normalizes path separators and strips leading slashes.
+   * @private
+   */
+  #normalizePath(zipPath) {
+    if (!zipPath) return ''
+    let normal = zipPath.replace(/\\/g, '/')
+    if (normal.startsWith('/')) {
+      normal = normal.substring(1)
+    }
+    return normal
+  }
+
   /**
    * Reads and caches a text file from the ZIP archive.
    *
@@ -221,7 +234,7 @@ class ZipManager {
    */
   async readFile(zipPath) {
     // Normalize path separators
-    const normalPath = zipPath.replace(/\\/g, '/')
+    const normalPath = this.#normalizePath(zipPath)
 
     // Return cached version if available and not dirty
     if (this.#xmlCache.has(normalPath) && !this.#dirtyFiles.has(normalPath)) {
@@ -239,8 +252,11 @@ class ZipManager {
       if (entry.type === 'text') {
         content = entry.content
       } else {
-        const { TextDecoder } = require('util')
-        content = new TextDecoder('utf-8').decode(entry.content)
+        const decoder =
+          typeof globalThis.TextDecoder !== 'undefined'
+            ? new globalThis.TextDecoder('utf-8')
+            : new (require('util').TextDecoder)('utf-8')
+        content = decoder.decode(entry.content)
       }
       this.#xmlCache.set(normalPath, content)
       return content
@@ -278,7 +294,7 @@ class ZipManager {
    * @returns {string|null} Cached content or null.
    */
   readCachedFile(zipPath) {
-    const normalPath = zipPath.replace(/\\/g, '/')
+    const normalPath = this.#normalizePath(zipPath)
     if (this.#dirtyFiles.has(normalPath)) {
       return this.#dirtyFiles.get(normalPath)
     }
@@ -291,8 +307,11 @@ class ZipManager {
       if (entry.type === 'text') {
         content = entry.content
       } else {
-        const { TextDecoder } = require('util')
-        content = new TextDecoder('utf-8').decode(entry.content)
+        const decoder =
+          typeof globalThis.TextDecoder !== 'undefined'
+            ? new globalThis.TextDecoder('utf-8')
+            : new (require('util').TextDecoder)('utf-8')
+        content = decoder.decode(entry.content)
       }
       this.#xmlCache.set(normalPath, content)
       return content
@@ -307,7 +326,7 @@ class ZipManager {
    * @returns {Promise<Uint8Array|null>} Binary content or null if not found.
    */
   async readBinaryFile(zipPath) {
-    const normalPath = zipPath.replace(/\\/g, '/')
+    const normalPath = this.#normalizePath(zipPath)
     if (this.#dirtyBinaryFiles.has(normalPath)) {
       return this.#dirtyBinaryFiles.get(normalPath)
     }
@@ -329,7 +348,7 @@ class ZipManager {
   }
 
   writeFile(zipPath, content) {
-    const normalPath = zipPath.replace(/\\/g, '/')
+    const normalPath = this.#normalizePath(zipPath)
     this.#dirtyFiles.set(normalPath, content)
     this.#xmlCache.set(normalPath, content)
     this.#removedFiles.delete(normalPath)
@@ -340,7 +359,7 @@ class ZipManager {
   }
 
   writeBinaryFile(zipPath, data) {
-    const normalPath = zipPath.replace(/\\/g, '/')
+    const normalPath = this.#normalizePath(zipPath)
     this.#dirtyBinaryFiles.set(normalPath, data)
     this.#removedFiles.delete(normalPath)
     if (this.#zip) {
@@ -380,7 +399,7 @@ class ZipManager {
    * @param {string} zipPath - Path to remove.
    */
   removeFile(zipPath) {
-    const normalPath = zipPath.replace(/\\/g, '/')
+    const normalPath = this.#normalizePath(zipPath)
     this.#removedFiles.add(normalPath)
     this.#xmlCache.delete(normalPath)
     this.#dirtyFiles.delete(normalPath)
@@ -397,7 +416,7 @@ class ZipManager {
    * @returns {boolean}
    */
   hasFile(zipPath) {
-    const normalPath = zipPath.replace(/\\/g, '/')
+    const normalPath = this.#normalizePath(zipPath)
     if (this.#removedFiles.has(normalPath)) return false
     if (this.#dirtyFiles.has(normalPath) || this.#dirtyBinaryFiles.has(normalPath)) return true
     if (this.#cachedFiles && this.#cachedFiles.has(normalPath)) return true

package/src/managers/charts/ChartWorkbookUpdater.js

@@ -58,7 +58,6 @@ class ChartWorkbookUpdater {
         compressionOptions: { level: 6 },
       })
     } catch (err) {
-      console.error('Failed to update embedded workbook', err)
       logger.error('Failed to update embedded workbook', err)
       return workbookData // Return original if failed
     }

package/src/utils/relationshipUtils.js

@@ -67,24 +67,15 @@ function isValidRelationshipId(str) {
  * remapRelationshipIds(xml, new Map([['rId1', 'rId5'], ['rId2', 'rId6']]));
  */
 function remapRelationshipIds(xml, idMap) {
-  let updated = xml
+  if (!idMap || idMap.size === 0) return xml
 
-  // Sort by length descending to avoid partial replacements (e.g., rId1 replacing part of rId10)
-  const sortedEntries = Array.from(idMap.entries()).sort(([a], [b]) => b.length - a.length)
-
-  for (const [oldId, newId] of sortedEntries) {
-    // Replace rId references in attribute values: r:id="rId1", r:embed="rId1"
-    const pattern = new RegExp(`(r:[a-zA-Z]+=")${oldId}(")|rId="${oldId}(")`, 'g')
-    updated = updated.replace(pattern, (match, pre, post) => {
-      if (pre) return `${pre}${newId}${post}`
-      return match.replace(oldId, newId)
-    })
-
-    // Simple global replace as fallback
-    updated = updated.split(`"${oldId}"`).join(`"${newId}"`)
-  }
-
-  return updated
+  // Perform single-pass replacement of relationship IDs inside quotes to prevent clobbering
+  return xml.replace(/([\'"])(rId\d+)([\'"])/g, (match, openQuote, id, closeQuote) => {
+    if (idMap.has(id)) {
+      return `${openQuote}${idMap.get(id)}${closeQuote}`
+    }
+    return match
+  })
 }
 
 module.exports = {