node-pptx-templater 1.0.11 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-pptx-templater",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "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",
   "type": "commonjs",

package/src/core/OutputWriter.js

@@ -107,8 +107,6 @@ class OutputWriter {
    * @returns {Promise<void>}
    */
   async #flushAllSlides(slideManager, zipManager) {
-    // SlideManager already writes to zipManager via setSlideXml,
-    // so this is mostly a no-op with a validation step.
     const info = slideManager.getAllSlideInfo()
 
     for (const slide of info) {
@@ -117,64 +115,58 @@ class OutputWriter {
       }
     }
 
-    // Update the slide count and titles in docProps/app.xml to prevent repair mode issues
+    // Change this block to await the process completely
     if (zipManager.hasFile('docProps/app.xml')) {
-      zipManager.addPendingPromise(
-        zipManager.rawZip
-          .file('docProps/app.xml')
-          .async('text')
-          .then(content => {
-            const parser = new XMLParser()
-            const appObj = parser.parse(content, 'app.xml')
-            const properties = appObj.Properties
-
-            if (properties) {
-              // 1. Update Slides count
-              properties.Slides = info.length
-
-              // 2. Find old slide titles count and update HeadingPairs
-              let oldSlideTitlesCount = 0
-              const variants = properties.HeadingPairs?.['vt:vector']?.['vt:variant']
-              if (Array.isArray(variants)) {
-                for (let i = 0; i < variants.length; i++) {
-                  if (variants[i]['vt:lpstr'] === 'Slide Titles') {
-                    const countVar = variants[i + 1]
-                    if (countVar) {
-                      oldSlideTitlesCount = parseInt(countVar['vt:i4'], 10) || 0
-                      countVar['vt:i4'] = info.length
-                    }
-                    break
+      // AWAIT this process entirely before exiting the function!
+      await zipManager.rawZip
+        .file('docProps/app.xml')
+        .async('text')
+        .then(content => {
+          const parser = new XMLParser()
+          const appObj = parser.parse(content, 'app.xml')
+          const properties = appObj.Properties
+
+          if (properties) {
+            properties.Slides = info.length
+
+            let oldSlideTitlesCount = 0
+            const variants = properties.HeadingPairs?.['vt:vector']?.['vt:variant']
+            if (Array.isArray(variants)) {
+              for (let i = 0; i < variants.length; i++) {
+                if (variants[i]['vt:lpstr'] === 'Slide Titles') {
+                  const countVar = variants[i + 1]
+                  if (countVar) {
+                    oldSlideTitlesCount = parseInt(countVar['vt:i4'], 10) || 0
+                    countVar['vt:i4'] = info.length
                   }
+                  break
                 }
               }
+            }
 
-              // 3. Update TitlesOfParts
-              const titlesVector = properties.TitlesOfParts?.['vt:vector']
-              if (titlesVector) {
-                let lpstrs = titlesVector['vt:lpstr']
-                if (lpstrs) {
-                  if (!Array.isArray(lpstrs)) lpstrs = [lpstrs]
-
-                  // Remove the old slide titles (which are at the end)
-                  if (oldSlideTitlesCount > 0 && lpstrs.length >= oldSlideTitlesCount) {
-                    lpstrs = lpstrs.slice(0, lpstrs.length - oldSlideTitlesCount)
-                  }
-
-                  // Append new slide titles
-                  const newSlideTitles = info.map(slide => slide.title || `Slide ${slide.index}`)
-                  lpstrs.push(...newSlideTitles)
-
-                  titlesVector['vt:lpstr'] = lpstrs
-                  titlesVector['@_size'] = String(lpstrs.length)
+            const titlesVector = properties.TitlesOfParts?.['vt:vector']
+            if (titlesVector) {
+              let lpstrs = titlesVector['vt:lpstr']
+              if (lpstrs) {
+                if (!Array.isArray(lpstrs)) lpstrs = [lpstrs]
+                if (oldSlideTitlesCount > 0 && lpstrs.length >= oldSlideTitlesCount) {
+                  lpstrs = lpstrs.slice(0, lpstrs.length - oldSlideTitlesCount)
                 }
-              }
+                const newSlideTitles = info.map(slide => slide.title || `Slide ${slide.index}`)
+                lpstrs.push(...newSlideTitles)
 
-              const declaration = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
-              const updatedXml = parser.build(appObj, declaration)
-              zipManager.writeFile('docProps/app.xml', updatedXml)
+                titlesVector['vt:lpstr'] = lpstrs
+                titlesVector['@_size'] = String(lpstrs.length)
+              }
             }
-          })
-      )
+
+            const declaration = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
+            const updatedXml = parser.build(appObj, declaration)
+
+            // Writing it safely here now that the function block is strictly sequential
+            zipManager.writeFile('docProps/app.xml', updatedXml)
+          }
+        })
     }
 
     logger.debug(`Flushed ${info.length} slide(s) to ZIP`)

package/src/managers/ShapeManager.js

@@ -69,24 +69,43 @@ class ShapeManager {
       throw new PPTXError(`Shape "${shapeId}" not found in slide ${slideIndex}`)
     }
 
-    const xfrm = res.shape['p:spPr']?.['a:xfrm']
-    if (xfrm) {
-      if (options.x !== undefined) {
-        if (!xfrm['a:off']) xfrm['a:off'] = {}
-        xfrm['a:off']['@_x'] = String(Math.round(options.x))
-      }
-      if (options.y !== undefined) {
-        if (!xfrm['a:off']) xfrm['a:off'] = {}
-        xfrm['a:off']['@_y'] = String(Math.round(options.y))
-      }
-      if (options.width !== undefined) {
-        if (!xfrm['a:ext']) xfrm['a:ext'] = {}
-        xfrm['a:ext']['@_cx'] = String(Math.round(options.width))
-      }
-      if (options.height !== undefined) {
-        if (!xfrm['a:ext']) xfrm['a:ext'] = {}
-        xfrm['a:ext']['@_cy'] = String(Math.round(options.height))
-      }
+    if (!res.shape['p:spPr']) {
+      res.shape['p:spPr'] = {}
+    }
+    if (!res.shape['p:spPr']['a:xfrm']) {
+      res.shape['p:spPr']['a:xfrm'] = {}
+    }
+    const xfrm = res.shape['p:spPr']['a:xfrm']
+
+    if (!xfrm['a:off']) {
+      xfrm['a:off'] = {}
+    }
+    if (!xfrm['a:ext']) {
+      xfrm['a:ext'] = {}
+    }
+
+    if (options.x !== undefined) {
+      xfrm['a:off']['@_x'] = String(Math.round(options.x))
+    } else if (xfrm['a:off']['@_x'] === undefined) {
+      xfrm['a:off']['@_x'] = '0'
+    }
+
+    if (options.y !== undefined) {
+      xfrm['a:off']['@_y'] = String(Math.round(options.y))
+    } else if (xfrm['a:off']['@_y'] === undefined) {
+      xfrm['a:off']['@_y'] = '0'
+    }
+
+    if (options.width !== undefined) {
+      xfrm['a:ext']['@_cx'] = String(Math.round(options.width))
+    } else if (xfrm['a:ext']['@_cx'] === undefined) {
+      xfrm['a:ext']['@_cx'] = '0'
+    }
+
+    if (options.height !== undefined) {
+      xfrm['a:ext']['@_cy'] = String(Math.round(options.height))
+    } else if (xfrm['a:ext']['@_cy'] === undefined) {
+      xfrm['a:ext']['@_cy'] = '0'
     }
 
     const decl = this.#xmlParser.extractDeclaration(slideXml)

package/src/managers/charts/ChartCacheGenerator.js

@@ -293,16 +293,17 @@ class ChartCacheGenerator {
           if (countMatch) pointsCount = parseInt(countMatch[1], 10)
         }
       }
-      if (pointsCount === 0 && options.labels) {
-        pointsCount = options.labels.length
-      }
 
-      // Parse existing styling and flags from the current <c:dLbls> block
       let existingTxPr = ''
       let existingDLblPos = ''
       let existingNumFmt = ''
       let existingSpPr = ''
+      let existingExtLst = ''
+      let existingShowLeaderLines = ''
       const existingDLblSpPrs = {}
+      const existingDLblTxPrs = {}
+      const existingDLblLayouts = {}
+      const existingDLblPositions = {}
       const existingShowTags = {}
 
       const dLblsMatch = /<c:dLbls>([\s\S]*?)<\/c:dLbls>/.exec(content)
@@ -324,8 +325,16 @@ class ChartCacheGenerator {
         if (spPrMatch) {
           existingSpPr = spPrMatch[1]
         }
+        const extLstMatch = /(<c:extLst>[\s\S]*?<\/c:extLst>)/.exec(dLblsContent)
+        if (extLstMatch) {
+          existingExtLst = extLstMatch[1]
+        }
+        const showLeaderMatch = /(<c:showLeaderLines\s+[^>]*\/>)/.exec(dLblsContent)
+        if (showLeaderMatch) {
+          existingShowLeaderLines = showLeaderMatch[1]
+        }
 
-        // Parse individual <c:dLbl> shape properties to map their background fills
+        // Parse individual <c:dLbl> properties: fills, text styling, layouts, and positions
         const dLblPattern = /<c:dLbl>([\s\S]*?)<\/c:dLbl>/g
         let dLblMatch
         while ((dLblMatch = dLblPattern.exec(dLblsContent)) !== null) {
@@ -337,6 +346,18 @@ class ChartCacheGenerator {
             if (dLblSpPrMatch) {
               existingDLblSpPrs[idx] = dLblSpPrMatch[1]
             }
+            const dLblTxPrMatch = /(<c:txPr>[\s\S]*?<\/c:txPr>)/.exec(dLblContent)
+            if (dLblTxPrMatch) {
+              existingDLblTxPrs[idx] = dLblTxPrMatch[1]
+            }
+            const dLblLayoutMatch = /(<c:layout>[\s\S]*?<\/c:layout>|<c:layout\/>)/.exec(dLblContent)
+            if (dLblLayoutMatch) {
+              existingDLblLayouts[idx] = dLblLayoutMatch[1]
+            }
+            const dLblPosMatch = /(<c:dLblPos\s+[^>]*\/>)/.exec(dLblContent)
+            if (dLblPosMatch) {
+              existingDLblPositions[idx] = dLblPosMatch[1]
+            }
           }
         }
 
@@ -367,7 +388,12 @@ class ChartCacheGenerator {
         existingNumFmt,
         existingShowTags,
         existingSpPr,
-        existingDLblSpPrs
+        existingDLblSpPrs,
+        existingDLblTxPrs,
+        existingDLblLayouts,
+        existingDLblPositions,
+        existingExtLst,
+        existingShowLeaderLines
       )
 
       let updatedContent = content
@@ -397,7 +423,12 @@ class ChartCacheGenerator {
     existingNumFmt = '',
     existingShowTags = {},
     existingSpPr = '',
-    existingDLblSpPrs = {}
+    existingDLblSpPrs = {},
+    existingDLblTxPrs = {},
+    existingDLblLayouts = {},
+    existingDLblPositions = {},
+    existingExtLst = '',
+    existingShowLeaderLines = ''
   ) {
     const {
       labels,
@@ -463,6 +494,11 @@ class ChartCacheGenerator {
         xml += `<c:dLbl>`
         xml += `<c:idx val="${i}"/>`
 
+        // Restore per-point layout (manual position offsets) from template
+        if (existingDLblLayouts && existingDLblLayouts[i]) {
+          xml += existingDLblLayouts[i]
+        }
+
         if (labelsFromCells && !template) {
           const range = ChartWorkbookUpdater.parseCellRange(labelsFromCells)
           const startColNum = ChartWorkbookUpdater.colLetterToNum(range.startCol)
@@ -510,8 +546,9 @@ class ChartCacheGenerator {
             let bodyPr = '<a:bodyPr/>'
             let pPrXml = ''
             let rPrXml = ''
-            if (existingTxPr) {
-              const extracted = this.extractTxPrParts(existingTxPr)
+            const dLblTxPr = (existingDLblTxPrs && existingDLblTxPrs[i]) || existingTxPr
+            if (dLblTxPr) {
+              const extracted = this.extractTxPrParts(dLblTxPr)
               bodyPr = extracted.bodyPr
               pPrXml = extracted.pPrXml
               rPrXml = extracted.rPrXml
@@ -556,12 +593,16 @@ class ChartCacheGenerator {
 
         if (labelStyle) {
           xml += this.generateTxPrXml(labelStyle)
+        } else if (existingDLblTxPrs && existingDLblTxPrs[i]) {
+          xml += existingDLblTxPrs[i]
         } else if (existingTxPr) {
           xml += existingTxPr
         }
 
         if (openxmlPos) {
           xml += `<c:dLblPos val="${openxmlPos}"/>`
+        } else if (existingDLblPositions && existingDLblPositions[i]) {
+          xml += existingDLblPositions[i]
         } else if (existingDLblPos) {
           xml += existingDLblPos
         }
@@ -648,6 +689,14 @@ class ChartCacheGenerator {
       xml += `<c:showBubbleSize val="0"/>`
     }
 
+    // Restore showLeaderLines and extension list from template
+    if (existingShowLeaderLines) {
+      xml += existingShowLeaderLines
+    }
+    if (existingExtLst) {
+      xml += existingExtLst
+    }
+
     xml += '</c:dLbls>'
     return xml
   }