reamkit 0.1.0-alpha.0 → 1.0.0

package/dist/esm/{style-cascade → core/style-cascade}/resolver.js

@@ -1,5 +1,10 @@
 import { DEFAULT_RESOLVED_PARAGRAPH, DEFAULT_RESOLVED_RUN } from "./types.js";
-//#region src/style-cascade/resolver.ts
+//#region src/core/style-cascade/resolver.ts
+var EMPTY_STYLE_SHEET = {
+	defaultRunProperties: {},
+	defaultParagraphProperties: {},
+	styles: /* @__PURE__ */ new Map()
+};
 function resolveRunProperties(runDirect, paragraphDirect, sheet) {
 	let acc = mergeRun(DEFAULT_RESOLVED_RUN, sheet.defaultRunProperties);
 	if (paragraphDirect.styleId) {
@@ -52,7 +57,7 @@ function mergeRun(base, override) {
 		italic: override.italic ?? base.italic,
 		underline: override.underline ?? base.underline,
 		strike: override.strike ?? base.strike,
-		fontSizeHalfPoints: override.fontSizeHalfPoints ?? base.fontSizeHalfPoints,
+		fontSizePt: override.fontSizePt ?? base.fontSizePt,
 		colorHex: override.colorHex ?? base.colorHex,
 		fontFamily: override.fontFamily ?? base.fontFamily,
 		verticalAlign: override.verticalAlign ?? base.verticalAlign,
@@ -65,13 +70,13 @@ function mergePar(base, override) {
 	const styleId = override.styleId ?? base.styleId;
 	return {
 		alignment: override.alignment ?? base.alignment,
-		spacingBeforeTwips: override.spacingBeforeTwips ?? base.spacingBeforeTwips,
-		spacingAfterTwips: override.spacingAfterTwips ?? base.spacingAfterTwips,
-		spacingLineTwips: override.spacingLineTwips ?? base.spacingLineTwips,
+		spacingBefore: override.spacingBefore ?? base.spacingBefore,
+		spacingAfter: override.spacingAfter ?? base.spacingAfter,
+		spacingLine: override.spacingLine ?? base.spacingLine,
 		spacingLineRule: override.spacingLineRule ?? base.spacingLineRule,
-		indentLeftTwips: override.indentLeftTwips ?? base.indentLeftTwips,
-		indentRightTwips: override.indentRightTwips ?? base.indentRightTwips,
-		indentFirstLineTwips: override.indentFirstLineTwips ?? base.indentFirstLineTwips,
+		indentLeft: override.indentLeft ?? base.indentLeft,
+		indentRight: override.indentRight ?? base.indentRight,
+		indentFirstLine: override.indentFirstLine ?? base.indentFirstLine,
 		pageBreakBefore: override.pageBreakBefore ?? base.pageBreakBefore,
 		bidi: override.bidi ?? base.bidi,
 		...outlineLevel !== void 0 ? { outlineLevel } : {},
@@ -93,4 +98,4 @@ function copyDefined(base, override) {
 	return out;
 }
 //#endregion
-export { resolveParagraphProperties, resolveRunProperties };
+export { EMPTY_STYLE_SHEET, resolveParagraphProperties, resolveRunProperties };

package/dist/esm/{style-cascade → core/style-cascade}/types.d.ts

@@ -1,10 +1,11 @@
 import { Alignment, FontFamilyMap, UnderlineStyle, VerticalAlign } from '../document-model/index.js';
+import { Pt } from '../ir/index.js';
 export interface ResolvedRunProperties {
     readonly bold: boolean;
     readonly italic: boolean;
     readonly underline: UnderlineStyle;
     readonly strike: boolean;
-    readonly fontSizeHalfPoints: number;
+    readonly fontSizePt: Pt;
     readonly colorHex: string;
     readonly fontFamily: FontFamilyMap;
     readonly verticalAlign: VerticalAlign;
@@ -13,13 +14,13 @@ export interface ResolvedRunProperties {
 }
 export interface ResolvedParagraphProperties {
     readonly alignment: Alignment;
-    readonly spacingBeforeTwips: number;
-    readonly spacingAfterTwips: number;
-    readonly spacingLineTwips: number;
+    readonly spacingBefore: Pt;
+    readonly spacingAfter: Pt;
+    readonly spacingLine: Pt;
     readonly spacingLineRule: 'auto' | 'exact' | 'atLeast';
-    readonly indentLeftTwips: number;
-    readonly indentRightTwips: number;
-    readonly indentFirstLineTwips: number;
+    readonly indentLeft: Pt;
+    readonly indentRight: Pt;
+    readonly indentFirstLine: Pt;
     readonly pageBreakBefore: boolean;
     readonly bidi: boolean;
     readonly outlineLevel?: number;

package/dist/esm/{style-cascade → core/style-cascade}/types.js

@@ -1,10 +1,11 @@
-//#region src/style-cascade/types.ts
+import { halfPtToPt, twipsToPt } from "../ir/units.js";
+//#region src/core/style-cascade/types.ts
 var DEFAULT_RESOLVED_RUN = {
 	bold: false,
 	italic: false,
 	underline: "none",
 	strike: false,
-	fontSizeHalfPoints: 22,
+	fontSizePt: halfPtToPt(22),
 	colorHex: "000000",
 	fontFamily: {},
 	verticalAlign: "baseline",
@@ -12,13 +13,13 @@ var DEFAULT_RESOLVED_RUN = {
 };
 var DEFAULT_RESOLVED_PARAGRAPH = {
 	alignment: "left",
-	spacingBeforeTwips: 0,
-	spacingAfterTwips: 0,
-	spacingLineTwips: 240,
+	spacingBefore: twipsToPt(0),
+	spacingAfter: twipsToPt(0),
+	spacingLine: twipsToPt(240),
 	spacingLineRule: "auto",
-	indentLeftTwips: 0,
-	indentRightTwips: 0,
-	indentFirstLineTwips: 0,
+	indentLeft: twipsToPt(0),
+	indentRight: twipsToPt(0),
+	indentFirstLine: twipsToPt(0),
 	pageBreakBefore: false,
 	bidi: false
 };

package/dist/esm/{ooxml/spreadsheet → excel}/cell-reference.js

@@ -1,4 +1,4 @@
-//#region src/ooxml/spreadsheet/cell-reference.ts
+//#region src/excel/cell-reference.ts
 var A = 65;
 var Z = 90;
 var a = 97;

package/dist/esm/{ooxml/spreadsheet → excel}/defined-name-ref.js

@@ -1,5 +1,5 @@
 import { parseCellRef } from "./cell-reference.js";
-//#region src/ooxml/spreadsheet/defined-name-ref.ts
+//#region src/excel/defined-name-ref.ts
 function stripQualifier(token) {
 	const bang = token.lastIndexOf("!");
 	return (bang >= 0 ? token.substring(bang + 1) : token).replace(/\$/g, "").trim();

package/dist/esm/{ooxml/spreadsheet → excel}/index.d.ts

@@ -4,7 +4,7 @@ export { parseAreaRef, parseTitleRowRange } from './defined-name-ref.js';
 export type { CellRange } from './defined-name-ref.js';
 export { parseSharedStrings } from './shared-strings-parser.js';
 export { parseWorkbook } from './workbook-parser.js';
-export type { DefinedName, ParsedWorkbook, SheetReference, } from './workbook-parser.js';
+export type { DefinedName, ParsedWorkbook, SheetReference } from './workbook-parser.js';
 export { parseWorksheet } from './worksheet-parser.js';
 export type { CellType, ColumnWidth, MergedRange, ParsedWorksheet, RowHeight, WorksheetCell, XlsxPageMargins, XlsxPageSetup, XlsxPrintOptions, } from './worksheet-parser.js';
 export { parseXlsxStyles, EMPTY_XLSX_STYLES } from './styles-parser.js';

package/dist/esm/{ooxml/spreadsheet → excel}/number-format.js

@@ -1,4 +1,4 @@
-//#region src/ooxml/spreadsheet/number-format.ts
+//#region src/excel/number-format.ts
 var BUILTIN = new Map([
 	[0, "General"],
 	[1, "0"],

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

@@ -0,0 +1,18 @@
+import { BodyElement, SectionProperties } from '../core/document-model/index.js';
+import { CellRange, DefinedName, ParsedWorksheet, XlsxStyles } from './index.js';
+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): {
+    readonly startRow: number;
+    readonly endRow: number;
+} | undefined;
+interface PrintModelOptions {
+    readonly printArea?: CellRange;
+    readonly gridLines: boolean;
+    readonly titleRows?: {
+        readonly startRow: number;
+        readonly endRow: number;
+    };
+}
+export declare function worksheetToBody(worksheet: ParsedWorksheet, sharedStrings: Array<string>, styles: XlsxStyles, date1904: boolean, print: PrintModelOptions): Array<BodyElement>;
+export {};

package/dist/esm/{converter/xlsx-to-pdf.js → excel/print-model.js}

@@ -1,25 +1,8 @@
-import { FontRegistry } from "../font/font-registry.js";
-import { fetchFontSet } from "../fonts/remote-fonts.js";
-import { OpcPackage } from "../opc/package.js";
-import { parseCoreProperties } from "../opc/core-properties.js";
-import "../opc/index.js";
-import { EMPTY_STYLE_SHEET } from "../ooxml/wordproc/styles-parser.js";
-import "../ooxml/wordproc/index.js";
-import { signPdf } from "../pdf/signature.js";
-import { renderStyledPdf } from "../pdf/styled-page-renderer.js";
-import "../pdf/index.js";
-import { parseAreaRef, parseTitleRowRange } from "../ooxml/spreadsheet/defined-name-ref.js";
-import { parseSharedStrings } from "../ooxml/spreadsheet/shared-strings-parser.js";
-import { parseWorkbook } from "../ooxml/spreadsheet/workbook-parser.js";
-import { parseWorksheet } from "../ooxml/spreadsheet/worksheet-parser.js";
-import { EMPTY_XLSX_STYLES, parseXlsxStyles } from "../ooxml/spreadsheet/styles-parser.js";
-import { applyNumberFormat } from "../ooxml/spreadsheet/number-format.js";
-import "../ooxml/spreadsheet/index.js";
-//#region src/converter/xlsx-to-pdf.ts
-var WORKBOOK_PART = "xl/workbook.xml";
-var SHARED_STRINGS_PART = "xl/sharedStrings.xml";
-var STYLES_PART = "xl/styles.xml";
-var CORE_PROPS_PART = "docProps/core.xml";
+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;
@@ -35,100 +18,6 @@ var PAPER_SIZES_TWIPS = new Map([
 	[70, [5953, 8392]]
 ]);
 var DEFAULT_PAPER_TWIPS = [11906, 16838];
-async function convertXlsxToPdf(xlsx, options = {}) {
-	const { signature } = options;
-	const renderOptions = signature ? {
-		...options,
-		signaturePlaceholder: signature
-	} : options;
-	let pdf;
-	if (renderOptions.fonts ?? renderOptions.fontBytes) pdf = convertXlsxToPdfSync(xlsx, renderOptions);
-	else {
-		const fonts = await fetchFontSet({
-			...options.fontFamily ? { family: options.fontFamily } : {},
-			...options.fontFetch ? { fetch: options.fontFetch } : {}
-		});
-		pdf = convertXlsxToPdfSync(xlsx, {
-			...renderOptions,
-			fonts
-		});
-	}
-	return signature ? signPdf(pdf, signature) : pdf;
-}
-function convertXlsxToPdfSync(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);
-	const pkg = OpcPackage.open(xlsx);
-	const workbookData = pkg.getPart(WORKBOOK_PART);
-	if (!workbookData) throw new Error("Not a valid xlsx: missing xl/workbook.xml");
-	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 stylesData = pkg.getPart(STYLES_PART);
-	const styles = stylesData ? parseXlsxStyles(stylesData) : EMPTY_XLSX_STYLES;
-	const workbookRels = pkg.getPartRelationships(WORKBOOK_PART);
-	const body = [];
-	let firstSheetSection;
-	for (let sheetIdx = 0; sheetIdx < sheets.length; sheetIdx++) {
-		const sheet = sheets[sheetIdx];
-		const sheetRel = workbookRels.find((r) => r.id === sheet.relationshipId);
-		if (!sheetRel) continue;
-		const resolved = pkg.resolveRelatedPart(WORKBOOK_PART, sheetRel);
-		if (!resolved) continue;
-		const worksheet = parseWorksheet(resolved.data);
-		if (sheetIdx === 0) firstSheetSection = sectionFromWorksheet(worksheet);
-		if (sheetIdx > 0) body.push({
-			kind: "paragraph",
-			paragraph: {
-				properties: { pageBreakBefore: true },
-				runs: []
-			}
-		});
-		const printArea = resolvePrintArea(definedNames, sheetIdx);
-		const titleRows = resolvePrintTitleRows(definedNames, sheetIdx);
-		const gridLines = worksheet.printOptions?.gridLines === true;
-		body.push(...worksheetToBody(worksheet, sharedStrings, styles, date1904, {
-			...printArea ? { printArea } : {},
-			...titleRows ? { titleRows } : {},
-			gridLines
-		}));
-	}
-	const coreData = pkg.getPart(CORE_PROPS_PART);
-	const coreProps = coreData ? parseCoreProperties(coreData) : void 0;
-	const { fontBytes: _ignoreA, fonts: _ignoreB, section: sectionOverride, info: callerInfo, embedSource, attachments: callerAttachments, signature: _ignoreSig, ...renderOptions } = options;
-	const section = sectionOverride ?? firstSheetSection;
-	const info = mergeInfo(coreProps, callerInfo);
-	const attachments = [...callerAttachments ?? []];
-	if (embedSource && options.pdfA?.startsWith("PDF/A-3")) attachments.push({
-		name: "source.xlsx",
-		bytes: xlsx,
-		mimeType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-		relationship: "Source",
-		description: "Source Excel workbook"
-	});
-	return renderStyledPdf(body, {
-		registry,
-		styles: EMPTY_STYLE_SHEET,
-		...section ? { section } : {},
-		...info ? { info } : {},
-		...attachments.length > 0 ? { attachments } : {},
-		...renderOptions
-	});
-}
-function mergeInfo(core, caller) {
-	if (!core && !caller) return void 0;
-	return {
-		...core?.title ? { title: core.title } : {},
-		...core?.creator ? { author: core.creator } : {},
-		...core?.subject ? { subject: core.subject } : {},
-		...core?.keywords ? { keywords: core.keywords } : {},
-		...core?.created ? { creationDate: core.created } : {},
-		...core?.modified ? { modificationDate: core.modified } : {},
-		...caller
-	};
-}
 function sectionFromWorksheet(worksheet) {
 	const pageSize = pageSizeFromSetup(worksheet.pageSetup);
 	const margins = marginsFromXlsx(worksheet.pageMargins);
@@ -147,20 +36,20 @@ function pageSizeFromSetup(setup) {
 	const orientation = setup.orientation === "landscape" ? "landscape" : "portrait";
 	if (setup.paperSize === void 0 && setup.orientation !== "landscape") return void 0;
 	return {
-		widthTwips: w,
-		heightTwips: h,
+		width: twipsToPt(w),
+		height: twipsToPt(h),
 		orientation
 	};
 }
 function marginsFromXlsx(margins) {
 	if (!margins) return void 0;
 	return {
-		topTwips: Math.round(margins.topInches * TWIPS_PER_INCH),
-		rightTwips: Math.round(margins.rightInches * TWIPS_PER_INCH),
-		bottomTwips: Math.round(margins.bottomInches * TWIPS_PER_INCH),
-		leftTwips: Math.round(margins.leftInches * TWIPS_PER_INCH),
-		...margins.headerInches !== void 0 ? { headerTwips: Math.round(margins.headerInches * TWIPS_PER_INCH) } : {},
-		...margins.footerInches !== void 0 ? { footerTwips: Math.round(margins.footerInches * TWIPS_PER_INCH) } : {}
+		top: twipsToPt(Math.round(margins.topInches * TWIPS_PER_INCH)),
+		right: twipsToPt(Math.round(margins.rightInches * TWIPS_PER_INCH)),
+		bottom: twipsToPt(Math.round(margins.bottomInches * TWIPS_PER_INCH)),
+		left: twipsToPt(Math.round(margins.leftInches * TWIPS_PER_INCH)),
+		...margins.headerInches !== void 0 ? { header: twipsToPt(Math.round(margins.headerInches * TWIPS_PER_INCH)) } : {},
+		...margins.footerInches !== void 0 ? { footer: twipsToPt(Math.round(margins.footerInches * TWIPS_PER_INCH)) } : {}
 	};
 }
 var PRINT_AREA_NAME = "_xlnm.Print_Area";
@@ -173,17 +62,19 @@ function resolvePrintTitleRows(definedNames, sheetIdx) {
 }
 var MIN_PRINT_SCALE = .1;
 function sheetContentWidthTwips(worksheet) {
-	const pageWidthTwips = pageSizeFromSetup(worksheet.pageSetup)?.widthTwips ?? DEFAULT_PAPER_TWIPS[0];
+	const pageSize = pageSizeFromSetup(worksheet.pageSetup);
+	const pageWidthTwips = pageSize ? Math.round(pageSize.width * 20) : DEFAULT_PAPER_TWIPS[0];
 	const margins = marginsFromXlsx(worksheet.pageMargins);
-	const left = margins?.leftTwips ?? TWIPS_PER_INCH;
-	const right = margins?.rightTwips ?? TWIPS_PER_INCH;
+	const left = margins ? Math.round(margins.left * 20) : TWIPS_PER_INCH;
+	const right = margins ? Math.round(margins.right * 20) : TWIPS_PER_INCH;
 	return Math.max(TWIPS_PER_INCH / 2, pageWidthTwips - left - right);
 }
 function sheetContentHeightTwips(worksheet) {
-	const pageHeightTwips = pageSizeFromSetup(worksheet.pageSetup)?.heightTwips ?? DEFAULT_PAPER_TWIPS[1];
+	const pageSize = pageSizeFromSetup(worksheet.pageSetup);
+	const pageHeightTwips = pageSize ? Math.round(pageSize.height * 20) : DEFAULT_PAPER_TWIPS[1];
 	const margins = marginsFromXlsx(worksheet.pageMargins);
-	const top = margins?.topTwips ?? TWIPS_PER_INCH;
-	const bottom = margins?.bottomTwips ?? TWIPS_PER_INCH;
+	const top = margins ? Math.round(margins.top * 20) : TWIPS_PER_INCH;
+	const bottom = margins ? Math.round(margins.bottom * 20) : TWIPS_PER_INCH;
 	return Math.max(TWIPS_PER_INCH / 2, pageHeightTwips - top - bottom);
 }
 function computePrintScale(worksheet, totalGridTwips, contentWidthTwips, totalGridHeightTwips, contentHeightTwips) {
@@ -201,10 +92,10 @@ function computePrintScale(worksheet, totalGridTwips, contentWidthTwips, totalGr
 	return Math.min(1, Math.max(MIN_PRINT_SCALE, s));
 }
 function scaleRunFont(props, scale) {
-	const hp = props.fontSizeHalfPoints ?? 22;
+	const hp = props.fontSizePt !== void 0 ? Math.round(props.fontSizePt * 2) : 22;
 	return {
 		...props,
-		fontSizeHalfPoints: Math.max(2, Math.round(hp * scale))
+		fontSizePt: halfPtToPt(Math.max(2, Math.round(hp * scale)))
 	};
 }
 var MAX_SHEET_TEXT_CHARS = 1e6;
@@ -287,7 +178,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 			const merge = mergeOrigins.get(key(absR, absC));
 			if (insideMerge.has(key(absR, absC)) && !merge) {
 				const verticalParent = verticalMergeParent(worksheet.merges, absR, absC);
-				if (verticalParent && absC === verticalParent.startColumn) cells.push(makeVerticalContinuation(verticalParent, colWindowEnd));
+				if (verticalParent && absC === verticalParent.startColumn) cells.push(makeVerticalContinuation(verticalParent, colWindowEnd, absR, rowWindowEnd));
 				continue;
 			}
 			const ws = cellMatrix[r]?.[c];
@@ -314,8 +205,8 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 			}
 			const visibleEndCol = merge ? Math.min(merge.endColumn, colWindowEnd) : 0;
 			const properties = {
-				...merge && visibleEndCol > merge.startColumn ? { gridSpan: visibleEndCol - merge.startColumn + 1 } : {},
-				...merge && Math.min(merge.endRow, rowWindowEnd) > merge.startRow ? { vMerge: "restart" } : {},
+				...merge && visibleEndCol > merge.startColumn ? { colSpan: visibleEndCol - merge.startColumn + 1 } : {},
+				...merge && Math.min(merge.endRow, rowWindowEnd) > merge.startRow ? { merge: "start" } : {},
 				...shading ? { shading } : {},
 				...borders ? { borders } : {}
 			};
@@ -335,13 +226,13 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 			});
 		}
 		const baseRowProps = rowHeightMap.get(r);
-		const scaledRowProps = scaled && baseRowProps?.heightTwips !== void 0 ? {
-			...baseRowProps,
-			heightTwips: Math.max(1, Math.round(baseRowProps.heightTwips * printScale))
-		} : baseRowProps ?? {};
+		const rowHeightTwips = scaled && baseRowProps !== void 0 ? Math.max(1, Math.round(baseRowProps.heightTwips * printScale)) : baseRowProps?.heightTwips;
 		const isTitleRow = print.titleRows !== void 0 && absR >= print.titleRows.startRow && absR <= print.titleRows.endRow;
 		const rowProps = {
-			...scaledRowProps,
+			...rowHeightTwips !== void 0 ? {
+				height: twipsToPt(rowHeightTwips),
+				heightRule: "atLeast"
+			} : {},
 			...isTitleRow ? { isHeader: true } : {},
 			...breakRows.has(absR) ? { pageBreakBefore: true } : {}
 		};
@@ -352,7 +243,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 	}
 	const thin = {
 		style: "single",
-		sizeEighthPt: 4
+		width: eighthPtToPt(4)
 	};
 	const centered = worksheet.printOptions?.horizontalCentered === true;
 	return [{
@@ -369,7 +260,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 				} } : {},
 				...centered ? { alignment: "center" } : {}
 			},
-			grid: columnWidths,
+			grid: columnWidths.map((w) => twipsToPt(w)),
 			rows
 		}
 	}];
@@ -377,12 +268,12 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 function verticalMergeParent(merges, row, column) {
 	for (const m of merges) if (column >= m.startColumn && column <= m.endColumn && row > m.startRow && row <= m.endRow && m.endRow > m.startRow) return m;
 }
-function makeVerticalContinuation(merge, colWindowEnd) {
+function makeVerticalContinuation(merge, colWindowEnd, absR, rowWindowEnd) {
 	const span = Math.min(merge.endColumn, colWindowEnd) - merge.startColumn + 1;
 	return {
 		properties: {
-			vMerge: "continue",
-			...span > 1 ? { gridSpan: span } : {}
+			merge: absR < Math.min(merge.endRow, rowWindowEnd) ? "middle" : "end",
+			...span > 1 ? { colSpan: span } : {}
 		},
 		content: [{
 			kind: "paragraph",
@@ -412,7 +303,7 @@ function runPropsFromXf(xf, styles) {
 	const props = {};
 	if (font.bold) props.bold = true;
 	if (font.italic) props.italic = true;
-	if (font.sizePt !== void 0) props.fontSizeHalfPoints = Math.round(font.sizePt * 2);
+	if (font.sizePt !== void 0) props.fontSizePt = halfPtToPt(Math.round(font.sizePt * 2));
 	if (font.colorHex) props.colorHex = font.colorHex;
 	return props;
 }
@@ -459,7 +350,7 @@ function mapBorderEdge(edge) {
 	const { style, sizeEighthPt } = mapBorderStyle(edge.style);
 	return {
 		style,
-		sizeEighthPt,
+		width: eighthPtToPt(sizeEighthPt),
 		...edge.colorHex ? { colorHex: edge.colorHex } : {}
 	};
 }
@@ -512,4 +403,4 @@ function cellHasContent(cell) {
 	return !!cell && (cell.rawValue !== "" || cell.inlineText !== void 0);
 }
 //#endregion
-export { convertXlsxToPdf, convertXlsxToPdfSync };
+export { resolvePrintArea, resolvePrintTitleRows, sectionFromWorksheet, worksheetToBody };

package/dist/esm/{ooxml/spreadsheet → excel}/shared-strings-parser.js

@@ -1,5 +1,5 @@
 import { XMLParser } from "fast-xml-parser";
-//#region src/ooxml/spreadsheet/shared-strings-parser.ts
+//#region src/excel/shared-strings-parser.ts
 var decoder = new TextDecoder("utf-8");
 var parser = new XMLParser({
 	ignoreAttributes: false,

package/dist/esm/{ooxml/spreadsheet → excel}/styles-parser.js

@@ -1,5 +1,5 @@
 import { XMLParser } from "fast-xml-parser";
-//#region src/ooxml/spreadsheet/styles-parser.ts
+//#region src/excel/styles-parser.ts
 var decoder = new TextDecoder("utf-8");
 var parser = new XMLParser({
 	ignoreAttributes: false,

package/dist/esm/{ooxml/spreadsheet → excel}/workbook-parser.js

@@ -1,5 +1,5 @@
 import { XMLParser } from "fast-xml-parser";
-//#region src/ooxml/spreadsheet/workbook-parser.ts
+//#region src/excel/workbook-parser.ts
 var decoder = new TextDecoder("utf-8");
 var parser = new XMLParser({
 	ignoreAttributes: false,

package/dist/esm/{ooxml/spreadsheet → excel}/worksheet-parser.js

@@ -1,6 +1,6 @@
 import { parseCellRef } from "./cell-reference.js";
 import { XMLParser } from "fast-xml-parser";
-//#region src/ooxml/spreadsheet/worksheet-parser.ts
+//#region src/excel/worksheet-parser.ts
 var decoder = new TextDecoder("utf-8");
 var parser = new XMLParser({
 	ignoreAttributes: false,

package/dist/esm/excel/xlsx-reader.d.ts

@@ -0,0 +1,4 @@
+import { DocumentReader, ReadResult } from '../core/ir/adapters.js';
+import { FlowDoc } from '../core/ir/flow.js';
+export declare function readXlsx(xlsx: Uint8Array): ReadResult<FlowDoc>;
+export declare const xlsxReader: DocumentReader<FlowDoc>;

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

@@ -0,0 +1,91 @@
+import { ResourceStore } from "../core/ir/resources.js";
+import { FEATURES } from "../core/ir/features.js";
+import { EMPTY_STYLE_SHEET } from "../core/style-cascade/resolver.js";
+import "../core/style-cascade/index.js";
+import { bytesInclude } from "../core/bytes.js";
+import { OpcPackage } from "../core/opc/package.js";
+import { parseCoreProperties } from "../core/opc/core-properties.js";
+import "../core/opc/index.js";
+import { parseSharedStrings } from "./shared-strings-parser.js";
+import { parseWorkbook } from "./workbook-parser.js";
+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";
+//#region src/excel/xlsx-reader.ts
+var WORKBOOK_PART = "xl/workbook.xml";
+var SHARED_STRINGS_PART = "xl/sharedStrings.xml";
+var STYLES_PART = "xl/styles.xml";
+var CORE_PROPS_PART = "docProps/core.xml";
+function readXlsx(xlsx) {
+	const pkg = OpcPackage.open(xlsx);
+	const workbookData = pkg.getPart(WORKBOOK_PART);
+	if (!workbookData) throw new Error("Not a valid xlsx: missing xl/workbook.xml");
+	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 stylesData = pkg.getPart(STYLES_PART);
+	const styles = stylesData ? parseXlsxStyles(stylesData) : EMPTY_XLSX_STYLES;
+	const workbookRels = pkg.getPartRelationships(WORKBOOK_PART);
+	const body = [];
+	let firstSheetSection;
+	for (let sheetIdx = 0; sheetIdx < sheets.length; sheetIdx++) {
+		const sheet = sheets[sheetIdx];
+		const sheetRel = workbookRels.find((r) => r.id === sheet.relationshipId);
+		if (!sheetRel) continue;
+		const resolved = pkg.resolveRelatedPart(WORKBOOK_PART, sheetRel);
+		if (!resolved) continue;
+		const worksheet = parseWorksheet(resolved.data);
+		if (sheetIdx === 0) firstSheetSection = sectionFromWorksheet(worksheet);
+		if (sheetIdx > 0) body.push({
+			kind: "paragraph",
+			paragraph: {
+				properties: { pageBreakBefore: true },
+				runs: []
+			}
+		});
+		const printArea = resolvePrintArea(definedNames, sheetIdx);
+		const titleRows = resolvePrintTitleRows(definedNames, sheetIdx);
+		const gridLines = worksheet.printOptions?.gridLines === true;
+		body.push(...worksheetToBody(worksheet, sharedStrings, styles, date1904, {
+			...printArea ? { printArea } : {},
+			...titleRows ? { titleRows } : {},
+			gridLines
+		}));
+	}
+	const coreData = pkg.getPart(CORE_PROPS_PART);
+	const info = infoFromCore(coreData ? parseCoreProperties(coreData) : void 0);
+	return {
+		doc: {
+			kind: "flow",
+			body,
+			sections: [],
+			...firstSheetSection ? { section: firstSheetSection } : {},
+			styles: EMPTY_STYLE_SHEET,
+			resources: new ResourceStore(),
+			...info ? { info } : {}
+		},
+		losses: []
+	};
+}
+var xlsxReader = {
+	id: "xlsx",
+	produces: "flow",
+	supports: new Set([FEATURES.text, FEATURES.tables]),
+	sniff: (bytes) => bytes[0] === 80 && bytes[1] === 75 && bytesInclude(bytes, "xl/workbook.xml"),
+	read: (bytes) => readXlsx(bytes)
+};
+function infoFromCore(core) {
+	if (!core) return void 0;
+	return {
+		...core.title ? { title: core.title } : {},
+		...core.creator ? { author: core.creator } : {},
+		...core.subject ? { subject: core.subject } : {},
+		...core.keywords ? { keywords: core.keywords } : {},
+		...core.created ? { creationDate: core.created } : {},
+		...core.modified ? { modificationDate: core.modified } : {}
+	};
+}
+//#endregion
+export { readXlsx, xlsxReader };

package/dist/esm/{converter → excel}/xlsx-to-pdf.d.ts

@@ -1,5 +1,5 @@
-import { FontBytesByVariant } from '../font/index.js';
-import { FetchLike } from '../fonts/index.js';
+import { FontBytesByVariant } from '../core/font/index.js';
+import { FetchLike } from '../core/fonts/index.js';
 import { SignatureOptions, StyledRenderOptions } from '../pdf/index.js';
 export interface ConvertXlsxOptions extends Omit<StyledRenderOptions, 'registry' | 'styles'> {
     readonly fontBytes?: Uint8Array;
@@ -9,5 +9,16 @@ export interface ConvertXlsxOptions extends Omit<StyledRenderOptions, 'registry'
     readonly embedSource?: boolean;
     readonly signature?: SignatureOptions;
 }
+/**
+ * Convert a .xlsx to PDF in one shot.
+ *
+ * @deprecated Use `Ream.parse(bytes).convert('pdf', options)` — one parse,
+ * any number of targets. This function remains for 0.1.x compatibility.
+ */
 export declare function convertXlsxToPdf(xlsx: Uint8Array, options?: ConvertXlsxOptions): Promise<Uint8Array>;
+/**
+ * Synchronous one-shot conversion (requires `fonts`/`fontBytes`).
+ *
+ * Internal since 1.0 — see the async variant above.
+ */
 export declare function convertXlsxToPdfSync(xlsx: Uint8Array, options: ConvertXlsxOptions): Uint8Array;