reamkit 1.1.0 → 1.3.0

package/dist/esm/core/ir/features.js

@@ -8,6 +8,7 @@ var FEATURES = {
 	headersFooters: "headersFooters",
 	images: "images",
 	imagesJp2: "images.jp2",
+	hyperlinks: "hyperlinks",
 	shapes: "shapes",
 	charts: "charts",
 	math: "math",

package/dist/esm/core/ir/flow.d.ts

@@ -11,6 +11,9 @@ export interface FlowDoc {
     readonly styles: StyleSheet;
     readonly numbering?: Numbering;
     readonly headersFooters?: ReadonlyMap<string, ReadonlyArray<BodyElement>>;
+    /** §17.11 footnotes/endnotes content by id (separator stubs excluded). */
+    readonly footnotes?: ReadonlyMap<string, ReadonlyArray<BodyElement>>;
+    readonly endnotes?: ReadonlyMap<string, ReadonlyArray<BodyElement>>;
     /** Parsed charts keyed by relationship id (ChartBlock.chartRelId). */
     readonly charts?: ReadonlyMap<string, Chart>;
     /** Content-addressed binary resources (images). */

package/dist/esm/core/links.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Returns the trimmed URL when its scheme is on the allowlist, undefined
+ * otherwise (including scheme-less/relative targets — those are not external
+ * links for a converted document).
+ */
+export declare function sanitizeHref(href: string): string | undefined;

package/dist/esm/core/links.js

@@ -0,0 +1,19 @@
+//#region src/core/links.ts
+var ALLOWED_SCHEMES = new Set([
+	"http",
+	"https",
+	"mailto"
+]);
+/**
+* Returns the trimmed URL when its scheme is on the allowlist, undefined
+* otherwise (including scheme-less/relative targets — those are not external
+* links for a converted document).
+*/
+function sanitizeHref(href) {
+	const url = href.trim();
+	const m = /^([a-zA-Z][a-zA-Z0-9+.-]*):/.exec(url);
+	if (!m) return void 0;
+	return ALLOWED_SCHEMES.has(m[1].toLowerCase()) ? url : void 0;
+}
+//#endregion
+export { sanitizeHref };

package/dist/esm/core/numbering/apply.js

@@ -12,10 +12,13 @@ function applyNumbering(body, numbering) {
 		const level = (instance ? numbering.abstractNums.get(instance.abstractNumId) : void 0)?.levels.get(ref.ilvl);
 		const markerRun = {
 			text: `${marker}\t`,
-			properties: level?.runProperties ?? {}
+			properties: level?.runProperties ?? {},
+			listMarker: true
 		};
+		const newProps = mergeIndentFromLevel(p.properties, level?.paragraphProperties);
 		return {
-			properties: mergeIndentFromLevel(p.properties, level?.paragraphProperties),
+			...p,
+			properties: newProps,
 			runs: [markerRun, ...p.runs]
 		};
 	};

package/dist/esm/core/opc/index.d.ts

@@ -3,3 +3,4 @@ export type { Relationship } from './relationships.js';
 export { REL_OFFICE_DOCUMENT, REL_CORE_PROPERTIES, REL_EXTENDED_PROPERTIES, } from './relationship-types.js';
 export { parseCoreProperties } from './core-properties.js';
 export type { CoreProperties } from './core-properties.js';
+export { isOoxmlRel } from './relationship-types.js';

package/dist/esm/core/opc/package.js

@@ -1,5 +1,5 @@
 import { parseRelationships } from "./relationships.js";
-import "./relationship-types.js";
+import { isOoxmlRel } from "./relationship-types.js";
 import { unzipSync } from "fflate";
 //#region src/core/opc/package.ts
 var ROOT_RELS_PATH = "_rels/.rels";
@@ -11,6 +11,7 @@ var OpcPackage = class OpcPackage {
 	}
 	relsCache = /* @__PURE__ */ new Map();
 	static open(buffer, options = {}) {
+		if (buffer.length >= 4 && buffer[0] === 208 && buffer[1] === 207 && buffer[2] === 17 && buffer[3] === 224) throw new Error("OLE compound file: a password-protected (encrypted) OOXML document or a legacy binary .doc/.xls — re-save as an unencrypted .docx/.xlsx");
 		const maxArchive = options.maxArchiveBytes ?? 128 * MIB;
 		const maxEntry = options.maxEntryBytes ?? 256 * MIB;
 		const maxTotal = options.maxTotalBytes ?? 512 * MIB;
@@ -77,7 +78,7 @@ var OpcPackage = class OpcPackage {
 		};
 	}
 	getMainDocumentPath() {
-		const candidates = this.rootRelationships.filter((r) => r.type === "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" && r.targetMode === "Internal");
+		const candidates = this.rootRelationships.filter((r) => isOoxmlRel(r.type, "officeDocument") && r.targetMode === "Internal");
 		if (candidates.length === 0) throw new Error("OPC package has no officeDocument relationship");
 		if (candidates.length > 1) throw new Error(`OPC package has multiple officeDocument relationships (${candidates.length})`);
 		return resolveTarget("/", candidates[0].target);

package/dist/esm/core/opc/relationship-types.d.ts

@@ -1,3 +1,4 @@
 export declare const REL_OFFICE_DOCUMENT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";
 export declare const REL_CORE_PROPERTIES = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
 export declare const REL_EXTENDED_PROPERTIES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";
+export declare function isOoxmlRel(type: string, name: string): boolean;

package/dist/esm/core/opc/relationship-types.js

@@ -1,4 +1,7 @@
 //#region src/core/opc/relationship-types.ts
-var REL_OFFICE_DOCUMENT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";
+var OOXML_REL_BASES = ["http://schemas.openxmlformats.org/officeDocument/2006/relationships/", "http://purl.oclc.org/ooxml/officeDocument/relationships/"];
+function isOoxmlRel(type, name) {
+	return OOXML_REL_BASES.some((base) => type === base + name);
+}
 //#endregion
-export { REL_OFFICE_DOCUMENT };
+export { isOoxmlRel };

package/dist/esm/core/style-cascade/index.d.ts

@@ -1,3 +1,4 @@
 export { EMPTY_STYLE_SHEET, resolveBodyStyles, resolveHeadersFootersStyles, resolveParagraphProperties, resolveRunProperties, } from './resolver.js';
 export type { ResolvedRunProperties, ResolvedParagraphProperties, } from './types.js';
 export { DEFAULT_RESOLVED_RUN, DEFAULT_RESOLVED_PARAGRAPH } from './types.js';
+export { resolveTableStyles } from './table.js';

package/dist/esm/core/style-cascade/index.js

@@ -1,2 +1,3 @@
 import "./types.js";
 import "./resolver.js";
+import "./table.js";

package/dist/esm/core/style-cascade/table.d.ts

@@ -0,0 +1,2 @@
+import { BodyElement, StyleSheet } from '../document-model/index.js';
+export declare function resolveTableStyles(body: ReadonlyArray<BodyElement>, sheet: StyleSheet): ReadonlyArray<BodyElement>;

package/dist/esm/core/style-cascade/table.js

@@ -0,0 +1,161 @@
+//#region src/core/style-cascade/table.ts
+function resolveTableStyles(body, sheet) {
+	const visit = (el) => {
+		if (el.kind === "table") {
+			applyTableStyle(el.table, sheet);
+			for (const row of el.table.rows) for (const cell of row.cells) for (const child of cell.content) visit(child);
+		} else if (el.kind === "shape" && el.shape.text) for (const child of el.shape.text.content) visit(child);
+	};
+	for (const el of body) visit(el);
+	return body;
+}
+function applyTableStyle(table, sheet) {
+	const styleId = table.properties.styleId;
+	if (!styleId) return;
+	const folded = foldTableStyleChain(styleId, sheet);
+	if (!folded) return;
+	const tp = table.properties;
+	if (!tp.borders && folded.base.borders) tp.borders = folded.base.borders;
+	if (!tp.defaultCellMargins && folded.base.cellMargins) tp.defaultCellMargins = folded.base.cellMargins;
+	const look = table.properties.look ?? {};
+	const rows = table.rows;
+	const colCount = Math.max(table.grid.length, ...rows.map((r) => r.cells.reduce((s, c) => s + (c.properties.colSpan ?? 1), 0)));
+	for (let r = 0; r < rows.length; r++) {
+		const row = rows[r];
+		let colStart = 0;
+		for (const cell of row.cells) {
+			const span = cell.properties.colSpan ?? 1;
+			const layer = cellLayer(folded, look, {
+				firstRow: r === 0,
+				lastRow: r === rows.length - 1,
+				firstCol: colStart === 0,
+				lastCol: colStart + span >= colCount,
+				rowBand: bandIndex(r, look.firstRow === true, folded.rowBandSize),
+				colBand: bandIndex(colStart, look.firstColumn === true, folded.colBandSize),
+				noHBand: look.noHBand === true,
+				noVBand: look.noVBand === true
+			});
+			colStart += span;
+			if (!layer) continue;
+			applyLayerToCell(cell, layer);
+		}
+	}
+}
+function applyLayerToCell(tableCell, layer) {
+	const cell = tableCell;
+	if (layer.shading && !cell.properties.shading) cell.properties.shading = layer.shading;
+	if (layer.cellMargins && !cell.properties.margins) cell.properties.margins = layer.cellMargins;
+	if (layer.borders) {
+		const own = cell.properties.borders ?? {};
+		const merged = {
+			...layer.borders,
+			...definedOnly(own)
+		};
+		cell.properties.borders = merged;
+	}
+	if (layer.runProperties || layer.paragraphProperties) for (const el of cell.content) {
+		if (el.kind !== "paragraph") continue;
+		const p = el.paragraph;
+		if (layer.paragraphProperties) p.properties = {
+			...layer.paragraphProperties,
+			...definedOnly(p.properties)
+		};
+		if (layer.runProperties) for (const run of p.runs) run.properties = {
+			...layer.runProperties,
+			...definedOnly(run.properties)
+		};
+	}
+}
+function bandIndex(index, skipFirst, bandSize) {
+	const adjusted = index - (skipFirst ? 1 : 0);
+	if (adjusted < 0) return -1;
+	return Math.floor(adjusted / Math.max(1, bandSize));
+}
+function cellLayer(folded, look, pos) {
+	const layers = [folded.base];
+	const cond = (t) => folded.conditions.get(t);
+	if (!pos.noVBand && pos.colBand >= 0) layers.push(pos.colBand % 2 === 0 ? cond("band1Vert") : cond("band2Vert"));
+	if (!pos.noHBand && pos.rowBand >= 0) layers.push(pos.rowBand % 2 === 0 ? cond("band1Horz") : cond("band2Horz"));
+	if (look.firstColumn && pos.firstCol) layers.push(cond("firstCol"));
+	if (look.lastColumn && pos.lastCol) layers.push(cond("lastCol"));
+	if (look.firstRow && pos.firstRow) layers.push(cond("firstRow"));
+	if (look.lastRow && pos.lastRow) layers.push(cond("lastRow"));
+	if (look.firstRow && look.firstColumn && pos.firstRow && pos.firstCol) layers.push(cond("nwCell"));
+	if (look.firstRow && look.lastColumn && pos.firstRow && pos.lastCol) layers.push(cond("neCell"));
+	if (look.lastRow && look.firstColumn && pos.lastRow && pos.firstCol) layers.push(cond("swCell"));
+	if (look.lastRow && look.lastColumn && pos.lastRow && pos.lastCol) layers.push(cond("seCell"));
+	let out;
+	for (const layer of layers) {
+		if (!layer) continue;
+		out = out ? mergeLayer(out, layer) : layer;
+	}
+	return out;
+}
+function foldTableStyleChain(styleId, sheet) {
+	const chain = [];
+	const visited = /* @__PURE__ */ new Set();
+	let cursor = styleId;
+	while (cursor && !visited.has(cursor)) {
+		visited.add(cursor);
+		const style = sheet.styles.get(cursor);
+		if (!style || style.type !== "table") break;
+		chain.unshift(style);
+		cursor = style.basedOn;
+	}
+	if (chain.length === 0) return void 0;
+	let base = {};
+	const conditions = /* @__PURE__ */ new Map();
+	let rowBandSize = 1;
+	let colBandSize = 1;
+	for (const style of chain) {
+		const own = {
+			...style.tableLayer ?? {},
+			...Object.keys(style.runProperties).length > 0 && !style.tableLayer?.runProperties ? { runProperties: style.runProperties } : {},
+			...Object.keys(style.paragraphProperties).length > 0 && !style.tableLayer?.paragraphProperties ? { paragraphProperties: style.paragraphProperties } : {}
+		};
+		base = mergeLayer(base, own);
+		for (const c of style.tableConditions ?? []) {
+			const prev = conditions.get(c.type);
+			conditions.set(c.type, prev ? mergeLayer(prev, c.layer) : c.layer);
+		}
+		if (style.rowBandSize !== void 0) rowBandSize = style.rowBandSize;
+		if (style.colBandSize !== void 0) colBandSize = style.colBandSize;
+	}
+	return {
+		base,
+		conditions,
+		rowBandSize,
+		colBandSize
+	};
+}
+function mergeLayer(base, override) {
+	return {
+		...override.borders ?? base.borders ? { borders: {
+			...base.borders,
+			...definedOnly(override.borders ?? {})
+		} } : {},
+		...override.cellMargins ?? base.cellMargins ? { cellMargins: {
+			...base.cellMargins,
+			...definedOnly(override.cellMargins ?? {})
+		} } : {},
+		...override.shading ?? base.shading ? { shading: override.shading ?? base.shading } : {},
+		...override.runProperties ?? base.runProperties ? { runProperties: {
+			...base.runProperties,
+			...definedOnly(override.runProperties ?? {})
+		} } : {},
+		...override.paragraphProperties ?? base.paragraphProperties ? { paragraphProperties: {
+			...base.paragraphProperties,
+			...definedOnly(override.paragraphProperties ?? {})
+		} } : {}
+	};
+}
+function definedOnly(obj) {
+	const out = {};
+	for (const key of Object.keys(obj)) {
+		const v = obj[key];
+		if (v !== void 0) out[key] = v;
+	}
+	return out;
+}
+//#endregion
+export { resolveTableStyles };

package/dist/esm/core/vector.d.ts

@@ -43,3 +43,5 @@ export declare class PathBuilder {
     close(): this;
     build(fillRule?: 'nonzero' | 'evenodd'): VectorPath;
 }
+export declare function flipTransform(m: readonly [number, number, number, number, number, number], pageHeight: number): [number, number, number, number, number, number];
+export declare function svgPathData(segments: ReadonlyArray<PathSegment>, fmt: (n: number) => string): string;

package/dist/esm/core/vector.js

@@ -44,5 +44,23 @@ var PathBuilder = class {
 		};
 	}
 };
+function flipTransform(m, pageHeight) {
+	return [
+		m[0],
+		-m[1],
+		m[2],
+		-m[3],
+		m[4],
+		pageHeight - m[5]
+	];
+}
+function svgPathData(segments, fmt) {
+	const parts = [];
+	for (const s of segments) if (s.op === "move") parts.push(`M ${fmt(s.x)} ${fmt(s.y)}`);
+	else if (s.op === "line") parts.push(`L ${fmt(s.x)} ${fmt(s.y)}`);
+	else if (s.op === "cubic") parts.push(`C ${fmt(s.x1)} ${fmt(s.y1)} ${fmt(s.x2)} ${fmt(s.y2)} ${fmt(s.x)} ${fmt(s.y)}`);
+	else parts.push("Z");
+	return parts.join(" ");
+}
 //#endregion
-export { PathBuilder };
+export { PathBuilder, flipTransform, svgPathData };

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

@@ -1,5 +1,8 @@
 import { BodyElement, SectionProperties } from '../core/document-model/index.js';
 import { CellRange, DefinedName, ParsedWorksheet, XlsxStyles } from './index.js';
+export declare const TWIPS_PER_EXCEL_CHAR = 105;
+export declare const DEFAULT_COL_TWIPS = 960;
+export declare const DEFAULT_ROW_TWIPS = 300;
 export declare function sectionFromWorksheet(worksheet: ParsedWorksheet): SectionProperties | undefined;
 export declare function resolvePrintArea(definedNames: ReadonlyArray<DefinedName>, sheetIdx: number): CellRange | undefined;
 export declare function resolvePrintTitleRows(definedNames: ReadonlyArray<DefinedName>, sheetIdx: number): {

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

@@ -2,10 +2,6 @@ import { eighthPtToPt, halfPtToPt, twipsToPt } from "../core/ir/units.js";
 import { parseAreaRef, parseTitleRowRange } from "./defined-name-ref.js";
 import { applyNumberFormat } from "./number-format.js";
 import "./index.js";
-//#region src/excel/print-model.ts
-var TWIPS_PER_EXCEL_CHAR = 105;
-var DEFAULT_COL_TWIPS = 960;
-var DEFAULT_ROW_TWIPS = 300;
 var TWIPS_PER_POINT = 20;
 var TWIPS_PER_INCH = 1440;
 var PAPER_SIZES_TWIPS = new Map([
@@ -154,9 +150,9 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 		const cEnd = Math.min(m.endColumn, colWindowEnd);
 		for (let r = Math.max(m.startRow, rowStart); r <= rEnd; r++) for (let c = Math.max(m.startColumn, colStart); c <= cEnd; c++) if (!(r === m.startRow && c === m.startColumn)) insideMerge.add(key(r, c));
 	}
-	const columnWidths = new Array(colCount).fill(DEFAULT_COL_TWIPS);
+	const columnWidths = new Array(colCount).fill(960);
 	for (const col of worksheet.columns) {
-		const twips = Math.round(col.widthChars * TWIPS_PER_EXCEL_CHAR);
+		const twips = Math.round(col.widthChars * 105);
 		for (let abs = col.min - 1; abs <= col.max - 1; abs++) {
 			const i = abs - colStart;
 			if (i >= 0 && i < colCount) columnWidths[i] = twips;
@@ -164,7 +160,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 	}
 	const totalGridTwips = columnWidths.reduce((sum, w) => sum + w, 0);
 	let totalGridHeightTwips = 0;
-	for (let r = 0; r < rowCount; r++) totalGridHeightTwips += rowHeightMap.get(r)?.heightTwips ?? DEFAULT_ROW_TWIPS;
+	for (let r = 0; r < rowCount; r++) totalGridHeightTwips += rowHeightMap.get(r)?.heightTwips ?? 300;
 	const printScale = computePrintScale(worksheet, totalGridTwips, sheetContentWidthTwips(worksheet), totalGridHeightTwips, sheetContentHeightTwips(worksheet));
 	const scaled = printScale < .999;
 	const breakRows = new Set(worksheet.rowBreaks ?? []);
@@ -217,7 +213,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 					cc++;
 				}
 				if (cc < colCount) {
-					const charsFit = Math.max(1, Math.round(availTwips / TWIPS_PER_EXCEL_CHAR));
+					const charsFit = Math.max(1, Math.round(availTwips / 105));
 					if (text.length > charsFit) text = text.slice(0, charsFit);
 				}
 			}

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

@@ -0,0 +1,9 @@
+import { OpcPackage } from '../core/opc/index.js';
+import { ParsedWorksheet } from './worksheet-parser.js';
+export interface SheetChartRef {
+    readonly chartPartPath: string;
+    readonly widthPt: number;
+    readonly heightPt: number;
+    readonly anchorRow: number;
+}
+export declare function parseSheetDrawing(drawingXml: Uint8Array, drawingPartPath: string, pkg: OpcPackage, worksheet: ParsedWorksheet): Array<SheetChartRef>;

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

@@ -0,0 +1,113 @@
+import { emuToPt } from "../core/ir/units.js";
+import "./print-model.js";
+import { XMLParser } from "fast-xml-parser";
+//#region src/excel/sheet-drawing.ts
+var CHART_URI = "http://schemas.openxmlformats.org/drawingml/2006/chart";
+var parser = new XMLParser({
+	ignoreAttributes: false,
+	attributeNamePrefix: "@_",
+	removeNSPrefix: true,
+	parseTagValue: false
+});
+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 [];
+	const rootObj = root;
+	const colWidthPt = makeColWidthPt(worksheet);
+	const rowHeightPt = makeRowHeightPt(worksheet);
+	const rels = pkg.getPartRelationships(drawingPartPath);
+	const out = [];
+	for (const kind of [
+		"twoCellAnchor",
+		"oneCellAnchor",
+		"absoluteAnchor"
+	]) for (const anchor of asArray(rootObj[kind])) {
+		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 from = cellMarker(a["from"]);
+		let widthPt = 0;
+		let heightPt = 0;
+		if (kind === "twoCellAnchor") {
+			const to = cellMarker(a["to"]);
+			if (!from || !to) continue;
+			widthPt = spanPt(from.col, from.colOffPt, to.col, to.colOffPt, colWidthPt);
+			heightPt = spanPt(from.row, from.rowOffPt, to.row, to.rowOffPt, rowHeightPt);
+		} else {
+			const ext = a["ext"];
+			if (!ext || typeof ext !== "object") continue;
+			const e = ext;
+			widthPt = emuToPt(num(e["@_cx"]) ?? 0);
+			heightPt = emuToPt(num(e["@_cy"]) ?? 0);
+		}
+		if (widthPt <= 0 || heightPt <= 0) continue;
+		out.push({
+			chartPartPath: resolved.path,
+			widthPt,
+			heightPt,
+			anchorRow: from?.row ?? 0
+		});
+	}
+	return out.sort((x, y) => x.anchorRow - y.anchorRow);
+}
+function chartRelIdOf(anchor) {
+	const frame = anchor["graphicFrame"];
+	if (!frame || typeof frame !== "object") return void 0;
+	const graphic = frame["graphic"];
+	if (!graphic || typeof graphic !== "object") return void 0;
+	const data = graphic["graphicData"];
+	if (!data || typeof data !== "object") return void 0;
+	const d = data;
+	if (d["@_uri"] !== CHART_URI) return void 0;
+	const chart = d["chart"];
+	if (!chart || typeof chart !== "object") return void 0;
+	const id = chart["@_id"];
+	return typeof id === "string" && id !== "" ? id : void 0;
+}
+function cellMarker(node) {
+	if (!node || typeof node !== "object") return void 0;
+	const m = node;
+	const col = num(m["col"]);
+	const row = num(m["row"]);
+	if (col === void 0 || row === void 0) return void 0;
+	return {
+		col,
+		row,
+		colOffPt: emuToPt(num(m["colOff"]) ?? 0),
+		rowOffPt: emuToPt(num(m["rowOff"]) ?? 0)
+	};
+}
+function spanPt(from, fromOffPt, to, toOffPt, trackPt) {
+	let span = 0;
+	for (let i = from; i < to; i++) span += trackPt(i);
+	return span - fromOffPt + toOffPt;
+}
+function makeColWidthPt(ws) {
+	return (col) => {
+		for (const c of ws.columns) if (col >= c.min - 1 && col <= c.max - 1) return c.widthChars * 105 / TWIPS_PER_PT;
+		return 960 / TWIPS_PER_PT;
+	};
+}
+function makeRowHeightPt(ws) {
+	return (row) => {
+		for (const r of ws.rowHeights) if (r.row === row) return r.heightPt;
+		return 300 / TWIPS_PER_PT;
+	};
+}
+function num(v) {
+	if (typeof v === "number" && Number.isFinite(v)) return v;
+	if (typeof v === "string" && v !== "") {
+		const n = Number(v);
+		if (Number.isFinite(n)) return n;
+	}
+}
+function asArray(v) {
+	return Array.isArray(v) ? v : v !== void 0 ? [v] : [];
+}
+//#endregion
+export { parseSheetDrawing };

package/dist/esm/excel/worksheet-parser.d.ts

@@ -56,5 +56,6 @@ export interface ParsedWorksheet {
     readonly printOptions?: XlsxPrintOptions;
     readonly rowBreaks?: ReadonlyArray<number>;
     readonly colBreaks?: ReadonlyArray<number>;
+    readonly drawingRelId?: string;
 }
 export declare function parseWorksheet(data: Uint8Array): ParsedWorksheet;

package/dist/esm/excel/worksheet-parser.js

@@ -32,13 +32,16 @@ function parseWorksheet(data) {
 	const printOptions = parsePrintOptions(wsObj);
 	const rowBreaks = parseBreaks(wsObj, "rowBreaks");
 	const colBreaks = parseBreaks(wsObj, "colBreaks");
+	const drawingNode = wsObj["drawing"];
+	const drawingRelId = drawingNode && typeof drawingNode === "object" ? strAttr(drawingNode, "id") : void 0;
 	const printModel = {
 		...pageMargins ? { pageMargins } : {},
 		...pageSetup ? { pageSetup } : {},
 		...fitToPage ? { fitToPage } : {},
 		...printOptions ? { printOptions } : {},
 		...rowBreaks.length > 0 ? { rowBreaks } : {},
-		...colBreaks.length > 0 ? { colBreaks } : {}
+		...colBreaks.length > 0 ? { colBreaks } : {},
+		...drawingRelId !== void 0 ? { drawingRelId } : {}
 	};
 	const sheetData = wsObj["sheetData"];
 	if (!sheetData || typeof sheetData !== "object") return {

package/dist/esm/excel/xlsx-reader.js

@@ -1,8 +1,13 @@
+import { pt } from "../core/ir/units.js";
 import { ResourceStore } from "../core/ir/resources.js";
 import { FEATURES } from "../core/ir/features.js";
 import { EMPTY_STYLE_SHEET, resolveBodyStyles } from "../core/style-cascade/resolver.js";
 import "../core/style-cascade/index.js";
 import { bytesInclude } from "../core/bytes.js";
+import { DEFAULT_THEME_PALETTE, makeColorResolver } from "../core/drawingml/colors.js";
+import { parseChart, withChartColorStyle } from "../core/drawingml/chart-parser.js";
+import { parseTheme } from "../core/drawingml/theme-parser.js";
+import { isOoxmlRel } from "../core/opc/relationship-types.js";
 import { OpcPackage } from "../core/opc/package.js";
 import { parseCoreProperties } from "../core/opc/core-properties.js";
 import "../core/opc/index.js";
@@ -12,6 +17,7 @@ import { parseWorksheet } from "./worksheet-parser.js";
 import { EMPTY_XLSX_STYLES, parseXlsxStyles } from "./styles-parser.js";
 import "./index.js";
 import { resolvePrintArea, resolvePrintTitleRows, sectionFromWorksheet, worksheetToBody } from "./print-model.js";
+import { parseSheetDrawing } from "./sheet-drawing.js";
 //#region src/excel/xlsx-reader.ts
 var WORKBOOK_PART = "xl/workbook.xml";
 var SHARED_STRINGS_PART = "xl/sharedStrings.xml";
@@ -29,6 +35,8 @@ function readXlsx(xlsx) {
 	const styles = stylesData ? parseXlsxStyles(stylesData) : EMPTY_XLSX_STYLES;
 	const workbookRels = pkg.getPartRelationships(WORKBOOK_PART);
 	const body = [];
+	const charts = /* @__PURE__ */ new Map();
+	const resolveColor = buildXlsxColorResolver(pkg, workbookRels);
 	let firstSheetSection;
 	for (let sheetIdx = 0; sheetIdx < sheets.length; sheetIdx++) {
 		const sheet = sheets[sheetIdx];
@@ -53,6 +61,27 @@ function readXlsx(xlsx) {
 			...titleRows ? { titleRows } : {},
 			gridLines
 		}));
+		if (worksheet.drawingRelId) {
+			const drawingRel = pkg.getPartRelationships(resolved.path).find((r) => r.id === worksheet.drawingRelId);
+			const drawing = drawingRel ? pkg.resolveRelatedPart(resolved.path, drawingRel) : void 0;
+			if (drawing) for (const ref of parseSheetDrawing(drawing.data, drawing.path, pkg, worksheet)) {
+				if (!charts.has(ref.chartPartPath)) {
+					const chartData = pkg.getPart(ref.chartPartPath);
+					const parsed = chartData ? parseChart(chartData, resolveColor) : null;
+					if (!parsed) continue;
+					charts.set(ref.chartPartPath, withChartColorStyle(parsed, pkg, ref.chartPartPath, resolveColor));
+				}
+				body.push({
+					kind: "chart",
+					chart: {
+						chartRelId: ref.chartPartPath,
+						width: pt(ref.widthPt),
+						height: pt(ref.heightPt),
+						paragraphProperties: {}
+					}
+				});
+			}
+		}
 	}
 	const coreData = pkg.getPart(CORE_PROPS_PART);
 	const info = infoFromCore(coreData ? parseCoreProperties(coreData) : void 0);
@@ -64,11 +93,23 @@ function readXlsx(xlsx) {
 			...firstSheetSection ? { section: firstSheetSection } : {},
 			styles: EMPTY_STYLE_SHEET,
 			resources: new ResourceStore(),
+			...charts.size > 0 ? { charts } : {},
 			...info ? { info } : {}
 		},
 		losses: []
 	};
 }
+function buildXlsxColorResolver(pkg, workbookRels) {
+	const palette = new Map(DEFAULT_THEME_PALETTE);
+	for (const rel of workbookRels) {
+		if (!isOoxmlRel(rel.type, "theme")) continue;
+		const resolved = pkg.resolveRelatedPart(WORKBOOK_PART, rel);
+		if (!resolved) continue;
+		for (const [slot, hex] of parseTheme(resolved.data)) palette.set(slot, hex);
+		break;
+	}
+	return makeColorResolver(palette);
+}
 var xlsxReader = {
 	id: "xlsx",
 	produces: "flow",