reamkit 1.13.0 → 1.14.0

package/dist/esm/excel/sheet-to-flow.js

@@ -2,14 +2,18 @@ import { pt } from "../core/ir/units.js";
 import { EMPTY_STYLE_SHEET, resolveBodyStyles } from "../core/style-cascade/resolver.js";
 import "../core/style-cascade/index.js";
 import { resolvePrintArea, resolvePrintTitleRows, sectionFromWorksheet, slicerTable, worksheetToBody } from "./print-model.js";
+import { buildHeaderFooterContent } from "./header-footer.js";
 //#region src/excel/sheet-to-flow.ts
+var HEADER_REL = "_xlsxHeaderDefault";
+var FOOTER_REL = "_xlsxFooterDefault";
 function projectSheetDoc(sheet) {
 	const body = [];
 	let firstSheetSection;
+	const headersFooters = /* @__PURE__ */ new Map();
 	const sheetGrids = new Map(sheet.sheets.map((s) => [s.name, s.grid]));
 	for (let sheetIdx = 0; sheetIdx < sheet.sheets.length; sheetIdx++) {
 		const ws = sheet.sheets[sheetIdx];
-		if (sheetIdx === 0) firstSheetSection = sectionFromWorksheet(ws.grid);
+		if (sheetIdx === 0) firstSheetSection = withHeaderFooter(sectionFromWorksheet(ws.grid), ws, headersFooters);
 		if (sheetIdx > 0) body.push({
 			kind: "paragraph",
 			paragraph: {
@@ -24,7 +28,9 @@ function projectSheetDoc(sheet) {
 			...printArea ? { printArea } : {},
 			...titleRows ? { titleRows } : {},
 			gridLines,
-			sheetGrids
+			sheetGrids,
+			...ws.hyperlinks ? { hyperlinks: ws.hyperlinks } : {},
+			...sheet.sharedStringRuns ? { sharedStringRuns: sheet.sharedStringRuns } : {}
 		}));
 		for (const ref of ws.charts ?? []) body.push({
 			kind: "chart",
@@ -35,10 +41,25 @@ function projectSheetDoc(sheet) {
 				paragraphProperties: {}
 			}
 		});
+		for (const img of ws.images ?? []) body.push({
+			kind: "image",
+			image: {
+				resource: img.resourceId,
+				width: pt(img.widthPt),
+				height: pt(img.heightPt),
+				paragraphProperties: {}
+			}
+		});
+		for (const shape of ws.shapes ?? []) body.push({
+			kind: "shape",
+			shape
+		});
 		for (const slicer of ws.slicers ?? []) body.push({
 			kind: "table",
 			table: slicerTable(slicer)
 		});
+		if (ws.comments && ws.comments.length > 0) body.push(...commentBlocks(ws.comments));
+		if (ws.formControls && ws.formControls.length > 0) body.push(...formControlBlocks(ws.formControls));
 	}
 	return {
 		kind: "flow",
@@ -48,8 +69,110 @@ function projectSheetDoc(sheet) {
 		styles: EMPTY_STYLE_SHEET,
 		resources: sheet.resources,
 		...sheet.chartData && sheet.chartData.size > 0 ? { charts: sheet.chartData } : {},
+		...headersFooters.size > 0 ? { headersFooters } : {},
 		...sheet.info ? { info: sheet.info } : {}
 	};
 }
+function commentBlocks(comments) {
+	const out = [{
+		kind: "paragraph",
+		paragraph: {
+			properties: {},
+			runs: [{
+				text: "Comments",
+				properties: { bold: true }
+			}]
+		}
+	}];
+	for (const c of comments) {
+		const body = c.text.replace(/\s+/g, " ").trim();
+		const label = c.author ? `${c.ref} — ${c.author}: ` : `${c.ref}: `;
+		out.push({
+			kind: "paragraph",
+			paragraph: {
+				properties: {},
+				runs: [{
+					text: label,
+					properties: { bold: true }
+				}, ...body.length > 0 ? [{
+					text: body,
+					properties: {}
+				}] : []]
+			}
+		});
+	}
+	return out;
+}
+function formControlBlocks(controls) {
+	const out = [{
+		kind: "paragraph",
+		paragraph: {
+			properties: {},
+			runs: [{
+				text: "Form controls",
+				properties: { bold: true }
+			}]
+		}
+	}];
+	for (const c of controls) out.push({
+		kind: "paragraph",
+		paragraph: {
+			properties: {},
+			runs: [{
+				text: formControlLabel(c),
+				properties: {}
+			}]
+		}
+	});
+	return out;
+}
+function formControlLabel(c) {
+	const name = c.name ?? c.objectType ?? "Control";
+	switch ((c.objectType ?? "").toLowerCase()) {
+		case "checkbox": return `${c.checked ? "[x]" : "[ ]"} ${name}`;
+		case "radio": return `${c.checked ? "(o)" : "( )"} ${name}`;
+		case "buttons": return `[ ${name} ]`;
+		case "spin":
+		case "scroll": return c.value !== void 0 ? `${name} (value ${c.value})` : name;
+		case "drop":
+		case "list": return `${name} (list)`;
+		default: return c.objectType ? `${name} (${c.objectType})` : name;
+	}
+}
+function withHeaderFooter(section, ws, headersFooters) {
+	const hf = ws.grid.headerFooter;
+	if (!hf || !hf.oddHeader && !hf.oddFooter) return section;
+	const headers = [];
+	const footers = [];
+	if (hf.oddHeader) {
+		const content = buildHeaderFooterContent(hf.oddHeader, ws.name);
+		if (content.length > 0) {
+			headersFooters.set(HEADER_REL, resolveBodyStyles(content, EMPTY_STYLE_SHEET));
+			headers.push({
+				type: "default",
+				relationshipId: HEADER_REL
+			});
+		}
+	}
+	if (hf.oddFooter) {
+		const content = buildHeaderFooterContent(hf.oddFooter, ws.name);
+		if (content.length > 0) {
+			headersFooters.set(FOOTER_REL, resolveBodyStyles(content, EMPTY_STYLE_SHEET));
+			footers.push({
+				type: "default",
+				relationshipId: FOOTER_REL
+			});
+		}
+	}
+	if (headers.length === 0 && footers.length === 0) return section;
+	return {
+		...section ?? {
+			headers: [],
+			footers: []
+		},
+		headers,
+		footers
+	};
+}
 //#endregion
 export { projectSheetDoc };

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

@@ -101,6 +101,12 @@ function parseBorders(root) {
 		if (right) border.right = right;
 		if (bottom) border.bottom = bottom;
 		if (left) border.left = left;
+		const diagonal = parseBorderEdge(asObject(obj["diagonal"]));
+		if (diagonal) {
+			border.diagonal = diagonal;
+			if (boolAttr(obj, "diagonalUp")) border.diagonalUp = true;
+			if (boolAttr(obj, "diagonalDown")) border.diagonalDown = true;
+		}
 		out.push(border);
 	}
 	return out;
@@ -169,6 +175,13 @@ function parseFills(root) {
 			if (fg) fill.fgColorHex = fg;
 			if (bg) fill.bgColorHex = bg;
 		}
+		if (!fill.patternType) {
+			const avg = averageGradientColor(asObject(obj["gradientFill"]));
+			if (avg) {
+				fill.patternType = "solid";
+				fill.fgColorHex = avg;
+			}
+		}
 		out.push(fill);
 	}
 	return out;
@@ -205,6 +218,11 @@ function parseCellXfs(root) {
 			if (h) a.horizontal = h;
 			if (v) a.vertical = v;
 			if (wrap !== void 0) a.wrapText = wrap;
+			const indent = numAttr(align, "indent");
+			if (indent !== void 0 && indent > 0) a.indent = indent;
+			const rotation = numAttr(align, "textRotation");
+			if (rotation !== void 0 && rotation !== 0) a.textRotation = rotation;
+			if (boolAttr(align, "shrinkToFit")) a.shrinkToFit = true;
 			if (Object.keys(a).length > 0) xf.alignment = a;
 		}
 		out.push(xf);
@@ -250,6 +268,25 @@ function childToggle(obj, childName) {
 	if (val === void 0) return true;
 	return !(val === "false" || val === "0");
 }
+function averageGradientColor(gf) {
+	if (!gf) return void 0;
+	let r = 0;
+	let g = 0;
+	let b = 0;
+	let n = 0;
+	for (const s of asArray(gf["stop"])) {
+		const so = asObject(s);
+		const hex = so ? colorOf(asObject(so["color"])) : void 0;
+		if (!hex) continue;
+		r += parseInt(hex.slice(0, 2), 16);
+		g += parseInt(hex.slice(2, 4), 16);
+		b += parseInt(hex.slice(4, 6), 16);
+		n++;
+	}
+	if (n === 0) return void 0;
+	const h = (x) => Math.round(x / n).toString(16).padStart(2, "0").toUpperCase();
+	return `${h(r)}${h(g)}${h(b)}`;
+}
 function colorOf(node) {
 	if (!node) return void 0;
 	const rgb = strAttr(node, "rgb");

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

@@ -38,6 +38,9 @@ function parseWorksheet(data) {
 	const drawingRelId = drawingNode && typeof drawingNode === "object" ? strAttr(drawingNode, "id") : void 0;
 	const conditionalFormats = parseConditionalFormatting(wsObj);
 	const dataValidations = parseDataValidations(wsObj);
+	const hyperlinks = parseHyperlinks(wsObj);
+	const headerFooter = parseHeaderFooter(wsObj);
+	const formControls = parseFormControls(wsObj);
 	const sparklines = parseSparklines(wsObj);
 	const tablePartRelIds = parseTableParts(wsObj);
 	const printModel = {
@@ -51,6 +54,9 @@ function parseWorksheet(data) {
 		...drawingRelId !== void 0 ? { drawingRelId } : {},
 		...conditionalFormats.length > 0 ? { conditionalFormats } : {},
 		...dataValidations.length > 0 ? { dataValidations } : {},
+		...hyperlinks.length > 0 ? { hyperlinks } : {},
+		...headerFooter ? { headerFooter } : {},
+		...formControls.length > 0 ? { formControls } : {},
 		...sparklines.length > 0 ? { sparklines } : {},
 		...tablePartRelIds.length > 0 ? { tablePartRelIds } : {}
 	};
@@ -354,6 +360,41 @@ function boolAttr(obj, key) {
 	const raw = strAttr(obj, key);
 	return raw === "1" || raw === "true";
 }
+function parseHeaderFooter(ws) {
+	const node = asObjectNode(ws["headerFooter"]);
+	if (!node) return void 0;
+	const oddHeader = formulaText(node["oddHeader"]);
+	const oddFooter = formulaText(node["oddFooter"]);
+	if (!oddHeader && !oddFooter) return void 0;
+	return {
+		...oddHeader ? { oddHeader } : {},
+		...oddFooter ? { oddFooter } : {}
+	};
+}
+function parseHyperlinks(ws) {
+	const node = asObjectNode(ws["hyperlinks"]);
+	if (!node) return [];
+	const out = [];
+	for (const h of toArray(node["hyperlink"])) {
+		const obj = asObjectNode(h);
+		if (!obj) continue;
+		const ref = strAttr(obj, "ref");
+		if (!ref) continue;
+		const relId = strAttr(obj, "id");
+		const location = strAttr(obj, "location");
+		if (relId === void 0 && location === void 0) continue;
+		const display = strAttr(obj, "display");
+		const tooltip = strAttr(obj, "tooltip");
+		out.push({
+			ref,
+			...relId !== void 0 ? { relId } : {},
+			...location !== void 0 ? { location } : {},
+			...display !== void 0 ? { display } : {},
+			...tooltip !== void 0 ? { tooltip } : {}
+		});
+	}
+	return out;
+}
 function parseSqref(sqref) {
 	const out = [];
 	for (const token of sqref.split(/\s+/)) {
@@ -380,14 +421,73 @@ var CF_OPERATORS = new Set([
 ]);
 function parseCfRule(obj) {
 	const priority = parseNumericAttr(obj, "priority") ?? 0;
-	switch (strAttr(obj, "type")) {
+	const type = strAttr(obj, "type");
+	switch (type) {
 		case "cellIs": return parseCellIsRule(obj, priority);
 		case "colorScale": return parseColorScaleRule(obj, priority);
 		case "dataBar": return parseDataBarRule(obj, priority);
 		case "iconSet": return parseIconSetRule(obj, priority);
+		case "top10": return parseTop10Rule(obj, priority);
+		case "aboveAverage": return parseAboveAverageRule(obj, priority);
+		case "duplicateValues":
+		case "uniqueValues": return parseDupUniqueRule(type, obj, priority);
+		case "containsText":
+		case "notContainsText":
+		case "beginsWith":
+		case "endsWith": return parseTextRule(type, obj, priority);
 		default: return;
 	}
 }
+function parseTop10Rule(obj, priority) {
+	const dxfId = parseNumericAttr(obj, "dxfId");
+	if (dxfId === void 0) return void 0;
+	return {
+		type: "top10",
+		priority,
+		rank: parseNumericAttr(obj, "rank") ?? 10,
+		percent: boolAttr(obj, "percent"),
+		bottom: boolAttr(obj, "bottom"),
+		dxfId
+	};
+}
+function parseAboveAverageRule(obj, priority) {
+	const dxfId = parseNumericAttr(obj, "dxfId");
+	if (dxfId === void 0) return void 0;
+	const aboveRaw = strAttr(obj, "aboveAverage");
+	const aboveAverage = aboveRaw === void 0 ? true : aboveRaw === "1" || aboveRaw === "true";
+	const stdDev = parseNumericAttr(obj, "stdDev");
+	return {
+		type: "aboveAverage",
+		priority,
+		aboveAverage,
+		equalAverage: boolAttr(obj, "equalAverage"),
+		...stdDev !== void 0 ? { stdDev } : {},
+		dxfId
+	};
+}
+function parseDupUniqueRule(type, obj, priority) {
+	const dxfId = parseNumericAttr(obj, "dxfId");
+	if (dxfId === void 0) return void 0;
+	return {
+		type,
+		priority,
+		dxfId
+	};
+}
+function parseTextRule(type, obj, priority) {
+	const dxfId = parseNumericAttr(obj, "dxfId");
+	if (dxfId === void 0) return void 0;
+	const text = strAttr(obj, "text");
+	if (text === void 0) return void 0;
+	const formula = formulaText(obj["formula"]);
+	return {
+		type,
+		priority,
+		text,
+		dxfId,
+		...formula !== void 0 ? { formula } : {}
+	};
+}
 function parseIconSetRule(obj, priority) {
 	const is = obj["iconSet"];
 	if (!is || typeof is !== "object") return void 0;
@@ -545,6 +645,30 @@ function parseSparklines(ws) {
 	}
 	return out;
 }
+function parseFormControls(ws) {
+	const out = [];
+	const seen = /* @__PURE__ */ new Set();
+	collectControls(asObjectNode(ws["controls"]), out, seen);
+	for (const ext of toArray(asObjectNode(ws["extLst"])?.["ext"])) collectControls(asObjectNode(asObjectNode(ext)?.["controls"]), out, seen);
+	return out;
+}
+function collectControls(node, out, seen) {
+	if (!node) return;
+	const direct = toArray(node["control"]);
+	const fromChoice = toArray(asObjectNode(node["AlternateContent"])?.["Choice"]).flatMap((c) => toArray(asObjectNode(c)?.["control"]));
+	for (const c of [...direct, ...fromChoice]) {
+		const obj = asObjectNode(c);
+		if (!obj) continue;
+		const relId = strAttr(obj, "id");
+		if (!relId || seen.has(relId)) continue;
+		seen.add(relId);
+		const name = strAttr(obj, "name");
+		out.push({
+			relId,
+			...name ? { name } : {}
+		});
+	}
+}
 function asObjectNode(v) {
 	return v && typeof v === "object" && !Array.isArray(v) ? v : void 0;
 }

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

@@ -8,6 +8,7 @@ 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";
+import { parseAreaRef } from "./defined-name-ref.js";
 import { parseSharedStrings } from "./shared-strings-parser.js";
 import { parseWorkbook } from "./workbook-parser.js";
 import { parseWorksheet } from "./worksheet-parser.js";
@@ -18,6 +19,9 @@ import { parseSheetDrawing } from "./sheet-drawing.js";
 import { parseTablePartFull } from "./table-parser.js";
 import { parsePivotTablePart } from "./pivot-table-parser.js";
 import { parseSlicerCachePart, parseSlicerPart } from "./slicer-parser.js";
+import { parseLegacyComments, parsePersons, parseThreadedComments } from "./comments-parser.js";
+import { parseFormControlProps } from "./form-control-parser.js";
+import { parseSheetShapes } from "./sheet-shape-parser.js";
 import { projectSheetDoc } from "./sheet-to-flow.js";
 //#region src/excel/xlsx-reader.ts
 var WORKBOOK_PART = "xl/workbook.xml";
@@ -26,6 +30,8 @@ var STYLES_PART = "xl/styles.xml";
 var CORE_PROPS_PART = "docProps/core.xml";
 var SLICER_REL_TAIL = "/slicer";
 var SLICER_CACHE_REL_TAIL = "/slicerCache";
+var THREADED_COMMENTS_REL_TAIL = "/threadedComment";
+var PERSON_REL_TAIL = "/person";
 var MAX_SLICER_ITEMS = 256;
 function readXlsx(xlsx) {
 	return {
@@ -40,11 +46,21 @@ function readXlsxToSheetDoc(xlsx) {
 	const { sheets, date1904, definedNames } = parseWorkbook(workbookData);
 	if (sheets.length === 0) throw new Error("xlsx has no sheets");
 	const sharedStringsData = pkg.getPart(SHARED_STRINGS_PART);
-	const sharedStrings = sharedStringsData ? parseSharedStrings(sharedStringsData) : [];
+	const { texts: sharedStrings, runs: sharedStringRuns } = sharedStringsData ? parseSharedStrings(sharedStringsData) : {
+		texts: [],
+		runs: []
+	};
 	const stylesData = pkg.getPart(STYLES_PART);
 	const styles = stylesData ? parseXlsxStyles(stylesData) : EMPTY_XLSX_STYLES;
 	const workbookRels = pkg.getPartRelationships(WORKBOOK_PART);
+	const persons = /* @__PURE__ */ new Map();
+	for (const rel of workbookRels) {
+		if (!rel.type.endsWith(PERSON_REL_TAIL)) continue;
+		const part = pkg.resolveRelatedPart(WORKBOOK_PART, rel);
+		if (part) for (const [id, name] of parsePersons(part.data)) persons.set(id, name);
+	}
 	const chartData = /* @__PURE__ */ new Map();
+	const resources = new ResourceStore();
 	const palette = buildThemePalette(pkg, workbookRels);
 	const resolveColor = makeColorResolver(palette);
 	const sheetsOut = [];
@@ -58,21 +74,39 @@ function readXlsxToSheetDoc(xlsx) {
 		if (!resolved) continue;
 		const worksheet = parseWorksheet(resolved.data);
 		const charts = [];
+		const images = [];
+		let shapes;
 		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 (!chartData.has(ref.chartPartPath)) {
-					const chartXml = pkg.getPart(ref.chartPartPath);
-					const parsed = chartXml ? parseChart(chartXml, resolveColor) : null;
-					if (!parsed) continue;
-					chartData.set(ref.chartPartPath, withChartColorStyle(parsed, pkg, ref.chartPartPath, resolveColor));
+			if (drawing) {
+				const { charts: chartRefs, pictures } = parseSheetDrawing(drawing.data, drawing.path, pkg, worksheet);
+				for (const ref of chartRefs) {
+					if (!chartData.has(ref.chartPartPath)) {
+						const chartXml = pkg.getPart(ref.chartPartPath);
+						const parsed = chartXml ? parseChart(chartXml, resolveColor) : null;
+						if (!parsed) continue;
+						chartData.set(ref.chartPartPath, withChartColorStyle(parsed, pkg, ref.chartPartPath, resolveColor));
+					}
+					charts.push({
+						chartPartPath: ref.chartPartPath,
+						widthPt: ref.widthPt,
+						heightPt: ref.heightPt
+					});
+				}
+				for (const pic of pictures) {
+					const bytes = pkg.getPart(pic.imagePartPath);
+					if (!bytes) continue;
+					images.push({
+						resourceId: resources.put(bytes),
+						widthPt: pic.widthPt,
+						heightPt: pic.heightPt
+					});
+				}
+				if (bytesInclude(drawing.data, ":sp>") || bytesInclude(drawing.data, ":sp ")) {
+					const parsed = parseSheetShapes(drawing.data, worksheet, resolveColor);
+					if (parsed.length > 0) shapes = parsed;
 				}
-				charts.push({
-					chartPartPath: ref.chartPartPath,
-					widthPt: ref.widthPt,
-					heightPt: ref.heightPt
-				});
 			}
 		}
 		let tables;
@@ -118,6 +152,59 @@ function readXlsxToSheetDoc(xlsx) {
 			}
 			if (resolvedPivots.length > 0) pivotTables = resolvedPivots;
 		}
+		let hyperlinks;
+		if (worksheet.hyperlinks && worksheet.hyperlinks.length > 0) {
+			const wsRels = pkg.getPartRelationships(resolved.path);
+			const resolvedLinks = [];
+			for (const h of worksheet.hyperlinks) {
+				if (h.relId === void 0) continue;
+				const rel = wsRels.find((r) => r.id === h.relId);
+				if (!rel || rel.targetMode !== "External" || !rel.target) continue;
+				const area = parseAreaRef(h.ref);
+				if (!area) continue;
+				resolvedLinks.push({
+					ref: {
+						startColumn: area.startColumn,
+						startRow: area.startRow,
+						endColumn: area.endColumn,
+						endRow: area.endRow
+					},
+					url: rel.target
+				});
+			}
+			if (resolvedLinks.length > 0) hyperlinks = resolvedLinks;
+		}
+		let comments;
+		{
+			const wsRels = pkg.getPartRelationships(resolved.path);
+			const resolvedComments = [];
+			for (const rel of wsRels) {
+				if (!isOoxmlRel(rel.type, "comments")) continue;
+				const part = pkg.resolveRelatedPart(resolved.path, rel);
+				if (part) resolvedComments.push(...parseLegacyComments(part.data));
+			}
+			for (const rel of wsRels) {
+				if (!rel.type.endsWith(THREADED_COMMENTS_REL_TAIL)) continue;
+				const part = pkg.resolveRelatedPart(resolved.path, rel);
+				if (part) resolvedComments.push(...parseThreadedComments(part.data, persons));
+			}
+			if (resolvedComments.length > 0) comments = resolvedComments;
+		}
+		let formControls;
+		if (worksheet.formControls && worksheet.formControls.length > 0) {
+			const wsRels = pkg.getPartRelationships(resolved.path);
+			const resolvedControls = [];
+			for (const fc of worksheet.formControls) {
+				const rel = wsRels.find((r) => r.id === fc.relId);
+				const part = rel ? pkg.resolveRelatedPart(resolved.path, rel) : void 0;
+				const props = part ? parseFormControlProps(part.data) : {};
+				resolvedControls.push({
+					...fc.name ? { name: fc.name } : {},
+					...props
+				});
+			}
+			if (resolvedControls.length > 0) formControls = resolvedControls;
+		}
 		const grid = tables || pivotTables ? {
 			...worksheet,
 			...tables ? { tables } : {},
@@ -126,7 +213,12 @@ function readXlsxToSheetDoc(xlsx) {
 		sheetsOut.push({
 			name: sheet.name,
 			grid,
-			...charts.length > 0 ? { charts } : {}
+			...charts.length > 0 ? { charts } : {},
+			...images.length > 0 ? { images } : {},
+			...shapes ? { shapes } : {},
+			...hyperlinks ? { hyperlinks } : {},
+			...comments ? { comments } : {},
+			...formControls ? { formControls } : {}
 		});
 	}
 	if (pendingSlicers.length > 0) {
@@ -154,10 +246,11 @@ function readXlsxToSheetDoc(xlsx) {
 		sheets: sheetsOut,
 		styles,
 		sharedStrings,
+		...sharedStringRuns.some((r) => r !== void 0) ? { sharedStringRuns } : {},
 		definedNames,
 		date1904,
 		...chartData.size > 0 ? { chartData } : {},
-		resources: new ResourceStore(),
+		resources,
 		...info ? { info } : {}
 	};
 }

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

@@ -230,6 +230,14 @@ function cfRuleXml(rule) {
 		case "colorScale": return `<cfRule type="colorScale"${p}><colorScale>` + rule.cfvos.map(cfvoXml).join("") + rule.colorsHex.map((c) => `<color rgb="FF${c}"/>`).join("") + "</colorScale></cfRule>";
 		case "dataBar": return `<cfRule type="dataBar"${p}><dataBar` + (rule.minLength !== void 0 ? ` minLength="${rule.minLength}"` : "") + (rule.maxLength !== void 0 ? ` maxLength="${rule.maxLength}"` : "") + ">" + rule.cfvos.map(cfvoXml).join("") + `<color rgb="FF${rule.colorHex}"/></dataBar></cfRule>`;
 		case "iconSet": return `<cfRule type="iconSet"${p}><iconSet iconSet="${rule.iconSet}"` + (rule.reverse ? " reverse=\"1\"" : "") + ">" + rule.cfvos.map(cfvoXml).join("") + "</iconSet></cfRule>";
+		case "top10": return `<cfRule type="top10"${p} dxfId="${rule.dxfId}" rank="${rule.rank}"` + (rule.percent ? " percent=\"1\"" : "") + (rule.bottom ? " bottom=\"1\"" : "") + "/>";
+		case "aboveAverage": return `<cfRule type="aboveAverage"${p} dxfId="${rule.dxfId}"` + (rule.aboveAverage ? "" : " aboveAverage=\"0\"") + (rule.equalAverage ? " equalAverage=\"1\"" : "") + (rule.stdDev !== void 0 ? ` stdDev="${rule.stdDev}"` : "") + "/>";
+		case "duplicateValues":
+		case "uniqueValues": return `<cfRule type="${rule.type}"${p} dxfId="${rule.dxfId}"/>`;
+		case "containsText":
+		case "notContainsText":
+		case "beginsWith":
+		case "endsWith": return `<cfRule type="${rule.type}"${p} operator="${rule.type}" dxfId="${rule.dxfId}" text="${escapeAttr(rule.text)}">` + (rule.formula !== void 0 ? `<formula>${escapeText(rule.formula)}</formula>` : "") + "</cfRule>";
 	}
 }
 function cfvoXml(cfvo) {
@@ -313,7 +321,7 @@ function patternFill(f) {
 	return `<patternFill${f.patternType ? ` patternType="${f.patternType}"` : ""}>${inner}</patternFill>`;
 }
 function borderXml(b) {
-	return `<border>${edgeXml("left", b.left)}${edgeXml("right", b.right)}${edgeXml("top", b.top)}${edgeXml("bottom", b.bottom)}</border>`;
+	return `<border${b.diagonal ? `${b.diagonalUp ? " diagonalUp=\"1\"" : ""}${b.diagonalDown ? " diagonalDown=\"1\"" : ""}` : ""}>${edgeXml("left", b.left)}${edgeXml("right", b.right)}${edgeXml("top", b.top)}${edgeXml("bottom", b.bottom)}${edgeXml("diagonal", b.diagonal)}</border>`;
 }
 function edgeXml(name, edge) {
 	if (!edge || !edge.style) return `<${name}/>`;
@@ -323,7 +331,7 @@ function edgeXml(name, edge) {
 function cellXfXml(xf) {
 	const apply = applyAttr("applyNumberFormat", xf.applyNumberFormat) + applyAttr("applyFont", xf.applyFont) + applyAttr("applyFill", xf.applyFill) + applyAttr("applyBorder", xf.applyBorder) + applyAttr("applyAlignment", xf.applyAlignment);
 	const a = xf.alignment;
-	const alignment = a ? `<alignment${a.horizontal ? ` horizontal="${a.horizontal}"` : ""}${a.vertical ? ` vertical="${a.vertical}"` : ""}${a.wrapText ? " wrapText=\"1\"" : ""}/>` : "";
+	const alignment = a ? `<alignment${a.horizontal ? ` horizontal="${a.horizontal}"` : ""}${a.vertical ? ` vertical="${a.vertical}"` : ""}${a.wrapText ? " wrapText=\"1\"" : ""}${a.textRotation !== void 0 ? ` textRotation="${a.textRotation}"` : ""}${a.indent !== void 0 ? ` indent="${a.indent}"` : ""}${a.shrinkToFit ? " shrinkToFit=\"1\"" : ""}/>` : "";
 	return `<xf numFmtId="${xf.numFmtId}" fontId="${xf.fontId}" fillId="${xf.fillId}" borderId="${xf.borderId}"${apply}>` + alignment + "</xf>";
 }
 function applyAttr(name, value) {

package/dist/esm/layout/styled-layout.js

@@ -2430,6 +2430,35 @@ function emitRowChunk(out, row, marginLeft, cursorY, pageHeight, colCount, cellS
 			}
 		}
 		emitCellBorders(out, cell, cellX, rowBottom, row.heightPt, pageHeight, row.rowIdx, row.rowCount, colCount);
+		const diagDown = cell.borders.diagonalDown;
+		const diagUp = cell.borders.diagonalUp;
+		if ((diagDown || diagUp) && cell.mergeRole !== "middle" && cell.mergeRole !== "end") {
+			const transform = flipTransform([
+				1,
+				0,
+				0,
+				1,
+				cellX,
+				rowBottom
+			], pageHeight);
+			const w = cell.widthPt;
+			const h = row.heightPt;
+			const pushDiagonal = (b, y0, y1) => {
+				out.push({
+					type: "shape",
+					shape: {
+						paths: [new PathBuilder().moveTo(0, y0).lineTo(w, y1).build()],
+						stroke: {
+							colorHex: b.colorHex ?? "000000",
+							widthPt: b.width ?? .75
+						},
+						transform
+					}
+				});
+			};
+			if (diagDown) pushDiagonal(diagDown, h, 0);
+			if (diagUp) pushDiagonal(diagUp, 0, h);
+		}
 		if (cell.mergeRole === "middle" || cell.mergeRole === "end") continue;
 		let textY = rowTop - cell.padTopPt;
 		for (const line of cell.lines) {

package/dist/esm/pptx/slide-parser.d.ts

@@ -1,9 +1,9 @@
-import { BodyElement, FloatAnchor, ShapeBlock, ShapeFill } from '../core/document-model/index.js';
+import { BodyElement, FloatAnchor, ShapeBlock, ShapeFill, ShapeGeometry, ShapeTextBody } from '../core/document-model/index.js';
 import { ColorResolver } from '../core/drawingml/colors.js';
 import { Loss, Pt, ResourceId } from '../core/ir/index.js';
 import { PoNode } from '../core/po-helpers.js';
 import { PlaceholderCascade } from './placeholder-cascade.js';
-import { ShapeBoxEmu } from './sp-helpers.js';
+import { PlaceholderRef, ShapeBoxEmu } from './sp-helpers.js';
 export interface SlideContext {
     readonly cascade?: PlaceholderCascade;
     readonly resolveImage?: (relId: string) => ResourceId | undefined;
@@ -21,4 +21,6 @@ export declare function noDiagramOverrideLoss(where?: string): Loss;
 export declare function parseDiagramDrawing(spTree: PoNode, transform: GroupTransform, makeFloat: (box: ShapeBoxEmu) => FloatAnchor, colors: ColorResolver, resolveLink: LinkResolver): Array<ShapeBlock>;
 export declare function parseBackgroundFill(bg: PoNode, colors: ColorResolver): ShapeFill | undefined;
 export declare function backdropElement(fill: ShapeFill, widthPt: Pt, heightPt: Pt): BodyElement;
+export declare function parseGeometry(spPr: PoNode | undefined): ShapeGeometry;
+export declare function parseTxBody(txBody: PoNode, ph: PlaceholderRef | undefined, cascade: PlaceholderCascade | undefined, colors: ColorResolver, resolveLink: LinkResolver): ShapeTextBody | undefined;
 export {};

package/dist/esm/pptx/slide-parser.js

@@ -424,4 +424,4 @@ function cellFillHex(tcPr, colors) {
 	}
 }
 //#endregion
-export { backdropElement, diagramTransform, noDiagramOverrideLoss, parseBackgroundFill, parseDiagramDrawing, parseSlideShapes };
+export { backdropElement, diagramTransform, noDiagramOverrideLoss, parseBackgroundFill, parseDiagramDrawing, parseGeometry, parseSlideShapes, parseTxBody };