reamkit 1.3.0 → 1.5.0

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

@@ -12,6 +12,7 @@ import { DEFAULT_RESOLVED_PARAGRAPH, DEFAULT_RESOLVED_RUN } from "../core/style-
 import { resolveParagraphProperties, resolveRunProperties } from "../core/style-cascade/resolver.js";
 import "../core/style-cascade/index.js";
 import { PathBuilder, flipTransform } from "../core/vector.js";
+import { buildSparkline } from "../core/drawingml/sparkline-geometry.js";
 import { arcPoint, arcToBeziers } from "../core/arc-to-bezier.js";
 import { buildChartScene } from "../core/drawingml/chart-geometry.js";
 import { layoutMath, mathGlyphSegments, variantStyle } from "./math-layout.js";
@@ -560,6 +561,31 @@ function buildChartLayout(chart, widthPt, heightPt, font) {
 function rectAtPath(x, y, w, h) {
 	return new PathBuilder().moveTo(x, y).lineTo(x + w, y).lineTo(x + w, y + h).lineTo(x, y + h).close().build();
 }
+var CF_ICON_SIZE_PT = 9;
+var CF_ICON_GUTTER_PT = 12;
+function buildCellIconShape(icon, size) {
+	return {
+		paths: [cellIconPath(icon.shape, size)],
+		fillColorHex: icon.colorHex
+	};
+}
+function cellIconPath(shape, s) {
+	switch (shape) {
+		case "square": return rectAtPath(s * .12, s * .12, s * .76, s * .76);
+		case "diamond": return new PathBuilder().moveTo(s / 2, s * .92).lineTo(s * .92, s / 2).lineTo(s / 2, s * .08).lineTo(s * .08, s / 2).close().build();
+		case "triangleUp": return trianglePath([s / 2, s * .9], [s * .1, s * .12], [s * .9, s * .12]);
+		case "triangleDown": return trianglePath([s / 2, s * .1], [s * .1, s * .88], [s * .9, s * .88]);
+		case "triangleRight": return trianglePath([s * .9, s / 2], [s * .12, s * .1], [s * .12, s * .9]);
+		case "circle": return circlePath(s / 2, s / 2, s * .42);
+	}
+}
+function trianglePath(a, b, c) {
+	return new PathBuilder().moveTo(a[0], a[1]).lineTo(b[0], b[1]).lineTo(c[0], c[1]).close().build();
+}
+function circlePath(cx, cy, r) {
+	const k = .5522847498307936 * r;
+	return new PathBuilder().moveTo(cx + r, cy).cubicTo(cx + r, cy + k, cx + k, cy + r, cx, cy + r).cubicTo(cx - k, cy + r, cx - r, cy + k, cx - r, cy).cubicTo(cx - r, cy - k, cx - k, cy - r, cx, cy - r).cubicTo(cx + k, cy - r, cx + r, cy - k, cx + r, cy).close().build();
+}
 function rectPrim(r) {
 	return {
 		paths: [rectAtPath(r.x, r.y, r.w, r.h)],
@@ -1431,8 +1457,9 @@ function layoutTableCell(cell, tableProps, widthPt, options, fontResources, imag
 	const tableMar = tableProps.defaultCellMargins;
 	const padTopPt = cellMar?.top ?? tableMar?.top ?? 0;
 	const padBottomPt = cellMar?.bottom ?? tableMar?.bottom ?? 0;
-	const padLeftPt = cellMar?.left ?? tableMar?.left ?? DEFAULT_CELL_PADDING_TWIPS * TWIP_TO_PT;
+	const padLeftBase = cellMar?.left ?? tableMar?.left ?? DEFAULT_CELL_PADDING_TWIPS * TWIP_TO_PT;
 	const padRightPt = cellMar?.right ?? tableMar?.right ?? DEFAULT_CELL_PADDING_TWIPS * TWIP_TO_PT;
+	const padLeftPt = padLeftBase + (cell.properties.icon ? CF_ICON_GUTTER_PT : 0);
 	const innerWidth = Math.max(1, widthPt - padLeftPt - padRightPt);
 	const lines = [];
 	const nestedTables = [];
@@ -1462,6 +1489,9 @@ function layoutTableCell(cell, tableProps, widthPt, options, fontResources, imag
 		padLeftPt,
 		borders,
 		...cell.properties.shading?.colorHex ? { shadingColorHex: cell.properties.shading.colorHex } : {},
+		...cell.properties.dataBar ? { dataBar: cell.properties.dataBar } : {},
+		...cell.properties.icon ? { icon: cell.properties.icon } : {},
+		...cell.properties.sparkline ? { sparkline: cell.properties.sparkline } : {},
 		lines,
 		...nestedTables.length > 0 ? { nestedTables } : {},
 		contentHeightPt,
@@ -2084,6 +2114,66 @@ function emitRowChunk(out, row, marginLeft, cursorY, pageHeight, colCount, cellS
 			height: pt(row.heightPt),
 			fillColorHex: cell.shadingColorHex
 		});
+		if (cell.dataBar && cell.mergeRole !== "middle" && cell.mergeRole !== "end") {
+			const start = Math.max(0, Math.min(1, cell.dataBar.startFraction ?? 0));
+			const barWidth = cell.widthPt * Math.max(0, Math.min(1, cell.dataBar.fraction));
+			if (barWidth > 0) out.push({
+				type: "fill",
+				x: pt(cellX + cell.widthPt * start),
+				y: pt(pageHeight - rowBottom - row.heightPt),
+				width: pt(barWidth),
+				height: pt(row.heightPt),
+				fillColorHex: cell.dataBar.colorHex
+			});
+		}
+		if (cell.icon && cell.mergeRole !== "middle" && cell.mergeRole !== "end") {
+			const iconSize = Math.min(CF_ICON_SIZE_PT, Math.max(0, row.heightPt - 1));
+			if (iconSize > 0) {
+				const iconX = cellX + (CF_ICON_GUTTER_PT - iconSize) / 2;
+				const iconBottomYUp = rowBottom + (row.heightPt - iconSize) / 2;
+				const { paths, fillColorHex } = buildCellIconShape(cell.icon, iconSize);
+				out.push({
+					type: "shape",
+					shape: {
+						paths,
+						fillColorHex,
+						transform: flipTransform([
+							1,
+							0,
+							0,
+							1,
+							iconX,
+							iconBottomYUp
+						], pageHeight)
+					}
+				});
+			}
+		}
+		if (cell.sparkline && cell.sparkline.values.length > 0 && cell.mergeRole !== "middle" && cell.mergeRole !== "end") {
+			const inset = 1.5;
+			const sw = cell.widthPt - 2 * inset;
+			const sh = row.heightPt - 2 * inset;
+			if (sw > 0 && sh > 0) {
+				const prims = buildSparkline(cell.sparkline.kind, cell.sparkline.values, sw, sh, cell.sparkline.colorHex);
+				const transform = flipTransform([
+					1,
+					0,
+					0,
+					1,
+					cellX + inset,
+					rowBottom + inset
+				], pageHeight);
+				for (const prim of prims) out.push({
+					type: "shape",
+					shape: {
+						paths: prim.paths,
+						...prim.fillColorHex ? { fillColorHex: prim.fillColorHex } : {},
+						...prim.stroke ? { stroke: prim.stroke } : {},
+						transform
+					}
+				});
+			}
+		}
 		emitCellBorders(out, cell, cellX, rowBottom, row.heightPt, pageHeight, row.rowIdx, row.rowCount, colCount);
 		if (cell.mergeRole === "middle" || cell.mergeRole === "end") continue;
 		let textY = rowTop - cell.padTopPt;

package/dist/esm/word/document-parser.js

@@ -1,8 +1,8 @@
 import { twipsToPt } from "../core/ir/units.js";
-import { poAttr, poChildren, poFindByPath, poIntAttr, poIs, poText } from "../core/po-helpers.js";
+import { poAttr, poChildren, poFindByPath, poFindDescendant, poIntAttr, poIs, poText } from "../core/po-helpers.js";
 import { defaultColorResolver } from "../core/drawingml/colors.js";
 import { parseOMath } from "./omml-parser.js";
-import { expandMcChildren, parseDrawing } from "./drawing-parser.js";
+import { expandMcChildren, parseDrawing, parseVmlPicture } from "./drawing-parser.js";
 import { parseRunProperties } from "./run-properties.js";
 import { parseParagraphProperties } from "./paragraph-properties.js";
 import { poElementToFlat } from "./po-to-flat.js";
@@ -178,20 +178,44 @@ function parseBodyElements(children, ctx = DEFAULT_PARSE_CONTEXT) {
 	}
 	return out;
 }
-function tryExtractDrawingFromParagraph(p, ctx) {
-	let drawing;
-	let hasText = false;
-	for (const child of poChildren(p)) {
-		if (!poIs(child, "w:r")) continue;
-		for (const runChild of expandMcChildren(poChildren(child))) if (poIs(runChild, "w:drawing")) {
-			if (!drawing) drawing = runChild;
-		} else if (poIs(runChild, "w:t") && poText(runChild).length > 0) hasText = true;
-		else if (poIs(runChild, "w:tab") || poIs(runChild, "w:br") || poIs(runChild, "w:noBreakHyphen")) hasText = true;
+var COLLAPSE_TRANSPARENT_TAGS = new Set([
+	"w:ins",
+	"w:moveTo",
+	"w:sdt",
+	"w:sdtContent",
+	"w:smartTag"
+]);
+function scanForLoneDrawing(container, acc) {
+	for (const child of expandMcChildren(poChildren(container))) {
+		if (poIs(child, "w:pPr")) continue;
+		if (poIs(child, "w:r")) {
+			for (const rc of expandMcChildren(poChildren(child))) if (poIs(rc, "w:drawing")) {
+				if (!acc.drawing) acc.drawing = rc;
+			} else if (poIs(rc, "w:pict") || poIs(rc, "w:object")) {
+				if (!acc.vml && poFindDescendant(rc, "v:imagedata") !== void 0) acc.vml = rc;
+			} else if (poIs(rc, "w:t") && poText(rc).length > 0) acc.hasOther = true;
+			else if (poIs(rc, "w:tab") || poIs(rc, "w:br") || poIs(rc, "w:noBreakHyphen")) acc.hasOther = true;
+			continue;
+		}
+		if (poIs(child, "m:oMath") || poIs(child, "m:oMathPara")) {
+			acc.hasOther = true;
+			continue;
+		}
+		const tag = elementTag(child);
+		if (tag && COLLAPSE_TRANSPARENT_TAGS.has(tag)) scanForLoneDrawing(child, acc);
+		else if (tag && RUN_CONTAINER_TAGS.has(tag)) acc.hasOther = true;
 	}
-	if (!drawing || hasText) return null;
+}
+function tryExtractDrawingFromParagraph(p, ctx) {
+	const scan = { hasOther: false };
+	scanForLoneDrawing(p, scan);
+	const { drawing, vml } = scan;
+	if (scan.hasOther || !drawing && !vml) return null;
+	const fromVml = drawing === void 0;
 	const parseBody = (children) => parseBodyElements(children, ctx);
-	const content = parseDrawing(drawing, ctx.resolveColor, parseBody);
+	const content = fromVml ? parseVmlPicture(vml) : parseDrawing(drawing, ctx.resolveColor, parseBody);
 	if (!content) return null;
+	if (fromVml && content.kind === "image" && ctx.resolveImage?.(content.imageId) === void 0) return null;
 	const pPrNode = poChildren(p).find((c) => poIs(c, "w:pPr"));
 	const paragraphProperties = pPrNode ? parseParagraphProperties(poElementToFlat(pPrNode)) : {};
 	if (content.kind === "image") {
@@ -435,6 +459,16 @@ function parseRun(r, ctx) {
 					height: content.height
 				};
 			}
+		} else if (poIs(child, "w:pict") || poIs(child, "w:object")) {
+			const content = parseVmlPicture(child);
+			if (content && content.kind === "image") {
+				const resource = ctx.resolveImage?.(content.imageId);
+				if (resource) inlineImage = {
+					resource,
+					width: content.width,
+					height: content.height
+				};
+			}
 		}
 	}
 	return {

package/dist/esm/word/docx-writer.d.ts

@@ -0,0 +1,4 @@
+import { DocumentWriter, WriteResult } from '../core/ir/adapters.js';
+import { FlowDoc } from '../core/ir/flow.js';
+export declare function writeDocx(flow: FlowDoc): WriteResult;
+export declare const docxWriter: DocumentWriter<FlowDoc>;