@office-open/xlsx 0.10.0 → 0.10.2

package/dist/{context-e2jg7QPd.mjs → context-Btk-2AKp.mjs}

@@ -1,4 +1,4 @@
-import { a as SharedStrings } from "./comments-DxU57iWZ.mjs";
+import { a as SharedStrings } from "./comments-CIu-wLTT.mjs";
 import { attr, attrNum, attrs, children, escapeXml, findChild, stringify, textOf } from "@office-open/xml";
 import { ChartCollection, Relationships, derivePasswordHash } from "@office-open/core";
 //#region src/parts/styles.ts
@@ -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 = {
@@ -3998,4 +4107,4 @@ function resolveWsTarget(wsPath, target) {
 //#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 };
 
-//# sourceMappingURL=context-e2jg7QPd.mjs.map
+//# sourceMappingURL=context-Btk-2AKp.mjs.map