reamkit 1.13.0 → 1.15.0

package/dist/esm/excel/header-footer.js

@@ -0,0 +1,127 @@
+//#region src/excel/header-footer.ts
+function buildHeaderFooterContent(formatString, sheetName) {
+	const regions = parseHeaderFooterString(formatString, sheetName);
+	const out = [];
+	const para = (runs, alignment) => {
+		if (runs.length > 0) out.push({
+			kind: "paragraph",
+			paragraph: {
+				properties: { alignment },
+				runs: [...runs]
+			}
+		});
+	};
+	para(regions.left, "left");
+	para(regions.center, "center");
+	para(regions.right, "right");
+	return out;
+}
+function parseHeaderFooterString(s, sheetName) {
+	const regions = {
+		left: [],
+		center: [],
+		right: []
+	};
+	let current = regions.center;
+	let bold = false;
+	let italic = false;
+	let buf = "";
+	const runProps = () => ({
+		...bold ? { bold: true } : {},
+		...italic ? { italic: true } : {}
+	});
+	const flush = () => {
+		if (buf.length > 0) {
+			current.push({
+				text: buf,
+				properties: runProps()
+			});
+			buf = "";
+		}
+	};
+	const pushField = (field) => {
+		flush();
+		current.push({
+			text: "1",
+			properties: runProps(),
+			field
+		});
+	};
+	let i = 0;
+	while (i < s.length) {
+		const ch = s[i];
+		if (ch !== "&") {
+			buf += ch;
+			i++;
+			continue;
+		}
+		const next = s[i + 1];
+		if (next === void 0) {
+			buf += "&";
+			break;
+		}
+		if (next === "&") {
+			buf += "&";
+			i += 2;
+			continue;
+		}
+		if (next === "L" || next === "C" || next === "R") {
+			flush();
+			current = next === "L" ? regions.left : next === "R" ? regions.right : regions.center;
+			i += 2;
+			continue;
+		}
+		if (next === "P") {
+			pushField("PAGE");
+			i += 2;
+			continue;
+		}
+		if (next === "N") {
+			pushField("NUMPAGES");
+			i += 2;
+			continue;
+		}
+		if (next === "A") {
+			buf += sheetName;
+			i += 2;
+			continue;
+		}
+		if (next === "B") {
+			flush();
+			bold = !bold;
+			i += 2;
+			continue;
+		}
+		if (next === "I") {
+			flush();
+			italic = !italic;
+			i += 2;
+			continue;
+		}
+		if (next === "K") {
+			i += 2;
+			let n = 0;
+			while (n < 6 && i < s.length && /[0-9A-Fa-f]/.test(s[i])) {
+				i++;
+				n++;
+			}
+			continue;
+		}
+		if (next === "\"") {
+			i += 2;
+			while (i < s.length && s[i] !== "\"") i++;
+			if (i < s.length) i++;
+			continue;
+		}
+		if (next >= "0" && next <= "9") {
+			i += 1;
+			while (i < s.length && s[i] >= "0" && s[i] <= "9") i++;
+			continue;
+		}
+		i += 2;
+	}
+	flush();
+	return regions;
+}
+//#endregion
+export { buildHeaderFooterContent };

package/dist/esm/excel/index.d.ts

@@ -7,7 +7,7 @@ export { parseWorkbook } from './workbook-parser.js';
 export type { ParsedWorkbook, SheetReference } from './workbook-parser.js';
 export type { DefinedName } from '../core/spreadsheet-model/index.js';
 export { parseWorksheet } from './worksheet-parser.js';
