@rowsncolumns/toolkit 24.4.3 → 24.4.4

package/dist/esm/exporter/xlsx/xlsx-export.js

@@ -2,6 +2,8 @@ import { cellRangeToAddress, cellToAddress, escapeCharacters, getCellEffectiveFo
 import { zipSync } from "fflate";
 import { omitInvalidDataValidationError } from "../invalid-data-validation";
 import { buildAutoFilterConditionXml } from "../../autofilter-condition";
+import { buildControlElementXml, buildControlsXml, buildCtrlPropXml, buildFormControlVmlShape, buildVmlDrawingXml, CTRL_PROP_CONTENT_TYPE, CTRL_PROP_REL_TYPE, FORM_CONTROL_VML_SHAPETYPE, } from "./form-controls-builder";
+import { buildChartExGraphicFrameXml, buildChartExXml, CHART_EX_CONTENT_TYPE, CHART_EX_REL_TYPE, isChartExType, } from "./chartex-builder";
 import { applyPowerQueryParts } from "./power-query-builder";
 import { encodeImplicitIntersection } from "../../helpers/implicit-intersection";
 import { qualifyFutureFunctions } from "./future-functions";
@@ -53,6 +55,8 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
     const embedsBySheet = groupEmbedsBySheet(embeds ?? []);
     const textBoxesBySheet = groupTextBoxesBySheet(embeds ?? []);
     const shapesBySheet = groupShapesBySheet(embeds ?? []);
+    const formControlsBySheet = groupFormControlsBySheet(embeds ?? []);
+    const ctrlProps = { parts: [] };
     const chartsBySheet = groupChartsBySheet(charts ?? []);
     // Remap slicer tableIds to match prepared table IDs
     const remappedSlicers = slicers.map((slicer) => {
@@ -118,6 +122,7 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
         const embedImages = embedsBySheet.get(sheet.sheetId) ?? [];
         const textBoxes = textBoxesBySheet.get(sheet.sheetId) ?? [];
         const sheetShapes = shapesBySheet.get(sheet.sheetId) ?? [];
+        const sheetFormControls = formControlsBySheet.get(sheet.sheetId) ?? [];
         const sheetCharts = chartsBySheet.get(sheet.sheetId) ?? [];
         const sheetSlicers = slicersBySheet.get(sheet.sheetId) ?? [];
         const worksheetSlicerRelIds = [];
@@ -250,6 +255,8 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
             sheets: sortedSheets,
             locale,
             protectedRanges,
+            formControls: sheetFormControls,
+            ctrlProps,
         });
         return {
             index,
@@ -322,6 +329,10 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
     const drawingSheets = [];
     const imageExtensions = new Set();
     const chartEntries = [];
+    // Excel 2016+ chartex parts (treemap / sunburst) — numbered apart from
+    // `chart{N}.xml`, as Excel does.
+    const chartExEntries = [];
+    let globalChartExIndex = 1;
     for (const entry of worksheetEntries) {
         const placements = [...entry.cellImages, ...entry.embedImages];
         const textBoxesForSheet = entry.textBoxes ?? [];
@@ -341,6 +352,7 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
             shapes: shapesForSheet,
             startImageIndex: globalImageIndex,
             startChartIndex: globalChartIndex,
+            startChartExIndex: globalChartExIndex,
             charts: chartsForSheet,
             slicers: slicersForSheet,
             sheetNameById,
@@ -358,13 +370,20 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
         for (const chartEntry of drawingParts.charts) {
             chartEntries.push(chartEntry);
         }
+        for (const chartExEntry of drawingParts.chartExs) {
+            chartExEntries.push(chartExEntry);
+        }
         globalImageIndex = drawingParts.nextImageIndex;
         globalChartIndex = drawingParts.nextChartIndex;
+        globalChartExIndex = drawingParts.nextChartExIndex;
         drawingSheets.push(entry.index + 1);
     }
     for (const chartEntry of chartEntries) {
         files[chartEntry.path] = encodeXml(chartEntry.xml);
     }
+    for (const chartExEntry of chartExEntries) {
+        files[chartExEntry.path] = encodeXml(chartExEntry.xml);
+    }
     for (const slicerCacheEntry of slicerCacheEntries) {
         files[slicerCacheEntry.path] = encodeXml(slicerCacheEntry.xml);
     }
@@ -398,6 +417,10 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
     const commentsSheets = worksheetEntries
         .filter((entry) => entry.commentsXml)
         .map((entry) => entry.sheet.sheetId ?? entry.index + 1);
+    const hasVmlDrawings = worksheetEntries.some((entry) => entry.vmlDrawingXml);
+    for (const part of ctrlProps.parts) {
+        files[part.path] = encodeXml(part.xml);
+    }
     const threadedCommentsSheets = worksheetEntries
         .filter((entry) => entry.threadedCommentsXml)
         .map((entry) => entry.sheet.sheetId ?? entry.index + 1);
@@ -407,6 +430,7 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
         drawingSheets,
         mediaExtensions: Array.from(imageExtensions),
         chartCount: chartEntries.length,
+        chartExCount: chartExEntries.length,
         slicerCount: slicerEntries.length,
         slicerCacheCount: slicerCacheEntries.length,
         pivotTableCount: pivotTableEntries.length,
@@ -415,6 +439,8 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
         threadedCommentsSheets,
         hasPersons: !personRegistry.isEmpty(),
         externalLinkCount: externalLinks.length,
+        hasVmlDrawings,
+        ctrlPropCount: ctrlProps.parts.length,
     });
     files["[Content_Types].xml"] = encodeXml(contentTypesXml);
     // Preserved Power Query machinery (DataMashup customXml, connections.xml, queryTable parts) is
