node-pptx-templater 1.0.10 → 1.0.12

package/src/managers/ShapeManager.js

@@ -47,6 +47,95 @@ class ShapeManager {
     logger.debug(`Updated text for shape "${shapeId}" on slide ${slideIndex}`)
   }
 
+  /**
+   * Updates an existing shape's position and/or dimensions.
+   *
+   * @param {number} slideIndex
+   * @param {string} shapeId
+   * @param {Object} options Position and dimensions configuration.
+   * @param {number} [options.x] Absolute X offset coordinate (in EMUs).
+   * @param {number} [options.y] Absolute Y offset coordinate (in EMUs).
+   * @param {number} [options.width] Bounding box width (in EMUs).
+   * @param {number} [options.height] Bounding box height (in EMUs).
+   * @param {SlideManager} slideManager
+   */
+  updateShapePosition(slideIndex, shapeId, options = {}, slideManager) {
+    const slideXml = slideManager.getSlideXml(slideIndex)
+    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
+    const spTree = slideObj?.['p:sld']?.['p:cSld']?.['p:spTree']
+    const res = this.findShapeRecursive(spTree, shapeId)
+
+    if (!res) {
+      throw new PPTXError(`Shape "${shapeId}" not found in slide ${slideIndex}`)
+    }
+
+    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)
+    slideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    logger.debug(`Updated position/dimensions for shape "${shapeId}" on slide ${slideIndex}`)
+  }
+
+  /**
+   * Updates an existing textbox shape's position and/or dimensions.
+   *
+   * @param {number} slideIndex
+   * @param {string} textBoxId
+   * @param {Object} options Position and dimensions configuration.
+   * @param {number} [options.x] Absolute X offset coordinate (in EMUs).
+   * @param {number} [options.y] Absolute Y offset coordinate (in EMUs).
+   * @param {number} [options.width] Bounding box width (in EMUs).
+   * @param {number} [options.height] Bounding box height (in EMUs).
+   * @param {SlideManager} slideManager
+   */
+  updateTextBoxPosition(slideIndex, textBoxId, options = {}, slideManager) {
+    try {
+      this.updateShapePosition(slideIndex, textBoxId, options, slideManager)
+    } catch (err) {
+      if (err.message.includes('not found')) {
+        throw new PPTXError(`Textbox "${textBoxId}" not found in slide ${slideIndex}`)
+      }
+      throw err
+    }
+  }
+
   /**
    * Clones a shape and adds it with offsets.
    *

package/src/managers/charts/ChartCacheGenerator.js

@@ -170,6 +170,58 @@ class ChartCacheGenerator {
    *
    * 3. If no <c:title> block exists at all: create a minimal one.
    */