-export type { CellType, ColumnWidth, DataValidation, DataValidationType, ExcelTable, MergedRange, ParsedWorksheet, RowHeight, WorksheetCell, XlsxPageMargins, XlsxPageSetup, XlsxPrintOptions, } from '../core/spreadsheet-model/index.js';
+export type { CellType, ColumnWidth, DataValidation, DataValidationType, HeaderFooter, HyperlinkRef, ExcelTable, MergedRange, ParsedWorksheet, RowHeight, SheetRichRun, WorksheetCell, XlsxPageMargins, XlsxPageSetup, XlsxPrintOptions, } from '../core/spreadsheet-model/index.js';
 export { parseXlsxStyles, EMPTY_XLSX_STYLES } from './styles-parser.js';
 export type { XlsxBorder, XlsxBorderEdge, XlsxBorderStyleName, XlsxCellAlignment, XlsxCellXf, XlsxFill, XlsxFont, XlsxHorizontalAlign, XlsxStyles, XlsxVerticalAlign, } from '../core/spreadsheet-model/index.js';
 export { applyNumberFormat } from './number-format.js';

package/dist/esm/excel/number-format.d.ts

@@ -1 +1,3 @@
 export declare function applyNumberFormat(rawValue: string, numFmtId: number, customFormats: ReadonlyMap<number, string>, date1904?: boolean): string;
+export declare function excelSerialToDate(serial: number, date1904: boolean): Date;
+export declare function excelSerialFromUtcParts(year: number, month0: number, day: number, date1904: boolean): number;

package/dist/esm/excel/number-format.js

@@ -46,6 +46,10 @@ function excelSerialToDate(serial, date1904) {
 	if (date1904) return new Date(Date.UTC(1904, 0, 1) + ms);
 	return new Date(Date.UTC(1899, 11, 30) + ms);
 }
+function excelSerialFromUtcParts(year, month0, day, date1904) {
+	const epoch = date1904 ? Date.UTC(1904, 0, 1) : Date.UTC(1899, 11, 30);
+	return Math.round((Date.UTC(year, month0, day) - epoch) / 864e5);
+}
 var MONTH_ABBR = [
 	"Jan",
 	"Feb",
@@ -435,4 +439,4 @@ function unquoteLiteral(s) {
 	return out;
 }
 //#endregion
-export { applyNumberFormat };
+export { applyNumberFormat, excelSerialFromUtcParts, excelSerialToDate };

package/dist/esm/excel/print-model.d.ts

@@ -1,6 +1,6 @@
 import { BodyElement, SectionProperties, Table } from '../core/document-model/index.js';
-import { CellRange, DefinedName, ParsedWorksheet, WorksheetCell, XlsxStyles } from './index.js';
-import { SheetSlicer } from '../core/ir/sheet.js';
+import { CellRange, DefinedName, ParsedWorksheet, SheetRichRun, WorksheetCell, XlsxStyles } from './index.js';
+import { SheetHyperlink, SheetSlicer } from '../core/ir/sheet.js';
 export declare const TWIPS_PER_EXCEL_CHAR = 105;
 export declare const DEFAULT_COL_TWIPS = 960;
 export declare const DEFAULT_ROW_TWIPS = 300;
@@ -18,6 +18,11 @@ interface PrintModelOptions {
         readonly endRow: number;
     };
     readonly sheetGrids?: ReadonlyMap<string, ParsedWorksheet>;
+    readonly sheetName?: string;
+    readonly definedNames?: ReadonlyArray<DefinedName>;
+    readonly hyperlinks?: ReadonlyArray<SheetHyperlink>;
+    readonly sharedStringRuns?: ReadonlyArray<ReadonlyArray<SheetRichRun> | undefined>;
+    readonly now?: Date;
 }
 export declare function worksheetToBody(worksheet: ParsedWorksheet, sharedStrings: ReadonlyArray<string>, styles: XlsxStyles, date1904: boolean, print: PrintModelOptions): Array<BodyElement>;
 export declare function resolveCellText(cell: WorksheetCell, sharedStrings: ReadonlyArray<string>, styles: XlsxStyles, date1904: boolean): string;

package/dist/esm/excel/print-model.js

@@ -192,7 +192,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 		}
 		return props;
 	};
-	const cfFormatter = buildConditionalFormatter(worksheet.conditionalFormats, styles, worksheet.cells);
+	const cfFormatter = buildConditionalFormatter(worksheet.conditionalFormats, styles, worksheet.cells, (cell) => resolveCellText(cell, sharedStrings, styles, date1904), date1904, print.now, print.sheetGrids, print.sheetName, print.definedNames);
 	const sparklineByCell = buildSparklineLookup(worksheet, print);
 	const tableFormatByCell = buildTableFormatLookup(worksheet);
 	const dropdownRanges = listDropdownRanges(worksheet.dataValidations);