@@ -563,6 +589,8 @@ class DataValidationCollector {
         return `<dataValidations count="${this.entries.size}">${items.join("")}</dataValidations>`;
     }
 }
+/** First VML shape id the note shapes take (`_x0000_s1026`, `_x0000_s1027`, …). */
+const NOTE_VML_SHAPE_ID_BASE = 1026;
 class CommentsCollector {
     entries = [];
     add(address, text, author = "System") {
@@ -587,13 +615,18 @@ class CommentsCollector {
             .join("");
         return `${XML_DECLARATION}<comments xmlns="${WORKSHEET_NS}"><authors>${authorsXml}</authors><commentList>${commentsXml}</commentList></comments>`;
     }
-    toVmlXml() {
-        if (!this.entries.length) {
-            return undefined;
-        }
-        const shapes = this.entries
-            .map((entry, index) => {
-            const shapeId = `_x0000_s${1026 + index}`;
+    /**
+     * VML shape ids the note shapes occupy. Excel allocates notes and form
+     * controls from one per-sheet counter, so the form-control allocator must
+     * never hand these out again.
+     */
+    vmlShapeIds() {
+        return this.entries.map((_, index) => NOTE_VML_SHAPE_ID_BASE + index);
+    }
+    /** One `<v:shape>` per note (Excel's hidden `Note` object). */
+    toVmlShapes() {
+        return this.entries.map((entry, index) => {
+            const shapeId = `_x0000_s${NOTE_VML_SHAPE_ID_BASE + index}`;
             // Parse cell address to get row and column
             const match = entry.address.match(/^([A-Z]+)(\d+)$/);
             if (!match)
@@ -604,11 +637,11 @@ class CommentsCollector {
                 .split("")
                 .reduce((acc, char) => acc * 26 + (char.charCodeAt(0) - 64), 0) - 1;
             return `<v:shape id="${shapeId}" type="#_x0000_t202" style='position:absolute;margin-left:59.25pt;margin-top:1.5pt;width:108pt;height:59.25pt;z-index:${index + 1};visibility:hidden' fillcolor="#ffffe1" o:insetmode="auto"><v:fill color2="#ffffe1"/><v:shadow on="t" color="black" obscured="t"/><v:path o:connecttype="none"/><v:textbox style='mso-direction-alt:auto'><div style='text-align:left'></div></v:textbox><x:ClientData ObjectType="Note"><x:MoveWithCells/><x:SizeWithCells/><x:Anchor>1, 15, 0, 2, 3, 15, 3, 16</x:Anchor><x:AutoFill>False</x:AutoFill><x:Row>${row - 1}</x:Row><x:Column>${colIndex}</x:Column></x:ClientData></v:shape>`;
-        })
-            .join("");
-        return `<xml xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel"><o:shapelayout v:ext="edit"><o:idmap v:ext="edit" data="1"/></o:shapelayout><v:shapetype id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe"><v:stroke joinstyle="miter"/><v:path gradientshapeok="t" o:connecttype="rect"/></v:shapetype>${shapes}</xml>`;
+        }).filter(Boolean);
     }
 }
+/** VML `<v:shapetype>` for legacy notes (`#_x0000_t202`). */
+const NOTE_VML_SHAPETYPE = `<v:shapetype id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe"><v:stroke joinstyle="miter"/><v:path gradientshapeok="t" o:connecttype="rect"/></v:shapetype>`;
 const INVALID_XML_CHAR_REGEX = /[\u0000-\u0008\u000B\u000C\u000E-\u001F]/g;
 const sanitizeXmlText = (value) => {
     if (!value)
@@ -660,7 +693,7 @@ const getRowsForSheet = (sheetData, sheetId) => {
         sheetData[Number(sheetId)] ??
         []);
 };
-const buildWorksheetXml = ({ sheet, rows, sharedStrings, sourceSharedStrings, cellXfs, styleBuilder, tables, relationships, drawingContext, conditionalFormats, dataValidationsById, dataValidations, ignoreFormulaPatterns, citations, comments, personRegistry, slicerRelIds, sheetData, sheets, locale, protectedRanges, }) => {
+const buildWorksheetXml = ({ sheet, rows, sharedStrings, sourceSharedStrings, cellXfs, styleBuilder, tables, relationships, drawingContext, conditionalFormats, dataValidationsById, dataValidations, ignoreFormulaPatterns, citations, comments, personRegistry, slicerRelIds, sheetData, sheets, locale, protectedRanges, formControls = [], ctrlProps = { parts: [] }, }) => {
     const tableNameMap = buildTableNameMap(tables);
     const bounds = {
         minRow: Number.POSITIVE_INFINITY,
@@ -823,12 +856,33 @@ const buildWorksheetXml = ({ sheet, rows, sharedStrings, sourceSharedStrings, ce
     }
     // Generate comments XML (notes) and add relationships if there are comments
     const commentsXml = commentsCollector.toXml();
-    let legacyDrawingXml = "";
     if (commentsXml) {
         relationships.add(COMMENTS_REL_TYPE, `../comments${sheet.sheetId}.xml`);
+    }
+    // Notes and form controls share the sheet's one legacy VML part
+    // (`<legacyDrawing>`); a control without its VML shape is dropped by Excel.
+    const noteVmlShapes = commentsCollector.toVmlShapes();
+    const formControlBuild = buildSheetFormControls({
+        sheet,
+        controls: formControls,
+        relationships,
+        ctrlProps,
+        zIndexStart: noteVmlShapes.length,
+        reservedShapeIds: commentsCollector.vmlShapeIds(),
+    });
+    const vmlDrawingXml = buildVmlDrawingXml({
+        shapeTypes: [
+            ...(noteVmlShapes.length ? [NOTE_VML_SHAPETYPE] : []),
+            ...(formControlBuild.vmlShapes.length ? [FORM_CONTROL_VML_SHAPETYPE] : []),
+        ],
+        shapes: [...noteVmlShapes, ...formControlBuild.vmlShapes],
+    });
+    let legacyDrawingXml = "";
+    if (vmlDrawingXml) {
         const legacyDrawingRelId = relationships.add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing", `../drawings/vmlDrawing${sheet.sheetId}.vml`);
         legacyDrawingXml = `<legacyDrawing r:id="${legacyDrawingRelId}"/>`;
     }
+    const controlsXml = formControlBuild.controlsXml;
     const sheetDataXml = `<sheetData>${rowXmlChunks.join("")}</sheetData>`;
     const protectionXml = buildSheetProtectionXml(sheet, protectedRanges);
     const printSettingsXml = buildPrintSettingsXml(sheet.printSettings);
@@ -865,13 +919,13 @@ const buildWorksheetXml = ({ sheet, rows, sharedStrings, sourceSharedStrings, ce
         explicitDefaultColumnWidthPx > 0) {
         sheetFormatPrAttrs.push(`defaultColWidth="${columnPixelToChars(explicitDefaultColumnWidthPx).toFixed(2)}"`);
     }
-    const worksheetXml = `${XML_DECLARATION}<worksheet xmlns="${WORKSHEET_NS}" xmlns:r="${REL_NS}">${sheetPrXml}<dimension ref="${dimension}"/>${sheetViews}<sheetFormatPr ${sheetFormatPrAttrs.join(" ")}/>${columnXml}${sheetDataXml}${protectionXml}${basicFilterXml}${mergeXml}${conditionalFormattingXml}${dataValidationsXml}${hyperlinksXml}${printSettingsXml}${drawingXml}${legacyDrawingXml}${tablePartsXml}${extLstXml}</worksheet>`;
+    const worksheetXml = `${XML_DECLARATION}<worksheet xmlns="${WORKSHEET_NS}" xmlns:r="${REL_NS}">${sheetPrXml}<dimension ref="${dimension}"/>${sheetViews}<sheetFormatPr ${sheetFormatPrAttrs.join(" ")}/>${columnXml}${sheetDataXml}${protectionXml}${basicFilterXml}${mergeXml}${conditionalFormattingXml}${dataValidationsXml}${hyperlinksXml}${printSettingsXml}${drawingXml}${legacyDrawingXml}${controlsXml}${tablePartsXml}${extLstXml}</worksheet>`;
     return {
         xml: worksheetXml,
         relationshipsXml: relationships.toXml(),
         images: collectedImages,
         commentsXml,
-        vmlDrawingXml: commentsCollector.toVmlXml(),
+        vmlDrawingXml,
         threadedCommentsXml,
     };
 };
@@ -2763,6 +2817,130 @@ const groupTextBoxesBySheet = (embeds) => {
     });
     return result;
 };
+/** Form-control embeds (`spec.type === "formControl"`) by sheet, in host order. */
+const groupFormControlsBySheet = (embeds) => {
+    const result = new Map();
+    (embeds ?? []).forEach((embed, order) => {
+        if (!embed.position?.overlayPosition)
+            return;
+        if (embed.spec?.type !== "formControl")
+            return;
+        const overlay = embed.position.overlayPosition;
+        const placement = {
+            shape: embed,
+            order,
+            rowIndex: overlay.anchorCell.rowIndex,
+            columnIndex: overlay.anchorCell.columnIndex,
+            offsetX: overlay.offsetXPixels ?? 0,
+            offsetY: overlay.offsetYPixels ?? 0,
+            width: overlay.widthPixels ?? 120,
+            height: overlay.heightPixels ?? 20,
+        };
+        const list = result.get(embed.position.sheetId) ?? [];
+        list.push(placement);
+        result.set(embed.position.sheetId, list);
+    });
+    return result;
+};
+/**
+ * Write a sheet's form controls: one ctrlProp part + sheet relationship per
+ * control, the `<controls>` worksheet element, and the VML shapes Excel
+ * draws them with (merged into the sheet's `vmlDrawing` alongside notes).
+ */
+const buildSheetFormControls = ({ sheet, controls, relationships, ctrlProps, zIndexStart, reservedShapeIds, }) => {
+    if (!controls.length)
+        return { controlsXml: "", vmlShapes: [] };
+    const controlElements = [];
+    const vmlShapes = [];
+    // Excel numbers notes and form-control shapes from one per-sheet counter
+    // (1025 upward); a control that arrived with its own id keeps it unless it
+    // collides with a note shape or another control.
+    const usedShapeIds = new Set(reservedShapeIds);
+    let nextShapeId = 1025;
+    const allocateShapeId = (wanted) => {
+        if (wanted && Number.isInteger(wanted) && !usedShapeIds.has(wanted)) {
+            usedShapeIds.add(wanted);
+            return wanted;
+        }
+        while (usedShapeIds.has(nextShapeId))
+            nextShapeId += 1;
+        usedShapeIds.add(nextShapeId);
+        return nextShapeId++;
+    };
+    const sumSizes = (count, getSize) => {
+        let total = 0;
+        for (let index = 0; index < count; index++)
+            total += getSize(index);
+        return total;
+    };
+    controls.forEach((placement, position) => {
+        const spec = placement.shape.spec;
+        const fromRow = Math.max(0, placement.rowIndex - 1);
+        const fromColumn = Math.max(0, placement.columnIndex - 1);
+        const offsetX = Math.max(0, placement.offsetX ?? 0);
+        const offsetY = Math.max(0, placement.offsetY ?? 0);
+        const widthPx = Math.max(5, placement.width ?? 120);
+        const heightPx = Math.max(5, placement.height ?? 20);
+        const columnSize = (index) => getColumnWidthPx(sheet, index, true);
+        const rowSize = (index) => getRowHeightPx(sheet, index, true);
+        const toColumn = resolveAnchorEndpoint({
+            startIndex: fromColumn,
+            startOffset: offsetX,
+            span: widthPx,
+            getSize: columnSize,
+        });
+        const toRow = resolveAnchorEndpoint({
+            startIndex: fromRow,
+            startOffset: offsetY,
+            span: heightPx,
+            getSize: rowSize,
+        });
+        const partIndex = ctrlProps.parts.length + 1;
+        const path = `xl/ctrlProps/ctrlProp${partIndex}.xml`;
+        ctrlProps.parts.push({ path, xml: buildCtrlPropXml(spec) });
+        const relId = relationships.add(CTRL_PROP_REL_TYPE, `../ctrlProps/ctrlProp${partIndex}.xml`);
+        const shapeId = allocateShapeId(spec.shapeId);
+        controlElements.push(buildControlElementXml({
+            spec,
+            relId,
+            shapeId,
+            from: {
+                col: fromColumn,
+                colOff: offsetX * EMUS_PER_PIXEL,
+                row: fromRow,
+                rowOff: offsetY * EMUS_PER_PIXEL,
+            },
+            to: {
+                col: toColumn.index,
+                colOff: toColumn.offset * EMUS_PER_PIXEL,
+                row: toRow.index,
+                rowOff: toRow.offset * EMUS_PER_PIXEL,
+            },
+        }));
+        vmlShapes.push(buildFormControlVmlShape({
+            spec,
+            shapeId,
+            zIndex: zIndexStart + position + 1,
+            geometry: {
+                leftPx: sumSizes(fromColumn, columnSize) + offsetX,
+                topPx: sumSizes(fromRow, rowSize) + offsetY,
+                widthPx,
+                heightPx,
+                anchor: [
+                    fromColumn,
+                    Math.round(offsetX),
+                    fromRow,
+                    Math.round(offsetY),
+                    toColumn.index,
+                    Math.round(toColumn.offset),
+                    toRow.index,
+                    Math.round(toRow.offset),
+                ],
+            },
+        }));
+    });
+    return { controlsXml: buildControlsXml(controlElements), vmlShapes };
+};
 const groupShapesBySheet = (embeds) => {
     const result = new Map();
     (embeds ?? []).forEach((embed, order) => {
@@ -3376,7 +3554,7 @@ const buildConditionalFormattingRuleXml = ({ rule, styleBuilder, priority, baseC
         rules.push(dataBarXml);
     return rules.length ? rules : undefined;
 };
-const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImageIndex, startChartIndex, charts, slicers, sheet, sheetNameById, }) => {
+const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImageIndex, startChartIndex, startChartExIndex = 1, charts, slicers, sheet, sheetNameById, }) => {
     if (!placements.length &&
         !textBoxes.length &&
         !shapes.length &&
@@ -3388,10 +3566,27 @@ const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImag
     const media = [];
     let imageIndex = startImageIndex;
     let chartIndex = startChartIndex;
+    let chartExIndex = startChartExIndex;
     let pictureId = 1;
     let frameId = 1;
     const chartEntries = [];
+    const chartExEntries = [];
     for (const placement of charts) {
+        if (isChartExType(placement.chart.spec.chartType)) {
+            // Treemap / sunburst live in a chartex part with an mc:AlternateContent anchor.
+            const chartExXml = buildChartExXml(placement.chart, sheetNameById);
+            if (!chartExXml)
+                continue;
+            const relId = relationships.add(CHART_EX_REL_TYPE, `../charts/chartEx${chartExIndex}.xml`);
+            anchors.push(createChartAnchor({ sheet, placement, relId, frameId, chartEx: true }));
+            chartExEntries.push({
+                path: `xl/charts/chartEx${chartExIndex}.xml`,
+                xml: chartExXml,
+            });
+            chartExIndex += 1;
+            frameId += 1;
+            continue;
+        }
         const chartXml = buildChartXml(placement.chart, sheetNameById);
         if (!chartXml)
             continue;
@@ -3480,8 +3675,10 @@ const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImag
         relsXml: relationships.toXml(),
         media,
         charts: chartEntries,
+        chartExs: chartExEntries,
         nextImageIndex: imageIndex,
         nextChartIndex: chartIndex,
+        nextChartExIndex: chartExIndex,
     };
 };
 const createTwoCellAnchor = ({ placement, relId, pictureId, sheet, }) => {
@@ -3555,7 +3752,7 @@ const buildPictureAdjustmentsXml = (adjustments) => {
     }
     return { blipChildren, srcRectXml };
 };
-const createChartAnchor = ({ placement, relId, frameId, sheet, }) => {
+const createChartAnchor = ({ placement, relId, frameId, sheet, chartEx = false, }) => {
     const fromRow = Math.max(0, placement.rowIndex - 1);
     const fromColumn = Math.max(0, placement.columnIndex - 1);
     const offsetX = Math.max(0, placement.offsetX ?? 0);
@@ -3576,6 +3773,14 @@ const createChartAnchor = ({ placement, relId, frameId, sheet, }) => {
     });
     const fromXml = `<xdr:from><xdr:col>${fromColumn}</xdr:col><xdr:colOff>${Math.round(offsetX * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${fromRow}</xdr:row><xdr:rowOff>${Math.round(offsetY * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:from>`;
     const toXml = `<xdr:to><xdr:col>${toColumn.index}</xdr:col><xdr:colOff>${Math.round(toColumn.offset * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${toRow.index}</xdr:row><xdr:rowOff>${Math.round(toRow.offset * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:to>`;
+    if (chartEx) {
+        return `<xdr:twoCellAnchor>${fromXml}${toXml}${buildChartExGraphicFrameXml({
+            relId,
+            frameId,
+            widthEmu: Math.round(widthPx * EMUS_PER_PIXEL),
+            heightEmu: Math.round(heightPx * EMUS_PER_PIXEL),
+        })}<xdr:clientData/></xdr:twoCellAnchor>`;
+    }
     return `<xdr:twoCellAnchor>${fromXml}${toXml}<xdr:graphicFrame><xdr:nvGraphicFramePr><xdr:cNvPr id="${frameId}" name="Chart ${frameId}"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="${Math.round(widthPx * EMUS_PER_PIXEL)}" cy="${Math.round(heightPx * EMUS_PER_PIXEL)}"/></xdr:xfrm><a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="${REL_NS}" r:id="${relId}"/></a:graphicData></a:graphic></xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor>`;
 };
 const createSlicerAnchor = ({ placement, frameId, sheet, }) => {
@@ -4395,7 +4600,7 @@ const buildWorkbookRelationships = (sheetCount, slicerCacheCount = 0, externalLi
         slicerCacheRelationshipIds: slicerCacheRelIds,
     };
 };
-const buildContentTypesXml = ({ sheetCount, tableCount, drawingSheets, mediaExtensions, chartCount, slicerCount = 0, slicerCacheCount = 0, pivotTableCount = 0, pivotCacheCount = 0, commentsSheets = [], threadedCommentsSheets = [], hasPersons = false, externalLinkCount = 0, }) => {
+const buildContentTypesXml = ({ sheetCount, tableCount, drawingSheets, mediaExtensions, chartCount, chartExCount = 0, slicerCount = 0, slicerCacheCount = 0, pivotTableCount = 0, pivotCacheCount = 0, commentsSheets = [], threadedCommentsSheets = [], hasPersons = false, externalLinkCount = 0, hasVmlDrawings = false, ctrlPropCount = 0, }) => {
     const sheetOverrides = Array.from({ length: sheetCount }, (_, index) => {
         return `<Override PartName="/xl/worksheets/sheet${index + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>`;
     }).join("");
@@ -4408,6 +4613,9 @@ const buildContentTypesXml = ({ sheetCount, tableCount, drawingSheets, mediaExte
     const chartOverrides = Array.from({ length: chartCount }, (_, index) => {
         return `<Override PartName="/xl/charts/chart${index + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.drawingml.chart+xml"/>`;
     }).join("");
+    const chartExOverrides = Array.from({ length: chartExCount }, (_, index) => {
+        return `<Override PartName="/xl/charts/chartEx${index + 1}.xml" ContentType="${CHART_EX_CONTENT_TYPE}"/>`;
+    }).join("");
     const slicerOverrides = Array.from({ length: slicerCount }, (_, index) => {
         return `<Override PartName="/xl/slicers/slicer${index + 1}.xml" ContentType="application/vnd.ms-excel.slicer+xml"/>`;
     }).join("");
@@ -4432,10 +4640,11 @@ const buildContentTypesXml = ({ sheetCount, tableCount, drawingSheets, mediaExte
     const mediaDefaults = mediaExtensions
         .map((extension) => `<Default Extension="${extension}" ContentType="image/${extension}"/>`)
         .join("");
-    const vmlDefault = commentsSheets.length
+    const vmlDefault = hasVmlDrawings || commentsSheets.length
         ? `<Default Extension="vml" ContentType="application/vnd.openxmlformats-officedocument.vmlDrawing"/>`
         : "";
-    return `${XML_DECLARATION}<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"/>${vmlDefault}${mediaDefaults}<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>${sheetOverrides}${tableOverrides}${drawingOverrides}${chartOverrides}${slicerOverrides}${slicerCacheOverrides}${pivotTableOverrides}${pivotCacheOverrides}${externalLinkOverrides}${commentsOverrides}${threadedCommentsOverrides}${personOverride}<Override PartName="/xl/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/><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"/><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"/></Types>`;
+    const ctrlPropOverrides = Array.from({ length: ctrlPropCount }, (_, index) => `<Override PartName="/xl/ctrlProps/ctrlProp${index + 1}.xml" ContentType="${CTRL_PROP_CONTENT_TYPE}"/>`).join("");
+    return `${XML_DECLARATION}<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"/>${vmlDefault}${mediaDefaults}<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>${sheetOverrides}${tableOverrides}${drawingOverrides}${chartOverrides}${chartExOverrides}${slicerOverrides}${slicerCacheOverrides}${pivotTableOverrides}${pivotCacheOverrides}${externalLinkOverrides}${ctrlPropOverrides}${commentsOverrides}${threadedCommentsOverrides}${personOverride}<Override PartName="/xl/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/><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"/><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"/></Types>`;
 };
 const buildRootRelationshipsXml = () => {
     return `${XML_DECLARATION}<Relationships xmlns="${PACKAGE_REL_NS}"><Relationship Id="rId1" Type="${REL_NS}/officeDocument" Target="xl/workbook.xml"/><Relationship Id="rId2" Type="${REL_NS}/extended-properties" Target="docProps/app.xml"/><Relationship Id="rId3" Type="${REL_NS}/core-properties" Target="docProps/core.xml"/></Relationships>`;

package/dist/esm/tsconfig.esm.tsbuildinfo

@@ -1 +1 @@
-{"root":["../../autofilter-condition.ts","../../csv-export.ts","../../csv-import-worker.ts","../../csv-import.ts","../../excel-export.ts","../../excel-import-session.ts","../../excel-import-worker.ts","../../helpers.ts","../../index.ts","../../indexed-colors.ts","../../ods-export.ts","../../parse.ts","../../power-query.ts","../../print-settings.ts","../../server.ts","../../theme1.ts","../../types.ts","../../vitest.config.ts","../../xlsx.d.ts","../../csv-parser/helpers.ts","../../csv-parser/types.ts","../../csv-parser/worker.ts","../../excel-parser/builtin-numfmts.ts","../../excel-parser/cfb-decryptor.ts","../../excel-parser/cfb-encryptor.ts","../../excel-parser/dv-cell-stamp.ts","../../excel-parser/helpers.ts","../../excel-parser/interface.ts","../../excel-parser/registry.ts","../../excel-parser/style-registry.ts","../../excel-parser/theme-default.ts","../../excel-parser/types.ts","../../excel-parser/utils.ts","../../excel-parser/workbook.ts","../../excel-parser/worker.ts","../../excel-parser/zip-parser-streaming.ts","../../excel-parser/zip-parser.ts","../../excel-parser/plugins/base/index.ts","../../excel-parser/plugins/ods/conditional-formatting.ts","../../excel-parser/plugins/ods/data-validations.ts","../../excel-parser/plugins/ods/formula.ts","../../excel-parser/plugins/ods/index.ts","../../excel-parser/plugins/ods/sparklines.ts","../../excel-parser/plugins/ods/styles.ts","../../excel-parser/plugins/ods/types.ts","../../excel-parser/plugins/xls/index.ts","../../excel-parser/plugins/xlsb/biff-record-reader.ts","../../excel-parser/plugins/xlsb/index.ts","../../excel-parser/plugins/xlsb/rgce-parser.ts","../../excel-parser/plugins/xlsm/index.ts","../../excel-parser/plugins/xlsx/charts.ts","../../excel-parser/plugins/xlsx/conditional-formatting.ts","../../excel-parser/plugins/xlsx/data-validations.ts","../../excel-parser/plugins/xlsx/drawing.ts","../../excel-parser/plugins/xlsx/index.ts","../../excel-parser/plugins/xlsx/numfmt.ts","../../excel-parser/plugins/xlsx/pivots.ts","../../excel-parser/plugins/xlsx/relationships.ts","../../excel-parser/plugins/xlsx/sheet-views.ts","../../excel-parser/plugins/xlsx/styles.ts","../../excel-parser/plugins/xlsx/theme.ts","../../excel-parser/plugins/xlsx/threaded-comments.ts","../../excel-parser/plugins/xlsx/value-type-detection.ts","../../exporter/invalid-data-validation.ts","../../exporter/ods/ods-export.ts","../../exporter/ods/sparkline-builder.ts","../../exporter/xlsx/chart-builder.ts","../../exporter/xlsx/chart-templates.ts","../../exporter/xlsx/future-functions.ts","../../exporter/xlsx/pivot-builder.ts","../../exporter/xlsx/power-query-builder.ts","../../exporter/xlsx/slicer-builder.ts","../../exporter/xlsx/sparkline-builder.ts","../../exporter/xlsx/style-builder.ts","../../exporter/xlsx/threaded-comments-builder.ts","../../exporter/xlsx/xlsx-export.ts","../../helpers/implicit-intersection.ts","../../helpers/theme-xml-generator.ts"],"version":"5.8.3"}
+{"root":["../../autofilter-condition.ts","../../csv-export.ts","../../csv-import-worker.ts","../../csv-import.ts","../../excel-export.ts","../../excel-import-session.ts","../../excel-import-worker.ts","../../helpers.ts","../../index.ts","../../indexed-colors.ts","../../ods-export.ts","../../parse.ts","../../power-query.ts","../../print-settings.ts","../../server.ts","../../theme1.ts","../../types.ts","../../vitest.config.ts","../../xlsx.d.ts","../../csv-parser/helpers.ts","../../csv-parser/types.ts","../../csv-parser/worker.ts","../../excel-parser/builtin-numfmts.ts","../../excel-parser/cfb-decryptor.ts","../../excel-parser/cfb-encryptor.ts","../../excel-parser/dv-cell-stamp.ts","../../excel-parser/helpers.ts","../../excel-parser/interface.ts","../../excel-parser/registry.ts","../../excel-parser/style-registry.ts","../../excel-parser/theme-default.ts","../../excel-parser/types.ts","../../excel-parser/utils.ts","../../excel-parser/workbook.ts","../../excel-parser/worker.ts","../../excel-parser/zip-parser-streaming.ts","../../excel-parser/zip-parser.ts","../../excel-parser/plugins/base/index.ts","../../excel-parser/plugins/ods/conditional-formatting.ts","../../excel-parser/plugins/ods/data-validations.ts","../../excel-parser/plugins/ods/formula.ts","../../excel-parser/plugins/ods/index.ts","../../excel-parser/plugins/ods/sparklines.ts","../../excel-parser/plugins/ods/styles.ts","../../excel-parser/plugins/ods/types.ts","../../excel-parser/plugins/xls/index.ts","../../excel-parser/plugins/xlsb/biff-record-reader.ts","../../excel-parser/plugins/xlsb/index.ts","../../excel-parser/plugins/xlsb/rgce-parser.ts","../../excel-parser/plugins/xlsm/index.ts","../../excel-parser/plugins/xlsx/chartex.ts","../../excel-parser/plugins/xlsx/charts.ts","../../excel-parser/plugins/xlsx/conditional-formatting.ts","../../excel-parser/plugins/xlsx/data-validations.ts","../../excel-parser/plugins/xlsx/drawing.ts","../../excel-parser/plugins/xlsx/form-controls.ts","../../excel-parser/plugins/xlsx/index.ts","../../excel-parser/plugins/xlsx/numfmt.ts","../../excel-parser/plugins/xlsx/pivots.ts","../../excel-parser/plugins/xlsx/relationships.ts","../../excel-parser/plugins/xlsx/sheet-views.ts","../../excel-parser/plugins/xlsx/styles.ts","../../excel-parser/plugins/xlsx/theme.ts","../../excel-parser/plugins/xlsx/threaded-comments.ts","../../excel-parser/plugins/xlsx/value-type-detection.ts","../../exporter/invalid-data-validation.ts","../../exporter/ods/ods-export.ts","../../exporter/ods/sparkline-builder.ts","../../exporter/xlsx/chart-builder.ts","../../exporter/xlsx/chart-templates.ts","../../exporter/xlsx/chartex-builder.ts","../../exporter/xlsx/form-controls-builder.ts","../../exporter/xlsx/future-functions.ts","../../exporter/xlsx/pivot-builder.ts","../../exporter/xlsx/power-query-builder.ts","../../exporter/xlsx/slicer-builder.ts","../../exporter/xlsx/sparkline-builder.ts","../../exporter/xlsx/style-builder.ts","../../exporter/xlsx/threaded-comments-builder.ts","../../exporter/xlsx/xlsx-export.ts","../../helpers/implicit-intersection.ts","../../helpers/theme-xml-generator.ts"],"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowsncolumns/toolkit",
-  "version": "24.4.3",
+  "version": "24.4.4",
   "author": "Vinay M",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "./dist/cjs/index.js",
@@ -43,14 +43,14 @@
     "url": "https://github.com/rowsncolumns/spreadsheet/issues"
   },
   "devDependencies": {
-    "@rowsncolumns/utils": ">=9.2.40",
+    "@rowsncolumns/utils": ">=9.2.41",
     "@types/lodash-es": "^4.17.12"
   },
   "peerDependencies": {},
   "dependencies": {
     "@noble/ciphers": "^0.5.3",
     "@noble/hashes": "^1.4.0",
-    "@rowsncolumns/calculator": ">=7.2.31",
+    "@rowsncolumns/calculator": ">=7.2.32",
     "@zip.js/zip.js": "^2.8.17",
     "fast-xml-parser": "^5.8.0",
     "fflate": "^0.8.2",

package/xlsx.d.ts

@@ -1,4 +1,18 @@
 declare module "xlsx/xlsx.mjs" {
+  import type * as SheetJs from "xlsx";
+
+  /** SheetJS workbook reader — used for the BIFF8 (`.xls`) plugin. */
+  export const read: typeof SheetJs.read;
+  /** SheetJS workbook writer (tests build BIFF8 fixtures with it). */
+  export const write: typeof SheetJs.write;
+  export const utils: typeof SheetJs.utils;
+  export type WorkBook = SheetJs.WorkBook;
+  export type WorkSheet = SheetJs.WorkSheet;
+  export type CellObject = SheetJs.CellObject;
+  export type ColInfo = SheetJs.ColInfo;
+  export type RowInfo = SheetJs.RowInfo;
+  export type DefinedName = SheetJs.DefinedName;
+
   export namespace CFB {
     interface CFBEntry {
       name: string;