reamkit 0.1.0-alpha.0 → 1.0.0

package/dist/esm/word/docx-to-pdf.js

@@ -0,0 +1,112 @@
+import { fetchFontSet, resolveFamilyKey } 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 "../pdf/index.js";
+import { OpcPackage } from "../core/opc/package.js";
+import "../core/opc/index.js";
+import { readDocx } from "./docx-reader.js";
+import { flowRenderOptions } from "../core/converter/project.js";
+//#region src/word/docx-to-pdf.ts
+var STYLES_PART = "word/styles.xml";
+var MAIN_DOCUMENT_PART = "word/document.xml";
+/**
+* Synchronous one-shot conversion (requires `fonts`/`fontBytes`, no network).
+*
+* Internal since 1.0 — see the async variant above.
+*/
+function convertDocxToPdfSync(docx, options) {
+	const fonts = options.fonts ?? (options.fontBytes ? { regular: options.fontBytes } : void 0);
+	if (!fonts) throw new Error("convertDocxToPdfSync requires options.fonts or options.fontBytes");
+	const registry = FontRegistry.fromBytes(fonts);
+	const { doc: flow } = readDocx(docx);
+	const { fontBytes: _ignoreA, fonts: _ignoreB, info: callerInfo, embedSource, attachments: callerAttachments, signature: _ignoreSig, ...renderOptions } = options;
+	const info = flow.info || callerInfo ? {
+		...flow.info,
+		...callerInfo
+	} : void 0;
+	const attachments = [...callerAttachments ?? []];
+	if (embedSource && options.pdfA?.startsWith("PDF/A-3")) attachments.push({
+		name: "source.docx",
+		bytes: docx,
+		mimeType: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+		relationship: "Source",
+		description: "Source Word document"
+	});
+	return renderStyledPdf(flow.body, {
+		registry,
+		...flowRenderOptions(flow),
+		...info ? { info } : {},
+		...attachments.length > 0 ? { attachments } : {},
+		...renderOptions
+	});
+}
+function detectDocxFamilyKeys(docx) {
+	const keys = new Set(["roboto"]);
+	let pkg;
+	try {
+		pkg = OpcPackage.open(docx);
+	} catch {
+		return keys;
+	}
+	const decoder = new TextDecoder("utf-8");
+	const re = /<w:rFonts[^>]*\bw:ascii="([^"]+)"/g;
+	for (const part of [STYLES_PART, MAIN_DOCUMENT_PART]) {
+		const data = pkg.getPart(part);
+		if (!data) continue;
+		const xml = decoder.decode(data);
+		let m;
+		while ((m = re.exec(xml)) !== null) keys.add(resolveFamilyKey(m[1]));
+	}
+	return keys;
+}
+/**
+* One-shot .docx → PDF (auto-downloads a substitute font set when the caller
+* supplies none; zero network with `fonts`/`fontBytes`).
+*
+* Internal since 1.0 — the public entry is `Ream.parse(bytes).convert('pdf')`;
+* the createConverter facade and the test suite drive this directly.
+*/
+async function convertDocxToPdf(docx, options = {}) {
+	const { signature } = options;
+	const pdf = await buildUnsignedDocxPdf(docx, signature ? {
+		...options,
+		signaturePlaceholder: signature
+	} : options);
+	return signature ? signPdf(pdf, signature) : pdf;
+}
+async function buildUnsignedDocxPdf(docx, options) {
+	if (options.fonts ?? options.fontBytes) return convertDocxToPdfSync(docx, options);
+	const auto = await resolveDocxAutoFonts(docx, options);
+	return convertDocxToPdfSync(docx, {
+		...options,
+		...auto
+	});
+}
+async function resolveDocxAutoFonts(docx, options = {}) {
+	const fetchOpt = options.fontFetch ? { fetch: options.fontFetch } : {};
+	const keys = options.fontFamily ? new Set([resolveFamilyKey(options.fontFamily)]) : detectDocxFamilyKeys(docx);
+	if (keys.size <= 1) {
+		const family = keys.values().next().value;
+		return { fonts: await fetchFontSet({
+			...family ? { family } : {},
+			...fetchOpt
+		}) };
+	}
+	const registriesByFamily = /* @__PURE__ */ new Map();
+	let baseBytes;
+	for (const key of keys) {
+		const bytes = await fetchFontSet({
+			family: key,
+			...fetchOpt
+		});
+		registriesByFamily.set(key, FontRegistry.fromBytes(bytes));
+		if (key === "roboto" || !baseBytes) baseBytes = bytes;
+	}
+	return {
+		fonts: baseBytes,
+		registriesByFamily
+	};
+}
+//#endregion
+export { convertDocxToPdf, resolveDocxAutoFonts };