@@ -210,6 +210,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 			}
 			const ws = cellMatrix[r]?.[c];
 			let text = ws ? resolveCellText(ws, sharedStrings, styles, date1904) : "";
+			const cfText = text.length > 0 ? text : void 0;
 			if (text.length > textBudget) text = text.slice(0, Math.max(0, textBudget));
 			textBudget -= text.length;
 			const xf = ws && ws.styleIndex !== void 0 ? styles.cellXfs[ws.styleIndex] : void 0;
@@ -227,7 +228,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 			let icon;
 			const sparkline = sparklineByCell.get(key(absR, absC));
 			if (cfFormatter && ws) {
-				const over = cfFormatter(absR, absC, ws.type === "n" && Number.isFinite(Number(ws.rawValue)) ? Number(ws.rawValue) : void 0);
+				const over = cfFormatter(absR, absC, ws.type === "n" && Number.isFinite(Number(ws.rawValue)) ? Number(ws.rawValue) : void 0, cfText);
 				if (over) {
 					if (over.fillHex) shading = { colorHex: over.fillHex };
 					if (over.dataBar) dataBar = over.dataBar;
@@ -235,7 +236,11 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 					runProps = applyCfOverride(runProps, over);
 				}
 			}
-			if (text.length > 0 && !merge && ws && (ws.type === "s" || ws.type === "str" || ws.type === "inlineStr") && (alignment === void 0 || alignment === "left")) {
+			const wrapText = xf?.alignment?.wrapText === true;
+			const rotation = xf?.alignment?.textRotation;
+			const rotated = rotation !== void 0 && rotation !== 0 && text.length > 0;
+			const shrinkToFit = xf?.alignment?.shrinkToFit === true && !wrapText && !rotated;
+			if (text.length > 0 && !merge && !wrapText && !rotated && !shrinkToFit && ws && (ws.type === "s" || ws.type === "str" || ws.type === "inlineStr") && (alignment === void 0 || alignment === "left")) {
 				let availTwips = columnWidths[c];
 				let cc = c + 1;
 				while (cc < colCount && !cellHasContent(cellMatrix[r]?.[cc])) {
@@ -247,7 +252,19 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 					if (text.length > charsFit) text = text.slice(0, charsFit);
 				}
 			}
+			if (shrinkToFit && ws && text.length > 0) {
+				const charsFit = Math.max(1, columnWidths[c] / 105);
+				if (text.length > charsFit) {
+					const baseHalfPt = (styles.fonts[xf.fontId]?.sizePt ?? 11) * 2;
+					const scaledHalfPt = Math.max(2, Math.round(baseHalfPt * charsFit / text.length));
+					runProps = {
+						...runProps,
+						fontSizePt: halfPtToPt(scaledHalfPt)
+					};
+				}
+			}
 			const dropdown = dropdownRanges.length > 0 && rangesCover(dropdownRanges, absR, absC);
+			const href = print.hyperlinks && print.hyperlinks.length > 0 ? hyperlinkUrlAt(print.hyperlinks, absR, absC) : void 0;
 			const visibleEndCol = merge ? Math.min(merge.endColumn, colWindowEnd) : 0;
 			const properties = {
 				...merge && visibleEndCol > merge.startColumn ? { colSpan: visibleEndCol - merge.startColumn + 1 } : {},
@@ -259,19 +276,32 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 				...borders ? { borders } : {},
 				...dropdown ? { dropdown: true } : {}
 			};
-			const paragraphProps = cellParaProps(alignment);
+			const indentLevels = xf?.alignment?.indent ?? 0;
+			const baseParaProps = cellParaProps(alignment);
+			const paragraphProps = indentLevels > 0 ? {
+				...baseParaProps,
+				indentLeft: twipsToPt(indentLevels * 3 * 105)
+			} : baseParaProps;
+			const richRuns = ws && ws.type === "s" && print.sharedStringRuns ? print.sharedStringRuns[Number(ws.rawValue)] : void 0;
+			const cellRuns = richRuns && richRuns.length > 0 ? richRuns.map((rr) => ({
+				text: rr.text,
+				properties: richRunProps(runProps, rr),
+				...href ? { href } : {}
+			})) : text.length > 0 ? [{
+				text,
+				properties: runProps,
+				...href ? { href } : {}
+			}] : [];
+			const content = rotated ? stackedVerticalContent(text, runProps, href) : [{
+				kind: "paragraph",
+				paragraph: {
+					properties: paragraphProps,
+					runs: cellRuns
+				}
+			}];
 			cells.push({
 				properties,
-				content: [{
-					kind: "paragraph",
-					paragraph: {
-						properties: paragraphProps,
-						runs: text.length > 0 ? [{
-							text,
-							properties: runProps
-						}] : []
-					}
-				}]
+				content
 			});
 		}
 		const baseRowProps = rowHeightMap.get(r);
