reamkit 1.2.0 → 1.4.0

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",

package/dist/esm/excel/xlsx-to-pdf.js

@@ -1,7 +1,7 @@
 import { fetchFontSet } from "../core/fonts/remote-fonts.js";
 import { FontRegistry } from "../core/font/font-registry.js";
 import { signPdf } from "../pdf/signature.js";
-import { renderStyledPdf } from "../pdf/styled-page-renderer.js";
+import { renderStyledPdf, renderStyledPdfEncrypted } from "../pdf/styled-page-renderer.js";
 import "../pdf/index.js";
 import { readXlsx } from "./xlsx-reader.js";
 import { flowRenderOptions } from "../core/converter/project.js";
@@ -18,18 +18,18 @@ async function convertXlsxToPdf(xlsx, options = {}) {
 		...options,
 		signaturePlaceholder: signature
 	} : options;
-	let pdf;
-	if (renderOptions.fonts ?? renderOptions.fontBytes) pdf = convertXlsxToPdfSync(xlsx, renderOptions);
-	else {
-		const fonts = await fetchFontSet({
+	const withFonts = renderOptions.fonts ?? renderOptions.fontBytes ? renderOptions : {
+		...renderOptions,
+		fonts: await fetchFontSet({
 			...options.fontFamily ? { family: options.fontFamily } : {},
 			...options.fontFetch ? { fetch: options.fontFetch } : {}
-		});
-		pdf = convertXlsxToPdfSync(xlsx, {
-			...renderOptions,
-			fonts
-		});
+		})
+	};
+	if (withFonts.encrypt) {
+		const args = prepareXlsxStyledRender(xlsx, withFonts);
+		return renderStyledPdfEncrypted(args.body, args.styled);
 	}
+	const pdf = convertXlsxToPdfSync(xlsx, withFonts);
 	return signature ? signPdf(pdf, signature) : pdf;
 }
 /**
@@ -38,6 +38,10 @@ async function convertXlsxToPdf(xlsx, options = {}) {
 * Internal since 1.0 — see the async variant above.
 */
 function convertXlsxToPdfSync(xlsx, options) {
+	const args = prepareXlsxStyledRender(xlsx, options);
+	return renderStyledPdf(args.body, args.styled);
+}
+function prepareXlsxStyledRender(xlsx, options) {
 	const fonts = options.fonts ?? (options.fontBytes ? { regular: options.fontBytes } : void 0);
 	if (!fonts) throw new Error("convertXlsxToPdfSync requires options.fonts or options.fontBytes");
 	const registry = FontRegistry.fromBytes(fonts);
@@ -56,14 +60,17 @@ function convertXlsxToPdfSync(xlsx, options) {
 		relationship: "Source",
 		description: "Source Excel workbook"
 	});
-	return renderStyledPdf(flow.body, {
-		registry,
-		...flowRenderOptions(flow),
-		...section ? { section } : {},
-		...info ? { info } : {},
-		...attachments.length > 0 ? { attachments } : {},
-		...renderOptions
-	});
+	return {
+		body: flow.body,
+		styled: {
+			registry,
+			...flowRenderOptions(flow),
+			...section ? { section } : {},
+			...info ? { info } : {},
+			...attachments.length > 0 ? { attachments } : {},
+			...renderOptions
+		}
+	};
 }
 //#endregion
 export { convertXlsxToPdf };

package/dist/esm/index.d.ts

@@ -4,6 +4,7 @@ export { renderStyledPdf } from './pdf/index.js';
 export type { StyledRenderOptions, DocumentInfo } from './pdf/index.js';
 export { signPdf } from './pdf/index.js';
 export type { SignaturePlaceholder, SignerCredentials, SignatureOptions } from './pdf/index.js';
+export type { PdfEncryptOptions, PdfPermissions } from './pdf/index.js';
 export { FontRegistry, parseTtf, subsetTtf } from './core/font/index.js';
 export type { FontBytesByVariant, FontVariant, ParsedTtf } from './core/font/index.js';
 export { getHyphenator, createLanguageHyphenator, createHyphenator, splitPatternBundle, } from './core/hyphenation/index.js';
@@ -24,5 +25,6 @@ export type { FontProvider, FontRequest, FontAnswer } from './core/fonts/provide
 export { svgWriter, writeSvg } from './svg/svg-writer.js';
 export type { SvgWriteOptions } from './svg/svg-writer.js';
 export { htmlWriter, writeHtml } from './html/html-writer.js';
