@node-projects/excelforge 2.4.0 → 3.1.0

package/dist/core/Workbook.js

@@ -3,20 +3,30 @@ import { StyleRegistry } from '../styles/StyleRegistry.js';
 import { SharedStrings } from './SharedStrings.js';
 import { buildChartXml } from '../features/ChartBuilder.js';
 import { buildTableXml } from '../features/TableBuilder.js';
+import { buildPivotTableFiles } from '../features/PivotTableBuilder.js';
+import { buildCtrlPropXml, buildFormControlVmlShape, buildVmlWithControls } from '../features/FormControlBuilder.js';
+import { VbaProject } from '../vba/VbaProject.js';
 import { buildZip } from '../utils/zip.js';
 import { strToBytes, base64ToBytes, escapeXml, colIndexToLetter } from '../utils/helpers.js';
-import { readWorkbook } from './WorkbookReader.js';
+import { readWorkbook, connTypeToNum, cmdTypeToNum } from './WorkbookReader.js';
 import { buildCoreXml, buildAppXml, buildCustomXml, } from './properties.js';
 export class Workbook {
     constructor() {
         this.sheets = [];
         this.namedRanges = [];
+        this.connections = [];
+        this.powerQueries = [];
+        this.externalLinks = [];
+        this.customPivotStyles = [];
+        this.pivotSlicers = [];
         this.properties = {};
         this.compressionLevel = 6;
         this.coreProperties = {};
         this.extendedProperties = {};
         this.customProperties = [];
+        this.isTemplate = false;
         this._dirtySheets = new Set();
+        this._customTableStyles = new Map();
     }
     markDirty(sheetIndexOrName) {
         if (typeof sheetIndexOrName === 'string') {
@@ -49,6 +59,50 @@ export class Workbook {
             status: result.core.contentStatus,
         };
         wb.sheets = result.sheets.map(s => s.ws);
+        wb.namedRanges = result.namedRanges;
+        wb.connections = result.connections;
+        wb.powerQueries = result.powerQueries;
+        const vbaData = result.unknownParts.get('xl/vbaProject.bin');
+        if (vbaData) {
+            try {
+                wb.vbaProject = VbaProject.fromBytes(vbaData);
+            }
+            catch { }
+        }
+        const calcPrMatch = result.workbookXml.match(/<calcPr([^>]*)\/?>/);
+        if (calcPrMatch) {
+            const a = calcPrMatch[1];
+            const cs = {};
+            const modeMatch = a.match(/calcMode="([^"]+)"/);
+            if (modeMatch)
+                cs.calcMode = modeMatch[1];
+            if (/fullCalcOnLoad="1"/.test(a))
+                cs.fullCalcOnLoad = true;
+            else if (/fullCalcOnLoad="0"/.test(a))
+                cs.fullCalcOnLoad = false;
+            if (/iterate="1"/.test(a))
+                cs.iterate = true;
+            const icMatch = a.match(/iterateCount="(\d+)"/);
+            if (icMatch)
+                cs.iterateCount = parseInt(icMatch[1], 10);
+            const idMatch = a.match(/iterateDelta="([^"]+)"/);
+            if (idMatch)
+                cs.iterateDelta = parseFloat(idMatch[1]);
+            if (/fullPrecision="1"/.test(a))
+                cs.fullPrecision = true;
+            else if (/fullPrecision="0"/.test(a))
+                cs.fullPrecision = false;
+            if (/calcOnSave="1"/.test(a))
+                cs.calcOnSave = true;
+            else if (/calcOnSave="0"/.test(a))
+                cs.calcOnSave = false;
+            if (/concurrentCalc="1"/.test(a))
+                cs.concurrentCalc = true;
+            else if (/concurrentCalc="0"/.test(a))
+                cs.concurrentCalc = false;
+            if (Object.keys(cs).length > 0)
+                wb.calcSettings = cs;
+        }
         return wb;
     }
     static async fromBase64(b64) {
@@ -78,14 +132,102 @@ export class Workbook {
     getSheetNames() {
         return this.sheets.map(s => s.name);
     }
+    getSheets() {
+        return this.sheets;
+    }
     removeSheet(name) {
         this.sheets = this.sheets.filter(s => s.name !== name);
         return this;
     }
+    addChartSheet(name, chart) {
+        const ws = this.addSheet(name);
+        ws._isChartSheet = true;
+        ws.addChart(chart);
+        return ws;
+    }
+    addDialogSheet(name) {
+        const ws = this.addSheet(name);
+        ws._isDialogSheet = true;
+        return ws;
+    }
+    copySheet(sourceName, newName) {
+        const src = this.getSheet(sourceName);
+        if (!src)
+            throw new Error(`Sheet "${sourceName}" not found`);
+        const ws = this.addSheet(newName);
+        const cells = src.readAllCells();
+        for (const { row, col, cell } of cells) {
+            const target = ws.getCell(row, col);
+            if (cell.value != null)
+                target.value = cell.value;
+            if (cell.formula)
+                target.formula = cell.formula;
+            if (cell.arrayFormula)
+                target.arrayFormula = cell.arrayFormula;
+            if (cell.richText)
+                target.richText = cell.richText.map(r => ({ ...r, font: r.font ? { ...r.font } : undefined }));
+            if (cell.style)
+                target.style = { ...cell.style };
+            if (cell.comment)
+                target.comment = { ...cell.comment };
+            if (cell.hyperlink)
+                target.hyperlink = { ...cell.hyperlink };
+        }
+        for (const m of src.getMerges()) {
+            ws.merge(m.startRow, m.startCol, m.endRow, m.endCol);
+        }
+        const range = src.getUsedRange();
+        if (range) {
+            for (let c = range.startCol; c <= range.endCol; c++) {
+                const cd = src.getColumn(c);
+                if (cd)
+                    ws.setColumn(c, { ...cd });
+            }
+        }
+        if (src.pageSetup)
+            ws.pageSetup = { ...src.pageSetup };
+        if (src.printArea)
+            ws.printArea = src.printArea;
+        return ws;
+    }
+    registerTableStyle(name, def) {
+        this._customTableStyles.set(name, def);
+        return this;
+    }
     addNamedRange(nr) {
         this.namedRanges.push(nr);
         return this;
     }
+    getNamedRanges() {
+        return this.namedRanges;
+    }
+    getNamedRange(name) {
+        return this.namedRanges.find(nr => nr.name === name);
+    }
+    removeNamedRange(name) {
+        this.namedRanges = this.namedRanges.filter(nr => nr.name !== name);
+        return this;
+    }
+    addConnection(conn) {
+        this.connections.push(conn);
+        return this;
+    }
+    getConnections() {
+        return this.connections;
+    }
+    getConnection(name) {
+        return this.connections.find(c => c.name === name);
+    }
+    removeConnection(name) {
+        this.connections = this.connections.filter(c => c.name !== name);
+        return this;
+    }
+    getPowerQueries() {
+        return this.powerQueries;
+    }
+    getPowerQuery(name) {
+        return this.powerQueries.find(q => q.name === name);
+    }
     getCustomProperty(name) {
         return this.customProperties.find(p => p.name === name);
     }
@@ -101,6 +243,24 @@ export class Workbook {
         this.customProperties = this.customProperties.filter(p => p.name !== name);
         return this;
     }
+    addExternalLink(link) {
+        this.externalLinks.push(link);
+        return this;
+    }
+    getExternalLinks() {
+        return this.externalLinks;
+    }
+    registerPivotStyle(style) {
+        this.customPivotStyles.push(style);
+        return this;
+    }
+    addPivotSlicer(slicer) {
+        this.pivotSlicers.push(slicer);
+        return this;
+    }
+    getPivotSlicers() {
+        return this.pivotSlicers;
+    }
     async build() {
         this._syncLegacyProperties();
         return this._readResult ? this._buildPatched() : this._buildFresh();
@@ -113,6 +273,13 @@ export class Workbook {
         const shared = new SharedStrings();
         const sheetXmls = new Map();
         if (hasDirty) {
+            const dxfRe = /<dxf>([\s\S]*?)<\/dxf>|<dxf\/>/g;
+            const rawDxfs = [];
+            let m;
+            while ((m = dxfRe.exec(rr.stylesXml)) !== null)
+                rawDxfs.push(m[1] ?? '');
+            if (rawDxfs.length)
+                styles.prependRawDxfs(rawDxfs);
             for (let i = 0; i < this.sheets.length; i++) {
                 sheetXmls.set(i, this.sheets[i].toXml(styles, shared));
             }
@@ -127,7 +294,7 @@ export class Workbook {
                 ...rr.extended,
                 ...this.extendedProperties,
                 titlesOfParts: this.sheets.map(s => s.name),
-                headingPairs: [{ name: 'Worksheets', count: this.sheets.length }],
+                headingPairs: this._headingPairs(),
             }, rr.extendedUnknownRaw)),
         });
         const customProps = this.customProperties.length > 0
@@ -137,6 +304,10 @@ export class Workbook {
             entries.push({ name: 'docProps/custom.xml', data: strToBytes(buildCustomXml(customProps)) });
         }
         entries.push({ name: 'xl/workbook.xml', data: strToBytes(this._patchWorkbookXml(rr.workbookXml)) });
+        const connectionsXml = this._connectionsXml(rr.connectionsXml);
+        if (connectionsXml) {
+            entries.push({ name: 'xl/connections.xml', data: strToBytes(connectionsXml) });
+        }
         if (hasDirty) {
             entries.push({ name: 'xl/styles.xml', data: strToBytes(styles.toXml()) });
             entries.push({ name: 'xl/sharedStrings.xml', data: strToBytes(shared.toXml()) });
@@ -146,38 +317,43 @@ export class Workbook {
             entries.push({ name: 'xl/sharedStrings.xml', data: strToBytes(rr.sharedXml) });
         }
         for (let i = 0; i < this.sheets.length; i++) {
-            const path = `xl/worksheets/sheet${i + 1}.xml`;
+            const ws = this.sheets[i];
+            const folder = ws._isChartSheet ? 'chartsheets' : ws._isDialogSheet ? 'dialogsheets' : 'worksheets';
+            const path = `xl/${folder}/sheet${i + 1}.xml`;
             if (hasDirty) {
-                entries.push({ name: path, data: strToBytes(sheetXmls.get(i) ?? '') });
-            }
-            else {
-                const orig = rr.sheets[i]?.originalXml ?? '';
-                const unknown = rr.sheets[i]?.unknownParts.join('\n') ?? '';
-                entries.push({ name: path, data: strToBytes(unknown ? orig.replace('</worksheet>', `${unknown}</worksheet>`) : orig) });
-            }
-        }
-        const dirtyTablePaths = new Set();
-        if (hasDirty) {
-            for (let i = 0; i < this.sheets.length; i++) {
-                if (rr.sheets[i]?.tablePaths) {
-                    for (const tp of rr.sheets[i].tablePaths)
-                        dirtyTablePaths.add(tp);
+                if (ws._isChartSheet) {
+                    entries.push({ name: path, data: strToBytes(ws.toChartSheetXml()) });
+                }
+                else if (ws._isDialogSheet) {
+                    entries.push({ name: path, data: strToBytes(ws.toDialogSheetXml(styles, shared)) });
+                }
+                else {
+                    entries.push({ name: path, data: strToBytes(sheetXmls.get(i) ?? '') });
                 }
             }
-        }
-        for (const [path, data] of rr.unknownParts) {
-            if (!dirtyTablePaths.has(path)) {
-                entries.push({ name: path, data });
+            else {
+                entries.push({ name: path, data: strToBytes(rr.sheets[i]?.originalXml ?? '') });
             }
         }
-        if (hasDirty) {
-            for (let i = 0; i < this.sheets.length; i++) {
-                const ws = this.sheets[i];
-                const tables = ws.getTables();
-                const paths = rr.sheets[i]?.tablePaths ?? [];
-                for (let j = 0; j < tables.length; j++) {
-                    const tblPath = paths[j];
-                    if (tblPath) {
+        const allTablePaths = new Set();
+        for (let i = 0; i < this.sheets.length; i++) {
+            const ws = this.sheets[i];
+            const tables = ws.getTables();
+            const paths = rr.sheets[i]?.tablePaths ?? [];
+            const xmls = rr.sheets[i]?.tableXmls ?? [];
+            for (let j = 0; j < tables.length; j++) {
+                const tblPath = paths[j];
+                if (tblPath) {
+                    allTablePaths.add(tblPath);
+                    if (j < xmls.length) {
+                        let xml = xmls[j];
+                        const origRefMatch = xml.match(/\bref="([^"]+)"/);
+                        if (origRefMatch && origRefMatch[1] !== tables[j].ref) {
+                            xml = xml.replace(`ref="${origRefMatch[1]}"`, `ref="${tables[j].ref}"`);
+                        }
+                        entries.push({ name: tblPath, data: strToBytes(xml) });
+                    }
+                    else {
                         const idMatch = tblPath.match(/table(\d+)\.xml$/);
                         const tableId = idMatch ? parseInt(idMatch[1], 10) : j + 1;
                         entries.push({ name: tblPath, data: strToBytes(buildTableXml(tables[j], tableId)) });
@@ -185,8 +361,23 @@ export class Workbook {
                 }
             }
         }
+        for (const [path, data] of rr.unknownParts) {
+            if (allTablePaths.has(path))
+                continue;
+            if (path === 'xl/vbaProject.bin' && this.vbaProject)
+                continue;
+            if (rr.allRels.has(path))
+                continue;
+            if (hasDirty && path === 'xl/calcChain.xml')
+                continue;
+            entries.push({ name: path, data });
+        }
+        if (this.vbaProject) {
+            this._ensureVbaSheetModules();
+            entries.push({ name: 'xl/vbaProject.bin', data: this.vbaProject.build() });
+        }
         entries.push({ name: '_rels/.rels', data: strToBytes(this._buildRootRels(customProps != null && customProps.length > 0)) });
-        entries.push({ name: 'xl/_rels/workbook.xml.rels', data: strToBytes(this._buildWorkbookRels(rr)) });
+        entries.push({ name: 'xl/_rels/workbook.xml.rels', data: strToBytes(this._buildWorkbookRels(rr, hasDirty)) });
         for (const [relPath, relMap] of rr.allRels) {
             if (relPath === 'xl/_rels/workbook.xml.rels' || relPath === '_rels/.rels')
                 continue;
@@ -194,7 +385,7 @@ export class Workbook {
         }
         entries.push({
             name: '[Content_Types].xml',
-            data: strToBytes(this._patchContentTypes(rr.contentTypesXml, customProps != null && customProps.length > 0)),
+            data: strToBytes(this._patchContentTypes(rr.contentTypesXml, customProps != null && customProps.length > 0, hasDirty)),
         });
         return buildZip(entries, { level: this.compressionLevel });
     }
@@ -202,29 +393,35 @@ export class Workbook {
         const styles = new StyleRegistry();
         const shared = new SharedStrings();
         const entries = [];
+        for (const [name, def] of this._customTableStyles) {
+            styles.registerTableStyle(name, def);
+        }
         let globalRId = 1;
         for (const ws of this.sheets)
             ws.rId = `rId${globalRId++}`;
         const allImages = [];
         const allCharts = [];
         const allTables = [];
+        const allPivotTables = [];
         const sheetImageRIds = new Map();
         const sheetChartRIds = new Map();
         const sheetTableRIds = new Map();
-        let imgCtr = 1, chartCtr = 1, tableCtr = 1, vmlCtr = 1;
+        const sheetPivotRIds = new Map();
+        let imgCtr = 1, chartCtr = 1, tableCtr = 1, vmlCtr = 1, pivotCtr = 1, pivotCacheIdCtr = 0, ctrlPropGlobal = 0, oleObjGlobal = 0;
         for (const ws of this.sheets) {
             const imgs = ws.getImages();
             const charts = ws.getCharts();
             const tables = ws.getTables();
             const imgRIds = [], chartRIds = [], tblRIds = [];
-            if (imgs.length || charts.length)
+            if (imgs.length || charts.length || ws.getShapes().length || ws.getWordArt().length || ws.getMathEquations().length || ws.getTableSlicers().length || ws.getOleObjects().length)
                 ws.drawingRId = `rId${globalRId++}`;
-            if (ws.getComments().length)
+            const controls = ws.getFormControls();
+            if (ws.getComments().length || controls.length)
                 ws.legacyDrawingRId = `rId${globalRId++}`;
             for (const img of imgs) {
                 const r = `rId${globalRId++}`;
                 imgRIds.push(r);
-                allImages.push({ ws, img, ext: img.format === 'jpeg' ? 'jpg' : img.format, idx: imgCtr++ });
+                allImages.push({ ws, img, ext: imageExt(img.format), idx: imgCtr++ });
             }
             for (let i = 0; i < charts.length; i++) {
                 const r = `rId${globalRId++}`;
@@ -236,64 +433,254 @@ export class Workbook {
                 tblRIds.push(r);
                 allTables.push({ ws, tableIdx: i, globalTableId: tableCtr++ });
             }
+            const oleRIds = [];
+            const oleIconRIds = [];
+            for (const ole of ws.getOleObjects()) {
+                oleRIds.push(`rId${globalRId++}`);
+                if (ole.iconData)
+                    oleIconRIds.push(`rId${globalRId++}`);
+                else
+                    oleIconRIds.push('');
+            }
+            ws.oleRIds = oleRIds;
+            ws.oleIconRIds = oleIconRIds;
+            const ctrlPropRIds = [];
+            for (let ci = 0; ci < controls.length; ci++)
+                ctrlPropRIds.push(`rId${globalRId++}`);
+            ws.ctrlPropRIds = ctrlPropRIds;
             sheetImageRIds.set(ws, imgRIds);
             sheetChartRIds.set(ws, chartRIds);
             sheetTableRIds.set(ws, tblRIds);
             ws.tableRIds = tblRIds;
+            const ptRIds = [];
+            for (const pt of ws.getPivotTables()) {
+                const pivotRId = `rId${globalRId++}`;
+                const cacheRId = `rId${globalRId++}`;
+                ptRIds.push(pivotRId);
+                allPivotTables.push({ ws, pt, pivotIdx: pivotCtr++, cacheId: pivotCacheIdCtr++, pivotRId, cacheRId });
+            }
+            sheetPivotRIds.set(ws, ptRIds);
+        }
+        const allCellImages = [];
+        let cellImgCtr = imgCtr;
+        let vmCounter = 1;
+        for (const ws of this.sheets) {
+            ws._cellImageVm = new Map();
+            for (const ci of ws.getCellImages()) {
+                const ext = imageExt(ci.format);
+                allCellImages.push({ img: ci, ext, idx: cellImgCtr++ });
+                ws._cellImageVm.set(ci.cell, vmCounter++);
+                ws.getCellByRef(ci.cell);
+            }
+        }
+        const hasCellImages = allCellImages.length > 0;
+        const sheetSlicerMap = new Map();
+        const allSlicerCaches = [];
+        let slicerDefCtr = 0, slicerCacheCtr = 0;
+        for (const ws of this.sheets) {
+            const tSlicers = ws.getTableSlicers();
+            if (tSlicers.length) {
+                sheetSlicerMap.set(ws, { tableSlicers: [], pivotSlicers: [], slicerDefRId: '', slicerDefIdx: 0 });
+            }
+        }
+        for (const ps of this.pivotSlicers) {
+            for (const ws of this.sheets) {
+                if (ws.getPivotTables().some(p => p.name === ps.pivotTableName)) {
+                    if (!sheetSlicerMap.has(ws)) {
+                        sheetSlicerMap.set(ws, { tableSlicers: [], pivotSlicers: [], slicerDefRId: '', slicerDefIdx: 0 });
+                    }
+                    break;
+                }
+            }
+        }
+        for (const [ws, info] of sheetSlicerMap) {
+            if (!ws.drawingRId)
+                ws.drawingRId = `rId${globalRId++}`;
+            info.slicerDefRId = `rId${globalRId++}`;
+            info.slicerDefIdx = ++slicerDefCtr;
+            ws.slicerRId = info.slicerDefRId;
+            const drawingInfo = [];
+            for (const s of ws.getTableSlicers()) {
+                const table = ws.getTables().find(t => t.name === s.tableName);
+                const tableEntry = allTables.find(t => t.ws === ws && ws.getTables()[t.tableIdx] === table);
+                const tableId = tableEntry?.globalTableId ?? 1;
+                const columnIndex = table ? (table.columns?.findIndex(c => c.name === s.columnName) ?? 0) + 1 : 1;
+                info.tableSlicers.push({ slicer: s, tableId, columnIndex });
+                drawingInfo.push({ name: s.name, cell: s.cell });
+                allSlicerCaches.push({
+                    name: s.name + '_cache', sourceName: s.columnName, type: 'table',
+                    rId: `rId${globalRId++}`, idx: ++slicerCacheCtr,
+                    tableId, columnIndex, sortOrder: s.sortOrder ?? 'ascending',
+                });
+            }
+            for (const ps of this.pivotSlicers) {
+                const pt = ws.getPivotTables().find(p => p.name === ps.pivotTableName);
+                if (!pt)
+                    continue;
+                const ptEntry = allPivotTables.find(p => p.ws === ws && p.pt === pt);
+                const sheetIdx = this.sheets.indexOf(ws) + 1;
+                let items = [];
+                const sourceWs = this.sheets.find(s => s.name === pt.sourceSheet);
+                if (sourceWs) {
+                    const sourceData = sourceWs.readRange(pt.sourceRef);
+                    const headers = (sourceData[0] ?? []).map(v => String(v ?? ''));
+                    const fieldIdx = headers.indexOf(ps.fieldName);
+                    if (fieldIdx >= 0) {
+                        const uniqueSet = new Set();
+                        for (let r = 1; r < sourceData.length; r++)
+                            uniqueSet.add(String(sourceData[r][fieldIdx] ?? ''));
+                        items = [...uniqueSet];
+                    }
+                }
+                info.pivotSlicers.push({ slicer: ps, pivotCacheId: ptEntry?.cacheId ?? 0 });
+                drawingInfo.push({ name: ps.name, cell: ps.cell });
+                allSlicerCaches.push({
+                    name: ps.name + '_cache', sourceName: ps.fieldName, type: 'pivot',
+                    rId: `rId${globalRId++}`, idx: ++slicerCacheCtr,
+                    pivotTableName: ps.pivotTableName, pivotCacheId: ptEntry?.cacheId ?? 0,
+                    tabId: sheetIdx, items,
+                });
+            }
+            ws._slicerDrawingInfo = drawingInfo;
         }
+        const hasSlicers = sheetSlicerMap.size > 0;
         const hasCustom = this.customProperties.length > 0;
+        const hasVba = !!this.vbaProject;
         const imgCTs = new Set();
-        for (const { ext } of allImages) {
-            const ct = ext === 'jpg' ? 'image/jpeg' : ext === 'png' ? 'image/png' : `image/${ext}`;
+        for (const { ext } of [...allImages, ...allCellImages]) {
+            const ct = imageContentType(ext);
             imgCTs.add(`<Default Extension="${ext}" ContentType="${ct}"/>`);
         }
         const sheetsWithComments = this.sheets.filter(ws => ws.getComments().length);
-        const vmlCT = sheetsWithComments.length ? '<Default Extension="vml" ContentType="application/vnd.openxmlformats-officedocument.vmlDrawing"/>' : '';
+        const sheetsWithVml = this.sheets.filter(ws => ws.getComments().length || ws.getFormControls().length);
+        const vmlCT = sheetsWithVml.length ? '<Default Extension="vml" ContentType="application/vnd.openxmlformats-officedocument.vmlDrawing"/>' : '';
         let vmlIdx = 0;
         const commentsCTs = sheetsWithComments.map(() => `<Override PartName="/xl/comments${++vmlIdx}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml"/>`).join('');
+        let ctrlPropCtr = 0;
+        const ctrlPropCTs = [];
+        for (const ws of this.sheets) {
+            if (ws._isDialogSheet)
+                continue;
+            for (let ci = 0; ci < ws.getFormControls().length; ci++) {
+                ctrlPropCTs.push(`<Override PartName="/xl/ctrlProps/ctrlProp${++ctrlPropCtr}.xml" ContentType="application/vnd.ms-excel.controlproperties+xml"/>`);
+            }
+        }
+        const hasOleObjects = this.sheets.some(ws => ws.getOleObjects().length > 0);
+        const oleCT = hasOleObjects ? '<Default Extension="bin" ContentType="application/vnd.openxmlformats-officedocument.oleObject"/>' : '';
         entries.push({ name: '[Content_Types].xml', data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
 <Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
 <Default Extension="xml" ContentType="application/xml"/>
 ${vmlCT}
+${oleCT}
 ${[...imgCTs].join('')}
-<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>
+<Override PartName="/xl/workbook.xml" ContentType="${hasVba ? 'application/vnd.ms-excel.sheet.macroEnabled.main+xml' : this.isTemplate ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml' : 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml'}"/>
+${hasVba ? '<Override PartName="/xl/vbaProject.bin" ContentType="application/vnd.ms-office.vbaProject"/>' : ''}
 <Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>
 <Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>
-${this.sheets.map((_, i) => `<Override PartName="/xl/worksheets/sheet${i + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>`).join('')}
+<Override PartName="/xl/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/>
+${this.sheets.filter(ws => !ws._isChartSheet && !ws._isDialogSheet).map(ws => { const idx = this.sheets.indexOf(ws); return `<Override PartName="/xl/worksheets/sheet${idx + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>`; }).join('')}
+${this.sheets.filter(ws => ws._isChartSheet).map(ws => { const idx = this.sheets.indexOf(ws); return `<Override PartName="/xl/chartsheets/sheet${idx + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml"/>`; }).join('')}
+${this.sheets.filter(ws => ws._isDialogSheet).map(ws => { const idx = this.sheets.indexOf(ws); return `<Override PartName="/xl/dialogsheets/sheet${idx + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.dialogsheet+xml"/>`; }).join('')}
 ${this.sheets.filter(ws => ws.drawingRId).map((_, i) => `<Override PartName="/xl/drawings/drawing${i + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.drawing+xml"/>`).join('')}
 ${allCharts.map(({ globalIdx }) => `<Override PartName="/xl/charts/chart${globalIdx}.xml" ContentType="application/vnd.openxmlformats-officedocument.drawingml.chart+xml"/>`).join('')}
 ${allTables.map(({ globalTableId }) => `<Override PartName="/xl/tables/table${globalTableId}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml"/>`).join('')}
+${allPivotTables.map(p => `<Override PartName="/xl/pivotTables/pivotTable${p.pivotIdx}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml"/>`).join('\n')}
+${allPivotTables.map(p => `<Override PartName="/xl/pivotCache/pivotCacheDefinition${p.pivotIdx}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml"/>`).join('\n')}
+${allPivotTables.map(p => `<Override PartName="/xl/pivotCache/pivotCacheRecords${p.pivotIdx}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml"/>`).join('\n')}
 ${commentsCTs}
+${ctrlPropCTs.join('')}
 <Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
 <Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>
 ${hasCustom ? '<Override PartName="/docProps/custom.xml" ContentType="application/vnd.openxmlformats-officedocument.custom-properties+xml"/>' : ''}
+${this.connections.length ? '<Override PartName="/xl/connections.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml"/>' : ''}
+${this.externalLinks.map((_, i) => `<Override PartName="/xl/externalLinks/externalLink${i + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml"/>`).join('\n')}
+${[...sheetSlicerMap.values()].map(info => `<Override PartName="/xl/slicers/slicer${info.slicerDefIdx}.xml" ContentType="application/vnd.ms-excel.slicer+xml"/>`).join('\n')}
+${allSlicerCaches.map(sc => `<Override PartName="/xl/slicerCaches/slicerCache${sc.idx}.xml" ContentType="application/vnd.ms-excel.slicerCache+xml"/>`).join('\n')}
+${this.sheets.flatMap(ws => ws.getQueryTables()).map((_, i) => `<Override PartName="/xl/queryTables/queryTable${i + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml"/>`).join('\n')}
+${hasCellImages ? `<Override PartName="/xl/metadata.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml"/>
+<Override PartName="/xl/richData/rdrichvalue.xml" ContentType="application/vnd.ms-excel.rdrichvalue+xml"/>
+<Override PartName="/xl/richData/rdRichValueStructure.xml" ContentType="application/vnd.ms-excel.rdrichvaluestructure+xml"/>
+<Override PartName="/xl/richData/richValueRel.xml" ContentType="application/vnd.ms-excel.richvaluerel+xml"/>
+<Override PartName="/xl/richData/rdRichValueTypes.xml" ContentType="application/vnd.ms-excel.rdrichvaluetypes+xml"/>
+<Override PartName="/xl/richData/rdarray.xml" ContentType="application/vnd.ms-excel.rdarray+xml"/>` : ''}
 </Types>`) });
         entries.push({ name: '_rels/.rels', data: strToBytes(this._buildRootRels(hasCustom)) });
         entries.push({ name: 'xl/_rels/workbook.xml.rels', data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-${this.sheets.map((ws, i) => `<Relationship Id="${ws.rId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet${i + 1}.xml"/>`).join('')}
+${this.sheets.map((ws, i) => {
+                const type = ws._isChartSheet ? 'chartsheet' : ws._isDialogSheet ? 'dialogsheet' : 'worksheet';
+                const folder = ws._isChartSheet ? 'chartsheets' : ws._isDialogSheet ? 'dialogsheets' : 'worksheets';
+                return `<Relationship Id="${ws.rId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/${type}" Target="${folder}/sheet${i + 1}.xml"/>`;
+            }).join('')}
 <Relationship Id="rIdStyles" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>
 <Relationship Id="rIdShared" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>
+<Relationship Id="rIdTheme" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="theme/theme1.xml"/>
+${allPivotTables.map(p => `<Relationship Id="${p.cacheRId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition" Target="pivotCache/pivotCacheDefinition${p.pivotIdx}.xml"/>`).join('\n')}
+${allSlicerCaches.map(sc => `<Relationship Id="${sc.rId}" Type="http://schemas.microsoft.com/office/2007/relationships/slicerCache" Target="slicerCaches/slicerCache${sc.idx}.xml"/>`).join('\n')}
+${hasVba ? '<Relationship Id="rIdVBA" Type="http://schemas.microsoft.com/office/2006/relationships/vbaProject" Target="vbaProject.bin"/>' : ''}
+${this.connections.length ? '<Relationship Id="rIdConns" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/connections" Target="connections.xml"/>' : ''}
+${this.externalLinks.map((_, i) => `<Relationship Id="rIdExtLink${i + 1}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink" Target="externalLinks/externalLink${i + 1}.xml"/>`).join('\n')}
+${hasCellImages ? '<Relationship Id="rIdMeta" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sheetMetadata" Target="metadata.xml"/>' : ''}
+${hasCellImages ? '<Relationship Id="rIdRichValueRel" Type="http://schemas.microsoft.com/office/2022/10/relationships/richValueRel" Target="richData/richValueRel.xml"/>' : ''}
+${hasCellImages ? '<Relationship Id="rIdRichValue" Type="http://schemas.microsoft.com/office/2017/06/relationships/rdRichValue" Target="richData/rdrichvalue.xml"/>' : ''}
+${hasCellImages ? '<Relationship Id="rIdRichValueStruct" Type="http://schemas.microsoft.com/office/2017/06/relationships/rdRichValueStructure" Target="richData/rdRichValueStructure.xml"/>' : ''}
+${hasCellImages ? '<Relationship Id="rIdRichValueTypes" Type="http://schemas.microsoft.com/office/2017/06/relationships/rdRichValueTypes" Target="richData/rdRichValueTypes.xml"/>' : ''}
+${hasCellImages ? '<Relationship Id="rIdRdArray" Type="http://schemas.microsoft.com/office/2017/06/relationships/rdArray" Target="richData/rdarray.xml"/>' : ''}
 </Relationships>`) });
-        const date1904 = this.properties.date1904 ? `<workbookPr date1904="1"/>` : '<workbookPr/>';
-        const namedRangesXml = this.namedRanges.length
-            ? `<definedNames>${this.namedRanges.map(nr => `<definedName name="${escapeXml(nr.name)}"${nr.scope ? ` localSheetId="${this.sheets.findIndex(s => s.name === nr.scope)}"` : ''}>${escapeXml(nr.ref)}</definedName>`).join('')}</definedNames>` : '';
+        if (hasVba) {
+            this._ensureVbaSheetModules();
+            entries.push({ name: 'xl/vbaProject.bin', data: this.vbaProject.build() });
+        }
+        const wbPrAttrs = [
+            this.properties.date1904 ? 'date1904="1"' : '',
+            hasVba ? 'codeName="ThisWorkbook"' : '',
+        ].filter(Boolean).join(' ');
+        const date1904 = `<workbookPr${wbPrAttrs ? ' ' + wbPrAttrs : ''}/>`;
+        const namedRangesXml = this._definedNamesXml(allSlicerCaches);
+        const pivotCachesXml = allPivotTables.length
+            ? `<pivotCaches>${allPivotTables.map(p => `<pivotCache cacheId="${p.cacheId}" r:id="${p.cacheRId}"/>`).join('')}</pivotCaches>`
+            : '';
         entries.push({ name: 'xl/workbook.xml', data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
 ${date1904}
 <bookViews><workbookView xWindow="0" yWindow="0" windowWidth="14400" windowHeight="8260"/></bookViews>
 <sheets>${this.sheets.map((ws, i) => `<sheet name="${escapeXml(ws.name)}" sheetId="${i + 1}" r:id="${ws.rId}"${ws.options?.state && ws.options.state !== 'visible' ? ` state="${ws.options.state}"` : ''}/>`).join('')}</sheets>
 ${namedRangesXml}
-<calcPr calcId="191028"/>
+${this._calcPrXml()}
+${pivotCachesXml}
+${hasSlicers ? (() => {
+                const tableSlicers = allSlicerCaches.filter(sc => sc.type === 'table');
+                const pivotSlicers = allSlicerCaches.filter(sc => sc.type === 'pivot');
+                let xml = '<extLst>';
+                if (pivotSlicers.length)
+                    xml += `<ext uri="{BBE1A952-AA13-448e-AADC-164F8A28A991}" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"><x14:slicerCaches>${pivotSlicers.map(sc => `<x14:slicerCache r:id="${sc.rId}"/>`).join('')}</x14:slicerCaches></ext>`;
+                if (tableSlicers.length)
+                    xml += `<ext uri="{46BE6895-7355-4a93-B00E-2C351335B9C9}" xmlns:x15="http://schemas.microsoft.com/office/spreadsheetml/2010/11/main" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"><x15:slicerCaches>${tableSlicers.map(sc => `<x14:slicerCache r:id="${sc.rId}"/>`).join('')}</x15:slicerCaches></ext>`;
+                xml += '</extLst>';
+                return xml;
+            })() : ''}
 </workbook>`) });
+        if (this.connections.length) {
+            entries.push({ name: 'xl/connections.xml', data: strToBytes(this._connectionsXml()) });
+        }
         for (let i = 0; i < this.sheets.length; i++) {
             const ws = this.sheets[i];
             const imgRIds = sheetImageRIds.get(ws) ?? [];
             const cRIds = sheetChartRIds.get(ws) ?? [];
             const tblEntries = allTables.filter(t => t.ws === ws);
             const tblRIds_ = sheetTableRIds.get(ws) ?? [];
-            entries.push({ name: `xl/worksheets/sheet${i + 1}.xml`, data: strToBytes(ws.toXml(styles, shared)) });
+            const sheetFolder = ws._isChartSheet ? 'chartsheets' : ws._isDialogSheet ? 'dialogsheets' : 'worksheets';
+            const sheetPath = `xl/${sheetFolder}/sheet${i + 1}.xml`;
+            if (ws._isChartSheet) {
+                entries.push({ name: sheetPath, data: strToBytes(ws.toChartSheetXml()) });
+            }
+            else if (ws._isDialogSheet) {
+                entries.push({ name: sheetPath, data: strToBytes(ws.toDialogSheetXml(styles, shared)) });
+            }
+            else {
+                entries.push({ name: sheetPath, data: strToBytes(ws.toXml(styles, shared)) });
+            }
             const wsRels = [];
             if (ws.drawingRId) {
                 const dIdx = this.sheets.filter((s, j) => j <= i && s.drawingRId).length;
@@ -307,17 +694,75 @@ ${namedRangesXml}
             for (let j = 0; j < tblEntries.length; j++) {
                 wsRels.push(`<Relationship Id="${tblRIds_[j]}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/table" Target="../tables/table${tblEntries[j].globalTableId}.xml"/>`);
             }
+            const ptRIds_ = sheetPivotRIds.get(ws) ?? [];
+            const ptEntries = allPivotTables.filter(p => p.ws === ws);
+            for (let j = 0; j < ptEntries.length; j++) {
+                wsRels.push(`<Relationship Id="${ptRIds_[j]}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable" Target="../pivotTables/pivotTable${ptEntries[j].pivotIdx}.xml"/>`);
+            }
+            const slicerInfo = sheetSlicerMap.get(ws);
+            if (slicerInfo) {
+                wsRels.push(`<Relationship Id="${slicerInfo.slicerDefRId}" Type="http://schemas.microsoft.com/office/2007/relationships/slicer" Target="../slicers/slicer${slicerInfo.slicerDefIdx}.xml"/>`);
+            }
             const sheetComments = ws.getComments();
-            if (sheetComments.length && ws.legacyDrawingRId) {
+            const sheetControls = ws.getFormControls();
+            if ((sheetComments.length || sheetControls.length) && ws.legacyDrawingRId) {
                 const vIdx = vmlCtr++;
-                const commRId = `rId${globalRId++}`;
                 wsRels.push(`<Relationship Id="${ws.legacyDrawingRId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing" Target="../drawings/vmlDrawing${vIdx}.vml"/>`);
-                wsRels.push(`<Relationship Id="${commRId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments" Target="../comments${vIdx}.xml"/>`);
-                entries.push({ name: `xl/comments${vIdx}.xml`, data: strToBytes(this._buildCommentsXml(sheetComments)) });
-                entries.push({ name: `xl/drawings/vmlDrawing${vIdx}.vml`, data: strToBytes(this._buildVmlXml(sheetComments, i)) });
+                if (sheetComments.length) {
+                    const commRId = `rId${globalRId++}`;
+                    wsRels.push(`<Relationship Id="${commRId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments" Target="../comments${vIdx}.xml"/>`);
+                    entries.push({ name: `xl/comments${vIdx}.xml`, data: strToBytes(this._buildCommentsXml(sheetComments)) });
+                }
+                const commentShapes = sheetComments.map(({ row, col }, ci) => {
+                    const left = (col + 1) * 64;
+                    const top = (row - 1) * 20;
+                    const sid = 1025 + i * 1000 + ci;
+                    return `<v:shape id="_x0000_s${sid}" type="#_x0000_t202" style="position:absolute;margin-left:${left}pt;margin-top:${top}pt;width:108pt;height:59.25pt;z-index:${ci + 1};visibility:hidden" fillcolor="#ffffe1" o:insetmode="auto">
+<v:fill color2="#ffffe1"/>
+<v:shadow color="black" obscured="t"/>
+<v:path o:connecttype="none"/>
+<v:textbox style="mso-direction-alt:auto"><div style="text-align:left"/></v:textbox>
+<x:ClientData ObjectType="Note"><x:MoveWithCells/><x:SizeWithCells/><x:Anchor>${col + 1},15,${row - 1},10,${col + 3},15,${row + 4},4</x:Anchor><x:AutoFill>False</x:AutoFill><x:Row>${row - 1}</x:Row><x:Column>${col - 1}</x:Column></x:ClientData>
+</v:shape>`;
+                });
+                const ctrlBaseId = 1025 + ws.sheetIndex * 1000 + sheetComments.length;
+                const controlShapes = sheetControls.map((ctrl, ci) => buildFormControlVmlShape(ctrl, ctrlBaseId + ci));
+                entries.push({ name: `xl/drawings/vmlDrawing${vIdx}.vml`, data: strToBytes(buildVmlWithControls(commentShapes, controlShapes)) });
+                if (!ws._isDialogSheet) {
+                    const ctrlRIds = ws.ctrlPropRIds;
+                    for (let ci = 0; ci < sheetControls.length; ci++) {
+                        const ctrlPropIdx = ++ctrlPropGlobal;
+                        wsRels.push(`<Relationship Id="${ctrlRIds[ci]}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp" Target="../ctrlProps/ctrlProp${ctrlPropIdx}.xml"/>`);
+                        entries.push({ name: `xl/ctrlProps/ctrlProp${ctrlPropIdx}.xml`, data: strToBytes(buildCtrlPropXml(sheetControls[ci])) });
+                    }
+                }
+            }
+            const oleObjects = ws.getOleObjects();
+            for (let oi = 0; oi < oleObjects.length; oi++) {
+                const ole = oleObjects[oi];
+                const oleIdx = ++oleObjGlobal;
+                const oleRId = ws.oleRIds[oi];
+                if (ole.linkToFile) {
+                    wsRels.push(`<Relationship Id="${oleRId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject" Target="${escapeXml(ole.linkPath ?? '')}" TargetMode="External"/>`);
+                }
+                else {
+                    const embName = `xl/embeddings/oleObject${oleIdx}.bin`;
+                    wsRels.push(`<Relationship Id="${oleRId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject" Target="../embeddings/oleObject${oleIdx}.bin"/>`);
+                    const oleData = !ole.data ? new Uint8Array(0)
+                        : typeof ole.data === 'string' ? base64ToBytes(ole.data) : ole.data;
+                    entries.push({ name: embName, data: oleData });
+                }
+                if (ole.iconData) {
+                    const iconExt = ole.iconFormat ?? 'emf';
+                    const iconIdx = imgCtr++;
+                    const iconRId = ws.oleIconRIds[oi];
+                    wsRels.push(`<Relationship Id="${iconRId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/image${iconIdx}.${iconExt}"/>`);
+                    const iconData = typeof ole.iconData === 'string' ? base64ToBytes(ole.iconData) : ole.iconData;
+                    entries.push({ name: `xl/media/image${iconIdx}.${iconExt}`, data: iconData });
+                }
             }
             if (wsRels.length) {
-                entries.push({ name: `xl/worksheets/_rels/sheet${i + 1}.xml.rels`, data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                entries.push({ name: `xl/${sheetFolder}/_rels/sheet${i + 1}.xml.rels`, data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
 ${wsRels.join('\n')}
 </Relationships>`) });
@@ -347,14 +792,105 @@ ${dRels.join('\n')}
         for (const { img, ext, idx } of allImages) {
             entries.push({ name: `xl/media/image${idx}.${ext}`, data: typeof img.data === 'string' ? base64ToBytes(img.data) : img.data });
         }
+        if (hasCellImages) {
+            const cellImgRIds = [];
+            const cellImgRels = [];
+            for (let ci = 0; ci < allCellImages.length; ci++) {
+                const { img, ext, idx } = allCellImages[ci];
+                const rId = `rId${ci + 1}`;
+                cellImgRIds.push(rId);
+                cellImgRels.push(`<Relationship Id="${rId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="/xl/media/image${idx}.${ext}"/>`);
+                entries.push({ name: `xl/media/image${idx}.${ext}`, data: typeof img.data === 'string' ? base64ToBytes(img.data) : img.data });
+            }
+            entries.push({ name: 'xl/metadata.xml', data: strToBytes(buildMetadataXml(allCellImages.length)) });
+            entries.push({ name: 'xl/richData/rdrichvalue.xml', data: strToBytes(buildRichValueXml(allCellImages.length)) });
+            entries.push({ name: 'xl/richData/richValueRel.xml', data: strToBytes(buildRichValueRelXml(cellImgRIds)) });
+            entries.push({ name: 'xl/richData/rdRichValueStructure.xml', data: strToBytes(buildRichValueStructureXml()) });
+            entries.push({ name: 'xl/richData/rdRichValueTypes.xml', data: strToBytes(buildRichValueTypesXml()) });
+            entries.push({ name: 'xl/richData/rdarray.xml', data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?><arrayData xmlns="http://schemas.microsoft.com/office/spreadsheetml/2017/richdata2" count="0"></arrayData>`) });
+            entries.push({ name: 'xl/richData/_rels/richValueRel.xml.rels', data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+${cellImgRels.join('\n')}
+</Relationships>`) });
+        }
         for (const { ws, chartIdx, globalIdx } of allCharts) {
             entries.push({ name: `xl/charts/chart${globalIdx}.xml`, data: strToBytes(buildChartXml(ws.getCharts()[chartIdx])) });
         }
         for (const { ws, tableIdx, globalTableId } of allTables) {
             entries.push({ name: `xl/tables/table${globalTableId}.xml`, data: strToBytes(buildTableXml(ws.getTables()[tableIdx], globalTableId)) });
         }
+        for (const { ws, pt, pivotIdx, cacheId: cId } of allPivotTables) {
+            const sourceWs = this.sheets.find(s => s.name === pt.sourceSheet);
+            const sourceData = sourceWs ? sourceWs.readRange(pt.sourceRef) : [[]];
+            const { pivotTableXml, cacheDefXml, cacheRecordsXml } = buildPivotTableFiles(pt, sourceData, pivotIdx, cId);
+            const wbRel = (type, target) => `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">\n<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/${type}" Target="${target}"/>\n</Relationships>`;
+            entries.push({ name: `xl/pivotTables/pivotTable${pivotIdx}.xml`, data: strToBytes(pivotTableXml) });
+            entries.push({ name: `xl/pivotTables/_rels/pivotTable${pivotIdx}.xml.rels`, data: strToBytes(wbRel('pivotCacheDefinition', `../pivotCache/pivotCacheDefinition${pivotIdx}.xml`)) });
+            entries.push({ name: `xl/pivotCache/pivotCacheDefinition${pivotIdx}.xml`, data: strToBytes(cacheDefXml) });
+            entries.push({ name: `xl/pivotCache/_rels/pivotCacheDefinition${pivotIdx}.xml.rels`, data: strToBytes(wbRel('pivotCacheRecords', `pivotCacheRecords${pivotIdx}.xml`)) });
+            entries.push({ name: `xl/pivotCache/pivotCacheRecords${pivotIdx}.xml`, data: strToBytes(cacheRecordsXml) });
+        }
         entries.push({ name: 'xl/styles.xml', data: strToBytes(styles.toXml()) });
         entries.push({ name: 'xl/sharedStrings.xml', data: strToBytes(shared.toXml()) });
+        entries.push({ name: 'xl/theme/theme1.xml', data: strToBytes(this._buildThemeXml()) });
+        for (let i = 0; i < this.externalLinks.length; i++) {
+            const link = this.externalLinks[i];
+            const idx = i + 1;
+            const sheetsXml = link.sheets.map(s => {
+                const dNames = s.definedNames?.map(d => `<definedName name="${escapeXml(d.name)}" refersTo="${escapeXml(d.ref)}"/>`).join('') ?? '';
+                return `<sheetName val="${escapeXml(s.name)}"/>${dNames ? `<sheetDataSet>${dNames}</sheetDataSet>` : ''}`;
+            }).join('');
+            entries.push({ name: `xl/externalLinks/externalLink${idx}.xml`, data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<externalLink xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+<externalBook r:id="rId1"><sheetNames>${sheetsXml}</sheetNames></externalBook>
+</externalLink>`) });
+            entries.push({ name: `xl/externalLinks/_rels/externalLink${idx}.xml.rels`, data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLinkPath" Target="${escapeXml(link.target)}" TargetMode="External"/>
+</Relationships>`) });
+        }
+        for (const [ws, info] of sheetSlicerMap) {
+            const allSheetSlicerItems = [];
+            for (const ts of info.tableSlicers) {
+                const s = ts.slicer;
+                allSheetSlicerItems.push(`<slicer name="${escapeXml(s.name)}" cache="${escapeXml(s.name + '_cache')}" caption="${escapeXml(s.caption ?? s.columnName)}" rowHeight="241300" columnCount="${s.columnCount ?? 1}" style="${s.style ?? 'SlicerStyleLight1'}"/>`);
+            }
+            for (const ps of info.pivotSlicers) {
+                const s = ps.slicer;
+                allSheetSlicerItems.push(`<slicer name="${escapeXml(s.name)}" cache="${escapeXml(s.name + '_cache')}" caption="${escapeXml(s.caption ?? s.fieldName)}" rowHeight="241300" columnCount="${s.columnCount ?? 1}" style="${s.style ?? 'SlicerStyleLight1'}"/>`);
+            }
+            entries.push({ name: `xl/slicers/slicer${info.slicerDefIdx}.xml`, data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<slicers xmlns="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x="http://schemas.openxmlformats.org/spreadsheetml/2006/main" mc:Ignorable="x">
+${allSheetSlicerItems.join('\n')}
+</slicers>`) });
+        }
+        for (const sc of allSlicerCaches) {
+            let cacheBody;
+            if (sc.type === 'table') {
+                cacheBody = `<extLst><x:ext uri="{2F2917AC-EB37-4324-AD4E-5DD8C200BD13}" xmlns:x15="http://schemas.microsoft.com/office/spreadsheetml/2010/11/main"><x15:tableSlicerCache tableId="${sc.tableId}" column="${sc.columnIndex}" sortOrder="${sc.sortOrder ?? 'ascending'}"/></x:ext></extLst>`;
+            }
+            else {
+                const itemsXml = (sc.items ?? []).map((_, xi) => `<i x="${xi}" s="1"/>`).join('');
+                cacheBody = `<pivotTables><pivotTable tabId="${sc.tabId}" name="${escapeXml(sc.pivotTableName ?? '')}"/></pivotTables>` +
+                    (sc.items?.length ? `<data><tabular pivotCacheId="${sc.pivotCacheId}" showMissing="0"><items count="${sc.items.length}">${itemsXml}</items></tabular></data>` : '');
+            }
+            entries.push({ name: `xl/slicerCaches/slicerCache${sc.idx}.xml`, data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<slicerCacheDefinition xmlns="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main" xmlns:x="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x" name="${escapeXml(sc.name)}" sourceName="${escapeXml(sc.sourceName)}">
+${cacheBody}
+</slicerCacheDefinition>`) });
+        }
+        const allQueryTables = this.sheets.flatMap(ws => ws.getQueryTables());
+        for (let i = 0; i < allQueryTables.length; i++) {
+            const qt = allQueryTables[i];
+            entries.push({ name: `xl/queryTables/queryTable${i + 1}.xml`, data: strToBytes(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<queryTable xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" name="${escapeXml(qt.name)}" connectionId="${qt.connectionId}" autoFormatId="16" applyNumberFormats="0" applyBorderFormats="0" applyFontFormats="0" applyPatternFormats="0" applyAlignmentFormats="0" applyWidthHeightFormats="0">
+<queryTableRefresh nextId="${(qt.columns?.length ?? 0) + 1}">
+<queryTableFields count="${qt.columns?.length ?? 0}">
+${(qt.columns ?? []).map((c, ci) => `<queryTableField id="${ci + 1}" name="${escapeXml(c)}" tableColumnId="${ci + 1}"/>`).join('\n')}
+</queryTableFields>
+</queryTableRefresh>
+</queryTable>`) });
+        }
         const cp = { ...this.coreProperties, created: this.coreProperties.created ?? new Date(), modified: new Date() };
         if (!cp.creator && this.properties.author)
             cp.creator = this.properties.author;
@@ -364,12 +900,27 @@ ${dRels.join('\n')}
                 application: this.extendedProperties.application ?? 'ExcelForge',
                 company: this.extendedProperties.company ?? this.properties.company,
                 titlesOfParts: this.sheets.map(s => s.name),
-                headingPairs: [{ name: 'Worksheets', count: this.sheets.length }],
+                headingPairs: this._headingPairs(),
             })) });
         if (hasCustom)
             entries.push({ name: 'docProps/custom.xml', data: strToBytes(buildCustomXml(this.customProperties)) });
         return buildZip(entries, { level: this.compressionLevel });
     }
+    _headingPairs() {
+        const normalCount = this.sheets.filter(ws => !ws._isChartSheet && !ws._isDialogSheet).length;
+        const chartCount = this.sheets.filter(ws => ws._isChartSheet).length;
+        const dialogCount = this.sheets.filter(ws => ws._isDialogSheet).length;
+        const pairs = [];
+        if (normalCount)
+            pairs.push({ name: 'Worksheets', count: normalCount });
+        if (chartCount)
+            pairs.push({ name: 'Charts', count: chartCount });
+        if (dialogCount)
+            pairs.push({ name: 'Dialogs', count: dialogCount });
+        if (!pairs.length)
+            pairs.push({ name: 'Worksheets', count: 0 });
+        return pairs;
+    }
     _syncLegacyProperties() {
         const p = this.properties;
         if (p.title)
@@ -393,19 +944,136 @@ ${dRels.join('\n')}
         if (p.status)
             this.coreProperties.contentStatus ??= p.status;
     }
+    _ensureVbaSheetModules() {
+        if (!this.vbaProject)
+            return;
+        const existingDocModules = this.vbaProject.modules.filter(m => m.type === 'document' && m.name !== 'ThisWorkbook');
+        if (existingDocModules.length >= this.sheets.length)
+            return;
+        for (const ws of this.sheets) {
+            const sheetCodeName = ws.name.replace(/[^A-Za-z0-9_]/g, '_');
+            if (!this.vbaProject.getModule(sheetCodeName)) {
+                this.vbaProject.addModule({ name: sheetCodeName, type: 'document', code: '' });
+            }
+        }
+    }
     _patchWorkbookXml(originalXml) {
         let xml = originalXml;
         for (let i = 0; i < this.sheets.length; i++) {
             xml = xml.replace(new RegExp(`(<sheet[^>]+sheetId="${i + 1}"[^>]+)name="[^"]*"`), `$1name="${escapeXml(this.sheets[i].name)}"`);
         }
+        if (this.vbaProject && !xml.includes('codeName=')) {
+            xml = xml.replace('<workbookPr', '<workbookPr codeName="ThisWorkbook"');
+            if (!xml.includes('<workbookPr')) {
+                xml = xml.replace('<bookViews', '<workbookPr codeName="ThisWorkbook"/><bookViews');
+            }
+        }
+        const dnXml = this._definedNamesXml();
+        if (xml.includes('<definedNames')) {
+            xml = xml.replace(/<definedNames[\s\S]*?<\/definedNames>/, dnXml);
+        }
+        else if (dnXml) {
+            xml = xml.replace('</sheets>', `</sheets>${dnXml}`);
+        }
+        if (this.calcSettings) {
+            const newCalcPr = this._calcPrXml();
+            if (xml.includes('<calcPr')) {
+                xml = xml.replace(/<calcPr[^>]*\/>|<calcPr[^>]*>[\s\S]*?<\/calcPr>/, newCalcPr);
+            }
+            else {
+                xml = xml.replace('</workbook>', `${newCalcPr}</workbook>`);
+            }
+        }
         return xml;
     }
-    _buildWorkbookRels(rr) {
-        const rels = [...rr.workbookRels.entries()].map(([id, rel]) => `<Relationship Id="${id}" Type="${rel.type}" Target="${rel.target}"/>`);
+    _definedNamesXml(slicerCaches) {
+        const printAreaNames = [];
+        for (const ws of this.sheets) {
+            if (ws.printArea) {
+                const ref = ws.printArea.includes('!') ? ws.printArea : `'${ws.name}'!${ws.printArea}`;
+                printAreaNames.push({ name: '_xlnm.Print_Area', ref, scope: ws.name });
+            }
+        }
+        const slicerNames = (slicerCaches ?? []).map(sc => ({ name: sc.name, ref: '#N/A' }));
+        const all = [...this.namedRanges, ...printAreaNames, ...slicerNames];
+        if (!all.length)
+            return '';
+        return `<definedNames>${all.map(nr => {
+            let attrs = `name="${escapeXml(nr.name)}"`;
+            if (nr.scope) {
+                const idx = this.sheets.findIndex(s => s.name === nr.scope);
+                if (idx >= 0)
+                    attrs += ` localSheetId="${idx}"`;
+            }
+            if (nr.comment)
+                attrs += ` comment="${escapeXml(nr.comment)}"`;
+            return `<definedName ${attrs}>${escapeXml(nr.ref)}</definedName>`;
+        }).join('')}</definedNames>`;
+    }
+    _calcPrXml() {
+        const cs = this.calcSettings;
+        let attrs = 'calcId="191028"';
+        if (cs) {
+            if (cs.calcMode === 'manual')
+                attrs += ' calcMode="manual"';
+            else if (cs.calcMode === 'autoNoTable')
+                attrs += ' calcMode="autoNoTable"';
+            if (cs.fullCalcOnLoad)
+                attrs += ' fullCalcOnLoad="1"';
+            if (cs.iterate) {
+                attrs += ' iterate="1"';
+                if (cs.iterateCount != null)
+                    attrs += ` iterateCount="${cs.iterateCount}"`;
+                if (cs.iterateDelta != null)
+                    attrs += ` iterateDelta="${cs.iterateDelta}"`;
+            }
+            if (cs.fullPrecision === false)
+                attrs += ' fullPrecision="0"';
+            if (cs.calcOnSave === false)
+                attrs += ' calcOnSave="0"';
+            if (cs.concurrentCalc === false)
+                attrs += ' concurrentCalc="0"';
+        }
+        return `<calcPr ${attrs}/>`;
+    }
+    _connectionsXml(originalXml) {
+        if (!this.connections.length)
+            return '';
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<connections xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">${this.connections.map(c => {
+            if (c._rawXml)
+                return c._rawXml;
+            let attrs = ` id="${c.id}" name="${escapeXml(c.name)}" type="${connTypeToNum(c.type)}" refreshedVersion="6"`;
+            if (c.description)
+                attrs += ` description="${escapeXml(c.description)}"`;
+            if (c.refreshOnLoad)
+                attrs += ' refreshOnLoad="1"';
+            if (c.background)
+                attrs += ' background="1"';
+            if (c.saveData)
+                attrs += ' saveData="1"';
+            if (c.keepAlive)
+                attrs += ' keepAlive="1"';
+            if (c.interval)
+                attrs += ` interval="${c.interval}"`;
+            const dbPr = c.connectionString || c.command
+                ? `<dbPr${c.connectionString ? ` connection="${escapeXml(c.connectionString)}"` : ''}${c.command ? ` command="${escapeXml(c.command)}"` : ''}${c.commandType ? ` commandType="${cmdTypeToNum(c.commandType)}"` : ''}/>`
+                : '';
+            return `<connection${attrs}>${dbPr}</connection>`;
+        }).join('')}</connections>`;
+    }
+    _buildWorkbookRels(rr, dropCalcChain = false) {
+        const rels = [...rr.workbookRels.entries()]
+            .filter(([_, rel]) => !(dropCalcChain && rel.type.includes('/calcChain')))
+            .map(([id, rel]) => `<Relationship Id="${id}" Type="${rel.type}" Target="${rel.target}"/>`);
         if (![...rr.workbookRels.values()].some(r => r.type.includes('/styles')))
             rels.push(`<Relationship Id="rIdStyles" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>`);
         if (![...rr.workbookRels.values()].some(r => r.type.includes('/sharedStrings')))
             rels.push(`<Relationship Id="rIdShared" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>`);
+        if (this.vbaProject && ![...rr.workbookRels.values()].some(r => r.type.includes('vbaProject')))
+            rels.push(`<Relationship Id="rIdVBA" Type="http://schemas.microsoft.com/office/2006/relationships/vbaProject" Target="vbaProject.bin"/>`);
+        if (this.connections.length && ![...rr.workbookRels.values()].some(r => r.type.includes('/connections')))
+            rels.push(`<Relationship Id="rIdConns" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/connections" Target="connections.xml"/>`);
         return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
 ${rels.join('\n')}
@@ -414,8 +1082,51 @@ ${rels.join('\n')}
     _relsToXml(relMap) {
         return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-${[...relMap.entries()].map(([id, r]) => `<Relationship Id="${id}" Type="${r.type}" Target="${r.target}"/>`).join('\n')}
+${[...relMap.entries()].map(([id, r]) => `<Relationship Id="${escapeXml(id)}" Type="${escapeXml(r.type)}" Target="${escapeXml(r.target)}"${r.targetMode ? ` TargetMode="${escapeXml(r.targetMode)}"` : ''}/>`).join('\n')}
 </Relationships>`;
+    }
+    _buildThemeXml() {
+        const t = this.theme;
+        const majorFont = t?.majorFont ?? 'Calibri Light';
+        const minorFont = t?.minorFont ?? 'Calibri';
+        const defaultColors = [
+            { name: 'dk1', color: '000000' }, { name: 'lt1', color: 'FFFFFF' },
+            { name: 'dk2', color: '44546A' }, { name: 'lt2', color: 'E7E6E6' },
+            { name: 'accent1', color: '4472C4' }, { name: 'accent2', color: 'ED7D31' },
+            { name: 'accent3', color: 'A5A5A5' }, { name: 'accent4', color: 'FFC000' },
+            { name: 'accent5', color: '5B9BD5' }, { name: 'accent6', color: '70AD47' },
+            { name: 'hlink', color: '0563C1' }, { name: 'folHlink', color: '954F72' },
+        ];
+        const colors = t?.colors?.map(c => {
+            let hex = c.color.replace(/^#/, '');
+            if (hex.length === 8)
+                hex = hex.substring(2);
+            return { name: c.name, color: hex };
+        }) ?? defaultColors;
+        const colorElements = colors.map(c => {
+            if (c.name === 'dk1' || c.name === 'lt1') {
+                return `<a:${c.name}><a:sysClr val="${c.name === 'dk1' ? 'windowText' : 'window'}" lastClr="${c.color}"/></a:${c.name}>`;
+            }
+            return `<a:${c.name}><a:srgbClr val="${c.color}"/></a:${c.name}>`;
+        }).join('');
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="${escapeXml(t?.name ?? 'Office Theme')}">
+<a:themeElements>
+<a:clrScheme name="Office">${colorElements}</a:clrScheme>
+<a:fontScheme name="Office">
+<a:majorFont><a:latin typeface="${escapeXml(majorFont)}"/><a:ea typeface=""/><a:cs typeface=""/></a:majorFont>
+<a:minorFont><a:latin typeface="${escapeXml(minorFont)}"/><a:ea typeface=""/><a:cs typeface=""/></a:minorFont>
+</a:fontScheme>
+<a:fmtScheme name="Office">
+<a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:lumMod val="110000"/><a:satMod val="105000"/><a:tint val="67000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="103000"/><a:tint val="73000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="109000"/><a:tint val="81000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:satMod val="103000"/><a:lumMod val="102000"/><a:tint val="94000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:satMod val="110000"/><a:lumMod val="100000"/><a:shade val="100000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="99000"/><a:satMod val="120000"/><a:shade val="78000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill></a:fillStyleLst>
+<a:lnStyleLst><a:ln w="6350" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln><a:ln w="12700" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln><a:ln w="19050" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln></a:lnStyleLst>
+<a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="57150" dist="19050" dir="5400000" algn="ctr" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="63000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle></a:effectStyleLst>
+<a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"><a:tint val="95000"/><a:satMod val="170000"/></a:schemeClr></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="93000"/><a:satMod val="150000"/><a:shade val="98000"/><a:lumMod val="102000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:tint val="98000"/><a:satMod val="130000"/><a:shade val="90000"/><a:lumMod val="103000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="63000"/><a:satMod val="120000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill></a:bgFillStyleLst>
+</a:fmtScheme>
+</a:themeElements>
+<a:objectDefaults/>
+<a:extraClrSchemeLst/>
+</a:theme>`;
     }
     _buildRootRels(hasCustom) {
         return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -426,12 +1137,24 @@ ${[...relMap.entries()].map(([id, r]) => `<Relationship Id="${id}" Type="${r.typ
 ${hasCustom ? `<Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties" Target="docProps/custom.xml"/>` : ''}
 </Relationships>`;
     }
-    _patchContentTypes(originalXml, addCustom) {
+    _patchContentTypes(originalXml, addCustom, dropCalcChain = false) {
         let xml = originalXml;
+        if (dropCalcChain)
+            xml = xml.replace(/<Override[^>]*calcChain[^>]*\/>/g, '');
         if (!xml.includes('sharedStrings'))
             xml = xml.replace('</Types>', `<Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>\n</Types>`);
         if (addCustom && !xml.includes('custom-properties'))
             xml = xml.replace('</Types>', `<Override PartName="/docProps/custom.xml" ContentType="application/vnd.openxmlformats-officedocument.custom-properties+xml"/>\n</Types>`);
+        if (this.vbaProject) {
+            if (!xml.includes('vbaProject.bin'))
+                xml = xml.replace('</Types>', `<Override PartName="/xl/vbaProject.bin" ContentType="application/vnd.ms-office.vbaProject"/>\n</Types>`);
+            xml = xml.replace('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml', 'application/vnd.ms-excel.sheet.macroEnabled.main+xml');
+        }
+        if (this.isTemplate && !this.vbaProject) {
+            xml = xml.replace('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml');
+        }
+        if (this.connections.length && !xml.includes('connections.xml'))
+            xml = xml.replace('</Types>', `<Override PartName="/xl/connections.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml"/>\n</Types>`);
         return xml;
     }
     async buildBase64() {
@@ -452,7 +1175,37 @@ ${hasCustom ? `<Relationship Id="rId4" Type="http://schemas.openxmlformats.org/o
         const commentsXml = comments.map(({ row, col, comment }) => {
             const ref = `${colIndexToLetter(col)}${row}`;
             const authorIdx = authors.indexOf(comment.author ?? '');
-            return `<comment ref="${ref}" authorId="${authorIdx}"><text><r><t>${escapeXml(comment.text)}</t></r></text></comment>`;
+            let textXml;
+            if (comment.richText && comment.richText.length > 0) {
+                textXml = comment.richText.map(run => {
+                    let rPr = '';
+                    if (run.font) {
+                        const f = run.font;
+                        if (f.bold)
+                            rPr += '<b/>';
+                        if (f.italic)
+                            rPr += '<i/>';
+                        if (f.underline && f.underline !== 'none')
+                            rPr += `<u val="${f.underline === 'single' ? 'single' : f.underline}"/>`;
+                        if (f.strike)
+                            rPr += '<strike/>';
+                        if (f.size)
+                            rPr += `<sz val="${f.size}"/>`;
+                        if (f.color)
+                            rPr += `<color rgb="${f.color}"/>`;
+                        if (f.name)
+                            rPr += `<rFont val="${escapeXml(f.name)}"/>`;
+                        if (f.family != null)
+                            rPr += `<family val="${f.family}"/>`;
+                    }
+                    const rPrTag = rPr ? `<rPr>${rPr}</rPr>` : '';
+                    return `<r>${rPrTag}<t xml:space="preserve">${escapeXml(run.text)}</t></r>`;
+                }).join('');
+            }
+            else {
+                textXml = `<r><t>${escapeXml(comment.text)}</t></r>`;
+            }
+            return `<comment ref="${ref}" authorId="${authorIdx}"><text>${textXml}</text></comment>`;
         }).join('');
         return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <comments xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
@@ -489,4 +1242,74 @@ ${shapes}
         URL.revokeObjectURL(url);
     }
 }
+function imageContentType(ext) {
+    switch (ext) {
+        case 'jpg': return 'image/jpeg';
+        case 'png': return 'image/png';
+        case 'gif': return 'image/gif';
+        case 'bmp': return 'image/bmp';
+        case 'tiff': return 'image/tiff';
+        case 'emf': return 'image/x-emf';
+        case 'wmf': return 'image/x-wmf';
+        case 'svg': return 'image/svg+xml';
+        case 'ico': return 'image/x-icon';
+        case 'webp': return 'image/webp';
+        default: return `image/${ext}`;
+    }
+}
+function imageExt(format) {
+    return format === 'jpeg' ? 'jpg' : format;
+}
+function buildMetadataXml(count) {
+    const bks = Array.from({ length: count }, (_, i) => `<bk><extLst><ext uri="{3e2802c4-a4d2-4d8b-9148-e3be6c30e623}"><xlrd:rvb i="${i}"/></ext></extLst></bk>`).join('');
+    const cellBks = Array.from({ length: count }, (_, i) => `<bk><rc t="1" v="${i}"/></bk>`).join('');
+    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>` +
+        `<metadata xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"` +
+        ` xmlns:xlrd="http://schemas.microsoft.com/office/spreadsheetml/2017/richdata">` +
+        `<metadataTypes count="1">` +
+        `<metadataType name="XLRICHVALUE" minSupportedVersion="120000" copy="1" pasteAll="1" pasteValues="1" merge="1" splitFirst="1" rowColShift="1" clearFormats="1" clearComments="1" assign="1" coerce="1"/>` +
+        `</metadataTypes>` +
+        `<futureMetadata name="XLRICHVALUE" count="${count}">${bks}</futureMetadata>` +
+        `<valueMetadata count="${count}">${cellBks}</valueMetadata>` +
+        `</metadata>`;
+}
+function buildRichValueXml(count) {
+    const rvs = Array.from({ length: count }, (_, i) => `<rv s="0"><v>${i}</v><v>5</v><v></v></rv>`).join('');
+    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>` +
+        `<rvData xmlns="http://schemas.microsoft.com/office/spreadsheetml/2017/richdata" count="${count}">${rvs}</rvData>`;
+}
+function buildRichValueRelXml(rIds) {
+    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>` +
+        `<richValueRels xmlns="http://schemas.microsoft.com/office/spreadsheetml/2022/richvaluerel"` +
+        ` xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">` +
+        rIds.map(id => `<rel r:id="${id}"/>`).join('') +
+        `</richValueRels>`;
+}
+function buildRichValueStructureXml() {
+    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>` +
+        `<rvStructures xmlns="http://schemas.microsoft.com/office/spreadsheetml/2017/richdata" count="1">` +
+        `<s t="_localImage"><k n="_rvRel:LocalImageIdentifier" t="i"/><k n="CalcOrigin" t="i"/><k n="Text" t="s"/></s>` +
+        `</rvStructures>`;
+}
+function buildRichValueTypesXml() {
+    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>` +
+        `<rvTypesInfo xmlns="http://schemas.microsoft.com/office/spreadsheetml/2017/richdata2"` +
+        ` xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"` +
+        ` mc:Ignorable="x"` +
+        ` xmlns:x="http://schemas.openxmlformats.org/spreadsheetml/2006/main">` +
+        `<global><keyFlags>` +
+        `<key name="_Self"><flag name="ExcludeFromFile" value="1"/><flag name="ExcludeFromCalcComparison" value="1"/></key>` +
+        `<key name="_DisplayString"><flag name="ExcludeFromCalcComparison" value="1"/></key>` +
+        `<key name="_Flags"><flag name="ExcludeFromCalcComparison" value="1"/></key>` +
+        `<key name="_Format"><flag name="ExcludeFromCalcComparison" value="1"/></key>` +
+        `<key name="_SubLabel"><flag name="ExcludeFromCalcComparison" value="1"/></key>` +
+        `<key name="_Attribution"><flag name="ExcludeFromCalcComparison" value="1"/></key>` +
+        `<key name="_Icon"><flag name="ExcludeFromCalcComparison" value="1"/></key>` +
+        `<key name="_Display"><flag name="ExcludeFromCalcComparison" value="1"/></key>` +
+        `<key name="_CanonicalPropertyNames"><flag name="ExcludeFromCalcComparison" value="1"/></key>` +
+        `<key name="_ClassificationId"><flag name="ExcludeFromCalcComparison" value="1"/></key>` +
+        `</keyFlags></global>` +
+        `<types></types>` +
+        `</rvTypesInfo>`;
+}
 //# sourceMappingURL=Workbook.js.map