@@ -377,6 +407,31 @@ function runPropsFromXf(xf, styles) {
 	if (font.colorHex) props.colorHex = font.colorHex;
 	return props;
 }
+function stackedVerticalContent(text, runProps, href) {
+	const out = [];
+	for (const ch of text) out.push({
+		kind: "paragraph",
+		paragraph: {
+			properties: { alignment: "center" },
+			runs: [{
+				text: ch,
+				properties: runProps,
+				...href ? { href } : {}
+			}]
+		}
+	});
+	return out;
+}
+function richRunProps(base, rr) {
+	const out = { ...base };
+	if (rr.bold) out.bold = true;
+	if (rr.italic) out.italic = true;
+	if (rr.underline) out.underline = "single";
+	if (rr.colorHex) out.colorHex = rr.colorHex;
+	if (rr.sizePt !== void 0) out.fontSizePt = halfPtToPt(Math.round(rr.sizePt * 2));
+	if (rr.vertAlign) out.verticalAlign = rr.vertAlign;
+	return out;
+}
 function applyCfOverride(base, o) {
 	return {
 		...base,
@@ -398,14 +453,55 @@ function mapAlignment(h) {
 	if (h === "justify") return "both";
 	if (h === "distributed") return "distribute";
 }
+var PATTERN_DENSITY = {
+	darkGray: .75,
+	mediumGray: .5,
+	lightGray: .25,
+	gray125: .125,
+	gray0625: .0625,
+	darkHorizontal: .5,
+	darkVertical: .5,
+	darkDown: .5,
+	darkUp: .5,
+	darkGrid: .62,
+	darkTrellis: .75,
+	lightHorizontal: .25,
+	lightVertical: .25,
+	lightDown: .25,
+	lightUp: .25,
+	lightGrid: .37,
+	lightTrellis: .5
+};
 function shadingFromXf(xf, styles) {
 	if (xf.applyFill === false) return void 0;
 	if (xf.fillId === 0 || xf.fillId === 1) {
 		if (!xf.applyFill) return void 0;
 	}
 	const fill = styles.fills[xf.fillId];
-	if (!fill || fill.patternType !== "solid" || !fill.fgColorHex) return void 0;
-	return { colorHex: fill.fgColorHex };
+	if (!fill) return void 0;
+	const pattern = fill.patternType;
+	if (!pattern || pattern === "none") return void 0;
+	if (pattern === "solid") return fill.fgColorHex ? { colorHex: fill.fgColorHex } : void 0;
+	const density = PATTERN_DENSITY[pattern];
+	if (density === void 0 || !fill.fgColorHex) return void 0;
+	const blended = blendHex(fill.fgColorHex, fill.bgColorHex ?? "FFFFFF", density);
+	return blended ? { colorHex: blended } : void 0;
+}
+function blendHex(fg, bg, fraction) {
+	const a = hexToRgb(fg);
+	const b = hexToRgb(bg);
+	if (!a || !b) return void 0;
+	const mix = (x, y) => Math.max(0, Math.min(255, Math.round(x * fraction + y * (1 - fraction)))).toString(16).padStart(2, "0").toUpperCase();
+	return `${mix(a[0], b[0])}${mix(a[1], b[1])}${mix(a[2], b[2])}`;
+}
+function hexToRgb(hex) {
+	const h = hex.length === 8 ? hex.slice(2) : hex;
+	if (!/^[0-9A-Fa-f]{6}$/.test(h)) return void 0;
+	return [
+		parseInt(h.slice(0, 2), 16),
+		parseInt(h.slice(2, 4), 16),
+		parseInt(h.slice(4, 6), 16)
+	];
 }
 function bordersFromXf(xf, styles) {
 	if (xf.applyBorder === false) return void 0;
@@ -421,6 +517,11 @@ function bordersFromXf(xf, styles) {
 	if (right) out.right = right;
 	if (bottom) out.bottom = bottom;
 	if (left) out.left = left;
+	const diagonal = border.diagonal ? mapBorderEdge(border.diagonal) : void 0;
+	if (diagonal) {
+		if (border.diagonalDown) out.diagonalDown = diagonal;
+		if (border.diagonalUp) out.diagonalUp = diagonal;
+	}
 	return Object.keys(out).length > 0 ? out : void 0;
 }
 function mapBorderEdge(edge) {
@@ -490,6 +591,12 @@ function rangesCover(ranges, row, col) {
 	for (const r of ranges) if (row >= r.startRow && row <= r.endRow && col >= r.startColumn && col <= r.endColumn) return true;
 	return false;
 }
+function hyperlinkUrlAt(links, row, col) {
+	for (const l of links) {
+		const r = l.ref;
+		if (row >= r.startRow && row <= r.endRow && col >= r.startColumn && col <= r.endColumn) return l.url;
+	}
+}
 function buildSparklineLookup(worksheet, print) {
 	const out = /* @__PURE__ */ new Map();
 	for (const sp of worksheet.sparklines ?? []) {

package/dist/esm/excel/shared-strings-parser.d.ts

@@ -1 +1,6 @@
-export declare function parseSharedStrings(data: Uint8Array): Array<string>;
+import { SheetRichRun } from '../core/spreadsheet-model/index.js';
+export interface SharedStrings {
+    readonly texts: ReadonlyArray<string>;
+    readonly runs: ReadonlyArray<ReadonlyArray<SheetRichRun> | undefined>;
+}
+export declare function parseSharedStrings(data: Uint8Array): SharedStrings;

package/dist/esm/excel/shared-strings-parser.js

@@ -17,22 +17,101 @@ function capLen(s) {
 function parseSharedStrings(data) {
 	const xml = decoder.decode(data);
 	const sst = parser.parse(xml)["sst"];
-	if (!sst || typeof sst !== "object") return [];
+	if (!sst || typeof sst !== "object") return {
+		texts: [],
+		runs: []
+	};
 	const siRaw = sst["si"];
-	return (Array.isArray(siRaw) ? siRaw : siRaw !== void 0 ? [siRaw] : []).map((item) => capLen(extractSiText(item)));
+	const items = Array.isArray(siRaw) ? siRaw : siRaw !== void 0 ? [siRaw] : [];
+	const texts = [];
+	const runs = [];
+	for (const item of items) {
+		const parsed = extractSi(item);
+		texts.push(capLen(parsed.text));
+		runs.push(parsed.runs);
+	}
+	return {
+		texts,
+		runs
+	};
 }
-function extractSiText(si) {
-	if (typeof si === "string") return si;
-	if (typeof si === "number") return String(si);
-	if (!si || typeof si !== "object") return "";
+function extractSi(si) {
+	if (typeof si === "string") return {
+		text: si,
+		runs: void 0
+	};
+	if (typeof si === "number") return {
+		text: String(si),
+		runs: void 0
+	};
+	if (!si || typeof si !== "object") return {
+		text: "",
+		runs: void 0
+	};
 	const obj = si;
-	const t = obj["t"];
-	const direct = textOf(t);
-	if (direct) return direct;
+	const direct = textOf(obj["t"]);
+	if (direct) return {
+		text: direct,
+		runs: void 0
+	};
 	const r = obj["r"];
-	if (Array.isArray(r)) return r.map((rr) => textOf(rr?.["t"])).join("");
-	if (r && typeof r === "object") return textOf(r["t"]);
-	return "";
+	const rs = Array.isArray(r) ? r : r && typeof r === "object" ? [r] : [];
+	if (rs.length === 0) return {
+		text: "",
+		runs: void 0
+	};
+	const runs = [];
+	let anyFormatting = false;
+	for (const rr of rs) {
+		const ro = rr;
+		const text = textOf(ro?.["t"]);
+		if (text.length === 0) continue;
+		const run = richRun(text, ro?.["rPr"]);
+		if (Object.keys(run).length > 1) anyFormatting = true;
+		runs.push(run);
+	}
+	return {
+		text: runs.map((x) => x.text).join(""),
+		runs: anyFormatting && runs.length > 0 ? runs : void 0
+	};
+}
+function richRun(text, rPr) {
+	const p = rPr && typeof rPr === "object" ? rPr : void 0;
+	if (!p) return { text };
+	const out = { text };
+	if (has(p, "b")) out.bold = true;
+	if (has(p, "i")) out.italic = true;
+	if (has(p, "u")) out.underline = true;
+	const color = colorRgb(p["color"]);
+	if (color) out.colorHex = color;
+	const sz = attrNum(p["sz"], "val");
+	if (sz !== void 0) out.sizePt = sz;
+	const vert = attrStr(p["vertAlign"], "val");
+	if (vert === "superscript" || vert === "subscript") out.vertAlign = vert;
+	return out;
+}
+function has(p, key) {
+	if (!(key in p)) return false;
+	const node = p[key];
+	const val = attrStr(node, "val");
+	return val !== "0" && val !== "false";
+}
+function attrStr(node, key) {
+	if (!node || typeof node !== "object") return void 0;
+	const v = node[`@_${key}`];
+	return typeof v === "string" ? v : void 0;
+}
+function attrNum(node, key) {
+	const s = attrStr(node, key);
+	if (s === void 0) return void 0;
+	const n = Number(s);
+	return Number.isFinite(n) ? n : void 0;
+}
+function colorRgb(node) {
+	const rgb = attrStr(node, "rgb");
+	if (!rgb) return void 0;
+	const hex = rgb.length === 8 ? rgb.slice(2) : rgb;
+	return /^[0-9A-Fa-f]{6}$/.test(hex) ? hex.toUpperCase() : void 0;
 }
 function textOf(node) {
 	if (typeof node === "string") return node;

package/dist/esm/excel/sheet-drawing.d.ts

@@ -6,4 +6,16 @@ export interface SheetChartRef {
     readonly heightPt: number;
     readonly anchorRow: number;
 }
-export declare function parseSheetDrawing(drawingXml: Uint8Array, drawingPartPath: string, pkg: OpcPackage, worksheet: ParsedWorksheet): Array<SheetChartRef>;
+export interface SheetPicture {
+    readonly imagePartPath: string;
+    readonly widthPt: number;
+    readonly heightPt: number;
+    readonly anchorRow: number;
+}
+export interface SheetDrawing {
+    readonly charts: Array<SheetChartRef>;
+    readonly pictures: Array<SheetPicture>;
+}
+export declare function parseSheetDrawing(drawingXml: Uint8Array, drawingPartPath: string, pkg: OpcPackage, worksheet: ParsedWorksheet): SheetDrawing;
+export declare function makeColWidthPt(ws: ParsedWorksheet): (col: number) => number;
+export declare function makeRowHeightPt(ws: ParsedWorksheet): (row: number) => number;

package/dist/esm/excel/sheet-drawing.js

@@ -12,12 +12,20 @@ var parser = new XMLParser({
 var TWIPS_PER_PT = 20;
 function parseSheetDrawing(drawingXml, drawingPartPath, pkg, worksheet) {
 	const root = parser.parse(new TextDecoder().decode(drawingXml))["wsDr"];
-	if (!root || typeof root !== "object") return [];
+	if (!root || typeof root !== "object") return {
+		charts: [],
+		pictures: []
+	};
 	const rootObj = root;
 	const colWidthPt = makeColWidthPt(worksheet);
 	const rowHeightPt = makeRowHeightPt(worksheet);
 	const rels = pkg.getPartRelationships(drawingPartPath);
-	const out = [];
+	const partPathOf = (relId) => {
+		const rel = rels.find((r) => r.id === relId);
+		return rel ? pkg.resolveRelatedPart(drawingPartPath, rel)?.path : void 0;
+	};
+	const charts = [];
+	const pictures = [];
 	for (const kind of [
 		"twoCellAnchor",
 		"oneCellAnchor",
@@ -26,10 +34,8 @@ function parseSheetDrawing(drawingXml, drawingPartPath, pkg, worksheet) {
 		if (!anchor || typeof anchor !== "object") continue;
 		const a = anchor;
 		const chartRelId = chartRelIdOf(a);
-		if (!chartRelId) continue;
-		const rel = rels.find((r) => r.id === chartRelId);
-		const resolved = rel ? pkg.resolveRelatedPart(drawingPartPath, rel) : void 0;
-		if (!resolved) continue;
+		const picRelId = chartRelId ? void 0 : picRelIdOf(a);
+		if (!chartRelId && !picRelId) continue;
 		const from = cellMarker(a["from"]);
 		let widthPt = 0;
 		let heightPt = 0;
@@ -46,14 +52,41 @@ function parseSheetDrawing(drawingXml, drawingPartPath, pkg, worksheet) {
 			heightPt = emuToPt(num(e["@_cy"]) ?? 0);
 		}
 		if (widthPt <= 0 || heightPt <= 0) continue;
-		out.push({
-			chartPartPath: resolved.path,
-			widthPt,
-			heightPt,
-			anchorRow: from?.row ?? 0
-		});
+		const anchorRow = from?.row ?? 0;
+		if (chartRelId) {
+			const path = partPathOf(chartRelId);
+			if (path) charts.push({
+				chartPartPath: path,
+				widthPt,
+				heightPt,
+				anchorRow
+			});
+		} else if (picRelId) {
+			const path = partPathOf(picRelId);
+			if (path) pictures.push({
+				imagePartPath: path,
+				widthPt,
+				heightPt,
+				anchorRow
+			});
+		}
 	}
-	return out.sort((x, y) => x.anchorRow - y.anchorRow);
+	charts.sort((x, y) => x.anchorRow - y.anchorRow);
+	pictures.sort((x, y) => x.anchorRow - y.anchorRow);
+	return {
+		charts,
+		pictures
+	};
+}
+function picRelIdOf(anchor) {
+	const pic = anchor["pic"];
+	if (!pic || typeof pic !== "object") return void 0;
+	const blipFill = pic["blipFill"];
+	if (!blipFill || typeof blipFill !== "object") return void 0;
+	const blip = blipFill["blip"];
+	if (!blip || typeof blip !== "object") return void 0;
+	const embed = blip["@_embed"];
+	return typeof embed === "string" && embed !== "" ? embed : void 0;
 }
 function chartRelIdOf(anchor) {
 	const frame = anchor["graphicFrame"];
@@ -110,4 +143,4 @@ function asArray(v) {
 	return Array.isArray(v) ? v : v !== void 0 ? [v] : [];
 }
 //#endregion
-export { parseSheetDrawing };
+export { makeColWidthPt, makeRowHeightPt, parseSheetDrawing };

package/dist/esm/excel/sheet-shape-parser.d.ts

@@ -0,0 +1,4 @@
+import { ShapeBlock } from '../core/document-model/index.js';
+import { ColorResolver } from '../core/drawingml/colors.js';
+import { ParsedWorksheet } from '../core/spreadsheet-model/index.js';
+export declare function parseSheetShapes(drawingXml: Uint8Array, worksheet: ParsedWorksheet, colors: ColorResolver): Array<ShapeBlock>;