node-pptx-templater 1.0.17 → 1.0.19

package/src/managers/TableManager.js

@@ -67,12 +67,7 @@ class TableManager {
    * @throws {TableNotFoundError} If the table is not found.
    */
   updateTable(slideIndex, tableId, data, slideManager) {
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
-    if (!tblObj) {
-      throw new TableNotFoundError(`Table "${tableId}" not found in slide ${slideIndex}`)
-    }
+    const { tblObj } = this.#getTableContext(slideIndex, tableId, slideManager)
 
     const trs = tblObj['a:tr'] || []
     if (trs.length === 0) {
@@ -174,8 +169,7 @@ class TableManager {
 
     tblObj['a:tr'] = newRows
 
-    const decl = this.#xmlParser.extractDeclaration(slideXml)
-    slideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    slideManager.markSlideObjDirty(slideIndex)
 
     const finalMerges = [...templateMerges, ...generatedMerges]
     for (const merge of finalMerges) {
@@ -204,12 +198,7 @@ class TableManager {
    * @param {SlideManager} slideManager
    */
   addTableRow(slideIndex, tableId, rowData, slideManager) {
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
-    if (!tblObj) {
-      throw new TableNotFoundError(`Table "${tableId}" not found in slide ${slideIndex}`)
-    }
+    const { tblObj } = this.#getTableContext(slideIndex, tableId, slideManager)
 
     const trs = tblObj['a:tr'] || []
     if (trs.length === 0) {
@@ -230,8 +219,7 @@ class TableManager {
 
     trs.push(newRow)
 
-    const decl = this.#xmlParser.extractDeclaration(slideXml)
-    slideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    slideManager.markSlideObjDirty(slideIndex)
   }
 
   /**
@@ -243,12 +231,7 @@ class TableManager {
    * @param {SlideManager} slideManager
    */
   removeTableRow(slideIndex, tableId, rowIndex, slideManager) {
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
-    if (!tblObj) {
-      throw new TableNotFoundError(`Table "${tableId}" not found in slide ${slideIndex}`)
-    }
+    const { tblObj } = this.#getTableContext(slideIndex, tableId, slideManager)
 
     const trs = tblObj['a:tr'] || []
     if (rowIndex < 0 || rowIndex >= trs.length) {
@@ -257,8 +240,7 @@ class TableManager {
 
     trs.splice(rowIndex, 1)
 
-    const decl = this.#xmlParser.extractDeclaration(slideXml)
-    slideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    slideManager.markSlideObjDirty(slideIndex)
   }
 
   /**
@@ -271,12 +253,7 @@ class TableManager {
    * @param {SlideManager} slideManager
    */
   insertTableRow(slideIndex, tableId, rowIndex, rowData, slideManager) {
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
-    if (!tblObj) {
-      throw new TableNotFoundError(`Table "${tableId}" not found in slide ${slideIndex}`)
-    }
+    const { tblObj } = this.#getTableContext(slideIndex, tableId, slideManager)
 
     const trs = tblObj['a:tr'] || []
     if (rowIndex < 0 || rowIndex > trs.length) {
@@ -302,8 +279,7 @@ class TableManager {
 
     trs.splice(rowIndex, 0, newRow)
 
-    const decl = this.#xmlParser.extractDeclaration(slideXml)
-    slideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    slideManager.markSlideObjDirty(slideIndex)
   }
 
   /**
@@ -316,12 +292,7 @@ class TableManager {
    * @param {SlideManager} slideManager
    */
   cloneTableRow(slideIndex, tableId, sourceRowIndex, targetRowIndex, slideManager) {
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
-    if (!tblObj) {
-      throw new TableNotFoundError(`Table "${tableId}" not found in slide ${slideIndex}`)
-    }
+    const { tblObj } = this.#getTableContext(slideIndex, tableId, slideManager)
 
     const trs = tblObj['a:tr'] || []
     if (sourceRowIndex < 0 || sourceRowIndex >= trs.length) {
@@ -337,8 +308,7 @@ class TableManager {
 
     trs.splice(targetRowIndex, 0, newRow)
 
-    const decl = this.#xmlParser.extractDeclaration(slideXml)
-    slideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    slideManager.markSlideObjDirty(slideIndex)
   }
 
   /**
@@ -353,12 +323,7 @@ class TableManager {
    * @param {SlideManager} slideManager
    */
   updateCell(slideIndex, tableId, rowIndex, colIndex, value, options = {}, slideManager) {
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
-    if (!tblObj) {
-      throw new TableNotFoundError(`Table "${tableId}" not found in slide ${slideIndex}`)
-    }
+    const { tblObj } = this.#getTableContext(slideIndex, tableId, slideManager)
 
     const row = tblObj['a:tr']?.[rowIndex]
     if (!row) {
@@ -407,8 +372,7 @@ class TableManager {
       }
     }
 
-    const decl = this.#xmlParser.extractDeclaration(slideXml)
-    slideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    slideManager.markSlideObjDirty(slideIndex)
   }
 
   /**
@@ -425,9 +389,8 @@ class TableManager {
    */
   validateMergeRegion(slideIndex, tableId, startRow, startCol, endRow, endCol, slideManager) {
     const errors = []
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
+    const slideObj = slideManager.getSlideObj(slideIndex)
+    const tblObj = this.#findTableObj(slideObj, tableId, slideManager, slideIndex)
     if (!tblObj) {
       errors.push(`Table "${tableId}" not found in slide ${slideIndex}`)
       return { valid: false, errors }
@@ -507,9 +470,7 @@ class TableManager {
       throw new PPTXError(`Invalid merge region: ${validation.errors.join('; ')}`)
     }
 
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
+    const { tblObj } = this.#getTableContext(slideIndex, tableId, slideManager)
     const trs = tblObj['a:tr'] || []
 
     const allTexts = []
@@ -561,8 +522,7 @@ class TableManager {
     const combinedText = allTexts.filter(t => t.trim() !== '').join('\n')
     this.#setCellTextObj(originCell, combinedText)
 
-    const decl = this.#xmlParser.extractDeclaration(slideXml)
-    slideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    slideManager.markSlideObjDirty(slideIndex)
   }
 
   /**
@@ -587,9 +547,8 @@ class TableManager {
       actualEndCol = undefined
     }
 
-    const slideXml = actualSlideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
+    const slideObj = actualSlideManager.getSlideObj(slideIndex)
+    const tblObj = this.#findTableObj(slideObj, tableId, actualSlideManager, slideIndex)
     if (!tblObj) {
       throw new TableNotFoundError(`Table "${tableId}" not found in slide ${slideIndex}`)
     }
@@ -629,8 +588,7 @@ class TableManager {
       }
     }
 
-    const decl = this.#xmlParser.extractDeclaration(slideXml)
-    actualSlideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    actualSlideManager.markSlideObjDirty(slideIndex)
   }
 
   /**
@@ -642,9 +600,8 @@ class TableManager {
    * @returns {Array<Object>} List of merged region coordinates
    */
   getMergedCells(slideIndex, tableId, slideManager) {
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
+    const slideObj = slideManager.getSlideObj(slideIndex)
+    const tblObj = this.#findTableObj(slideObj, tableId, slideManager, slideIndex)
     if (!tblObj) {
       throw new TableNotFoundError(`Table "${tableId}" not found in slide ${slideIndex}`)
     }
@@ -759,9 +716,8 @@ class TableManager {
       slideManager
     )
 
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
+    const slideObj = slideManager.getSlideObj(slideIndex)
+    const tblObj = this.#findTableObj(slideObj, tableId, slideManager, slideIndex)
     if (!tblObj) return
 
     const trs = tblObj['a:tr'] || []
@@ -777,8 +733,7 @@ class TableManager {
       }
     }
 
-    const decl = this.#xmlParser.extractDeclaration(slideXml)
-    slideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    slideManager.markSlideObjDirty(slideIndex)
   }
 
   /**
@@ -789,12 +744,7 @@ class TableManager {
    * @param {SlideManager} slideManager
    */
   autoFitTable(slideIndex, tableId, slideManager) {
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
-    const tblObj = this.#findTableObj(slideObj, tableId)
-    if (!tblObj) {
-      throw new TableNotFoundError(`Table "${tableId}" not found in slide ${slideIndex}`)
-    }
+    const { tblObj } = this.#getTableContext(slideIndex, tableId, slideManager)
 
     const trs = tblObj['a:tr'] || []
     const gridCols = tblObj['a:tblGrid']?.['a:gridCol']
@@ -835,8 +785,7 @@ class TableManager {
       gridCols[c]['@_w'] = String(width)
     }
 
-    const decl = this.#xmlParser.extractDeclaration(slideXml)
-    slideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    slideManager.markSlideObjDirty(slideIndex)
   }
 
   /**
@@ -849,10 +798,12 @@ class TableManager {
    * @param {SlideManager} slideManager
    */
   resizeTable(slideIndex, tableId, width, height, slideManager) {
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
+    const slideObj = slideManager.getSlideObj(slideIndex)
 
-    const spTree = slideObj?.['p:sld']?.['p:cSld']?.['p:spTree']
+    const spTree =
+      slideObj?.['p:sld']?.['p:cSld']?.['p:spTree'] ||
+      slideObj?.['p:sldLayout']?.['p:cSld']?.['p:spTree'] ||
+      slideObj?.['p:sldMaster']?.['p:cSld']?.['p:spTree']
     if (!spTree) return
 
     let frames = spTree['p:graphicFrame'] || []
@@ -931,8 +882,7 @@ class TableManager {
       }
     }
 
-    const decl = this.#xmlParser.extractDeclaration(slideXml)
-    slideManager.setSlideXml(slideIndex, this.#xmlParser.build(slideObj, decl))
+    slideManager.markSlideObjDirty(slideIndex)
   }
 
   /**
@@ -943,11 +893,13 @@ class TableManager {
    * @returns {Array<{name: string, id: string, rows: number, cols: number}>}
    */
   inspectTables(slideIndex, slideManager) {
-    const slideXml = slideManager.getSlideXml(slideIndex)
-    const slideObj = this.#xmlParser.parse(slideXml, `slide${slideIndex}.xml`)
+    const slideObj = slideManager.getSlideObj(slideIndex)
     const tables = []
 
-    const spTree = slideObj?.['p:sld']?.['p:cSld']?.['p:spTree']
+    const spTree =
+      slideObj?.['p:sld']?.['p:cSld']?.['p:spTree'] ||
+      slideObj?.['p:sldLayout']?.['p:cSld']?.['p:spTree'] ||
+      slideObj?.['p:sldMaster']?.['p:cSld']?.['p:spTree']
     if (!spTree) return []
 
     let frames = spTree['p:graphicFrame'] || []
@@ -1064,8 +1016,16 @@ class TableManager {
   /**
    * Helper to find a table element inside a slide parsed object.
    */
-  #findTableObj(slideObj, tableId) {
-    const spTree = slideObj?.['p:sld']?.['p:cSld']?.['p:spTree']
+  #findTableObj(slideObj, tableId, slideManager, slideIndex) {
+    if (slideManager && slideIndex !== undefined) {
+      const res = slideManager.getSlideTable(slideIndex, tableId)
+      return res ? res.table : null
+    }
+
+    const spTree =
+      slideObj?.['p:sld']?.['p:cSld']?.['p:spTree'] ||
+      slideObj?.['p:sldLayout']?.['p:cSld']?.['p:spTree'] ||
+      slideObj?.['p:sldMaster']?.['p:cSld']?.['p:spTree']
     if (!spTree) return null
 
     let frames = spTree['p:graphicFrame'] || []
@@ -1089,6 +1049,15 @@ class TableManager {
     return null
   }
 
+  #getTableContext(slideIndex, tableId, slideManager) {
+    const slideObj = slideManager.getSlideObj(slideIndex)
+    const tblObj = this.#findTableObj(slideObj, tableId, slideManager, slideIndex)
+    if (!tblObj) {
+      throw new TableNotFoundError(`Table "${tableId}" not found in slide ${slideIndex}`)
+    }
+    return { slideObj, tblObj }
+  }
+
   /**
    * Generates a new rowId for the given row object.
    */

package/src/managers/ZOrderManager.js

@@ -2,14 +2,9 @@
  * @fileoverview ZOrderManager - Handles slide element Z-order (layer stacking) operations.
  */
 
-const { createLogger } = require('../utils/logger.js')
 const { PPTXError } = require('../utils/errors.js')
 const { Z_ORDER_SYMBOL } = require('../parsers/XMLParser.js')
 
-const logger = createLogger('ZOrderManager')
-
-const drawingTags = new Set(['p:sp', 'p:pic', 'p:graphicFrame', 'p:grpSp', 'p:cxnSp'])
-
 function detectElementType(tag, item) {
   if (tag === 'p:sp') {
     const isTxBox =

package/src/managers/ZipManager.js

@@ -82,6 +82,18 @@ class ZipManager {
    */
   #removedFiles = new Set()
 
+  /**
+   * @private
+   * @type {Map<string, { type: string, content: string|Buffer|Uint8Array }>|null}
+   */
+  #cachedFiles = null
+
+  async loadFromCache(cachedFilesMap) {
+    this.#cachedFiles = cachedFilesMap
+    await this.#loadCoreProperties()
+    logger.debug(`Loaded from cache. Files: ${cachedFilesMap.size}`)
+  }
+
   async load(source) {
     try {
       const path = require('path')
@@ -221,6 +233,19 @@ class ZipManager {
       return this.#dirtyFiles.get(normalPath)
     }
 
+    if (this.#cachedFiles && this.#cachedFiles.has(normalPath)) {
+      const entry = this.#cachedFiles.get(normalPath)
+      let content
+      if (entry.type === 'text') {
+        content = entry.content
+      } else {
+        const { TextDecoder } = require('util')
+        content = new TextDecoder('utf-8').decode(entry.content)
+      }
+      this.#xmlCache.set(normalPath, content)
+      return content
+    }
+
     if (this.#isFolderMode) {
       const path = require('path')
       const fs = require('fs-extra')
@@ -234,6 +259,7 @@ class ZipManager {
       return content
     }
 
+    if (!this.#zip) return null
     const file = this.#zip.file(normalPath)
     if (!file) {
       logger.debug(`File not found in ZIP: ${normalPath}`)
@@ -256,7 +282,22 @@ class ZipManager {
     if (this.#dirtyFiles.has(normalPath)) {
       return this.#dirtyFiles.get(normalPath)
     }
-    return this.#xmlCache.get(normalPath) || null
+    if (this.#xmlCache.has(normalPath)) {
+      return this.#xmlCache.get(normalPath)
+    }
+    if (this.#cachedFiles && this.#cachedFiles.has(normalPath)) {
+      const entry = this.#cachedFiles.get(normalPath)
+      let content
+      if (entry.type === 'text') {
+        content = entry.content
+      } else {
+        const { TextDecoder } = require('util')
+        content = new TextDecoder('utf-8').decode(entry.content)
+      }
+      this.#xmlCache.set(normalPath, content)
+      return content
+    }
+    return null
   }
 
   /**
@@ -270,6 +311,10 @@ class ZipManager {
     if (this.#dirtyBinaryFiles.has(normalPath)) {
       return this.#dirtyBinaryFiles.get(normalPath)
     }
+    if (this.#cachedFiles && this.#cachedFiles.has(normalPath)) {
+      const entry = this.#cachedFiles.get(normalPath)
+      return entry.content
+    }
     if (this.#isFolderMode) {
       const path = require('path')
       const fs = require('fs-extra')
@@ -277,6 +322,7 @@ class ZipManager {
       if (!(await fs.pathExists(diskPath))) return null
       return fs.readFile(diskPath)
     }
+    if (!this.#zip) return null
     const file = this.#zip.file(normalPath)
     if (!file) return null
     return file.async('uint8array')
@@ -354,10 +400,11 @@ class ZipManager {
     const normalPath = zipPath.replace(/\\/g, '/')
     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
     if (this.#isFolderMode) {
       return this.#folderFiles.has(normalPath)
     }
-    return this.#zip.file(normalPath) !== null
+    return this.#zip && this.#zip.file(normalPath) !== null
   }
 
   /**
@@ -367,6 +414,14 @@ class ZipManager {
    * @returns {string[]} Array of matching file paths.
    */
   listFiles(prefix = '') {
+    if (this.#cachedFiles) {
+      const allFiles = new Set([
+        ...this.#cachedFiles.keys(),
+        ...this.#dirtyFiles.keys(),
+        ...this.#dirtyBinaryFiles.keys(),
+      ])
+      return Array.from(allFiles).filter(f => !this.#removedFiles.has(f) && f.startsWith(prefix))
+    }
     if (this.#isFolderMode) {
       const allFiles = new Set([
         ...this.#folderFiles,
@@ -375,6 +430,7 @@ class ZipManager {
       ])
       return Array.from(allFiles).filter(f => !this.#removedFiles.has(f) && f.startsWith(prefix))
     }
+    if (!this.#zip) return []
     return Object.keys(this.#zip.files).filter(f => !this.#zip.files[f].dir && f.startsWith(prefix))
   }
 
@@ -384,23 +440,43 @@ class ZipManager {
    *
    * @returns {Promise<Buffer>} Compressed PPTX as a Buffer.
    */
-  async toBuffer() {
+  async toBuffer(options = {}) {
     await this.#ensureZipForExport()
-    return this.#zip.generateAsync({
-      type: 'nodebuffer',
-      compression: 'DEFLATE',
-      compressionOptions: { level: 6 },
-    })
+    const zipOptions = this.#getZipOptions(options)
+    return this.#zip.generateAsync(zipOptions)
   }
 
-  async toStream() {
+  async toStream(options = {}) {
     await this.#ensureZipForExport()
-    return this.#zip.generateNodeStream({
+    const zipOptions = this.#getZipOptions(options)
+    zipOptions.streamFiles = true
+    return this.#zip.generateNodeStream(zipOptions)
+  }
+
+  #getZipOptions(options = {}) {
+    const compression = options.compression || 'balanced'
+    let method = 'DEFLATE'
+    let level = 6
+
+    if (compression === 'none' || compression === 'store') {
+      method = 'STORE'
+      level = 0
+    } else if (compression === 'fast') {
+      method = 'DEFLATE'
+      level = 1
+    } else if (compression === 'balanced') {
+      method = 'DEFLATE'
+      level = 6
+    } else if (compression === 'maximum') {
+      method = 'DEFLATE'
+      level = 9
+    }
+
+    return {
       type: 'nodebuffer',
-      compression: 'DEFLATE',
-      compressionOptions: { level: 6 },
-      streamFiles: true,
-    })
+      compression: method,
+      compressionOptions: method === 'DEFLATE' ? { level } : undefined,
+    }
   }
 
   /**
@@ -594,6 +670,36 @@ class ZipManager {
 
     const zip = new JSZip()
 
+    if (this.#cachedFiles) {
+      // 1. Read all files from cache (that are not removed)
+      for (const [relPath, entry] of this.#cachedFiles.entries()) {
+        if (this.#removedFiles.has(relPath)) continue
+
+        if (this.#dirtyFiles.has(relPath)) {
+          zip.file(relPath, this.#dirtyFiles.get(relPath))
+        } else if (this.#dirtyBinaryFiles.has(relPath)) {
+          zip.file(relPath, this.#dirtyBinaryFiles.get(relPath))
+        } else {
+          zip.file(relPath, entry.content)
+        }
+      }
+
+      // 2. Write any new files that were added (and not already in cache)
+      for (const [relPath, content] of this.#dirtyFiles.entries()) {
+        if (!this.#cachedFiles.has(relPath) && !this.#removedFiles.has(relPath)) {
+          zip.file(relPath, content)
+        }
+      }
+      for (const [relPath, data] of this.#dirtyBinaryFiles.entries()) {
+        if (!this.#cachedFiles.has(relPath) && !this.#removedFiles.has(relPath)) {
+          zip.file(relPath, data)
+        }
+      }
+
+      this.#zip = zip
+      return zip
+    }
+
     // 1. Read all files from the original folder structure (that are not removed)
     for (const relPath of this.#folderFiles) {
       if (this.#removedFiles.has(relPath)) continue

package/src/managers/charts/ChartWorkbookUpdater.js

@@ -184,7 +184,7 @@ class ChartWorkbookUpdater {
   static #serializeSheetXml(sheetXml, cells) {
     // Group cells by row
     const rows = {}
-    for (const [ref, val] of Object.entries(cells)) {
+    for (const ref of Object.keys(cells)) {
       const rowMatch = /\d+$/.exec(ref)
       if (!rowMatch) continue
       const r = parseInt(rowMatch[0], 10)

package/src/utils/contentTypesHelper.js

@@ -70,10 +70,9 @@ class ContentTypesHelper {
    */
   addMediaDefault(zipManager, extension, mimeType) {
     this.#updateQueue = this.#updateQueue.then(async () => {
-      const xmlFile = zipManager.rawZip.file('[Content_Types].xml')
-      if (!xmlFile) return
+      const content = await zipManager.readFile('[Content_Types].xml')
+      if (!content) return
 
-      const content = await xmlFile.async('text')
       const entry = `Extension="${extension}" ContentType="${mimeType}"`
       if (!content.includes(entry)) {
         const updated = content.replace('</Types>', `  <Default ${entry}/>\n</Types>`)
@@ -92,12 +91,11 @@ class ContentTypesHelper {
    */
   #addOverride(zipManager, partName, contentType) {
     this.#updateQueue = this.#updateQueue.then(async () => {
-      const xmlFile = zipManager.rawZip.file('[Content_Types].xml')
-      if (!xmlFile) {
+      const content = await zipManager.readFile('[Content_Types].xml')
+      if (!content) {
         logger.warn('[Content_Types].xml not found')
         return
       }
-      const content = await xmlFile.async('text')
       const entry = `PartName="${partName}"`
       if (!content.includes(entry)) {
         const override = `<Override PartName="${partName}" ContentType="${contentType}"/>`
@@ -115,12 +113,11 @@ class ContentTypesHelper {
    */
   #removeOverride(zipManager, partName) {
     this.#updateQueue = this.#updateQueue.then(async () => {
-      const xmlFile = zipManager.rawZip.file('[Content_Types].xml')
-      if (!xmlFile) {
+      const content = await zipManager.readFile('[Content_Types].xml')
+      if (!content) {
         logger.warn('[Content_Types].xml not found')
         return
       }
-      const content = await xmlFile.async('text')
       const regex = new RegExp(`<Override[^>]*PartName="${partName}"[^>]*/>\\s*`, 'g')
       if (regex.test(content)) {
         const updated = content.replace(regex, '')