+  /**
+   * Extracts parts of <c:txPr> block (bodyPr, pPr, and converts defRPr to rPr)
+   * to use when creating custom rich text components.
+   *
+   * @param {string} txPrXml - The <c:txPr> XML string or block content.
+   * @returns {Object} { bodyPr, pPrXml, rPrXml }
+   */
+  static extractTxPrParts(txPrXml) {
+    let bodyPr = '<a:bodyPr/>'
+    let pPrXml = ''
+    let rPrXml = ''
+
+    if (!txPrXml) {
+      return { bodyPr, pPrXml, rPrXml }
+    }
+
+    let txPrContent = txPrXml
+    const txPrInnerMatch = /<c:txPr>([\s\S]*?)<\/c:txPr>/.exec(txPrXml)
+    if (txPrInnerMatch) {
+      txPrContent = txPrInnerMatch[1]
+    }
+
+    // Extract <a:bodyPr>
+    const bodyPrMatch = /(<a:bodyPr[^>]*\/>|<a:bodyPr[^>]*>[\s\S]*?<\/a:bodyPr>)/.exec(txPrContent)
+    if (bodyPrMatch) bodyPr = bodyPrMatch[1]
+
+    // Extract <a:defRPr> → convert to <a:rPr> for the run
+    const defRPrMatch = /(<a:defRPr[\s\S]*?<\/a:defRPr>|<a:defRPr[^>]*\/>)/.exec(txPrContent)
+    if (defRPrMatch) {
+      rPrXml = defRPrMatch[1].replace(/^<a:defRPr/, '<a:rPr').replace(/<\/a:defRPr>$/, '</a:rPr>')
+    }
+
+    // Extract <a:pPr> (keeps algn, indent, etc.) but strip <a:defRPr> from it
+    const pPrBlockMatch = /(<a:pPr[^>]*>)([\s\S]*?)(<\/a:pPr>)/.exec(txPrContent)
+    if (pPrBlockMatch) {
+      const innerContent = pPrBlockMatch[2]
+        .replace(/<a:defRPr(?:[^>]*\/>|[\s\S]*?<\/a:defRPr>)/g, '')
+        .trim()
+      const attrs = pPrBlockMatch[1].slice(7, -1).trim()
+      if (attrs || innerContent) {
+        pPrXml = innerContent
+          ? `${pPrBlockMatch[1]}${innerContent}${pPrBlockMatch[3]}`
+          : `<a:pPr ${attrs}/>`
+      }
+    } else {
+      const scPPrMatch = /(<a:pPr[^>]*\/>)/.exec(txPrContent)
+      if (scPPrMatch) pPrXml = scPPrMatch[1]
+    }
+
+    return { bodyPr, pPrXml, rPrXml }
+  }
+
   static updateTitle(xml, title) {
     // Split by \n so callers can drive multi-paragraph titles
     const titleLines = title.split('\n')
@@ -205,48 +257,7 @@ class ChartCacheGenerator {
 
       // ── Strategy 2 ──────────────────────────────────────────────────────────────
       // No <c:tx> yet – build one from <c:txPr> styles.
-      let bodyPr = '<a:bodyPr/>'
-      let pPrXml = '' // paragraph properties (alignment etc.) without defRPr
-      let rPr = '' // run properties from defRPr
-
-      const txPrMatch = /<c:txPr>([\s\S]*?)<\/c:txPr>/.exec(titleContent)
-      if (txPrMatch) {
-        const txPrContent = txPrMatch[1]
-
-        // Extract <a:bodyPr>
-        const bodyPrMatch = /(<a:bodyPr[^>]*\/>|<a:bodyPr[^>]*>[\s\S]*?<\/a:bodyPr>)/.exec(
-          txPrContent
-        )
-        if (bodyPrMatch) bodyPr = bodyPrMatch[1]
-
-        // Extract <a:defRPr> → convert to <a:rPr> for the run
-        const defRPrMatch = /(<a:defRPr[\s\S]*?<\/a:defRPr>|<a:defRPr[^>]*\/>)/.exec(txPrContent)
-        if (defRPrMatch) {
-          rPr = defRPrMatch[1].replace(/^<a:defRPr/, '<a:rPr').replace(/<\/a:defRPr>$/, '</a:rPr>')
-        }
-
-        // Extract <a:pPr> (keeps algn, indent, etc.) but strip <a:defRPr> from it
-        // since that is now expressed as <a:rPr> in the run.
-        // We must handle both <a:defRPr .../> (self-closing) and
-        // <a:defRPr ...>...</a:defRPr> (element with children).
-        const pPrBlockMatch = /(<a:pPr[^>]*>)([\s\S]*?)(<\/a:pPr>)/.exec(txPrContent)
-        if (pPrBlockMatch) {
-          const innerContent = pPrBlockMatch[2]
-            .replace(/<a:defRPr(?:[^>]*\/>|[\s\S]*?<\/a:defRPr>)/g, '')
-            .trim()
-          // Only emit pPr tag if it has attributes or remaining child content
-          const attrs = pPrBlockMatch[1].slice(7, -1).trim() // strip '<a:pPr' and '>'
-          if (attrs || innerContent) {
-            pPrXml = innerContent
-              ? `${pPrBlockMatch[1]}${innerContent}${pPrBlockMatch[3]}`
-              : `<a:pPr ${attrs}/>`
-          }
-        } else {
-          // Self-closing <a:pPr .../> (no children)
-          const scPPrMatch = /(<a:pPr[^>]*\/>)/.exec(txPrContent)
-          if (scPPrMatch) pPrXml = scPPrMatch[1]
-        }
-      }
+      const { bodyPr, pPrXml, rPrXml: rPr } = this.extractTxPrParts(titleContent)
 
       // Build one <a:p> per title line, each with the same pPr + rPr
       const paragraphs = titleLines
@@ -282,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)
@@ -313,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) {
@@ -326,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]
+            }
           }
         }
 
