reamkit 1.0.1 → 1.0.2

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

@@ -3,5 +3,5 @@ import { ResolvedParagraphProperties, ResolvedRunProperties } from './types.js';
 export declare const EMPTY_STYLE_SHEET: StyleSheet;
 export declare function resolveRunProperties(runDirect: RunProperties, paragraphDirect: ParagraphProperties, sheet: StyleSheet): ResolvedRunProperties;
 export declare function resolveParagraphProperties(paragraphDirect: ParagraphProperties, sheet: StyleSheet): ResolvedParagraphProperties;
-export declare function resolveBodyStyles(body: ReadonlyArray<BodyElement>, sheet: StyleSheet): Array<BodyElement>;
+export declare function resolveBodyStyles(body: ReadonlyArray<BodyElement>, sheet: StyleSheet): ReadonlyArray<BodyElement>;
 export declare function resolveHeadersFootersStyles(hf: ReadonlyMap<string, ReadonlyArray<BodyElement>>, sheet: StyleSheet): ReadonlyMap<string, ReadonlyArray<BodyElement>>;

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

@@ -35,7 +35,20 @@ function computeRunProperties(runDirect, paragraphDirect, sheet) {
 	}
 	return mergeRun(acc, runDirect);
 }
+var paragraphCascadeCache = /* @__PURE__ */ new WeakMap();
 function resolveParagraphProperties(paragraphDirect, sheet) {
+	let bySheet = paragraphCascadeCache.get(sheet);
+	if (!bySheet) {
+		bySheet = /* @__PURE__ */ new WeakMap();
+		paragraphCascadeCache.set(sheet, bySheet);
+	}
+	const hit = bySheet.get(paragraphDirect);
+	if (hit) return hit;
+	const resolved = computeParagraphProperties(paragraphDirect, sheet);
+	bySheet.set(paragraphDirect, resolved);
+	return resolved;
+}
+function computeParagraphProperties(paragraphDirect, sheet) {
 	let acc = mergePar(DEFAULT_RESOLVED_PARAGRAPH, sheet.defaultParagraphProperties);
 	if (paragraphDirect.styleId) {
 		const chain = resolveStyleChain(paragraphDirect.styleId, sheet);
@@ -117,52 +130,45 @@ function copyDefined(base, override) {
 	}
 	return out;
 }
+function primeResolvedFixpoint(run, para) {
+	let bySheet = runCascadeCache.get(EMPTY_STYLE_SHEET);
+	if (!bySheet) {
+		bySheet = /* @__PURE__ */ new WeakMap();
+		runCascadeCache.set(EMPTY_STYLE_SHEET, bySheet);
+	}
+	let byRun = bySheet.get(run);
+	if (!byRun) {
+		byRun = /* @__PURE__ */ new WeakMap();
+		bySheet.set(run, byRun);
+	}
+	if (!byRun.has(para)) byRun.set(para, run);
+}
+function primeParagraphFixpoint(para) {
+	let bySheet = paragraphCascadeCache.get(EMPTY_STYLE_SHEET);
+	if (!bySheet) {
+		bySheet = /* @__PURE__ */ new WeakMap();
+		paragraphCascadeCache.set(EMPTY_STYLE_SHEET, bySheet);
+	}
+	if (!bySheet.has(para)) bySheet.set(para, para);
+}
 function resolveBodyStyles(body, sheet) {
-	const visitParagraph = (p) => ({
-		...p,
-		properties: resolveParagraphProperties(p.properties, sheet),
-		runs: p.runs.map((r) => ({
-			...r,
-			properties: resolveRunProperties(r.properties, p.properties, sheet)
-		}))
-	});
+	const visitParagraph = (p) => {
+		for (const r of p.runs) r.properties = resolveRunProperties(r.properties, p.properties, sheet);
+		p.properties = resolveParagraphProperties(p.properties, sheet);
+		primeParagraphFixpoint(p.properties);
+		for (const r of p.runs) primeResolvedFixpoint(r.properties, p.properties);
+	};
 	const visit = (el) => {
-		if (el.kind === "paragraph") return {
-			kind: "paragraph",
-			paragraph: visitParagraph(el.paragraph)
-		};
-		if (el.kind === "table") return {
-			kind: "table",
-			table: {
-				...el.table,
-				rows: el.table.rows.map((row) => ({
-					...row,
-					cells: row.cells.map((cell) => ({
-						...cell,
-						content: cell.content.map(visit)
-					}))
-				}))
-			}
-		};
-		if (el.kind === "shape" && el.shape.text) return {
-			kind: "shape",
-			shape: {
-				...el.shape,
-				text: {
-					...el.shape.text,
-					content: el.shape.text.content.map(visit)
-				}
-			}
-		};
-		return el;
+		if (el.kind === "paragraph") visitParagraph(el.paragraph);
+		else if (el.kind === "table") 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);
 	};
-	return body.map(visit);
+	for (const el of body) visit(el);
+	return body;
 }
 function resolveHeadersFootersStyles(hf, sheet) {
-	if (hf.size === 0) return hf;
-	const out = /* @__PURE__ */ new Map();
-	for (const [key, value] of hf) out.set(key, resolveBodyStyles(value, sheet));
-	return out;
+	for (const value of hf.values()) resolveBodyStyles(value, sheet);
+	return hf;
 }
 //#endregion
 export { EMPTY_STYLE_SHEET, resolveBodyStyles, resolveHeadersFootersStyles, resolveParagraphProperties, resolveRunProperties };

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

@@ -169,6 +169,25 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 	const scaled = printScale < .999;
 	const breakRows = new Set(worksheet.rowBreaks ?? []);
 	let textBudget = MAX_SHEET_TEXT_CHARS;
+	const runPropsByXf = /* @__PURE__ */ new Map();
+	const cellRunProps = (xf) => {
+		let props = runPropsByXf.get(xf);
+		if (props === void 0) {
+			const base = xf ? runPropsFromXf(xf, styles) : {};
+			props = scaled ? scaleRunFont(base, printScale) : base;
+			runPropsByXf.set(xf, props);
+		}
+		return props;
+	};
+	const paraPropsByAlignment = /* @__PURE__ */ new Map();
+	const cellParaProps = (alignment) => {
+		let props = paraPropsByAlignment.get(alignment);
+		if (props === void 0) {
+			props = alignment ? { alignment } : {};
+			paraPropsByAlignment.set(alignment, props);
+		}
+		return props;
+	};
 	const rows = [];
 	for (let r = 0; r < rowCount; r++) {
 		const absR = r + rowStart;
@@ -186,8 +205,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 			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;
-			const baseRunProps = xf ? runPropsFromXf(xf, styles) : {};
-			const runProps = scaled ? scaleRunFont(baseRunProps, printScale) : baseRunProps;
+			const runProps = cellRunProps(xf);
 			const alignment = xf ? alignmentFromXf(xf) : void 0;
 			const shading = xf ? shadingFromXf(xf, styles) : void 0;
 			const borders = xf ? bordersFromXf(xf, styles) : void 0;
@@ -210,7 +228,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 				...shading ? { shading } : {},
 				...borders ? { borders } : {}
 			};
-			const paragraphProps = alignment ? { alignment } : {};
+			const paragraphProps = cellParaProps(alignment);
 			cells.push({
 				properties,
 				content: [{

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "reamkit",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Ream — DOCX/XLSX to PDF (and SVG), built from scratch on the ECMA-376 and ISO 32000 specifications. Parse once, convert anywhere.",
   "license": "MIT",
-  "author": "Alex Krassavin",
+  "author": "Alex Krassavin <info@reamkit.dev>",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/alex-krassavin/reamkit.git"