@office-open/xlsx 0.12.0 → 0.12.2

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { ChartCollection, IMAGE_MEDIA_CONTENT_TYPES, Media, OoxmlMimeType, Relat
 import { OOXML_XML_DECLARATION, attr, attrMeasure, attrNum, attrs, children, escapeXml, findChild, selfCloseElement, stringify, stringifyElement, textOf, unescapeXml } from "@office-open/xml";
 import { blipDesc, buildHyperlinkElement, connectorLockingDesc, createSourceRectangle, graphicFrameLockingDesc, groupShapePropertiesDesc, parseEndpointConnection, parseNonVisualDrawingProperties, pictureLockingDesc, readHyperlink, registerHyperlink, shapeLockingDesc, shapePropertiesDesc, sourceRectangleDesc, stringifyBlipEffects, stringifyEndpointConnection, stringifyNonVisualDrawingProperties, textBodyDesc } from "@office-open/core/drawing";
 import { buildThemeXml, createThemeXml, createThemeXml as createThemeXml$1, parseShapeStyle, stringifyShapeStyle, themeDesc } from "@office-open/core/theme";
-import { chartSpaceDesc } from "@office-open/core/chart";
+import { buildUserShapesData, chartSpaceDesc, userShapesDesc } from "@office-open/core/chart";
 //#region src/parts/styles/parse.ts
 /**
 * Styles — parse helpers for xl/styles.xml sub-elements.
@@ -2917,6 +2917,18 @@ function letterToColumn(letters) {
 	for (let i = 0; i < letters.length; i++) col = col * 26 + (letters.charCodeAt(i) - 64);
 	return col;
 }
+const A1_CELL = /^([A-Z]+)(\d+)$/;
+/**
+* Parse a single A1 cell reference ("B12") into 1-based column/row numbers.
+* Returns undefined when the reference is not letters-then-digits.
+*/
+function parseA1Cell(ref) {
+	const m = ref.match(A1_CELL);
+	return m ? {
+		col: letterToColumn(m[1]),
+		row: parseInt(m[2], 10)
+	} : void 0;
+}
 /**
 * Convert a JavaScript Date to an Excel serial number.
 * Excel epoch: January 1, 1900 = 1 (with the 1900 leap year bug).
@@ -3049,31 +3061,44 @@ function parseOlapPr(el) {
 	if (String(attr(el, "serverFontColor")) === "0") ol.serverFontColor = false;
 	return Object.keys(ol).length > 0 ? ol : void 0;
 }
+const profileCache = /* @__PURE__ */ new WeakMap();
 /**
-* Extract unique values from source data for a given field index.
+* Profile every field of the source records in one pass — numericity, unique
+* values, and numeric min/max/integer flags together. Memoized per source
+* object so the cache-definition and cache-records stringifiers share a
+* single scan instead of each re-walking the records per field.
 */
-function collectUniqueValues(records, fieldIdx) {
-	const seen = /* @__PURE__ */ new Set();
-	const result = [];
-	for (const row of records) {
-		const val = row[fieldIdx];
+function profilePivotFields(sourceData) {
+	const cached = profileCache.get(sourceData);
+	if (cached !== void 0) return cached;
+	const cols = sourceData.fieldNames.map(() => ({
+		profile: {
+			numeric: true,
+			unique: [],
+			min: Infinity,
+			max: -Infinity,
+			allInteger: true
+		},
+		seen: /* @__PURE__ */ new Set()
+	}));
+	for (const row of sourceData.records) for (let i = 0; i < cols.length; i++) {
+		const col = cols[i];
+		const val = row[i];
+		if (typeof val === "string" && val !== "") col.profile.numeric = false;
 		const key = val instanceof Date ? val.toISOString() : String(val);
-		if (!seen.has(key)) {
-			seen.add(key);
-			result.push(val ?? null);
+		if (!col.seen.has(key)) {
+			col.seen.add(key);
+			col.profile.unique.push(val ?? null);
 		}
+		if (typeof val === "number") {
+			if (val < col.profile.min) col.profile.min = val;
+			if (val > col.profile.max) col.profile.max = val;
+			if (!Number.isInteger(val)) col.profile.allInteger = false;
+		} else col.profile.allInteger = false;
 	}
-	return result;
-}
-/**
-* Check if a field is numeric (all non-empty values are numbers).
-*/
-function isNumericField(records, fieldIdx) {
-	for (const row of records) {
-		const val = row[fieldIdx];
-		if (typeof val === "string" && val !== "") return false;
-	}
-	return true;
+	const profiles = cols.map((c) => c.profile);
+	profileCache.set(sourceData, profiles);
+	return profiles;
 }
 /**
 * Aggregate values using the specified function.
@@ -3326,6 +3351,7 @@ function buildFieldOverrideAttrs(fo) {
 }
 function buildPivotFields(o, sd, rowIndices, colIndices, dataIndices, pageIndices) {
 	const fieldNames = sd.fieldNames;
+	const profiles = profilePivotFields(sd);
 	const parts = [`<pivotFields count="${fieldNames.length}">`];
 	for (let i = 0; i < fieldNames.length; i++) {
 		const isRow = rowIndices.includes(i);
@@ -3345,7 +3371,7 @@ function buildPivotFields(o, sd, rowIndices, colIndices, dataIndices, pageIndice
 			if (o.autoSortScope) parts.push(`<pivotField ${dfAttrs.join(" ")}><autoSortScope>${buildPivotAreaXml(o.autoSortScope)}</autoSortScope></pivotField>`);
 			else parts.push(`<pivotField ${dfAttrs.join(" ")}/>`);
 		} else if (isRow) {
-			const uniqueVals = collectUniqueValues(sd.records, i);
+			const uniqueVals = profiles[i].unique;
 			const rAttrs = extraAttrs ? ` axis="axisRow" showAll="0" ${extraAttrs}` : " axis=\"axisRow\" showAll=\"0\"";
 			parts.push(`<pivotField${rAttrs}>`);
 			parts.push(`<items count="${uniqueVals.length + 1}">`);
@@ -3353,7 +3379,7 @@ function buildPivotFields(o, sd, rowIndices, colIndices, dataIndices, pageIndice
 			parts.push(`<item t="default"${override?.defaultItemSd === false ? " sd=\"0\"" : ""}/>`);
 			parts.push("</items></pivotField>");
 		} else if (isCol) {
-			const uniqueVals = collectUniqueValues(sd.records, i);
+			const uniqueVals = profiles[i].unique;
 			const cAttrs = extraAttrs ? ` axis="axisCol" showAll="0" ${extraAttrs}` : " axis=\"axisCol\" showAll=\"0\"";
 			parts.push(`<pivotField${cAttrs}>`);
 			parts.push(`<items count="${uniqueVals.length + 1}">`);
@@ -3361,7 +3387,7 @@ function buildPivotFields(o, sd, rowIndices, colIndices, dataIndices, pageIndice
 			parts.push(`<item t="default"${override?.defaultItemSd === false ? " sd=\"0\"" : ""}/>`);
 			parts.push("</items></pivotField>");
 		} else if (isPage) {
-			const uniqueVals = collectUniqueValues(sd.records, i);
+			const uniqueVals = profiles[i].unique;
 			const pAttrs = extraAttrs ? ` axis="axisPage" showAll="0" ${extraAttrs}` : " axis=\"axisPage\" showAll=\"0\"";
 			parts.push(`<pivotField${pAttrs}>`);
 			parts.push(`<items count="${uniqueVals.length + 1}">`);
@@ -3397,10 +3423,16 @@ function buildRowFields(rowIndices) {
 	parts.push("</rowFields>");
 	return parts.join("");
 }
+/** Unique-value count of field `idx`; an out-of-range index (an indexOf miss,
+* -1) keeps collectUniqueValues' behavior of a single null value. */
+function uniqueCount(profiles, idx) {
+	return profiles[idx]?.unique.length ?? 1;
+}
 function buildRowItems(sd, rowIndices) {
 	if (rowIndices.length === 0) return "<rowItems count=\"1\"><i/></rowItems>";
+	const profiles = profilePivotFields(sd);
 	const allUniqueCounts = [];
-	for (const idx of rowIndices) allUniqueCounts.push(collectUniqueValues(sd.records, idx).length);
+	for (const idx of rowIndices) allUniqueCounts.push(uniqueCount(profiles, idx));
 	if (rowIndices.length === 1) {
 		const count = allUniqueCounts[0] ?? 0;
 		const parts = [`<rowItems count="${count + 1}">`];
@@ -3424,8 +3456,9 @@ function buildColFields(colIndices) {
 }
 function buildColItems(sd, colIndices, dataFields) {
 	if (colIndices.length > 0) {
+		const profiles = profilePivotFields(sd);
 		const allUniqueCounts = [];
-		for (const idx of colIndices) allUniqueCounts.push(collectUniqueValues(sd.records, idx).length);
+		for (const idx of colIndices) allUniqueCounts.push(uniqueCount(profiles, idx));
 		const combos = cartesianOfCounts(allUniqueCounts);
 		const items = [];
 		for (const combo of combos) items.push(`<i>${combo.map((v) => `<x v="${v}"/>`).join("")}</i>`);
@@ -3458,20 +3491,20 @@ function buildDataFields(dataFields, dataFieldIndices) {
 	return parts.join("");
 }
 function computeLocationRef(sd, location, rowFieldIndices, colFieldIndices, dataFields) {
-	const match = (location.split(":")[0] ?? location).match(/^([A-Z]+)(\d+)$/);
-	if (!match) return location;
-	const startCol = match[1] ?? "";
-	const startRow = parseInt(match[2] ?? "0", 10);
+	const startCell = location.split(":")[0] ?? location;
+	const start = parseA1Cell(startCell);
+	if (!start) return location;
+	const profiles = profilePivotFields(sd);
 	let rowCount = 1;
 	const rowFieldIndex0 = rowFieldIndices[0];
-	if (rowFieldIndex0 !== void 0) rowCount += collectUniqueValues(sd.records, rowFieldIndex0).length;
+	if (rowFieldIndex0 !== void 0) rowCount += uniqueCount(profiles, rowFieldIndex0);
 	rowCount += 1;
 	let colCount = Math.max(rowFieldIndices.length, 1);
 	const colFieldIndex0 = colFieldIndices[0];
-	if (colFieldIndex0 !== void 0) colCount += collectUniqueValues(sd.records, colFieldIndex0).length;
+	if (colFieldIndex0 !== void 0) colCount += uniqueCount(profiles, colFieldIndex0);
 	else if (dataFields.length > 1) colCount += dataFields.length - 1;
 	colCount += 1;
-	return `${startCol}${startRow}:${columnToLetter(letterToColumn(startCol) + colCount - 1)}${startRow + rowCount - 1}`;
+	return `${startCell}:${columnToLetter(start.col + colCount - 1)}${start.row + rowCount - 1}`;
 }
 function buildPivotHierarchies(hierarchies) {
 	const parts = [`<pivotHierarchies count="${hierarchies.length}">`];
@@ -3565,6 +3598,22 @@ function cartesianOfCounts(counts) {
 *
 * @module
 */
+/** CT_Break list under rowBreaks/colBreaks — identical shape, only the tag differs. */
+function breaksXml(tag, list) {
+	let manualCount = 0;
+	const brkParts = list.map((b) => {
+		const bAttrs = { id: b.id };
+		if (b.min !== void 0) bAttrs.min = b.min;
+		if (b.max !== void 0) bAttrs.max = b.max;
+		if (b.manual) {
+			bAttrs.man = 1;
+			manualCount++;
+		}
+		if (b.pivot) bAttrs.pt = 1;
+		return `<brk${attrs(bAttrs)}/>`;
+	});
+	return `<${tag} count="${list.length}" manualBreakCount="${manualCount}">${brkParts.join("")}</${tag}>`;
+}
 /**
 * Build the complete worksheet XML string.
 *
@@ -3718,9 +3767,10 @@ function stringifyWorksheet(opts, ctx) {
 			prAttrs.saltValue = pr.saltValue ?? prDerived?.saltValue;
 			if (pr.spinCount !== void 0) prAttrs.spinCount = pr.spinCount;
 			else if (prDerived) prAttrs.spinCount = prDerived.spinCount;
-			if (pr.securityDescriptor) prAttrs.securityDescriptor = pr.securityDescriptor;
-			if (!!pr.securityDescriptor) prParts.push(`<protectedRange${attrs(prAttrs)}><securityDescriptor>${escapeXml(pr.securityDescriptor)}</securityDescriptor></protectedRange>`);
-			else prParts.push(selfCloseElement("protectedRange", attrs(prAttrs)));
+			if (pr.securityDescriptor) {
+				prAttrs.securityDescriptor = pr.securityDescriptor;
+				prParts.push(`<protectedRange${attrs(prAttrs)}><securityDescriptor>${escapeXml(pr.securityDescriptor)}</securityDescriptor></protectedRange>`);
+			} else prParts.push(selfCloseElement("protectedRange", attrs(prAttrs)));
 		}
 		prParts.push("</protectedRanges>");
 		p.push(prParts.join(""));
@@ -3919,36 +3969,8 @@ function stringifyWorksheet(opts, ctx) {
 		const hfXml = stringifyHeaderFooterXml(opts.headerFooter);
 		if (hfXml) p.push(hfXml);
 	}
-	if (rowBreaks.length > 0) {
-		let manualCount = 0;
-		const brkParts = rowBreaks.map((b) => {
-			const bAttrs = { id: b.id };
-			if (b.min !== void 0) bAttrs.min = b.min;
-			if (b.max !== void 0) bAttrs.max = b.max;
-			if (b.manual) {
-				bAttrs.man = 1;
-				manualCount++;
-			}
-			if (b.pivot) bAttrs.pt = 1;
-			return `<brk${attrs(bAttrs)}/>`;
-		});
-		p.push(`<rowBreaks count="${rowBreaks.length}" manualBreakCount="${manualCount}">${brkParts.join("")}</rowBreaks>`);
-	}
-	if (colBreaks.length > 0) {
-		let manualCount = 0;
-		const brkParts = colBreaks.map((b) => {
-			const bAttrs = { id: b.id };
-			if (b.min !== void 0) bAttrs.min = b.min;
-			if (b.max !== void 0) bAttrs.max = b.max;
-			if (b.manual) {
-				bAttrs.man = 1;
-				manualCount++;
-			}
-			if (b.pivot) bAttrs.pt = 1;
-			return `<brk${attrs(bAttrs)}/>`;
-		});
-		p.push(`<colBreaks count="${colBreaks.length}" manualBreakCount="${manualCount}">${brkParts.join("")}</colBreaks>`);
-	}
+	if (rowBreaks.length > 0) p.push(breaksXml("rowBreaks", rowBreaks));
+	if (colBreaks.length > 0) p.push(breaksXml("colBreaks", colBreaks));
 	if (customProperties.length > 0) {
 		const cpParts = ["<customProperties>"];
 		for (const cp of customProperties) cpParts.push(`<customPr name="${escapeXml(cp.name)}" r:id="${escapeXml(cp.rId)}"/>`);
@@ -3999,25 +4021,27 @@ function stringifyWorksheet(opts, ctx) {
 	if (opts.legacyDrawingHF) p.push(`<legacyDrawingHF r:id="${escapeXml(opts.legacyDrawingHF)}"/>`);
 	if (opts.drawingHF) {
 		const dhf = opts.drawingHF;
-		const dhfAttrs = { "r:id": dhf.rId };
-		if (dhf.lho !== void 0) dhfAttrs.lho = dhf.lho;
-		if (dhf.lhe !== void 0) dhfAttrs.lhe = dhf.lhe;
-		if (dhf.lhf !== void 0) dhfAttrs.lhf = dhf.lhf;
-		if (dhf.cho !== void 0) dhfAttrs.cho = dhf.cho;
-		if (dhf.che !== void 0) dhfAttrs.che = dhf.che;
-		if (dhf.chf !== void 0) dhfAttrs.chf = dhf.chf;
-		if (dhf.rho !== void 0) dhfAttrs.rho = dhf.rho;
-		if (dhf.rhe !== void 0) dhfAttrs.rhe = dhf.rhe;
-		if (dhf.rhf !== void 0) dhfAttrs.rhf = dhf.rhf;
-		if (dhf.lfo !== void 0) dhfAttrs.lfo = dhf.lfo;
-		if (dhf.lfe !== void 0) dhfAttrs.lfe = dhf.lfe;
-		if (dhf.lff !== void 0) dhfAttrs.lff = dhf.lff;
-		if (dhf.cfo !== void 0) dhfAttrs.cfo = dhf.cfo;
-		if (dhf.cfe !== void 0) dhfAttrs.cfe = dhf.cfe;
-		if (dhf.cff !== void 0) dhfAttrs.cff = dhf.cff;
-		if (dhf.rfo !== void 0) dhfAttrs.rfo = dhf.rfo;
-		if (dhf.rfe !== void 0) dhfAttrs.rfe = dhf.rfe;
-		if (dhf.rff !== void 0) dhfAttrs.rff = dhf.rff;
+		const dhfAttrs = {
+			"r:id": dhf.rId,
+			lho: dhf.lho,
+			lhe: dhf.lhe,
+			lhf: dhf.lhf,
+			cho: dhf.cho,
+			che: dhf.che,
+			chf: dhf.chf,
+			rho: dhf.rho,
+			rhe: dhf.rhe,
+			rhf: dhf.rhf,
+			lfo: dhf.lfo,
+			lfe: dhf.lfe,
+			lff: dhf.lff,
+			cfo: dhf.cfo,
+			cfe: dhf.cfe,
+			cff: dhf.cff,
+			rfo: dhf.rfo,
+			rfe: dhf.rfe,
+			rff: dhf.rff
+		};
 		p.push(selfCloseElement("drawingHF", attrs(dhfAttrs)));
 	}
 	if (opts.backgroundImage) p.push("<!--BACKGROUND_PICTURE-->");
@@ -4904,11 +4928,10 @@ function parseMarker(el) {
 	};
 }
 function cellRefToVmlCoords(ref) {
-	let i = 0;
-	while (i < ref.length && ref.charCodeAt(i) >= 65 && ref.charCodeAt(i) <= 90) i++;
+	const cell = parseA1Cell(ref);
 	return {
-		col: letterToColumn(ref.slice(0, i)) - 1,
-		row: parseInt(ref.slice(i), 10) - 1
+		col: (cell?.col ?? 1) - 1,
+		row: (cell?.row ?? 1) - 1
 	};
 }
 /** Parse rich text element into a plain string or rich runs. */
@@ -6940,25 +6963,18 @@ function stringifyPivotCacheDef(sourceRef, sourceSheet, sourceData, recordsRid,
 		p.push(conParts.join(""));
 	} else p.push(`<cacheSource type="worksheet"><worksheetSource ref="${escapeXml(sourceRef)}" sheet="${escapeXml(sourceSheet)}"/></cacheSource>`);
 	const fieldNames = sourceData.fieldNames;
+	const profiles = profilePivotFields(sourceData);
 	p.push(`<cacheFields count="${fieldNames.length}">`);
 	for (let i = 0; i < fieldNames.length; i++) {
 		const fieldName = fieldNames[i] ?? "";
-		const numeric = isNumericField(sourceData.records, i);
-		const uniqueVals = collectUniqueValues(sourceData.records, i);
+		const { numeric, unique: uniqueVals } = profiles[i];
 		if (numeric) {
-			let min = Infinity, max = -Infinity;
-			for (const row of sourceData.records) {
-				const v = row[i];
-				if (typeof v === "number") {
-					if (v < min) min = v;
-					if (v > max) max = v;
-				}
-			}
+			let min = profiles[i].min, max = profiles[i].max;
 			if (!isFinite(min)) {
 				min = 0;
 				max = 0;
 			}
-			const allInteger = sourceData.records.every((row) => typeof row[i] === "number" && Number.isInteger(row[i]));
+			const allInteger = profiles[i].allInteger;
 			const cfOverride = cacheDefOpts?.cacheFieldOverrides?.get(i);
 			const cfExtraAttrs = [];
 			const siExtraAttrs = [];
@@ -7233,12 +7249,11 @@ function stringifyPivotCacheDef(sourceRef, sourceSheet, sourceData, recordsRid,
 	return p.join("");
 }
 function stringifyPivotCacheRecords(sourceData) {
-	const numericFields = sourceData.fieldNames.map((_, i) => isNumericField(sourceData.records, i));
-	const fieldIndexMaps = sourceData.fieldNames.map((_, i) => {
-		if (numericFields[i]) return /* @__PURE__ */ new Map();
-		const unique = collectUniqueValues(sourceData.records, i);
+	const profiles = profilePivotFields(sourceData);
+	const fieldIndexMaps = profiles.map((f) => {
+		if (f.numeric) return /* @__PURE__ */ new Map();
 		const map = /* @__PURE__ */ new Map();
-		for (let j = 0; j < unique.length; j++) map.set(String(unique[j]), j);
+		for (let j = 0; j < f.unique.length; j++) map.set(String(f.unique[j]), j);
 		return map;
 	});
 	const p = [];
@@ -7249,7 +7264,7 @@ function stringifyPivotCacheRecords(sourceData) {
 			const val = row[i];
 			if (val === null) p.push("<m/>");
 			else if (val instanceof Date) p.push(`<d v="${val.toISOString().replace(/\.\d{3}Z$/, "Z")}"/>`);
-			else if (numericFields[i]) p.push(`<n v="${val}"/>`);
+			else if (profiles[i].numeric) p.push(`<n v="${val}"/>`);
 			else p.push(`<x v="${fieldIndexMaps[i]?.get(String(val)) ?? 0}"/>`);
 		}
 		p.push("</r>");
@@ -7266,6 +7281,16 @@ function stringifyPivotCacheRecords(sourceData) {
 *
 * @module
 */
+function tableRefWidth(ref) {
+	const sep = ref.indexOf(":");
+	const first = (sep === -1 ? ref : ref.slice(0, sep)).trim().toUpperCase();
+	const last = sep === -1 ? first : ref.slice(sep + 1).trim().toUpperCase();
+	const startCol = parseA1Cell(first)?.col;
+	const endCol = parseA1Cell(last)?.col;
+	if (startCol === void 0 || endCol === void 0) return void 0;
+	const width = endCol - startCol + 1;
+	return width >= 1 ? width : void 0;
+}
 const TotalsRowFunction = {
 	NONE: "none",
 	SUM: "sum",
@@ -7313,8 +7338,10 @@ const tableDesc = {
 		if (o.totalsRowCellStyle) rootAttrs.totalsRowCellStyle = o.totalsRowCellStyle;
 		p.push(`<table xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="xr xr2" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr2="http://schemas.microsoft.com/office/spreadsheetml/2015/revision2"${attrs(rootAttrs)}>`);
 		if (o.autoFilter !== void 0) p.push(stringifyAutoFilter(o.autoFilter));
-		p.push(`<tableColumns count="${o.columns.length}">`);
-		for (const [i, col] of o.columns.entries()) {
+		const width = tableRefWidth(o.ref);
+		const columns = width !== void 0 && o.columns.length !== width ? o.columns.slice(0, width).concat(Array.from({ length: width - o.columns.length }, (_, i) => ({ name: `Column${o.columns.length + i + 1}` }))) : o.columns;
+		p.push(`<tableColumns count="${columns.length}">`);
+		for (const [i, col] of columns.entries()) {
 			const colAttrs = {
 				id: i + 1,
 				name: col.name
@@ -9274,10 +9301,29 @@ var XlsxReadContext = class {
 *
 * @module
 */
+const LEADING_PATH_NUMBER = /(\d+)/;
 function sortByNumber(paths) {
-	return paths.sort((a, b) => {
-		return parseInt(a.match(/(\d+)/)?.[1] ?? "0", 10) - parseInt(b.match(/(\d+)/)?.[1] ?? "0", 10);
-	});
+	return paths.map((p) => ({
+		p,
+		n: parseInt(p.match(LEADING_PATH_NUMBER)?.[1] ?? "0", 10)
+	})).sort((a, b) => a.n - b.n).map(({ p }) => p);
+}
+/**
+* Fill a parsed chart's userShapes anchors from the companion part body —
+* chartSpaceDesc reads only the c:userShapes r:id; the body hangs off the
+* chart part's own rels (chartUserShapes relationship).
+*/
+function readChartUserShapes(chartPath, chart, readContext, doc) {
+	const rid = chart.userShapes?.relationshipId;
+	if (rid === void 0 || chartPath === void 0) return;
+	const rel = readContext.getWorksheetRelsByType(chartPath, "/chartUserShapes").find((r) => r.rId === rid);
+	const bodyEl = rel ? doc.get(rel.target) : void 0;
+	if (!bodyEl) return;
+	const body = userShapesDesc.parse(bodyEl, readContext);
+	chart.userShapes = {
+		...chart.userShapes,
+		anchors: body.anchors
+	};
 }
 /**
 * Worksheet parts read with sheetData deferred — the XML parser captures the
@@ -9309,7 +9355,7 @@ function parseXlsx(data) {
 	}
 	sortByNumber(worksheets);
 	drawings.push(...doc.keys("xl/drawings/").filter((k) => k.endsWith(".xml")));
-	charts.push(...doc.keys("xl/charts/").filter((k) => k.endsWith(".xml")));
+	charts.push(...doc.keys("xl/charts/").filter((k) => k.endsWith(".xml") && !/userShapes\d+\.xml$/.test(k)));
 	media.push(...doc.keys("xl/media/"));
 	sortByNumber(drawings);
 	sortByNumber(charts);
@@ -9563,6 +9609,7 @@ function parseWorkbook(data) {
 					const chartEl = chartPath ? xlsx.doc.get(chartPath) : void 0;
 					if (!chartEl) continue;
 					const chartSpace = chartSpaceDesc.parse(chartEl, readContext);
+					readChartUserShapes(chartPath, chartSpace, readContext, xlsx.doc);
 					const chartCnvPr = pickNonVisualDrawingProperties(anchor);
 					delete chartCnvPr.title;
 					charts.push({
@@ -9679,6 +9726,7 @@ function parseWorkbook(data) {
 					const chartEl = chartPath ? xlsx.doc.get(chartPath) : void 0;
 					if (!chartEl) continue;
 					csData.chart = chartSpaceDesc.parse(chartEl, readContext);
+					readChartUserShapes(chartPath, csData.chart, readContext, xlsx.doc);
 					if (anchor.macro !== void 0) csData.macro = anchor.macro;
 					if (anchor.frameLocks) csData.frameLocks = anchor.frameLocks;
 					if (anchor.absoluteX !== void 0) csData.absoluteX = convertToEmu(anchor.absoluteX);
@@ -10132,7 +10180,7 @@ function rebuildSharedStrings(xmlMap) {
 /** Re-serialize the shared-strings part (called after worksheets are built). */
 function rewriteSharedStrings(xmlMap, ss) {
 	if (ss.count === 0) return;
-	xmlMap.set("xl/sharedStrings.xml", toJson(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>${ss.serialize()}`));
+	xmlMap.set("xl/sharedStrings.xml", toJson(OOXML_XML_DECLARATION + ss.serialize()));
 }
 /**
 * Append a worksheet: serialize it (registering strings into the shared-strings
@@ -10310,9 +10358,9 @@ function appendCommentsToMap(xmlMap, vmlFiles, sheetName, commentOpts) {
 	let merged = commentOpts;
 	if (existingPart) merged = [...commentsDesc.parse(existingPart, STUB_READ_CTX).comments, ...commentOpts];
 	const commentsXml = commentsDesc.stringify({ comments: merged }, STUB_WRITE_CTX);
-	if (commentsXml) xmlMap.set(commentsPath, toJson(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>${commentsXml}`));
+	if (commentsXml) xmlMap.set(commentsPath, toJson(OOXML_XML_DECLARATION + commentsXml));
 	const vmlXml = vmlNotesDesc.stringify({ comments: merged }, STUB_WRITE_CTX);
-	if (vmlXml) vmlFiles.set(vmlPath, `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>${vmlXml}`);
+	if (vmlXml) vmlFiles.set(vmlPath, OOXML_XML_DECLARATION + vmlXml);
 	if (!existingComments) {
 		const n = getNextRelationshipIndex(wsRels);
 		appendRelationship(wsRels, n, COMMENTS_REL_TYPE, `../comments${commentsN}.xml`);
@@ -10375,6 +10423,9 @@ function bindMediaPlaceholders(xml, media, rels) {
 /** XLSX part path → content type, derived from the part registry. Matches
 * actual file paths, so the dense/sequential xlsx part naming is handled. */
 const XLSX_CONTENT_TYPE_RESOLVER$1 = resolverFromRegistry(XLSX_PARTS);
+/** Chart part → user-shapes part relationship (c:userShapes bridge). */
+const CHART_USER_SHAPES_REL = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartUserShapes";
+const PKG_REL_NS = "http://schemas.openxmlformats.org/package/2006/relationships";
 /** Extension → MIME for image and VML Default entries. Declared only for
 * extensions actually present in the package. VML backs legacy comment
 * anchors (xl/drawings/vmlDrawing${i}.vml). */
@@ -10571,18 +10622,20 @@ function compileWorkbook(options, overrides = [], mediaLevel = 0) {
 		wbXml = wbXml.replace("<!--EXTERNAL_REFS-->", extRefsXml);
 	} else wbXml = wbXml.replace("<!--EXTERNAL_REFS-->", "");
 	mapping["Workbook"] = {
-		data: `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>${wbXml}`,
+		data: XML_DECL + wbXml,
 		path: "xl/workbook.xml"
 	};
 	if (ctx.sharedStrings.count > 0) {
 		ctx.workbookRels.addRelationship(ctx.workbookRels.nextRelationshipId, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings", "sharedStrings.xml");
+		const ssXml = sharedStringsDesc.stringify(ctx.sharedStrings.toDescriptorOptions(), ctx);
 		mapping["SharedStrings"] = {
-			data: `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>${sharedStringsDesc.stringify(ctx.sharedStrings.toDescriptorOptions(), ctx)}`,
+			data: XML_DECL + ssXml,
 			path: "xl/sharedStrings.xml"
 		};
 	}
+	const stylesXml = stylesDesc.stringify({ styles: ctx.styles }, ctx);
 	mapping["Styles"] = {
-		data: `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>${stylesDesc.stringify({ styles: ctx.styles }, ctx)}`,
+		data: XML_DECL + stylesXml,
 		path: "xl/styles.xml"
 	};
 	const themeRels = new Relationships();
@@ -10595,10 +10648,23 @@ function compileWorkbook(options, overrides = [], mediaLevel = 0) {
 		data: XML_DECL + themeRels.serialize(),
 		path: "xl/theme/_rels/theme1.xml.rels"
 	};
-	for (const [i, chartData] of ctx.charts.array.entries()) mapping[`Chart${i}`] = {
-		data: XML_DECL + chartData.chartSpaceXml,
-		path: `xl/charts/chart${i + 1}.xml`
-	};
+	for (const [i, chartData] of ctx.charts.array.entries()) {
+		mapping[`Chart${i}`] = {
+			data: XML_DECL + chartData.chartSpaceXml,
+			path: `xl/charts/chart${i + 1}.xml`
+		};
+		if (chartData.userShapes) {
+			const rid = chartData.userShapes.relationshipId;
+			mapping[`ChartUserShapes${i}`] = {
+				data: XML_DECL + chartData.userShapes.xml,
+				path: `xl/charts/userShapes${i + 1}.xml`
+			};
+			mapping[`ChartRels${i}`] = {
+				data: XML_DECL + `<Relationships xmlns="${PKG_REL_NS}"><Relationship Id="${escapeXml(rid)}" Type="${CHART_USER_SHAPES_REL}" Target="userShapes${i + 1}.xml"/></Relationships>`,
+				path: `xl/charts/_rels/chart${i + 1}.xml.rels`
+			};
+		}
+	}
 	const calcChainCells = options.calcChain ?? state.calcCells;
 	const srcReferencesCalcChain = (options.passthroughRelationships ?? []).some((r) => r.source === "xl/workbook.xml" && r.relationshipType.endsWith("/calcChain"));
 	if (calcChainCells.length > 0 && !(srcReferencesCalcChain && options.calcChain === void 0)) {
@@ -10760,9 +10826,11 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 		}
 		for (const chart of chartOpts) {
 			const chartKey = `chart_${state.globalChartIdx}`;
+			const userShapes = chart.userShapes ? buildUserShapesData(chart.userShapes) : void 0;
 			ctx.charts.addChart(chartKey, {
 				key: chartKey,
-				chartSpaceXml: chartSpaceDesc.stringify(chart, ctx) ?? ""
+				chartSpaceXml: chartSpaceDesc.stringify(chart, ctx) ?? "",
+				...userShapes ? { userShapes } : {}
 			});
 			drawingRels.addRelationship(rid, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart", `../charts/chart${state.globalChartIdx + 1}.xml`);
 			const chartCnvPr = pickNonVisualDrawingProperties({
@@ -10829,7 +10897,7 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 		resolvedDrawingXml = bindMediaPlaceholders(resolvedDrawingXml, ctx.media, drawingRels);
 		const drawingIdx = i + 1;
 		mapping[`Drawing${i}`] = {
-			data: `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>${resolvedDrawingXml}`,
+			data: XML_DECL + resolvedDrawingXml,
 			path: `xl/drawings/drawing${drawingIdx}.xml`
 		};
 		mapping[`DrawingRels${i}`] = {
@@ -10844,12 +10912,12 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 		const commentsIdx = i + 1;
 		const commentsXml = commentsDesc.stringify({ comments: commentOpts }, ctx);
 		mapping[`Comments${i}`] = {
-			data: `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>${commentsXml}`,
+			data: XML_DECL + commentsXml,
 			path: `xl/comments${commentsIdx}.xml`
 		};
 		const vmlXml = vmlNotesDesc.stringify({ comments: commentOpts }, ctx);
 		mapping[`VmlDrawing${i}`] = {
-			data: `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>${vmlXml}`,
+			data: XML_DECL + vmlXml,
 			path: `xl/drawings/vmlDrawing${commentsIdx}.vml`
 		};
 		const commentsRid = ++nextRid;
@@ -10922,7 +10990,7 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 			});
 			const cacheDefRels = new Relationships();
 			cacheDefRels.addRelationship(1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords", "pivotCacheRecords1.xml");
-			const cacheDefXml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" + pivotCacheDefDesc.stringify({
+			const cacheDefXml = XML_DECL + pivotCacheDefDesc.stringify({
 				sourceRef: pt.source.split(":")[0] ? pt.source : "A1",
 				sourceSheet,
 				sourceData,
@@ -10936,7 +11004,7 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 				data: XML_DECL + cacheDefRels.serialize(),
 				path: `xl/pivotCache/_rels/pivotCacheDefinition${cacheIdx}.xml.rels`
 			};
-			const cacheRecordsXml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" + pivotCacheRecordsDesc.stringify({ sourceData }, ctx);
+			const cacheRecordsXml = XML_DECL + pivotCacheRecordsDesc.stringify({ sourceData }, ctx);
 			mapping[`PivotCacheRecords${cacheIdx}`] = {
 				data: cacheRecordsXml,
 				path: `xl/pivotCache/pivotCacheRecords${cacheIdx}.xml`
@@ -10971,7 +11039,7 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 		state.globalTableIdx++;
 		const tableIdx = state.globalTableIdx;
 		if (!tbl.columns?.length) continue;
-		const tableXmlStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" + tableDesc.stringify({
+		const tableXmlStr = XML_DECL + tableDesc.stringify({
 			...tbl,
 			id: tbl.id ?? tableIdx
 		}, ctx);
@@ -11048,9 +11116,11 @@ function compileChartsheets(chartsheetConfigs, ctx, mapping, passthroughRelation
 		if (!chartDef) continue;
 		const csChartGlobalIdx = ctx.charts.array.length;
 		const csChartKey = `cs_chart_${csChartGlobalIdx}`;
+		const csUserShapes = chartDef.userShapes ? buildUserShapesData(chartDef.userShapes) : void 0;
 		ctx.charts.addChart(csChartKey, {
 			key: csChartKey,
-			chartSpaceXml: chartSpaceDesc.stringify(chartDef, ctx) ?? ""
+			chartSpaceXml: chartSpaceDesc.stringify(chartDef, ctx) ?? "",
+			...csUserShapes ? { userShapes: csUserShapes } : {}
 		});
 		const csRels = new Relationships();
 		const csDrawingIdx = i + 1;
@@ -11166,16 +11236,16 @@ function hasMetadataContent(metadata) {
 }
 function extractPivotSourceData(rows, sourceRef) {
 	const parts = sourceRef.split(":");
-	const startMatch = parts[0]?.match(/^([A-Z]+)(\d+)$/);
-	const endMatch = parts[1]?.match(/^([A-Z]+)(\d+)$/);
-	if (!startMatch) return {
+	const start = parseA1Cell(parts[0] ?? "");
+	if (!start) return {
 		fieldNames: [],
 		records: []
 	};
-	const startRow = parseInt(startMatch[2] ?? "1", 10) - 1;
-	const endRow = endMatch ? parseInt(endMatch[2] ?? "1", 10) - 1 : startRow;
-	const startCol = letterToColumn(startMatch[1] ?? "A") - 1;
-	const endCol = endMatch ? letterToColumn(endMatch[1] ?? "A") - 1 : startCol;
+	const end = parts[1] !== void 0 ? parseA1Cell(parts[1]) : void 0;
+	const startRow = start.row - 1;
+	const endRow = (end?.row ?? start.row) - 1;
+	const startCol = start.col - 1;
+	const endCol = (end?.col ?? start.col) - 1;
 	const colCount = endCol - startCol + 1;
 	const headerRow = rows[startRow];
 	const fieldNames = [];
@@ -11213,10 +11283,10 @@ function renderPivotSheetData(pivotOpts, worksheetConfigs, sharedStrings, curren
 	let minRow = Infinity;
 	let minCol = Infinity;
 	for (const pt of pivotOpts) {
-		const locMatch = (pt.location ?? "A3").match(/^([A-Z]+)(\d+)$/);
-		if (!locMatch) continue;
-		const startCol = letterToColumn(locMatch[1] ?? "A") - 1;
-		const startRow = parseInt(locMatch[2] ?? "1", 10);
+		const loc = parseA1Cell(pt.location ?? "A3");
+		if (!loc) continue;
+		const startCol = loc.col - 1;
+		const startRow = loc.row;
 		const rowFieldNames = pt.rows;
 		const dataFields = pt.data;
 		const sourceWsIdx = findWorksheetIndex(worksheetConfigs, pt.sourceSheet ?? currentSheetName);
@@ -11259,7 +11329,7 @@ function renderPivotSheetData(pivotOpts, worksheetConfigs, sharedStrings, curren
 			maxRow = Math.max(maxRow, rowIdx);
 		};
 		if (colFieldIndices.length > 0 && !colFieldIndices.some((idx) => idx === -1)) {
-			const colUniqueVals = collectUniqueValues(sourceData.records, colFieldIndices[0] ?? 0).map((v) => typeof v === "string" || typeof v === "number" ? String(v) : String(v ?? ""));
+			const colUniqueVals = profilePivotFields(sourceData)[colFieldIndices[0] ?? 0].unique.map((v) => typeof v === "string" || typeof v === "number" ? String(v) : String(v ?? ""));
 			const crossTabMap = /* @__PURE__ */ new Map();
 			for (const record of sourceData.records) {
 				const rowKey = rowFieldIndices.map((fi) => String(record[fi])).join("|");
@@ -11671,6 +11741,6 @@ function generateWorkbookStream(options, packerOptions) {
 	} });
 }
 //#endregion
-export { Media, PivotFilterType as PivotFilterTypeValue, SharedStrings, Styles, TableType, TotalsRowFunction, XlsxReadContext, XlsxWriteContext, buildExternalReferencesXml, buildTablePartsXml, stringifyWorksheet as buildWorksheetXml, stringifyWorksheet, calcChainDesc, chartsheetDesc, columnToLetter, commentsDesc, compileWorkbook, connectionsDesc, createThemeXml, dateToSerialNumber, dialogsheetDesc, drawingDesc, externalLinkDesc, generateWorkbook, generateWorkbookStream, generateWorkbookSync, hashPassword, letterToColumn, lintWorkbookFormulas, mapInfoDesc, metadataDesc, parseWorkbook, parseXlsx, patchWorkbook, pickAnchorOptions, pivotCacheDefDesc, pivotCacheRecordsDesc, pivotTableDesc, queryTableDesc, sharedStringsDesc, singleXmlCellsDesc, stylesDesc, tableDesc, vmlNotesDesc, workbookDesc, worksheetDesc };
+export { Media, PivotFilterType as PivotFilterTypeValue, SharedStrings, Styles, TableType, TotalsRowFunction, XlsxReadContext, XlsxWriteContext, buildExternalReferencesXml, buildTablePartsXml, stringifyWorksheet as buildWorksheetXml, stringifyWorksheet, calcChainDesc, chartsheetDesc, columnToLetter, commentsDesc, compileWorkbook, connectionsDesc, createThemeXml, dateToSerialNumber, dialogsheetDesc, drawingDesc, externalLinkDesc, generateWorkbook, generateWorkbookStream, generateWorkbookSync, hashPassword, letterToColumn, lintWorkbookFormulas, mapInfoDesc, metadataDesc, parseA1Cell, parseWorkbook, parseXlsx, patchWorkbook, pickAnchorOptions, pivotCacheDefDesc, pivotCacheRecordsDesc, pivotTableDesc, queryTableDesc, sharedStringsDesc, singleXmlCellsDesc, stylesDesc, tableDesc, vmlNotesDesc, workbookDesc, worksheetDesc };
 
 //# sourceMappingURL=index.mjs.map