@office-open/xlsx 0.10.1 → 0.10.3

package/dist/{context-Cru_79gz.mjs → context-CJzw_ObT.mjs}

@@ -1,6 +1,6 @@
-import { a as SharedStrings } from "./comments-CIu-wLTT.mjs";
+import { a as SharedStrings } from "./comments-CQ5dlj-4.mjs";
 import { attr, attrNum, attrs, children, escapeXml, findChild, stringify, textOf } from "@office-open/xml";
-import { ChartCollection, Relationships, derivePasswordHash } from "@office-open/core";
+import { ChartCollection, Media, Relationships, derivePasswordHash } from "@office-open/core";
 //#region src/parts/styles.ts
 function fontKey(f) {
 	return `b${f.bold ? 1 : 0}i${f.italic ? 1 : 0}u${f.underline ? 1 : 0}s${f.strike ? 1 : 0}z${f.size ?? 0}c${f.color ?? ""}n${f.font ?? ""}cs${f.charset ?? ""}fm${f.family ?? ""}co${f.condense ? 1 : 0}ex${f.extend ? 1 : 0}va${f.vertAlign ?? ""}sc${f.scheme ?? ""}sh${f.shadow ? 1 : 0}ol${f.outline ? 1 : 0}`;
@@ -396,14 +396,14 @@ const stylesDesc = {
 		const result = {};
 		const numFmtsEl = findChild(el, "numFmts");
 		if (numFmtsEl) {
-			const numFmts = {};
+			const numFmtById = /* @__PURE__ */ new Map();
 			for (const nf of numFmtsEl.elements ?? []) {
 				if (nf.name !== "numFmt") continue;
 				const id = attrNum(nf, "numFmtId");
 				const code = attr(nf, "formatCode");
-				if (id !== void 0 && code) numFmts[code] = id;
+				if (id !== void 0 && code) numFmtById.set(id, code);
 			}
-			result.customNumFmts = numFmts;
+			result.customNumFmtById = numFmtById;
 		}
 		const fontsEl = findChild(el, "fonts");
 		if (fontsEl) {
@@ -833,7 +833,7 @@ const chartsheetDesc = {
 		if (sheetPr) {
 			if (sheetPr.attributes?.["published"] === "1") result.published = true;
 			const tabColor = findChild(sheetPr, "tabColor");
-			if (tabColor?.attributes?.["rgb"]) result.tabColor = tabColor.attributes["rgb"];
+			if (tabColor?.attributes?.["rgb"]) result.tabColor = String(tabColor.attributes["rgb"]);
 		}
 		const sheetViews = findChild(el, "sheetViews");
 		if (sheetViews) {
@@ -844,10 +844,24 @@ const chartsheetDesc = {
 };
 //#endregion
 //#region src/parts/drawing.ts
+/** How a drawing is anchored to the worksheet (xdr:*Anchor element). */
+const ANCHOR_TYPES = {
+	twoCell: "twoCell",
+	oneCell: "oneCell",
+	absolute: "absolute"
+};
+/** editAs behavior for twoCellAnchor (ST_EditAs). */
+const EDIT_AS_TYPES = {
+	twoCell: "twoCell",
+	oneCell: "oneCell",
+	absolute: "absolute"
+};
 const XDR_NS = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing";
 const A_NS = "http://schemas.openxmlformats.org/drawingml/2006/main";
 const R_NS$1 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
 const C_URI = "http://schemas.openxmlformats.org/drawingml/2006/chart";
+const DEFAULT_EXTENT_CX = 4e5;
+const DEFAULT_EXTENT_CY = 3e5;
 const drawingDesc = {
 	kind: "custom",
 	stringify(opts, _ctx) {
@@ -857,11 +871,11 @@ const drawingDesc = {
 		const p = [`<wsDr xmlns="${XDR_NS}" xmlns:a="${A_NS}" xmlns:r="${R_NS$1}">`];
 		let id = 1;
 		for (const img of images) {
-			p.push(`<twoCellAnchor editAs="oneCell"><from><col>${img.col - 1}</col><colOff>${img.colOffset ?? 0}</colOff><row>${img.row - 1}</row><rowOff>${img.rowOffset ?? 0}</rowOff></from>`, `<to><col>${img.col}</col><colOff>0</colOff><row>${img.row}</row><rowOff>0</rowOff></to>`, `<pic><nvPicPr><cNvPr id="${id}" name="Picture ${id}"/><cNvPicPr preferRelativeResize="1"/></nvPicPr>`, `<blipFill><a:blip r:embed="${img.rId}"/><a:stretch><a:fillRect/></a:stretch></blipFill>`, `<spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="400000" cy="300000"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></spPr></pic>`, `<clientData fLocksWithSheet="${img.locksWithSheet !== false ? 1 : 0}" fPrintsWithSheet="${img.printsWithSheet !== false ? 1 : 0}"/></twoCellAnchor>`);
+			p.push(stringifyImage(img, id));
 			id++;
 		}
 		for (const chart of charts) {
-			p.push(`<twoCellAnchor editAs="oneCell"><from><col>${chart.col - 1}</col><colOff>${chart.colOffset ?? 0}</colOff><row>${chart.row - 1}</row><rowOff>${chart.rowOffset ?? 0}</rowOff></from>`, `<to><col>${chart.col + 8}</col><colOff>0</colOff><row>${chart.row + 15}</row><rowOff>0</rowOff></to>`, `<graphicFrame><nvGraphicFramePr><cNvPr id="${id}" name="Chart ${id}"/><cNvGraphicFramePr><a:graphicFrameLocks noGrp="1"/></cNvGraphicFramePr></nvGraphicFramePr>`, `<xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/></xfrm>`, `<a:graphic><a:graphicData uri="${C_URI}"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="${R_NS$1}" r:id="${chart.rId}"/></a:graphicData></a:graphic></graphicFrame>`, `<clientData fLocksWithSheet="${chart.locksWithSheet !== false ? 1 : 0}" fPrintsWithSheet="${chart.printsWithSheet !== false ? 1 : 0}"/></twoCellAnchor>`);
+			p.push(stringifyChart(chart, id));
 			id++;
 		}
 		p.push("</wsDr>");
@@ -872,47 +886,17 @@ const drawingDesc = {
 		const images = [];
 		const charts = [];
 		for (const anchor of el.elements ?? []) {
-			if (anchor.name !== "twoCellAnchor") continue;
-			const from = findChild(anchor, "from");
-			findChild(anchor, "to");
-			if (!from) continue;
-			const col = readNumChild(from, "col") + 1;
-			const colOffset = readNumChild(from, "colOff") || void 0;
-			const row = readNumChild(from, "row") + 1;
-			const rowOffset = readNumChild(from, "rowOff") || void 0;
+			const name = anchor.name;
+			if (name !== "twoCellAnchor" && name !== "oneCellAnchor" && name !== "absoluteAnchor") continue;
 			const pic = findChild(anchor, "pic");
 			if (pic) {
-				const rId = findChild(findChild(pic, "blipFill") ?? pic, "a:blip")?.attributes?.["r:embed"];
-				if (rId) {
-					const clientData = findChild(anchor, "clientData");
-					images.push({
-						col,
-						colOffset,
-						row,
-						rowOffset,
-						rId,
-						locksWithSheet: clientData?.attributes?.["fLocksWithSheet"] !== "0",
-						printsWithSheet: clientData?.attributes?.["fPrintsWithSheet"] !== "0"
-					});
-				}
+				images.push(parseImageAnchor(anchor, pic, name));
 				continue;
 			}
 			const graphicFrame = findChild(anchor, "graphicFrame");
 			if (graphicFrame) {
-				const graphicData = findChild(findChild(graphicFrame, "a:graphic") ?? graphicFrame, "a:graphicData");
-				const rId = (graphicData ? findChild(graphicData, "c:chart") : void 0)?.attributes?.["r:id"];
-				if (rId) {
-					const clientData = findChild(anchor, "clientData");
-					charts.push({
-						col,
-						colOffset,
-						row,
-						rowOffset,
-						rId,
-						locksWithSheet: clientData?.attributes?.["fLocksWithSheet"] !== "0",
-						printsWithSheet: clientData?.attributes?.["fPrintsWithSheet"] !== "0"
-					});
-				}
+				const chart = parseChartAnchor(anchor, graphicFrame);
+				if (chart) charts.push(chart);
 			}
 		}
 		if (images.length > 0) result.images = images;
@@ -920,12 +904,137 @@ const drawingDesc = {
 		return result;
 	}
 };
+/** Marker cell (0-based col/row + EMU offsets). */
+function markerXml(col, colOff, row, rowOff) {
+	return `<col>${col - 1}</col><colOff>${colOff}</colOff><row>${row - 1}</row><rowOff>${rowOff}</rowOff>`;
+}
+function clientDataXml(img) {
+	return `<clientData fLocksWithSheet="${img.locksWithSheet !== false ? 1 : 0}" fPrintsWithSheet="${img.printsWithSheet !== false ? 1 : 0}"/>`;
+}
+function picXml(rId, id, cx, cy) {
+	return `<pic><nvPicPr><cNvPr id="${id}" name="Picture ${id}"/><cNvPicPr preferRelativeResize="1"/></nvPicPr><blipFill><a:blip r:embed="${rId}"/><a:stretch><a:fillRect/></a:stretch></blipFill><spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${cx}" cy="${cy}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></spPr></pic>`;
+}
+function stringifyImage(img, id) {
+	const anchorType = img.anchorType ?? ANCHOR_TYPES.twoCell;
+	const cx = img.extentCx ?? DEFAULT_EXTENT_CX;
+	const cy = img.extentCy ?? DEFAULT_EXTENT_CY;
+	const pic = picXml(img.rId, id, cx, cy);
+	const clientData = clientDataXml(img);
+	if (anchorType === ANCHOR_TYPES.absolute) return `<absoluteAnchor><pos x="${img.absoluteX ?? 0}" y="${img.absoluteY ?? 0}"/><ext cx="${cx}" cy="${cy}"/>${pic}${clientData}</absoluteAnchor>`;
+	const from = markerXml(img.col, img.colOffset ?? 0, img.row, img.rowOffset ?? 0);
+	if (anchorType === ANCHOR_TYPES.oneCell) return `<oneCellAnchor><from>${from}</from><ext cx="${cx}" cy="${cy}"/>${pic}${clientData}</oneCellAnchor>`;
+	return `<twoCellAnchor editAs="${img.editAs ?? EDIT_AS_TYPES.oneCell}"><from>${from}</from><to>${markerXml(img.toCol ?? img.col + 1, img.toColOffset ?? 0, img.toRow ?? img.row + 1, img.toRowOffset ?? 0)}</to>${pic}${clientData}</twoCellAnchor>`;
+}
+function stringifyChart(chart, id) {
+	const from = markerXml(chart.col, chart.colOffset ?? 0, chart.row, chart.rowOffset ?? 0);
+	const to = markerXml(chart.col + 9, 0, chart.row + 16, 0);
+	const clientData = clientDataXml(chart);
+	return `<twoCellAnchor editAs="oneCell"><from>${from}</from><to>${to}</to><graphicFrame><nvGraphicFramePr><cNvPr id="${id}" name="Chart ${id}"/><cNvGraphicFramePr><a:graphicFrameLocks noGrp="1"/></cNvGraphicFramePr></nvGraphicFramePr><xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/></xfrm><a:graphic><a:graphicData uri="${C_URI}"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="${R_NS$1}" r:id="${chart.rId}"/></a:graphicData></a:graphic></graphicFrame>${clientData}</twoCellAnchor>`;
+}
 function readNumChild(el, tag) {
 	const child = findChild(el, tag);
 	if (!child?.elements?.length) return 0;
 	const n = Number(child.elements[0]?.text ?? "");
 	return Number.isNaN(n) ? 0 : n;
 }
+function readMarker(el) {
+	return {
+		col: readNumChild(el, "col") + 1,
+		colOffset: readNumChild(el, "colOff") || void 0,
+		row: readNumChild(el, "row") + 1,
+		rowOffset: readNumChild(el, "rowOff") || void 0
+	};
+}
+function readPicRId(pic) {
+	return findChild(findChild(pic, "blipFill") ?? pic, "a:blip")?.attributes?.["r:embed"];
+}
+/** Picture extent from pic/spPr/a:xfrm/a:ext (actual image size in EMU). */
+function readPicExtent(pic) {
+	const spPr = findChild(pic, "spPr");
+	const xfrm = spPr ? findChild(spPr, "a:xfrm") : void 0;
+	const ext = xfrm ? findChild(xfrm, "a:ext") : void 0;
+	if (!ext?.attributes) return {};
+	const cx = Number(ext.attributes["cx"]);
+	const cy = Number(ext.attributes["cy"]);
+	return {
+		cx: Number.isNaN(cx) ? void 0 : cx,
+		cy: Number.isNaN(cy) ? void 0 : cy
+	};
+}
+function parseImageAnchor(anchor, pic, name) {
+	const result = {
+		col: 1,
+		row: 1,
+		rId: readPicRId(pic) ?? ""
+	};
+	const ext = readPicExtent(pic);
+	if (ext.cx !== void 0) result.extentCx = ext.cx;
+	if (ext.cy !== void 0) result.extentCy = ext.cy;
+	const clientData = findChild(anchor, "clientData");
+	if (clientData?.attributes) {
+		if (clientData.attributes["fLocksWithSheet"] !== void 0) result.locksWithSheet = clientData.attributes["fLocksWithSheet"] !== "0";
+		if (clientData.attributes["fPrintsWithSheet"] !== void 0) result.printsWithSheet = clientData.attributes["fPrintsWithSheet"] !== "0";
+	}
+	if (name === "absoluteAnchor") {
+		result.anchorType = ANCHOR_TYPES.absolute;
+		const pos = findChild(anchor, "pos");
+		if (pos?.attributes) {
+			const x = Number(pos.attributes["x"]);
+			const y = Number(pos.attributes["y"]);
+			if (!Number.isNaN(x)) result.absoluteX = x;
+			if (!Number.isNaN(y)) result.absoluteY = y;
+		}
+		return result;
+	}
+	const from = findChild(anchor, "from");
+	if (from) {
+		const m = readMarker(from);
+		result.col = m.col;
+		result.row = m.row;
+		if (m.colOffset !== void 0) result.colOffset = m.colOffset;
+		if (m.rowOffset !== void 0) result.rowOffset = m.rowOffset;
+	}
+	if (name === "oneCellAnchor") {
+		result.anchorType = ANCHOR_TYPES.oneCell;
+		return result;
+	}
+	result.anchorType = ANCHOR_TYPES.twoCell;
+	const to = findChild(anchor, "to");
+	if (to) {
+		const m = readMarker(to);
+		result.toCol = m.col;
+		result.toRow = m.row;
+		if (m.colOffset !== void 0) result.toColOffset = m.colOffset;
+		if (m.rowOffset !== void 0) result.toRowOffset = m.rowOffset;
+	}
+	const editAs = anchor.attributes?.["editAs"];
+	if (editAs) result.editAs = editAs;
+	return result;
+}
+function parseChartAnchor(anchor, graphicFrame) {
+	const graphicData = findChild(findChild(graphicFrame, "a:graphic") ?? graphicFrame, "a:graphicData");
+	const rId = (graphicData ? findChild(graphicData, "c:chart") : void 0)?.attributes?.["r:id"];
+	if (!rId) return void 0;
+	const result = {
+		col: 1,
+		row: 1,
+		rId
+	};
+	const from = findChild(anchor, "from");
+	if (from) {
+		const m = readMarker(from);
+		result.col = m.col;
+		result.row = m.row;
+		if (m.colOffset !== void 0) result.colOffset = m.colOffset;
+		if (m.rowOffset !== void 0) result.rowOffset = m.rowOffset;
+	}
+	const clientData = findChild(anchor, "clientData");
+	if (clientData?.attributes) {
+		if (clientData.attributes["fLocksWithSheet"] !== void 0) result.locksWithSheet = clientData.attributes["fLocksWithSheet"] !== "0";
+		if (clientData.attributes["fPrintsWithSheet"] !== void 0) result.printsWithSheet = clientData.attributes["fPrintsWithSheet"] !== "0";
+	}
+	return result;
+}
 //#endregion
 //#region src/parts/external-link.ts
 const externalLinkDesc = {
@@ -1002,7 +1111,7 @@ const externalLinkDesc = {
 		const bookEl = findChild(el, "externalBook");
 		if (bookEl) {
 			const book = {};
-			if (bookEl.attributes?.["r:id"]) result.bookRId = bookEl.attributes["r:id"];
+			if (bookEl.attributes?.["r:id"]) result.bookRId = String(bookEl.attributes["r:id"]);
 			const sheetNamesEl = findChild(bookEl, "sheetNames");
 			if (sheetNamesEl) {
 				const names = [];
@@ -1014,8 +1123,7 @@ const externalLinkDesc = {
 				const dns = [];
 				for (const child of definedNamesEl.elements ?? []) {
 					if (child.name !== "definedName") continue;
-					const dn = {};
-					if (child.attributes?.["name"]) dn.name = String(child.attributes["name"]);
+					const dn = { name: String(child.attributes?.["name"] ?? "") };
 					if (child.attributes?.["refersTo"]) dn.refersTo = String(child.attributes["refersTo"]);
 					if (child.attributes?.["sheetId"] !== void 0) dn.sheetId = Number(child.attributes["sheetId"]);
 					if (child.attributes?.["publishToServer"]) dn.publishToServer = true;
@@ -1031,19 +1139,16 @@ const externalLinkDesc = {
 				const sds = [];
 				for (const sdChild of sheetDataSetEl.elements ?? []) {
 					if (sdChild.name !== "sheetData") continue;
-					const sd = {};
-					if (sdChild.attributes?.["sheetId"] !== void 0) sd.sheetId = Number(sdChild.attributes["sheetId"]);
+					const sd = { sheetId: Number(sdChild.attributes?.["sheetId"] ?? 0) };
 					if (sdChild.attributes?.["refreshError"]) sd.refreshError = true;
 					const rows = [];
 					for (const rowChild of sdChild.elements ?? []) {
 						if (rowChild.name !== "row") continue;
-						const row = {};
-						if (rowChild.attributes?.["r"] !== void 0) row.rowNumber = Number(rowChild.attributes["r"]);
+						const row = { rowNumber: Number(rowChild.attributes?.["r"] ?? 0) };
 						const cells = [];
 						for (const cellChild of rowChild.elements ?? []) {
 							if (cellChild.name !== "cell") continue;
-							const cell = {};
-							if (cellChild.attributes?.["r"]) cell.reference = String(cellChild.attributes["r"]);
+							const cell = { reference: String(cellChild.attributes?.["r"] ?? "") };
 							if (cellChild.attributes?.["t"]) cell.type = String(cellChild.attributes["t"]);
 							const vEl = findChild(cellChild, "v");
 							if (vEl && vEl.elements?.[0]?.text !== void 0) cell.value = String(vEl.elements[0].text);
@@ -1062,14 +1167,13 @@ const externalLinkDesc = {
 		const oleEl = findChild(el, "oleLink");
 		if (oleEl) {
 			const ole = {};
-			if (oleEl.attributes?.["r:id"]) result.oleRId = oleEl.attributes["r:id"];
+			if (oleEl.attributes?.["r:id"]) result.oleRId = String(oleEl.attributes["r:id"]);
 			const oleItemsEl = findChild(oleEl, "oleItems");
 			if (oleItemsEl) {
 				const items = [];
 				for (const child of oleItemsEl.elements ?? []) {
 					if (child.name !== "oleItem") continue;
-					const item = {};
-					if (child.attributes?.["name"]) item.name = String(child.attributes["name"]);
+					const item = { name: String(child.attributes?.["name"] ?? "") };
 					if (child.attributes?.["advise"]) item.advise = true;
 					if (child.attributes?.["prefer"]) item.prefer = true;
 					items.push(item);
@@ -1906,7 +2010,8 @@ function parsePivotArea(el) {
 	const result = {};
 	const field = attrNum(el, "field");
 	if (field !== void 0) result.field = field;
-	if (attr(el, "type")) result.type = attr(el, "type");
+	const typeVal = attr(el, "type");
+	if (typeVal) result.type = typeVal;
 	if (attr(el, "dataOnly") === "0") result.dataOnly = false;
 	if (attr(el, "labelOnly") === "1") result.labelOnly = true;
 	if (attr(el, "grandRow") === "1") result.grandRow = true;
@@ -1915,7 +2020,8 @@ function parsePivotArea(el) {
 	if (attr(el, "outline") === "0") result.outline = false;
 	if (attr(el, "offset")) result.offset = attr(el, "offset");
 	if (attr(el, "collapsedLevelsAreSubtotals") === "1") result.collapsedLevelsAreSubtotals = true;
-	if (attr(el, "axis")) result.axis = attr(el, "axis");
+	const axisVal = attr(el, "axis");
+	if (axisVal) result.axis = axisVal;
 	const fp = attrNum(el, "fieldPosition");
 	if (fp !== void 0) result.fieldPosition = fp;
 	const refsEl = findChild(el, "references");
@@ -2015,18 +2121,23 @@ const pivotCacheRecordsDesc = {
 			if (rEl.name !== "r") continue;
 			const record = [];
 			for (const fEl of rEl.elements ?? []) {
-				const entry = {};
-				if (fEl.name === "x") {
-					entry.type = "string";
-					entry.v = attrNum(fEl, "v") ?? 0;
-				} else if (fEl.name === "n") {
-					entry.type = "number";
+				let entry;
+				if (fEl.name === "x") entry = {
+					type: "string",
+					v: attrNum(fEl, "v") ?? 0
+				};
+				else if (fEl.name === "n") {
 					const v = attr(fEl, "v");
-					entry.v = v !== void 0 ? Number(v) : 0;
-				} else if (fEl.name === "d") {
-					entry.type = "date";
-					entry.v = attr(fEl, "v") ?? "";
-				} else if (fEl.name === "m") entry.type = "missing";
+					entry = {
+						type: "number",
+						v: v !== void 0 ? Number(v) : 0
+					};
+				} else if (fEl.name === "d") entry = {
+					type: "date",
+					v: attr(fEl, "v") ?? ""
+				};
+				else if (fEl.name === "m") entry = { type: "missing" };
+				else continue;
 				record.push(entry);
 			}
 			records.push(record);
@@ -2521,8 +2632,6 @@ const tableDesc = {
 			for (const colEl of colsEl.elements ?? []) {
 				if (colEl.name !== "tableColumn") continue;
 				const col = {};
-				const colId = attrNum(colEl, "id");
-				if (colId !== void 0) col.id = colId;
 				col.name = attr(colEl, "name") ?? "";
 				if (attr(colEl, "totalsRowFunction")) col.totalsRowFunction = attr(colEl, "totalsRowFunction");
 				if (attr(colEl, "totalsRowLabel")) col.totalsRowLabel = attr(colEl, "totalsRowLabel");
@@ -2745,8 +2854,10 @@ const workbookDesc = {
 			if (attr(webPublishingEl, "vml") === "1") wp.vml = true;
 			if (attr(webPublishingEl, "allowPng") === "1") wp.allowPng = true;
 			if (attr(webPublishingEl, "targetScreenSize")) wp.targetScreenSize = attr(webPublishingEl, "targetScreenSize");
-			if (attrNum(webPublishingEl, "dpi") !== void 0) wp.dpi = attrNum(webPublishingEl, "dpi");
-			if (attrNum(webPublishingEl, "codePage") !== void 0) wp.codePage = attrNum(webPublishingEl, "codePage");
+			const dpi = attrNum(webPublishingEl, "dpi");
+			if (dpi !== void 0) wp.dpi = dpi;
+			const codePage = attrNum(webPublishingEl, "codePage");
+			if (codePage !== void 0) wp.codePage = codePage;
 			if (attr(webPublishingEl, "characterSet")) wp.characterSet = attr(webPublishingEl, "characterSet");
 			result.webPublishing = wp;
 		}
@@ -2794,9 +2905,7 @@ const workbookDesc = {
 			const objs = [];
 			for (const wo of wpoEl.elements ?? []) {
 				if (wo.name !== "webPublishObject") continue;
-				const obj = {};
-				const rId = wo.attributes?.["r:id"];
-				if (rId) obj.rId = rId;
+				const obj = { rId: wo.attributes?.["r:id"] ?? "" };
 				if (attr(wo, "destinationFile")) obj.destinationFile = attr(wo, "destinationFile");
 				if (attr(wo, "autoRepublish") === "1") obj.autoRepublish = true;
 				if (attr(wo, "title")) obj.title = attr(wo, "title");
@@ -2812,28 +2921,28 @@ const workbookDesc = {
 			for (const vt of vtEl.elements ?? []) {
 				if (vt.name !== "volType") continue;
 				const volType = {};
-				if (attr(vt, "type")) volType.type = attr(vt, "type");
+				const typeVal = attr(vt, "type");
+				if (typeVal) volType.type = typeVal;
 				const mains = [];
 				for (const m of vt.elements ?? []) {
 					if (m.name !== "main") continue;
-					const main = {};
-					if (attr(m, "first")) main.first = attr(m, "first");
+					const main = { first: attr(m, "first") ?? "" };
 					const topics = [];
 					for (const tp of m.elements ?? []) {
 						if (tp.name !== "tp") continue;
-						const topic = {};
 						const vEl = findChild(tp, "v");
-						if (vEl) topic.value = vEl.elements?.[0]?.text ?? "";
-						if (attr(tp, "t")) topic.valueType = attr(tp, "t");
+						const topic = { value: String(vEl?.elements?.[0]?.text ?? "") };
+						const tVal = attr(tp, "t");
+						if (tVal) topic.valueType = tVal;
 						const stps = [];
 						const refs = [];
 						for (const inner of tp.elements ?? []) {
 							if (inner.name === "stp") stps.push(String(inner.elements?.[0]?.text ?? ""));
 							if (inner.name === "tr") {
-								const ref = {};
-								if (attr(inner, "r")) ref.reference = attr(inner, "r");
-								const sIdx = attrNum(inner, "s");
-								if (sIdx !== void 0) ref.sheetIndex = sIdx;
+								const ref = {
+									reference: attr(inner, "r") ?? "",
+									sheetIndex: attrNum(inner, "s") ?? 0
+								};
 								refs.push(ref);
 							}
 						}
@@ -3829,17 +3938,6 @@ var ContentTypes = class {
 	}
 };
 //#endregion
-//#region src/parts/media.ts
-var Media = class {
-	map = /* @__PURE__ */ new Map();
-	addImage(key, data) {
-		this.map.set(key, data);
-	}
-	get array() {
-		return [...this.map.values()];
-	}
-};
-//#endregion
 //#region src/context.ts
 /**
 * XLSX compile context — write and read contexts for the descriptor pipeline.
@@ -3956,7 +4054,7 @@ var XlsxReadContext = class {
 	resolveStyle(styleIndex) {
 		const ps = this.parsedStyles;
 		if (!ps) return void 0;
-		const { cellXfs, fonts, fills, borders, customNumFmts } = ps;
+		const { cellXfs, fonts, fills, borders, customNumFmtById } = ps;
 		if (!cellXfs || styleIndex >= cellXfs.length) return void 0;
 		const xf = cellXfs[styleIndex];
 		const result = {};
@@ -3967,11 +4065,9 @@ var XlsxReadContext = class {
 		const borderId = xf.borderId;
 		if (borderId !== void 0 && borders && borderId < borders.length) result.border = borders[borderId];
 		const numFmtId = xf.numFmtId;
-		if (numFmtId !== void 0 && customNumFmts) {
-			for (const [code, id] of Object.entries(customNumFmts)) if (id === numFmtId) {
-				result.numFmt = code;
-				break;
-			}
+		if (numFmtId !== void 0 && customNumFmtById) {
+			const code = customNumFmtById.get(numFmtId);
+			if (code !== void 0) result.numFmt = code;
 		}
 		if (xf.alignment) result.alignment = xf.alignment;
 		if (xf.protection) result.protection = xf.protection;
@@ -3996,6 +4092,6 @@ function resolveWsTarget(wsPath, target) {
 	return dirParts.join("/");
 }
 //#endregion
-export { stylesDesc as C, Styles as S, collectUniqueValues as _, usersDesc as a, chartsheetDesc as b, workbookDesc as c, tableDesc as d, pivotCacheDefDesc as f, aggregate as g, PivotFilterType as h, revisionLogDesc as i, TableType as l, pivotTableDesc as m, XlsxWriteContext as n, buildExternalReferencesXml as o, pivotCacheRecordsDesc as p, revisionHeadersDesc as r, buildTablePartsXml as s, XlsxReadContext as t, TotalsRowFunction as u, externalLinkDesc as v, calcChainDesc as x, drawingDesc as y };
+export { Styles as C, calcChainDesc as S, aggregate as _, usersDesc as a, drawingDesc as b, buildTablePartsXml as c, TotalsRowFunction as d, tableDesc as f, PivotFilterType as g, pivotTableDesc as h, revisionLogDesc as i, workbookDesc as l, pivotCacheRecordsDesc as m, XlsxWriteContext as n, Media as o, pivotCacheDefDesc as p, revisionHeadersDesc as r, buildExternalReferencesXml as s, XlsxReadContext as t, TableType as u, collectUniqueValues as v, stylesDesc as w, chartsheetDesc as x, externalLinkDesc as y };
 
-//# sourceMappingURL=context-Cru_79gz.mjs.map
+//# sourceMappingURL=context-CJzw_ObT.mjs.map