+export { docxWriter, writeDocx } from './word/docx-writer.js';
 export { layoutStyledDocument } from './layout/styled-layout.js';
 export type { LaidOutDocument } from './layout/page-doc.js';

package/dist/esm/index.js

@@ -15,8 +15,9 @@ import { createLanguageHyphenator, getHyphenator } from "./core/hyphenation/inde
 import { docxReader, readDocx } from "./word/docx-reader.js";
 import { readXlsx, xlsxReader } from "./excel/xlsx-reader.js";
 import { NO_FONT, callerFontProvider, chainProviders, embeddedDocFontProvider, isEmbeddingRestricted, localFontProvider, readOs2FsType, remoteFontProvider } from "./core/fonts/provider.js";
+import { docxWriter, writeDocx } from "./word/docx-writer.js";
 import { htmlWriter, writeHtml } from "./html/html-writer.js";
 import { svgWriter, writeSvg } from "./svg/svg-writer.js";
 import { createConverter } from "./core/converter/facade.js";
 import { Ream } from "./core/converter/ream.js";
-export { ConversionLossError, FEATURES, FontRegistry, NO_FONT, Ream, ResourceStore, callerFontProvider, chainProviders, createConverter, createHyphenator, createLanguageHyphenator, docxReader, eighthPtToPt, embeddedDocFontProvider, emuToPt, fetchFontSet, formatLoss, getHyphenator, halfPtToPt, htmlWriter, inchToPt, isEmbeddingRestricted, layoutStyledDocument, localFontProvider, mmToPt, parseTtf, pt, pxToPt, readDocx, readOs2FsType, readXlsx, remoteFontProvider, renderStyledPdf, resolveFamilyKey, signPdf, splitPatternBundle, subsetTtf, svgWriter, twipsToPt, writeHtml, writeSvg, xlsxReader };
+export { ConversionLossError, FEATURES, FontRegistry, NO_FONT, Ream, ResourceStore, callerFontProvider, chainProviders, createConverter, createHyphenator, createLanguageHyphenator, docxReader, docxWriter, eighthPtToPt, embeddedDocFontProvider, emuToPt, fetchFontSet, formatLoss, getHyphenator, halfPtToPt, htmlWriter, inchToPt, isEmbeddingRestricted, layoutStyledDocument, localFontProvider, mmToPt, parseTtf, pt, pxToPt, readDocx, readOs2FsType, readXlsx, remoteFontProvider, renderStyledPdf, resolveFamilyKey, signPdf, splitPatternBundle, subsetTtf, svgWriter, twipsToPt, writeDocx, writeHtml, writeSvg, xlsxReader };

package/dist/esm/layout/page-doc.d.ts

@@ -16,6 +16,7 @@ export interface TextToken {
     readonly href?: string;
     readonly footnoteRef?: string;
     readonly anchor?: string;
+    readonly listMarker?: true;
     readonly resolvedRun: ResolvedRunProperties;
     readonly font: FontResource;
     readonly fontSizePt: number;

package/dist/esm/layout/styled-layout.d.ts

@@ -5,6 +5,7 @@ import { Hyphenator } from '../core/hyphenation/index.js';
 import { LaidOutDocument, PageItem } from './page-doc.js';
 import { AttachedFile } from '../pdf/embedded-file.js';
 import { SignaturePlaceholder } from '../pdf/signature.js';
+import { PdfEncryptOptions } from '../pdf/encryption.js';
 import { ResourceStore } from '../core/ir/index.js';
 import { StructTreeBuilder } from '../pdf/struct-tree.js';
 export type PdfALevel = 'PDF/A-1b' | 'PDF/A-1a' | 'PDF/A-2b' | 'PDF/A-2u' | 'PDF/A-2a' | 'PDF/A-3b' | 'PDF/A-3u' | 'PDF/A-3a';
@@ -39,6 +40,7 @@ export interface StyledRenderOptions {
     readonly tagged?: boolean;
     readonly pdfUA?: boolean;
     readonly language?: string;
+    readonly encrypt?: PdfEncryptOptions;
     readonly attachments?: ReadonlyArray<AttachedFile>;
     readonly signaturePlaceholder?: SignaturePlaceholder;
 }