@@ -356,7 +388,12 @@ class ChartCacheGenerator {
         existingNumFmt,
         existingShowTags,
         existingSpPr,
-        existingDLblSpPrs
+        existingDLblSpPrs,
+        existingDLblTxPrs,
+        existingDLblLayouts,
+        existingDLblPositions,
+        existingExtLst,
+        existingShowLeaderLines
       )
 
       let updatedContent = content
@@ -386,9 +423,22 @@ class ChartCacheGenerator {
     existingNumFmt = '',
     existingShowTags = {},
     existingSpPr = '',
-    existingDLblSpPrs = {}
+    existingDLblSpPrs = {},
+    existingDLblTxPrs = {},
+    existingDLblLayouts = {},
+    existingDLblPositions = {},
+    existingExtLst = '',
+    existingShowLeaderLines = ''
   ) {
-    const { labels, labelsFromCells, template, position, labelStyle, labelMap } = options
+    const {
+      labels,
+      labelsFromCells,
+      template,
+      position,
+      labelStyle,
+      labelMap,
+      showSeriesNameInBar,
+    } = options
 
     let xml = '<c:dLbls>'
 
@@ -403,7 +453,10 @@ class ChartCacheGenerator {
       top: 't',
       bottom: 'b',
     }
-    const openxmlPos = position ? posMap[position] : null
+    let openxmlPos = position ? posMap[position] : null
+    if (!openxmlPos && showSeriesNameInBar) {
+      openxmlPos = 'ctr'
+    }
 
     const values = seriesData.values || []
     const sumValues = values.reduce((sum, v) => sum + (Number(v) || 0), 0)
@@ -441,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)
@@ -485,15 +543,30 @@ class ChartCacheGenerator {
             xml += `</c:strRef>`
             xml += `</c:tx>`
           } else {
+            let bodyPr = '<a:bodyPr/>'
+            let pPrXml = ''
+            let rPrXml = ''
+            const dLblTxPr = (existingDLblTxPrs && existingDLblTxPrs[i]) || existingTxPr
+            if (dLblTxPr) {
+              const extracted = this.extractTxPrParts(dLblTxPr)
+              bodyPr = extracted.bodyPr
+              pPrXml = extracted.pPrXml
+              rPrXml = extracted.rPrXml
+            }
+
+            const labelLines = String(textContent).split('\n')
+            const paragraphs = labelLines
+              .map(line => {
+                const escapedLine = this.#escapeXml(line)
+                return `<a:p>${pPrXml}<a:r>${rPrXml}<a:t>${escapedLine}</a:t></a:r></a:p>`
+              })
+              .join('')
+
             xml += `<c:tx>`
             xml += `<c:rich>`
-            xml += `<a:bodyPr/>`
+            xml += bodyPr
             xml += `<a:lstStyle/>`
-            xml += `<a:p>`
-            xml += `<a:r>`
-            xml += `<a:t>${this.#escapeXml(textContent)}</a:t>`
-            xml += `</a:r>`
-            xml += `</a:p>`
+            xml += paragraphs
             xml += `</c:rich>`
             xml += `</c:tx>`
           }
@@ -520,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
         }
@@ -571,7 +648,9 @@ class ChartCacheGenerator {
 
     // showVal
     const defaultShowVal = hasCustomLabels ? '0' : '1'
-    if (existingShowTags['showVal'] && !hasCustomLabels) {
+    if (showSeriesNameInBar) {
+      xml += `<c:showVal val="0"/>`
+    } else if (existingShowTags['showVal'] && !hasCustomLabels) {
       xml += existingShowTags['showVal']
     } else {
       xml += `<c:showVal val="${defaultShowVal}"/>`
@@ -585,7 +664,9 @@ class ChartCacheGenerator {
     }
 
     // showSerName
-    if (existingShowTags['showSerName']) {
+    if (showSeriesNameInBar) {
+      xml += `<c:showSerName val="1"/>`
+    } else if (existingShowTags['showSerName']) {
       xml += existingShowTags['showSerName']
     } else {
       xml += `<c:showSerName val="0"/>`
@@ -608,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
   }