package/dist/esm/{ooxml/wordproc → word}/drawing-parser.d.ts

@@ -1,9 +1,10 @@
-import { BodyElement, ShapeFill, ShapeGeometry, ShapeLine, ShapeTextBody, ShapeTransform } from '../../document-model/index.js';
-import { ColorResolver } from '../drawingml/colors.js';
-import { PoNode } from './po-helpers.js';
+import { BodyElement, ShapeFill, ShapeGeometry, ShapeLine, ShapeTextBody, ShapeTransform } from '../core/document-model/index.js';
+import { ColorResolver } from '../core/drawingml/colors.js';
+import { PoNode } from '../core/po-helpers.js';
+import { Pt } from '../core/ir/index.js';
 export interface ShapeData {
-    readonly widthEmu: number;
-    readonly heightEmu: number;
+    readonly width: Pt;
+    readonly height: Pt;
     readonly geometry: ShapeGeometry;
     readonly fill: ShapeFill;
     readonly line?: ShapeLine;
@@ -14,8 +15,8 @@ export type ParseBody = (children: ReadonlyArray<PoNode>) => Array<BodyElement>;
 export type DrawingContent = {
     readonly kind: 'image';
     readonly imageId: string;
-    readonly widthEmu: number;
-    readonly heightEmu: number;
+    readonly width: Pt;
+    readonly height: Pt;
     readonly altText?: string;
 } | {
     readonly kind: 'shape';
@@ -24,8 +25,8 @@ export type DrawingContent = {
 } | {
     readonly kind: 'chart';
     readonly chartRelId: string;
-    readonly widthEmu: number;
-    readonly heightEmu: number;
+    readonly width: Pt;
+    readonly height: Pt;
     readonly altText?: string;
 };
 export declare function resolveMc(altContent: PoNode): ReadonlyArray<PoNode>;

package/dist/esm/{ooxml/wordproc → word}/drawing-parser.js

@@ -1,5 +1,7 @@
-import { poAttr, poChildren, poFindDescendant, poIntAttr, poIs, poTag } from "./po-helpers.js";
-//#region src/ooxml/wordproc/drawing-parser.ts
+import { emuToPt } from "../core/ir/units.js";
+import { poAttr, poChildren, poFindDescendant, poIntAttr, poIs, poTag } from "../core/po-helpers.js";
+import { resolveColorNode } from "../core/drawingml/colors.js";
+//#region src/word/drawing-parser.ts
 var WPS_URI = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
 var CHART_URI = "http://schemas.openxmlformats.org/drawingml/2006/chart";
 var UNDERSTOOD_NS = new Set(["wps"]);
@@ -45,8 +47,8 @@ function parseDrawing(drawing, resolveColor, parseBody) {
 		if (chartRelId && extentCx !== void 0 && extentCy !== void 0) return {
 			kind: "chart",
 			chartRelId,
-			widthEmu: extentCx,
-			heightEmu: extentCy,
+			width: emuToPt(extentCx),
+			height: emuToPt(extentCy),
 			...alt
 		};
 		return null;
@@ -56,8 +58,8 @@ function parseDrawing(drawing, resolveColor, parseBody) {
 	if (extentCx !== void 0 && extentCy !== void 0 && rId) return {
 		kind: "image",
 		imageId: rId,
-		widthEmu: extentCx,
-		heightEmu: extentCy,
+		width: emuToPt(extentCx),
+		height: emuToPt(extentCy),
 		...alt
 	};
 	return null;
@@ -98,8 +100,8 @@ function parseWsp(graphicData, extentCx, extentCy, resolveColor, parseBody) {
 	const text = parseBody ? parseTextBox(wsp, parseBody) : void 0;
 	if (widthEmu === void 0 || heightEmu === void 0) return null;
 	return {
-		widthEmu,
-		heightEmu,
+		width: emuToPt(widthEmu),
+		height: emuToPt(heightEmu),
 		geometry,
 		fill,
 		...line ? { line } : {},
@@ -123,10 +125,10 @@ function parseTextBox(wsp, parseBody) {
 	const anchor = a === "ctr" ? "ctr" : a === "b" ? "b" : a === "t" ? "t" : void 0;
 	return {
 		content,
-		...lIns !== void 0 ? { insetLeftEmu: lIns } : {},
-		...tIns !== void 0 ? { insetTopEmu: tIns } : {},
-		...rIns !== void 0 ? { insetRightEmu: rIns } : {},
-		...bIns !== void 0 ? { insetBottomEmu: bIns } : {},
+		...lIns !== void 0 ? { insetLeft: emuToPt(lIns) } : {},
+		...tIns !== void 0 ? { insetTop: emuToPt(tIns) } : {},
+		...rIns !== void 0 ? { insetRight: emuToPt(rIns) } : {},
+		...bIns !== void 0 ? { insetBottom: emuToPt(bIns) } : {},
 		...anchor ? { anchor } : {}
 	};
 }
@@ -287,7 +289,7 @@ function parseLine(spPr, resolveColor) {
 	else if (poIs(c, "a:solidFill")) colorHex = colorFromContainer(c, resolveColor);
 	else if (poIs(c, "a:prstDash")) dash = normalizeDash(poAttr(c, "val"));
 	return {
-		...widthEmu !== void 0 ? { widthEmu } : {},
+		...widthEmu !== void 0 ? { width: emuToPt(widthEmu) } : {},
 		...colorHex ? { colorHex } : {},
 		...dash ? { dash } : {},
 		...cap ? { cap } : {},
@@ -310,35 +312,6 @@ function normalizeDash(v) {
 	if (v === "lgDashDotDot") return "lgDashDot";
 	if (v === "sysDashDot" || v === "sysDashDotDot") return "sysDash";
 }
-function readColorMods(colorNode) {
-	const mods = [];
-	for (const c of poChildren(colorNode)) for (const kind of [
-		"lumMod",
-		"lumOff",
-		"shade",
-		"tint",
-		"alpha"
-	]) if (poIs(c, `a:${kind}`)) {
-		const v = poIntAttr(c, "val");
-		if (v !== void 0) mods.push({
-			kind,
-			val: v / 1e5
-		});
-	}
-	return mods;
-}
-function resolveColorNode(c, resolveColor) {
-	const isSrgb = poIs(c, "a:srgbClr");
-	if (!isSrgb && !poIs(c, "a:schemeClr")) return void 0;
-	const v = poAttr(c, "val");
-	if (!v) return void 0;
-	const mods = readColorMods(c);
-	const raw = isSrgb ? { srgb: v } : { scheme: v };
-	return resolveColor(mods.length > 0 ? {
-		...raw,
-		mods
-	} : raw);
-}
 function colorFromContainer(parent, resolveColor) {
 	for (const c of poChildren(parent)) {
 		const hex = resolveColorNode(c, resolveColor);

package/dist/esm/{ooxml/wordproc → word}/font-table.d.ts

@@ -1,5 +1,5 @@
-import { OpcPackage } from '../../opc/index.js';
-import { FontRegistry } from '../../font/index.js';
+import { OpcPackage } from '../core/opc/index.js';
+import { FontRegistry } from '../core/font/index.js';
 type EmbedVariant = 'regular' | 'bold' | 'italic' | 'boldItalic';
 interface EmbedRef {
     readonly rId: string;

package/dist/esm/{ooxml/wordproc → word}/font-table.js

@@ -1,5 +1,5 @@
-import { FontRegistry } from "../../font/font-registry.js";
-//#region src/ooxml/wordproc/font-table.ts
+import { FontRegistry } from "../core/font/font-registry.js";
+//#region src/word/font-table.ts
 var FONT_TABLE_PART = "word/fontTable.xml";
 var REL_FONT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/font";
 var VARIANT_BY_TAG = {

package/dist/esm/{ooxml/wordproc → word}/index.d.ts

@@ -1,10 +1,11 @@
+export type { ImageResolver, ParseContext } from './document-parser.js';
 export { extractParagraphs } from './text-extractor.js';
 export { parseDocument, parseBodyElements, parseSection, parseSections, parseHeaderFooter, EMPTY_SECTION, } from './document-parser.js';
 export { parseRunProperties } from './run-properties.js';
 export { parseParagraphProperties } from './paragraph-properties.js';
-export { parseStyles, EMPTY_STYLE_SHEET } from './styles-parser.js';
+export { parseStyles } from './styles-parser.js';
 export { parseTable } from './table-parser.js';
-export { loadEmbeddedFonts, deobfuscateEmbeddedFont, parseFontTable, } from './font-table.js';
+export { loadEmbeddedFonts, deobfuscateEmbeddedFont, parseFontTable } from './font-table.js';
 export { parseNumbering, EMPTY_NUMBERING } from './numbering-parser.js';
 export { parseSettings, EMPTY_SETTINGS } from './settings-parser.js';
 export type { DocumentSettings } from './settings-parser.js';

package/dist/esm/{ooxml/wordproc → word}/numbering-parser.d.ts

@@ -1,3 +1,3 @@
-import { Numbering } from '../../document-model/index.js';
+import { Numbering } from '../core/document-model/index.js';
 export declare const EMPTY_NUMBERING: Numbering;
 export declare function parseNumbering(data: Uint8Array): Numbering;

package/dist/esm/{ooxml/wordproc → word}/numbering-parser.js

@@ -2,7 +2,7 @@ import { asArray, asElement, getAttr } from "./xml-helpers.js";
 import { parseRunProperties } from "./run-properties.js";
 import { parseParagraphProperties } from "./paragraph-properties.js";
 import { XMLParser } from "fast-xml-parser";
-//#region src/ooxml/wordproc/numbering-parser.ts
+//#region src/word/numbering-parser.ts
 var decoder = new TextDecoder("utf-8");
 var parser = new XMLParser({
 	ignoreAttributes: false,

package/dist/esm/{ooxml/math → word}/omml-parser.d.ts

@@ -1,4 +1,4 @@
-import { MathNode } from '../../document-model/index.js';
-import { PoNode } from '../wordproc/po-helpers.js';
+import { MathNode } from '../core/document-model/index.js';
+import { PoNode } from '../core/po-helpers.js';
 export declare function parseOMath(oMath: PoNode): MathNode;
 export declare function childRow(parent: PoNode, tag: string): MathNode;

package/dist/esm/{ooxml/math → word}/omml-parser.js

@@ -1,5 +1,5 @@
-import { poChildren, poChildrenWith, poIs, poTag, poText, poToggle, poVal } from "../wordproc/po-helpers.js";
-//#region src/ooxml/math/omml-parser.ts
+import { poChildren, poChildrenWith, poIs, poTag, poText, poToggle, poVal } from "../core/po-helpers.js";
+//#region src/word/omml-parser.ts
 function parseOMath(oMath) {
 	return {
 		type: "row",

package/dist/esm/{ooxml/wordproc → word}/paragraph-properties.d.ts

@@ -1,2 +1,2 @@
-import { ParagraphProperties } from '../../document-model/index.js';
+import { ParagraphProperties } from '../core/document-model/index.js';
 export declare function parseParagraphProperties(pPr: unknown): ParagraphProperties;

package/dist/esm/{ooxml/wordproc → word}/paragraph-properties.js

@@ -1,6 +1,7 @@
+import { twipsToPt } from "../core/ir/units.js";
 import { asElement, getAttr, getVal, parseIntAttr, parseToggle } from "./xml-helpers.js";
 import { parseRunProperties } from "./run-properties.js";
-//#region src/ooxml/wordproc/paragraph-properties.ts
+//#region src/word/paragraph-properties.ts
 var ALIGNMENTS = new Set([
 	"left",
 	"right",
@@ -31,9 +32,9 @@ function parseParagraphProperties(pPr) {
 		const after = parseIntAttr(node, "after");
 		const line = parseIntAttr(node, "line");
 		const lineRule = getAttr(node, "lineRule");
-		if (before !== void 0) out.spacingBeforeTwips = before;
-		if (after !== void 0) out.spacingAfterTwips = after;
-		if (line !== void 0) out.spacingLineTwips = line;
+		if (before !== void 0) out.spacingBefore = twipsToPt(before);
+		if (after !== void 0) out.spacingAfter = twipsToPt(after);
+		if (line !== void 0) out.spacingLine = twipsToPt(line);
 		if (lineRule && LINE_RULES.has(lineRule)) out.spacingLineRule = lineRule;
 	}
 	if ("w:ind" in el) {
@@ -42,10 +43,10 @@ function parseParagraphProperties(pPr) {
 		const right = parseIntAttr(node, "right");
 		const firstLine = parseIntAttr(node, "firstLine");
 		const hanging = parseIntAttr(node, "hanging");
-		if (left !== void 0) out.indentLeftTwips = left;
-		if (right !== void 0) out.indentRightTwips = right;
-		if (firstLine !== void 0) out.indentFirstLineTwips = firstLine;
-		else if (hanging !== void 0) out.indentFirstLineTwips = -hanging;
+		if (left !== void 0) out.indentLeft = twipsToPt(left);
+		if (right !== void 0) out.indentRight = twipsToPt(right);
+		if (firstLine !== void 0) out.indentFirstLine = twipsToPt(firstLine);
+		else if (hanging !== void 0) out.indentFirstLine = twipsToPt(-hanging);
 	}
 	if ("w:pageBreakBefore" in el) {
 		const v = parseToggle(el["w:pageBreakBefore"]);

package/dist/esm/{ooxml/wordproc → word}/po-to-flat.d.ts

@@ -1,2 +1,2 @@
-import { PoNode } from './po-helpers.js';
+import { PoNode } from '../core/po-helpers.js';
 export declare function poElementToFlat(node: PoNode | undefined): Record<string, unknown>;

package/dist/esm/{ooxml/wordproc → word}/po-to-flat.js

@@ -1,5 +1,5 @@
-import { poChildren, poTag } from "./po-helpers.js";
-//#region src/ooxml/wordproc/po-to-flat.ts
+import { poChildren, poTag } from "../core/po-helpers.js";
+//#region src/word/po-to-flat.ts
 var ATTRS_KEY = ":@";
 var TEXT_KEY = "#text";
 function poElementToFlat(node) {

package/dist/esm/{ooxml/wordproc → word}/run-properties.d.ts

@@ -1,2 +1,2 @@
-import { RunProperties } from '../../document-model/index.js';
+import { RunProperties } from '../core/document-model/index.js';
 export declare function parseRunProperties(rPr: unknown): RunProperties;

package/dist/esm/{ooxml/wordproc → word}/run-properties.js

@@ -1,5 +1,6 @@
+import { halfPtToPt } from "../core/ir/units.js";
 import { asElement, getAttr, getVal, parseIntAttr, parseToggle } from "./xml-helpers.js";
-//#region src/ooxml/wordproc/run-properties.ts
+//#region src/word/run-properties.ts
 var UNDERLINE_STYLES = new Set([
 	"none",
 	"single",
@@ -42,7 +43,7 @@ function parseRunProperties(rPr) {
 	}
 	if ("w:sz" in el) {
 		const v = parseIntAttr(el["w:sz"], "val");
-		if (v !== void 0) out.fontSizeHalfPoints = v;
+		if (v !== void 0) out.fontSizePt = halfPtToPt(v);
 	}
 	if ("w:color" in el) {
 		const v = getVal(el["w:color"]);

package/dist/esm/{ooxml/wordproc → word}/settings-parser.js

@@ -1,6 +1,6 @@
-import { poAttr, poChildren, poFindByPath, poIs } from "./po-helpers.js";
+import { poAttr, poChildren, poFindByPath, poIs } from "../core/po-helpers.js";
 import { XMLParser } from "fast-xml-parser";
-//#region src/ooxml/wordproc/settings-parser.ts
+//#region src/word/settings-parser.ts
 var decoder = new TextDecoder("utf-8");
 var parser = new XMLParser({
 	ignoreAttributes: false,

package/dist/esm/word/styles-parser.d.ts

@@ -0,0 +1,2 @@
+import { StyleSheet } from '../core/document-model/index.js';
+export declare function parseStyles(stylesXml: Uint8Array): StyleSheet;

package/dist/esm/{ooxml/wordproc → word}/styles-parser.js

@@ -1,8 +1,10 @@
+import { EMPTY_STYLE_SHEET } from "../core/style-cascade/resolver.js";
+import "../core/style-cascade/index.js";
 import { asArray, asElement, getAttr, getVal } from "./xml-helpers.js";
 import { parseRunProperties } from "./run-properties.js";
 import { parseParagraphProperties } from "./paragraph-properties.js";
 import { XMLParser } from "fast-xml-parser";
-//#region src/ooxml/wordproc/styles-parser.ts
+//#region src/word/styles-parser.ts
 var decoder = new TextDecoder("utf-8");
 var parser = new XMLParser({
 	ignoreAttributes: false,
@@ -18,11 +20,6 @@ var STYLE_TYPES = new Set([
 	"table",
 	"numbering"
 ]);
-var EMPTY_STYLE_SHEET = {
-	defaultRunProperties: {},
-	defaultParagraphProperties: {},
-	styles: /* @__PURE__ */ new Map()
-};
 function parseStyles(stylesXml) {
 	const xml = decoder.decode(stylesXml);
 	const root = asElement(parser.parse(xml)["w:styles"]);
@@ -64,4 +61,4 @@ function parseStyles(stylesXml) {
 	};
 }
 //#endregion
-export { EMPTY_STYLE_SHEET, parseStyles };
+export { parseStyles };

package/dist/esm/word/table-parser.d.ts

@@ -0,0 +1,4 @@
+import { Table } from '../core/document-model/index.js';
+import { PoNode } from '../core/po-helpers.js';
+import { ParseContext } from './document-parser.js';
+export declare function parseTable(tbl: PoNode, ctx?: ParseContext): Table;

package/dist/esm/{ooxml/wordproc → word}/table-parser.js

@@ -1,6 +1,7 @@
-import { poAttr, poChildren, poChildrenWith, poFirstChild, poIntAttr, poToggle, poVal } from "./po-helpers.js";
-import { parseBodyElements } from "./document-parser.js";
-//#region src/ooxml/wordproc/table-parser.ts
+import { eighthPtToPt, twipsToPt } from "../core/ir/units.js";
+import { poAttr, poChildren, poChildrenWith, poFirstChild, poIntAttr, poToggle, poVal } from "../core/po-helpers.js";
+import { DEFAULT_PARSE_CONTEXT, parseBodyElements } from "./document-parser.js";
+//#region src/word/table-parser.ts
 var BORDER_STYLES = new Set([
 	"none",
 	"single",
@@ -20,17 +21,62 @@ var HEIGHT_RULES = new Set([
 	"atLeast",
 	"exact"
 ]);
-function parseTable(tbl) {
+function parseTable(tbl, ctx = DEFAULT_PARSE_CONTEXT) {
 	const properties = parseTableProperties(poFirstChild(tbl, "w:tblPr"));
 	const grid = parseTableGrid(poFirstChild(tbl, "w:tblGrid"));
-	const rows = [];
-	for (const tr of poChildrenWith(tbl, "w:tr")) rows.push(parseTableRow(tr));
+	const draftRows = [];
+	for (const tr of poChildrenWith(tbl, "w:tr")) draftRows.push(parseTableRow(tr, ctx));
+	const roles = resolveMergeRoles(draftRows.map((r) => r.cells));
 	return {
 		properties,
 		grid,
-		rows
+		rows: draftRows.map((draft, rowIdx) => ({
+			properties: draft.properties,
+			cells: draft.cells.map((d, cellIdx) => {
+				const merge = roles[rowIdx][cellIdx];
+				return merge ? {
+					...d.cell,
+					properties: {
+						...d.cell.properties,
+						merge
+					}
+				} : d.cell;
+			})
+		}))
 	};
 }
+function resolveMergeRoles(rows) {
+	const out = rows.map((r) => new Array(r.length).fill(void 0));
+	const colSlots = /* @__PURE__ */ new Map();
+	for (let rowIdx = 0; rowIdx < rows.length; rowIdx++) {
+		const row = rows[rowIdx];
+		let colIdx = 0;
+		for (let cellIdx = 0; cellIdx < row.length; cellIdx++) {
+			const d = row[cellIdx];
+			let arr = colSlots.get(colIdx);
+			if (!arr) {
+				arr = [];
+				colSlots.set(colIdx, arr);
+			}
+			arr.push({
+				rowIdx,
+				cellIdx,
+				vMerge: d.vMerge
+			});
+			colIdx += Math.max(1, d.cell.properties.colSpan ?? 1);
+		}
+	}
+	for (const slots of colSlots.values()) for (let i = 0; i < slots.length; i++) {
+		const cur = slots[i];
+		const next = slots[i + 1];
+		const nextIsContinue = !!next && next.vMerge === "continue";
+		let role;
+		if (cur.vMerge === "restart") role = nextIsContinue ? "start" : void 0;
+		else if (cur.vMerge === "continue") role = nextIsContinue ? "middle" : "end";
+		out[cur.rowIdx][cur.cellIdx] = role;
+	}
+	return out;
+}
 function parseTableProperties(tblPr) {
 	if (!tblPr) return {};
 	const out = {};
@@ -38,7 +84,8 @@ function parseTableProperties(tblPr) {
 	if (tblW) {
 		const w = poIntAttr(tblW, "w");
 		const type = poAttr(tblW, "type");
-		if (w !== void 0) out.widthTwips = w;
+		if (w !== void 0 && type === "pct") out.widthFraction = w / 5e3;
+		else if (w !== void 0) out.widthPt = twipsToPt(w);
 		if (type && WIDTH_TYPES.has(type)) out.widthType = type;
 	}
 	const tblLayout = poFirstChild(tblPr, "w:tblLayout");
@@ -57,14 +104,14 @@ function parseTableGrid(tblGrid) {
 	const cols = [];
 	for (const gridCol of poChildrenWith(tblGrid, "w:gridCol")) {
 		const w = poIntAttr(gridCol, "w");
-		cols.push(w ?? 0);
+		cols.push(twipsToPt(w ?? 0));
 	}
 	return cols;
 }
-function parseTableRow(tr) {
+function parseTableRow(tr, ctx) {
 	const properties = parseRowProperties(poFirstChild(tr, "w:trPr"));
 	const cells = [];
-	for (const tc of poChildrenWith(tr, "w:tc")) cells.push(parseTableCell(tc));
+	for (const tc of poChildrenWith(tr, "w:tc")) cells.push(parseTableCell(tc, ctx));
 	return {
 		properties,
 		cells
@@ -77,35 +124,39 @@ function parseRowProperties(trPr) {
 	if (trHeight) {
 		const val = poIntAttr(trHeight, "val");
 		const rule = poAttr(trHeight, "hRule");
-		if (val !== void 0) out.heightTwips = val;
+		if (val !== void 0) out.height = twipsToPt(val);
 		if (rule && HEIGHT_RULES.has(rule)) out.heightRule = rule;
 	}
 	if (poFirstChild(trPr, "w:cantSplit")) out.cantSplit = poToggle(poFirstChild(trPr, "w:cantSplit")) ?? true;
 	if (poFirstChild(trPr, "w:tblHeader")) out.isHeader = poToggle(poFirstChild(trPr, "w:tblHeader")) ?? true;
 	return out;
 }
-function parseTableCell(tc) {
+function parseTableCell(tc, ctx) {
+	const { properties, vMerge } = parseCellProperties(poFirstChild(tc, "w:tcPr"));
 	return {
-		properties: parseCellProperties(poFirstChild(tc, "w:tcPr")),
-		content: parseBodyElements(poChildren(tc))
+		cell: {
+			properties,
+			content: parseBodyElements(poChildren(tc), ctx)
+		},
+		...vMerge ? { vMerge } : {}
 	};
 }
 function parseCellProperties(tcPr) {
-	if (!tcPr) return {};
+	if (!tcPr) return { properties: {} };
 	const out = {};
+	let rawVMerge;
 	const tcW = poFirstChild(tcPr, "w:tcW");
 	if (tcW) {
 		const w = poIntAttr(tcW, "w");
-		if (w !== void 0) out.widthTwips = w;
+		if (w !== void 0) out.width = twipsToPt(w);
 	}
 	const gridSpan = poFirstChild(tcPr, "w:gridSpan");
 	if (gridSpan) {
 		const v = poIntAttr(gridSpan, "val");
-		if (v !== void 0) out.gridSpan = v;
+		if (v !== void 0) out.colSpan = v;
 	}
 	const vMerge = poFirstChild(tcPr, "w:vMerge");
-	if (vMerge) if (poVal(vMerge) === "restart") out.vMerge = "restart";
-	else out.vMerge = "continue";
+	if (vMerge) rawVMerge = poVal(vMerge) === "restart" ? "restart" : "continue";
 	const borders = parseBorders(poFirstChild(tcPr, "w:tcBorders"));
 	if (borders) out.borders = borders;
 	const margins = parseCellMargins(poFirstChild(tcPr, "w:tcMar"));
@@ -115,7 +166,10 @@ function parseCellProperties(tcPr) {
 		const fill = poAttr(shd, "fill");
 		if (fill && fill !== "auto" && /^[0-9A-Fa-f]{6}$/.test(fill)) out.shading = { colorHex: fill.toUpperCase() };
 	}
-	return out;
+	return {
+		properties: out,
+		...rawVMerge ? { vMerge: rawVMerge } : {}
+	};
 }
 function parseBorders(node) {
 	if (!node) return void 0;
@@ -141,7 +195,7 @@ function parseBorder(node) {
 	const sz = poIntAttr(node, "sz");
 	const color = poAttr(node, "color");
 	const out = { style: val };
-	if (sz !== void 0) out.sizeEighthPt = sz;
+	if (sz !== void 0) out.width = eighthPtToPt(sz);
 	if (color && color !== "auto" && /^[0-9A-Fa-f]{6}$/.test(color)) out.colorHex = color.toUpperCase();
 	return out;
 }
@@ -152,10 +206,10 @@ function parseCellMargins(node) {
 	const bottom = poIntAttr(poFirstChild(node, "w:bottom"), "w");
 	const left = poIntAttr(poFirstChild(node, "w:left") ?? poFirstChild(node, "w:start"), "w");
 	const right = poIntAttr(poFirstChild(node, "w:right") ?? poFirstChild(node, "w:end"), "w");
-	if (top !== void 0) out.topTwips = top;
-	if (bottom !== void 0) out.bottomTwips = bottom;
-	if (left !== void 0) out.leftTwips = left;
-	if (right !== void 0) out.rightTwips = right;
+	if (top !== void 0) out.top = twipsToPt(top);
+	if (bottom !== void 0) out.bottom = twipsToPt(bottom);
+	if (left !== void 0) out.left = twipsToPt(left);
+	if (right !== void 0) out.right = twipsToPt(right);
 	return Object.keys(out).length > 0 ? out : void 0;
 }
 //#endregion

package/dist/esm/{ooxml/wordproc → word}/xml-helpers.js

@@ -1,4 +1,4 @@
-//#region src/ooxml/wordproc/xml-helpers.ts
+//#region src/word/xml-helpers.ts
 function asElement(v) {
 	if (v === null || v === void 0) return void 0;
 	if (typeof v !== "object" || Array.isArray(v)) return void 0;