js.documents 4.5.0 → 4.6.0

package/README.md

@@ -575,7 +575,7 @@ The package is layered from generic primitives outward to the two conversion dir
 - **`src/markdown/`** — third adapter family, via `markdown-codec`. `readMarkdownContent` passes `readMarkdownContent`'s (markdown-codec's flat reader, so named since that package's 4.0.0; the bare `readMarkdown` name is now its tree-form `DocumentPackage` reader) result through the math-lowering pass (`math.ts` — markdown-codec's preserved `$$` display blocks and `\( \)` inline spans become two-layer formula blocks, with the document's symbol table seeded from its own prose). `buildMarkdownText` wraps `writeMarkdownContent`, reconstructing markdown math syntax from formula blocks carrying a presentation layer. `text.ts` is the byte↔text boundary. `MarkdownEditor` holds a mutable in-memory `ContentDocument`.
 - **`src/csv/`** — fourth adapter family, sharing the spreadsheet variant with xlsx/ods. `records.ts` is the RFC 4180 record parser/writer (one shared `quoteCsvField`, also used by the `.odb` CSV exporter); `text.ts` is the byte↔text boundary, rejecting malformed UTF-8; `read.ts` turns records into a spreadsheet `ContentDocument` (first record as verbatim string header, data cells through the same cell-typing heuristic `pdfToOds` uses); `write.ts` turns one sheet of a spreadsheet `ContentDocument` back into records via each cell's `displayText`. TSV is the same format with `{ delimiter: '\t' }` on either side.
 - **`src/svg/`** — fifth adapter family, sharing the drawing variant with odg. `text.ts` is the byte↔text boundary, rejecting malformed UTF-8; `read.ts` maps the six SVG shape primitives (rect/circle/ellipse/line/polyline/polygon/path) onto a one-page drawing `ContentDocument`, with transform lists composed as 2×3 affines and CSS lengths and the viewBox map resolved into page points; `write.ts` writes the six primitives back out, one shape element each; `path.ts` is the full SVG path-data grammar (M/L/H/V/C/S/Z plus Q/T/A and the relative forms — S/Q/T convert exactly, A is the one bounded approximation at ≤90° per cubic); `transform.ts` parses and composes the transform attribute and classifies the result by frame representability; `units.ts` resolves CSS length units and the viewBox; `paint.ts` resolves fill/stroke presentation attributes and dash styles; `diagnostics.ts` is the shared scope-limit vocabulary.
-- **`src/layout/`** — the pure conversion algorithms: `engine.ts` (wordprocessing → layout: flow, line-breaking, pagination), `slides.ts` (presentation → layout: direct placement), `sheets.ts` (spreadsheet → layout: grid, print settings, the first algorithm accepting `AbortSignal`), `drawing.ts` (drawing → layout: vector primitives + shape reuse), `reconstruct.ts` (layout → content: baseline clustering for wordprocessing/presentation, near-1:1 mapping for drawing, gridline-lattice-or-text-clustering for spreadsheet; plus the PDF construct surfacing — link reconciliation to `ContentRun.hyperlink` or link constructs, hidden-layer content dropped, anchor/comment and AcroForm contentControl constructs).
+- **`src/layout/`** — the pure conversion algorithms: `engine.ts` (wordprocessing → layout: flow, line-breaking, pagination), `slides.ts` (presentation → layout: direct placement), `sheets.ts` (spreadsheet → layout: grid, print settings, the first algorithm accepting `AbortSignal`), `drawing.ts` (drawing → layout: vector primitives + shape reuse), `reconstruct.ts` (layout → content: baseline clustering for wordprocessing/presentation, near-1:1 mapping for drawing, gridline-lattice-or-text-clustering for spreadsheet; plus the PDF construct surfacing — link reconciliation to `ContentRun.hyperlink` or link constructs, hidden-layer content dropped, anchor/comment and AcroForm contentControl constructs, and tagged-structure semantics where the file states them: heading levels from owning `H1`..`H6` elements over the font-size census, lattice-free table recovery from `/Table`/`/TR`/`/TH`/`/TD` ownership, and `division` constructs around `/Part`/`/Sect`/`/Div` extents).
 - **`src/hsqldb/`** — `.odb` decoders, four tiers: `script.ts` (TEXT-script DDL/DML parser), `rowformat.ts`/`cache.ts` (CACHED binary row-store), `binary-script.ts` (BINARY/COMPRESSED whole-script). All import only `document-schema.js` — no odf.js knowledge.
 - **`src/firebird/`** — Tier 3: gbak logical-backup reader. `reader.ts` (attribute framing + RLE decompression + XDR decoding), `schema.ts`/`data.ts` (table/row walking). No ratified spec — built against Firebird's own engine source.
 - **`src/odb/`** — decoder-selection and pivot-mapping: `read.ts` routes to the right tier, `spreadsheet.ts`/`csv.ts` map to output formats. `odb/sql/` is the bounded SQL engine, `odb/formula/` is the rpt formula engine, `odb/report/` is the renderer, `odb/values.ts` is shared comparison/aggregation semantics.

package/dist/convert/pdf-package-tables.cjs

@@ -67,10 +67,25 @@ function stampPdfPackageTables(pkg, layout) {
 			};
 		});
 	});
+	if (layout.structure !== void 0) walkStructureElements(layout.structure, void 0, definitions);
 	if (Object.keys(definitions).length > 0) pkg.definitions = {
 		...pkg.definitions,
 		...definitions
 	};
 }
+function walkStructureElements(elements, parentKey, definitions) {
+	for (const element of elements) {
+		definitions[element.id] = {
+			kind: "structure",
+			type: element.type,
+			...element.title !== void 0 ? { title: element.title } : {},
+			...element.language !== void 0 ? { language: element.language } : {},
+			...element.alt !== void 0 ? { alt: element.alt } : {},
+			...element.actualText !== void 0 ? { actualText: element.actualText } : {},
+			...parentKey !== void 0 ? { parent: parentKey } : {}
+		};
+		walkStructureElements(element.children, element.id, definitions);
+	}
+}
 //#endregion
 exports.stampPdfPackageTables = stampPdfPackageTables;

package/dist/convert/pdf-package-tables.js

@@ -66,10 +66,25 @@ function stampPdfPackageTables(pkg, layout) {
 			};
 		});
 	});
+	if (layout.structure !== void 0) walkStructureElements(layout.structure, void 0, definitions);
 	if (Object.keys(definitions).length > 0) pkg.definitions = {
 		...pkg.definitions,
 		...definitions
 	};
 }
+function walkStructureElements(elements, parentKey, definitions) {
+	for (const element of elements) {
+		definitions[element.id] = {
+			kind: "structure",
+			type: element.type,
+			...element.title !== void 0 ? { title: element.title } : {},
+			...element.language !== void 0 ? { language: element.language } : {},
+			...element.alt !== void 0 ? { alt: element.alt } : {},
+			...element.actualText !== void 0 ? { actualText: element.actualText } : {},
+			...parentKey !== void 0 ? { parent: parentKey } : {}
+		};
+		walkStructureElements(element.children, element.id, definitions);
+	}
+}
 //#endregion
 export { stampPdfPackageTables };

package/dist/layout/reconstruct.cjs

@@ -136,19 +136,20 @@ function reconstructWordprocessing(doc, options) {
 	const signal = options?.signal;
 	doc = dropHiddenLayerContent(doc);
 	const headingLevels = headingSizeLevels(doc);
+	const structure = indexStructure(doc);
 	const sections = [];
 	let currentGroup = [];
 	let groupStartPageIndex = 0;
 	for (const page of doc.pages) {
 		require_ports_abort.throwIfAborted(signal);
 		if (currentGroup.length > 0 && !samePageSize(currentGroup[0], page)) {
-			sections.push(buildSection(currentGroup, groupStartPageIndex, doc.images, headingLevels, doc.form));
+			sections.push(buildSection(currentGroup, groupStartPageIndex, doc.images, headingLevels, doc.form, structure));
 			groupStartPageIndex += currentGroup.length;
 			currentGroup = [];
 		}
 		currentGroup.push(page);
 	}
-	if (currentGroup.length > 0) sections.push(buildSection(currentGroup, groupStartPageIndex, doc.images, headingLevels, doc.form));
+	if (currentGroup.length > 0) sections.push(buildSection(currentGroup, groupStartPageIndex, doc.images, headingLevels, doc.form, structure));
 	return {
 		kind: "wordprocessing",
 		metadata: doc.metadata,
@@ -169,6 +170,59 @@ function dropHiddenLayerContent(doc) {
 		}))
 	};
 }
+const HEADING_LEVELS = /* @__PURE__ */ new Map([
+	["H1", 1],
+	["H2", 2],
+	["H3", 3],
+	["H4", 4],
+	["H5", 5],
+	["H6", 6]
+]);
+const DIVISION_TYPES = /* @__PURE__ */ new Set([
+	"Part",
+	"Sect",
+	"Div"
+]);
+const CELL_TYPES = /* @__PURE__ */ new Set(["TD", "TH"]);
+const ROW_TYPES = /* @__PURE__ */ new Set(["TR"]);
+const TABLE_TYPES = /* @__PURE__ */ new Set(["Table"]);
+function indexStructure(doc) {
+	if (doc.structure === void 0 || doc.structure.length === 0) return;
+	const byId = /* @__PURE__ */ new Map();
+	let order = 0;
+	const walk = (element, parent) => {
+		const node = {
+			id: element.id,
+			type: element.type,
+			parent,
+			order: order++
+		};
+		byId.set(element.id, node);
+		for (const child of element.children) walk(child, node);
+	};
+	for (const root of doc.structure) walk(root, void 0);
+	return { nodeOfItem: (item) => item.kind === "link" || item.kind === "internalLink" ? void 0 : byId.get(item.structure ?? "") };
+}
+function nearestOfType(node, types) {
+	for (let current = node; current !== void 0; current = current.parent) if (types.has(current.type)) return current;
+}
+function nearestHeadingLevel(node) {
+	for (let current = node; current !== void 0; current = current.parent) {
+		const level = HEADING_LEVELS.get(current.type);
+		if (level !== void 0) return level;
+	}
+}
+function structureHeadingLevel(items, structure) {
+	if (items.length === 0 || items.some((item) => structure.nodeOfItem(item) === void 0)) return;
+	let level;
+	for (const item of items) {
+		const itemLevel = nearestHeadingLevel(structure.nodeOfItem(item));
+		if (itemLevel === void 0) return { level: void 0 };
+		if (level === void 0) level = itemLevel;
+		else if (level !== itemLevel) return;
+	}
+	return { level };
+}
 const HEADING_MIN_SIZE_DELTA_PT = 2;
 const MAX_HEADING_LEVEL = 6;
 function headingSizeLevels(doc) {
@@ -193,11 +247,12 @@ function headingLevelOf(paragraph, levels) {
 function samePageSize(a, b) {
 	return a.widthPt === b.widthPt && a.heightPt === b.heightPt;
 }
-function buildSection(pages, startPageIndex, images, headingLevels, form) {
+function buildSection(pages, startPageIndex, images, headingLevels, form, structure) {
 	const blocks = [];
+	const divisionByBlock = /* @__PURE__ */ new WeakMap();
 	pages.forEach((page, i) => {
 		if (i > 0) blocks.push({ kind: "pageBreak" });
-		blocks.push(...reconstructPageBlocks(page, startPageIndex + i, images, headingLevels, form));
+		blocks.push(...reconstructPageBlocks(page, startPageIndex + i, images, headingLevels, form, structure, divisionByBlock));
 	});
 	return {
 		pageSize: {
@@ -205,20 +260,34 @@ function buildSection(pages, startPageIndex, images, headingLevels, form) {
 			heightPt: pages[0].heightPt
 		},
 		margins: ZERO_MARGINS,
-		blocks
+		blocks: wrapDivisionExtents(blocks, divisionByBlock)
 	};
 }
-function reconstructPageBlocks(page, pageIndex, images, headingLevels, form) {
-	const recoveredTable = recoverTable(page, pageIndex);
-	const consumedText = recoveredTable?.consumedText;
-	const textItems = page.items.filter((i) => i.kind === "text" && consumedText?.has(i) !== true);
+function reconstructPageBlocks(page, pageIndex, images, headingLevels, form, structure, divisionByBlock) {
+	const recoveredTables = recoverTables(page, pageIndex, structure);
+	const consumedText = /* @__PURE__ */ new Set();
+	const claimedItems = /* @__PURE__ */ new Set();
+	for (const recovered of recoveredTables) {
+		for (const item of recovered.consumedText) consumedText.add(item);
+		for (const item of recovered.latticeItems) claimedItems.add(item);
+	}
+	const textItems = page.items.filter((i) => i.kind === "text" && !consumedText.has(i));
 	const imageItems = page.items.filter((i) => i.kind === "image");
 	const paragraphs = clusterIntoParagraphs(clusterIntoLines(textItems));
+	const recordDivisions = (block, items) => {
+		if (structure !== void 0) divisionByBlock.set(block, divisionChainOf(items, structure));
+	};
 	const positioned = [];
-	for (const paragraph of paragraphs) positioned.push({
-		yPt: paragraph.lines[0].baselineY,
-		block: paragraphToContentParagraph(paragraph, pageIndex, headingLevelOf(paragraph, headingLevels))
-	});
+	for (const paragraph of paragraphs) {
+		const paragraphItems = paragraph.lines.flatMap((line) => line.items);
+		const structural = structure === void 0 ? void 0 : structureHeadingLevel(paragraphItems, structure);
+		const block = paragraphToContentParagraph(paragraph, pageIndex, structural !== void 0 ? structural.level : headingLevelOf(paragraph, headingLevels));
+		recordDivisions(block, paragraphItems);
+		positioned.push({
+			yPt: paragraph.lines[0].baselineY,
+			block
+		});
+	}
 	for (const img of imageItems) {
 		const asset = images[img.imageId];
 		if (asset !== void 0) {
@@ -235,21 +304,29 @@ function reconstructPageBlocks(page, pageIndex, images, headingLevels, form) {
 				widthPt: img.widthPt,
 				heightPt: img.heightPt
 			});
+			recordDivisions(block, [img]);
 			positioned.push({
 				yPt: img.yPt,
 				block
 			});
 		}
 	}
-	if (recoveredTable !== void 0) positioned.push({
-		yPt: recoveredTable.topYPt,
-		block: recoveredTable.table
-	});
-	const recoveredVectors = recoverPageVectors(page, pageIndex, recoveredTable?.latticeItems ?? NO_ITEMS);
-	if (recoveredVectors !== void 0) positioned.push({
-		yPt: recoveredVectors.topYPt,
-		block: recoveredVectors.block
-	});
+	for (const recovered of recoveredTables) {
+		recordDivisions(recovered.table, [...recovered.consumedText]);
+		positioned.push({
+			yPt: recovered.topYPt,
+			block: recovered.table
+		});
+	}
+	const recoveredVectors = recoverPageVectors(page, pageIndex, claimedItems);
+	if (recoveredVectors !== void 0) {
+		const vectorItems = page.items.filter((item) => !claimedItems.has(item) && layoutItemToVector(item, page.heightPt) !== void 0);
+		recordDivisions(recoveredVectors.block, vectorItems);
+		positioned.push({
+			yPt: recoveredVectors.topYPt,
+			block: recoveredVectors.block
+		});
+	}
 	positioned.sort((a, b) => b.yPt - a.yPt);
 	const blocks = positioned.map((p) => p.block);
 	reconcileLinks(blocks, page, pageIndex);
@@ -257,6 +334,49 @@ function reconstructPageBlocks(page, pageIndex, images, headingLevels, form) {
 	appendFormFieldConstructs(blocks, form, pageIndex);
 	return blocks;
 }
+function divisionChainOf(items, structure) {
+	let prefix;
+	for (const item of items) {
+		const chain = [];
+		for (let current = structure.nodeOfItem(item); current !== void 0; current = current.parent) if (DIVISION_TYPES.has(current.type)) chain.push(current.id);
+		chain.reverse();
+		if (prefix === void 0) {
+			prefix = chain;
+			continue;
+		}
+		let shared = 0;
+		while (shared < prefix.length && shared < chain.length && prefix[shared] === chain[shared]) shared += 1;
+		prefix = prefix.slice(0, shared);
+	}
+	return prefix ?? [];
+}
+function wrapDivisionExtents(blocks, divisionByBlock) {
+	const out = [];
+	const open = [];
+	for (const block of blocks) {
+		const chain = divisionByBlock.get(block);
+		if (chain !== void 0) {
+			while (open.length > 0 && !chain.includes(open[open.length - 1])) {
+				out.push({ kind: "constructEnd" });
+				open.pop();
+			}
+			for (const id of chain) {
+				if (open.includes(id)) continue;
+				out.push({
+					kind: "constructStart",
+					descriptor: { kind: "division" }
+				});
+				open.push(id);
+			}
+		}
+		out.push(block);
+	}
+	while (open.length > 0) {
+		out.push({ kind: "constructEnd" });
+		open.pop();
+	}
+	return out;
+}
 function framesIntersect(a, b) {
 	return a.xPt < b.xPt + b.widthPt && b.xPt < a.xPt + a.widthPt && a.yPt < b.yPt + b.heightPt && b.yPt < a.yPt + a.heightPt;
 }
@@ -420,9 +540,10 @@ function paragraphToContentParagraph(paragraph, pageIndex, headingLevel) {
 }
 function reconstructPresentation(doc, options) {
 	const signal = options?.signal;
+	const structure = indexStructure(doc);
 	const slides = doc.pages.map((page, pageIndex) => {
 		require_ports_abort.throwIfAborted(signal);
-		return reconstructSlide(page, pageIndex, doc.images);
+		return reconstructSlide(page, pageIndex, doc.images, structure);
 	});
 	return {
 		kind: "presentation",
@@ -430,10 +551,15 @@ function reconstructPresentation(doc, options) {
 		slides
 	};
 }
-function reconstructSlide(page, pageIndex, images) {
-	const recoveredTable = recoverTable(page, pageIndex);
-	const consumedText = recoveredTable?.consumedText;
-	const textItems = page.items.filter((i) => i.kind === "text" && consumedText?.has(i) !== true);
+function reconstructSlide(page, pageIndex, images, structure) {
+	const recoveredTables = recoverTables(page, pageIndex, structure);
+	const consumedText = /* @__PURE__ */ new Set();
+	const claimedItems = /* @__PURE__ */ new Set();
+	for (const recovered of recoveredTables) {
+		for (const item of recovered.consumedText) consumedText.add(item);
+		for (const item of recovered.latticeItems) claimedItems.add(item);
+	}
+	const textItems = page.items.filter((i) => i.kind === "text" && !consumedText.has(i));
 	const imageItems = page.items.filter((i) => i.kind === "image");
 	const textShapes = clusterIntoBlocks(clusterIntoLines(textItems)).map((block) => blockToShape(block, page.heightPt, pageIndex));
 	const imageShapes = [];
@@ -441,14 +567,14 @@ function reconstructSlide(page, pageIndex, images) {
 		const shape = imageToShape(img, page.heightPt, pageIndex, images);
 		if (shape !== void 0) imageShapes.push(shape);
 	}
-	const recoveredVectors = recoverPageVectors(page, pageIndex, recoveredTable?.latticeItems ?? NO_ITEMS);
+	const recoveredVectors = recoverPageVectors(page, pageIndex, claimedItems);
 	const vectorShapes = recoveredVectors === void 0 ? [] : [wrapBlockInShape(recoveredVectors.block, {
 		xPt: 0,
 		yPt: 0,
 		widthPt: page.widthPt,
 		heightPt: page.heightPt
 	}, page.heightPt, pageIndex)];
-	const tableShapes = recoveredTable === void 0 ? [] : [wrapBlockInShape(recoveredTable.table, recoveredTable.frame, page.heightPt, pageIndex)];
+	const tableShapes = recoveredTables.map((recovered) => wrapBlockInShape(recovered.table, recovered.frame, page.heightPt, pageIndex));
 	return {
 		size: {
 			widthPt: page.widthPt,
@@ -894,6 +1020,112 @@ function recoverPageVectors(page, pageIndex, excluded) {
 		topYPt: page.heightPt - topYDownPt
 	};
 }
+function recoverTables(page, pageIndex, structure) {
+	if (structure !== void 0) {
+		const tagged = recoverTaggedTables(page, pageIndex, structure);
+		if (tagged.length > 0) return tagged;
+	}
+	const lattice = recoverTable(page, pageIndex);
+	return lattice === void 0 ? [] : [lattice];
+}
+function recoverTaggedTables(page, pageIndex, structure) {
+	const cellsByTable = /* @__PURE__ */ new Map();
+	for (const item of page.items) {
+		if (item.kind !== "text") continue;
+		const cell = nearestOfType(structure.nodeOfItem(item), CELL_TYPES);
+		const row = nearestOfType(cell?.parent, ROW_TYPES);
+		const table = nearestOfType(row?.parent, TABLE_TYPES);
+		if (cell === void 0 || row === void 0 || table === void 0) continue;
+		const entry = cellsByTable.get(table.id) ?? {
+			table,
+			cells: []
+		};
+		entry.cells.push({
+			table,
+			row,
+			cell,
+			items: [item]
+		});
+		cellsByTable.set(table.id, entry);
+	}
+	if (cellsByTable.size === 0) return [];
+	const latticeItems = require_layout_lattice.detectGridLattice(page.items)?.sourceItems ?? NO_ITEMS;
+	const recovered = [];
+	for (const { cells } of cellsByTable.values()) {
+		const rowsById = /* @__PURE__ */ new Map();
+		for (const cellEntry of cells) {
+			const rowEntry = rowsById.get(cellEntry.row.id) ?? {
+				row: cellEntry.row,
+				cells: []
+			};
+			rowEntry.cells.push(cellEntry);
+			rowsById.set(cellEntry.row.id, rowEntry);
+		}
+		const rows = [...rowsById.values()].sort((a, b) => a.row.order - b.row.order);
+		for (const row of rows) row.cells.sort((a, b) => a.cell.order - b.cell.order);
+		const columnCount = Math.max(...rows.map((row) => row.cells.length));
+		const columnWidthsPt = [];
+		for (let j = 0; j < columnCount; j++) {
+			let minX = Number.POSITIVE_INFINITY;
+			let maxX = Number.NEGATIVE_INFINITY;
+			for (const row of rows) {
+				const cellEntry = row.cells[j];
+				if (cellEntry === void 0) continue;
+				for (const item of cellEntry.items) {
+					minX = Math.min(minX, item.xPt);
+					maxX = Math.max(maxX, item.xPt + (item.widthPt ?? 0));
+				}
+			}
+			const width = maxX - minX;
+			columnWidthsPt.push(width > 0 ? width : DEFAULT_COLUMN_WIDTH_FALLBACK_PT);
+		}
+		const allItems = cells.flatMap((cellEntry) => cellEntry.items);
+		const contentRows = rows.map((row) => {
+			const contentCells = [];
+			for (let j = 0; j < columnCount; j++) {
+				const cellEntry = row.cells[j];
+				const cell = { blocks: cellBlocksFromItems(cellEntry?.items ?? [], pageIndex) };
+				if (cellEntry !== void 0) require_layout_shared.stampFrame(cell, pageIndex, textItemsPdfBox(cellEntry.items));
+				contentCells.push(cell);
+			}
+			return { cells: contentCells };
+		});
+		const box = textItemsPdfBox(allItems);
+		const table = {
+			kind: "table",
+			rows: contentRows,
+			columnWidthsPt
+		};
+		require_layout_shared.stampFrame(table, pageIndex, box);
+		recovered.push({
+			table,
+			frame: require_model_geometry.flipY(box, page.heightPt),
+			topYPt: box.yPt + box.heightPt,
+			consumedText: new Set(allItems),
+			latticeItems
+		});
+	}
+	return recovered;
+}
+function textItemsPdfBox(items) {
+	let minX = Number.POSITIVE_INFINITY;
+	let maxX = Number.NEGATIVE_INFINITY;
+	let minY = Number.POSITIVE_INFINITY;
+	let maxY = Number.NEGATIVE_INFINITY;
+	for (const item of items) {
+		const { ascentPt, descentPt } = textItemVerticalExtent(item);
+		minX = Math.min(minX, item.xPt);
+		maxX = Math.max(maxX, item.xPt + (item.widthPt ?? 0));
+		minY = Math.min(minY, item.yPt - descentPt);
+		maxY = Math.max(maxY, item.yPt + ascentPt);
+	}
+	return {
+		xPt: minX,
+		yPt: minY,
+		widthPt: maxX - minX,
+		heightPt: maxY - minY
+	};
+}
 function cellBlocksFromItems(items, pageIndex) {
 	return clusterIntoLines(items).map((line) => lineToParagraph(line, pageIndex));
 }
@@ -998,23 +1230,7 @@ function buildCellsFromGroups(groups, pageIndex, context) {
 			value: inferredCellValue(displayText, row, column, context),
 			displayText
 		};
-		let minX = Number.POSITIVE_INFINITY;
-		let maxX = Number.NEGATIVE_INFINITY;
-		let minY = Number.POSITIVE_INFINITY;
-		let maxY = Number.NEGATIVE_INFINITY;
-		for (const item of items) {
-			const { ascentPt, descentPt } = textItemVerticalExtent(item);
-			minX = Math.min(minX, item.xPt);
-			maxX = Math.max(maxX, item.xPt + (item.widthPt ?? 0));
-			minY = Math.min(minY, item.yPt - descentPt);
-			maxY = Math.max(maxY, item.yPt + ascentPt);
-		}
-		require_layout_shared.stampFrame(cell, pageIndex, {
-			xPt: minX,
-			yPt: minY,
-			widthPt: maxX - minX,
-			heightPt: maxY - minY
-		});
+		require_layout_shared.stampFrame(cell, pageIndex, textItemsPdfBox(items));
 		cells.push(cell);
 	}
 	cells.sort((a, b) => a.row - b.row || a.column - b.column);

package/dist/layout/reconstruct.js

@@ -135,19 +135,20 @@ function reconstructWordprocessing(doc, options) {
 	const signal = options?.signal;
 	doc = dropHiddenLayerContent(doc);
 	const headingLevels = headingSizeLevels(doc);
+	const structure = indexStructure(doc);
 	const sections = [];
 	let currentGroup = [];
 	let groupStartPageIndex = 0;
 	for (const page of doc.pages) {
 		throwIfAborted(signal);
 		if (currentGroup.length > 0 && !samePageSize(currentGroup[0], page)) {
-			sections.push(buildSection(currentGroup, groupStartPageIndex, doc.images, headingLevels, doc.form));
+			sections.push(buildSection(currentGroup, groupStartPageIndex, doc.images, headingLevels, doc.form, structure));
 			groupStartPageIndex += currentGroup.length;
 			currentGroup = [];
 		}
 		currentGroup.push(page);
 	}
-	if (currentGroup.length > 0) sections.push(buildSection(currentGroup, groupStartPageIndex, doc.images, headingLevels, doc.form));
+	if (currentGroup.length > 0) sections.push(buildSection(currentGroup, groupStartPageIndex, doc.images, headingLevels, doc.form, structure));
 	return {
 		kind: "wordprocessing",
 		metadata: doc.metadata,
@@ -168,6 +169,59 @@ function dropHiddenLayerContent(doc) {
 		}))
 	};
 }
+const HEADING_LEVELS = /* @__PURE__ */ new Map([
+	["H1", 1],
+	["H2", 2],
+	["H3", 3],
+	["H4", 4],
+	["H5", 5],
+	["H6", 6]
+]);
+const DIVISION_TYPES = /* @__PURE__ */ new Set([
+	"Part",
+	"Sect",
+	"Div"
+]);
+const CELL_TYPES = /* @__PURE__ */ new Set(["TD", "TH"]);
+const ROW_TYPES = /* @__PURE__ */ new Set(["TR"]);
+const TABLE_TYPES = /* @__PURE__ */ new Set(["Table"]);
+function indexStructure(doc) {
+	if (doc.structure === void 0 || doc.structure.length === 0) return;
+	const byId = /* @__PURE__ */ new Map();
+	let order = 0;
+	const walk = (element, parent) => {
+		const node = {
+			id: element.id,
+			type: element.type,
+			parent,
+			order: order++
+		};
+		byId.set(element.id, node);
+		for (const child of element.children) walk(child, node);
+	};
+	for (const root of doc.structure) walk(root, void 0);
+	return { nodeOfItem: (item) => item.kind === "link" || item.kind === "internalLink" ? void 0 : byId.get(item.structure ?? "") };
+}
+function nearestOfType(node, types) {
+	for (let current = node; current !== void 0; current = current.parent) if (types.has(current.type)) return current;
+}
+function nearestHeadingLevel(node) {
+	for (let current = node; current !== void 0; current = current.parent) {
+		const level = HEADING_LEVELS.get(current.type);
+		if (level !== void 0) return level;
+	}
+}
+function structureHeadingLevel(items, structure) {
+	if (items.length === 0 || items.some((item) => structure.nodeOfItem(item) === void 0)) return;
+	let level;
+	for (const item of items) {
+		const itemLevel = nearestHeadingLevel(structure.nodeOfItem(item));
+		if (itemLevel === void 0) return { level: void 0 };
+		if (level === void 0) level = itemLevel;
+		else if (level !== itemLevel) return;
+	}
+	return { level };
+}
 const HEADING_MIN_SIZE_DELTA_PT = 2;
 const MAX_HEADING_LEVEL = 6;
 function headingSizeLevels(doc) {
@@ -192,11 +246,12 @@ function headingLevelOf(paragraph, levels) {
 function samePageSize(a, b) {
 	return a.widthPt === b.widthPt && a.heightPt === b.heightPt;
 }
-function buildSection(pages, startPageIndex, images, headingLevels, form) {
+function buildSection(pages, startPageIndex, images, headingLevels, form, structure) {
 	const blocks = [];
+	const divisionByBlock = /* @__PURE__ */ new WeakMap();
 	pages.forEach((page, i) => {
 		if (i > 0) blocks.push({ kind: "pageBreak" });
-		blocks.push(...reconstructPageBlocks(page, startPageIndex + i, images, headingLevels, form));
+		blocks.push(...reconstructPageBlocks(page, startPageIndex + i, images, headingLevels, form, structure, divisionByBlock));
 	});
 	return {
 		pageSize: {
@@ -204,20 +259,34 @@ function buildSection(pages, startPageIndex, images, headingLevels, form) {
 			heightPt: pages[0].heightPt
 		},
 		margins: ZERO_MARGINS,
-		blocks
+		blocks: wrapDivisionExtents(blocks, divisionByBlock)
 	};
 }
-function reconstructPageBlocks(page, pageIndex, images, headingLevels, form) {
-	const recoveredTable = recoverTable(page, pageIndex);
-	const consumedText = recoveredTable?.consumedText;
-	const textItems = page.items.filter((i) => i.kind === "text" && consumedText?.has(i) !== true);
+function reconstructPageBlocks(page, pageIndex, images, headingLevels, form, structure, divisionByBlock) {
+	const recoveredTables = recoverTables(page, pageIndex, structure);
+	const consumedText = /* @__PURE__ */ new Set();
+	const claimedItems = /* @__PURE__ */ new Set();
+	for (const recovered of recoveredTables) {
+		for (const item of recovered.consumedText) consumedText.add(item);
+		for (const item of recovered.latticeItems) claimedItems.add(item);
+	}
+	const textItems = page.items.filter((i) => i.kind === "text" && !consumedText.has(i));
 	const imageItems = page.items.filter((i) => i.kind === "image");
 	const paragraphs = clusterIntoParagraphs(clusterIntoLines(textItems));
+	const recordDivisions = (block, items) => {
+		if (structure !== void 0) divisionByBlock.set(block, divisionChainOf(items, structure));
+	};
 	const positioned = [];
-	for (const paragraph of paragraphs) positioned.push({
-		yPt: paragraph.lines[0].baselineY,
-		block: paragraphToContentParagraph(paragraph, pageIndex, headingLevelOf(paragraph, headingLevels))
-	});
+	for (const paragraph of paragraphs) {
+		const paragraphItems = paragraph.lines.flatMap((line) => line.items);
+		const structural = structure === void 0 ? void 0 : structureHeadingLevel(paragraphItems, structure);
+		const block = paragraphToContentParagraph(paragraph, pageIndex, structural !== void 0 ? structural.level : headingLevelOf(paragraph, headingLevels));
+		recordDivisions(block, paragraphItems);
+		positioned.push({
+			yPt: paragraph.lines[0].baselineY,
+			block
+		});
+	}
 	for (const img of imageItems) {
 		const asset = images[img.imageId];
 		if (asset !== void 0) {
@@ -234,21 +303,29 @@ function reconstructPageBlocks(page, pageIndex, images, headingLevels, form) {
 				widthPt: img.widthPt,
 				heightPt: img.heightPt
 			});
+			recordDivisions(block, [img]);
 			positioned.push({
 				yPt: img.yPt,
 				block
 			});
 		}
 	}
-	if (recoveredTable !== void 0) positioned.push({
-		yPt: recoveredTable.topYPt,
-		block: recoveredTable.table
-	});
-	const recoveredVectors = recoverPageVectors(page, pageIndex, recoveredTable?.latticeItems ?? NO_ITEMS);
-	if (recoveredVectors !== void 0) positioned.push({
-		yPt: recoveredVectors.topYPt,
-		block: recoveredVectors.block
-	});
+	for (const recovered of recoveredTables) {
+		recordDivisions(recovered.table, [...recovered.consumedText]);
+		positioned.push({
+			yPt: recovered.topYPt,
+			block: recovered.table
+		});
+	}
+	const recoveredVectors = recoverPageVectors(page, pageIndex, claimedItems);
+	if (recoveredVectors !== void 0) {
+		const vectorItems = page.items.filter((item) => !claimedItems.has(item) && layoutItemToVector(item, page.heightPt) !== void 0);
+		recordDivisions(recoveredVectors.block, vectorItems);
+		positioned.push({
+			yPt: recoveredVectors.topYPt,
+			block: recoveredVectors.block
+		});
+	}
 	positioned.sort((a, b) => b.yPt - a.yPt);
 	const blocks = positioned.map((p) => p.block);
 	reconcileLinks(blocks, page, pageIndex);
@@ -256,6 +333,49 @@ function reconstructPageBlocks(page, pageIndex, images, headingLevels, form) {
 	appendFormFieldConstructs(blocks, form, pageIndex);
 	return blocks;
 }
+function divisionChainOf(items, structure) {
+	let prefix;
+	for (const item of items) {
+		const chain = [];
+		for (let current = structure.nodeOfItem(item); current !== void 0; current = current.parent) if (DIVISION_TYPES.has(current.type)) chain.push(current.id);
+		chain.reverse();
+		if (prefix === void 0) {
+			prefix = chain;
+			continue;
+		}
+		let shared = 0;
+		while (shared < prefix.length && shared < chain.length && prefix[shared] === chain[shared]) shared += 1;
+		prefix = prefix.slice(0, shared);
+	}
+	return prefix ?? [];
+}
+function wrapDivisionExtents(blocks, divisionByBlock) {
+	const out = [];
+	const open = [];
+	for (const block of blocks) {
+		const chain = divisionByBlock.get(block);
+		if (chain !== void 0) {
+			while (open.length > 0 && !chain.includes(open[open.length - 1])) {
+				out.push({ kind: "constructEnd" });
+				open.pop();
+			}
+			for (const id of chain) {
+				if (open.includes(id)) continue;
+				out.push({
+					kind: "constructStart",
+					descriptor: { kind: "division" }
+				});
+				open.push(id);
+			}
+		}
+		out.push(block);
+	}
+	while (open.length > 0) {
+		out.push({ kind: "constructEnd" });
+		open.pop();
+	}
+	return out;
+}
 function framesIntersect(a, b) {
 	return a.xPt < b.xPt + b.widthPt && b.xPt < a.xPt + a.widthPt && a.yPt < b.yPt + b.heightPt && b.yPt < a.yPt + a.heightPt;
 }
@@ -419,9 +539,10 @@ function paragraphToContentParagraph(paragraph, pageIndex, headingLevel) {
 }
 function reconstructPresentation(doc, options) {
 	const signal = options?.signal;
+	const structure = indexStructure(doc);
 	const slides = doc.pages.map((page, pageIndex) => {
 		throwIfAborted(signal);
-		return reconstructSlide(page, pageIndex, doc.images);
+		return reconstructSlide(page, pageIndex, doc.images, structure);
 	});
 	return {
 		kind: "presentation",
@@ -429,10 +550,15 @@ function reconstructPresentation(doc, options) {
 		slides
 	};
 }
-function reconstructSlide(page, pageIndex, images) {
-	const recoveredTable = recoverTable(page, pageIndex);
-	const consumedText = recoveredTable?.consumedText;
-	const textItems = page.items.filter((i) => i.kind === "text" && consumedText?.has(i) !== true);
+function reconstructSlide(page, pageIndex, images, structure) {
+	const recoveredTables = recoverTables(page, pageIndex, structure);
+	const consumedText = /* @__PURE__ */ new Set();
+	const claimedItems = /* @__PURE__ */ new Set();
+	for (const recovered of recoveredTables) {
+		for (const item of recovered.consumedText) consumedText.add(item);
+		for (const item of recovered.latticeItems) claimedItems.add(item);
+	}
+	const textItems = page.items.filter((i) => i.kind === "text" && !consumedText.has(i));
 	const imageItems = page.items.filter((i) => i.kind === "image");
 	const textShapes = clusterIntoBlocks(clusterIntoLines(textItems)).map((block) => blockToShape(block, page.heightPt, pageIndex));
 	const imageShapes = [];
@@ -440,14 +566,14 @@ function reconstructSlide(page, pageIndex, images) {
 		const shape = imageToShape(img, page.heightPt, pageIndex, images);
 		if (shape !== void 0) imageShapes.push(shape);
 	}
-	const recoveredVectors = recoverPageVectors(page, pageIndex, recoveredTable?.latticeItems ?? NO_ITEMS);
+	const recoveredVectors = recoverPageVectors(page, pageIndex, claimedItems);
 	const vectorShapes = recoveredVectors === void 0 ? [] : [wrapBlockInShape(recoveredVectors.block, {
 		xPt: 0,
 		yPt: 0,
 		widthPt: page.widthPt,
 		heightPt: page.heightPt
 	}, page.heightPt, pageIndex)];
-	const tableShapes = recoveredTable === void 0 ? [] : [wrapBlockInShape(recoveredTable.table, recoveredTable.frame, page.heightPt, pageIndex)];
+	const tableShapes = recoveredTables.map((recovered) => wrapBlockInShape(recovered.table, recovered.frame, page.heightPt, pageIndex));
 	return {
 		size: {
 			widthPt: page.widthPt,
@@ -893,6 +1019,112 @@ function recoverPageVectors(page, pageIndex, excluded) {
 		topYPt: page.heightPt - topYDownPt
 	};
 }
+function recoverTables(page, pageIndex, structure) {
+	if (structure !== void 0) {
+		const tagged = recoverTaggedTables(page, pageIndex, structure);
+		if (tagged.length > 0) return tagged;
+	}
+	const lattice = recoverTable(page, pageIndex);
+	return lattice === void 0 ? [] : [lattice];
+}
+function recoverTaggedTables(page, pageIndex, structure) {
+	const cellsByTable = /* @__PURE__ */ new Map();
+	for (const item of page.items) {
+		if (item.kind !== "text") continue;
+		const cell = nearestOfType(structure.nodeOfItem(item), CELL_TYPES);
+		const row = nearestOfType(cell?.parent, ROW_TYPES);
+		const table = nearestOfType(row?.parent, TABLE_TYPES);
+		if (cell === void 0 || row === void 0 || table === void 0) continue;
+		const entry = cellsByTable.get(table.id) ?? {
+			table,
+			cells: []
+		};
+		entry.cells.push({
+			table,
+			row,
+			cell,
+			items: [item]
+		});
+		cellsByTable.set(table.id, entry);
+	}
+	if (cellsByTable.size === 0) return [];
+	const latticeItems = detectGridLattice(page.items)?.sourceItems ?? NO_ITEMS;
+	const recovered = [];
+	for (const { cells } of cellsByTable.values()) {
+		const rowsById = /* @__PURE__ */ new Map();
+		for (const cellEntry of cells) {
+			const rowEntry = rowsById.get(cellEntry.row.id) ?? {
+				row: cellEntry.row,
+				cells: []
+			};
+			rowEntry.cells.push(cellEntry);
+			rowsById.set(cellEntry.row.id, rowEntry);
+		}
+		const rows = [...rowsById.values()].sort((a, b) => a.row.order - b.row.order);
+		for (const row of rows) row.cells.sort((a, b) => a.cell.order - b.cell.order);
+		const columnCount = Math.max(...rows.map((row) => row.cells.length));
+		const columnWidthsPt = [];
+		for (let j = 0; j < columnCount; j++) {
+			let minX = Number.POSITIVE_INFINITY;
+			let maxX = Number.NEGATIVE_INFINITY;
+			for (const row of rows) {
+				const cellEntry = row.cells[j];
+				if (cellEntry === void 0) continue;
+				for (const item of cellEntry.items) {
+					minX = Math.min(minX, item.xPt);
+					maxX = Math.max(maxX, item.xPt + (item.widthPt ?? 0));
+				}
+			}
+			const width = maxX - minX;
+			columnWidthsPt.push(width > 0 ? width : DEFAULT_COLUMN_WIDTH_FALLBACK_PT);
+		}
+		const allItems = cells.flatMap((cellEntry) => cellEntry.items);
+		const contentRows = rows.map((row) => {
+			const contentCells = [];
+			for (let j = 0; j < columnCount; j++) {
+				const cellEntry = row.cells[j];
+				const cell = { blocks: cellBlocksFromItems(cellEntry?.items ?? [], pageIndex) };
+				if (cellEntry !== void 0) stampFrame(cell, pageIndex, textItemsPdfBox(cellEntry.items));
+				contentCells.push(cell);
+			}
+			return { cells: contentCells };
+		});
+		const box = textItemsPdfBox(allItems);
+		const table = {
+			kind: "table",
+			rows: contentRows,
+			columnWidthsPt
+		};
+		stampFrame(table, pageIndex, box);
+		recovered.push({
+			table,
+			frame: flipY(box, page.heightPt),
+			topYPt: box.yPt + box.heightPt,
+			consumedText: new Set(allItems),
+			latticeItems
+		});
+	}
+	return recovered;
+}
+function textItemsPdfBox(items) {
+	let minX = Number.POSITIVE_INFINITY;
+	let maxX = Number.NEGATIVE_INFINITY;
+	let minY = Number.POSITIVE_INFINITY;
+	let maxY = Number.NEGATIVE_INFINITY;
+	for (const item of items) {
+		const { ascentPt, descentPt } = textItemVerticalExtent(item);
+		minX = Math.min(minX, item.xPt);
+		maxX = Math.max(maxX, item.xPt + (item.widthPt ?? 0));
+		minY = Math.min(minY, item.yPt - descentPt);
+		maxY = Math.max(maxY, item.yPt + ascentPt);
+	}
+	return {
+		xPt: minX,
+		yPt: minY,
+		widthPt: maxX - minX,
+		heightPt: maxY - minY
+	};
+}
 function cellBlocksFromItems(items, pageIndex) {
 	return clusterIntoLines(items).map((line) => lineToParagraph(line, pageIndex));
 }
@@ -997,23 +1229,7 @@ function buildCellsFromGroups(groups, pageIndex, context) {
 			value: inferredCellValue(displayText, row, column, context),
 			displayText
 		};
-		let minX = Number.POSITIVE_INFINITY;
-		let maxX = Number.NEGATIVE_INFINITY;
-		let minY = Number.POSITIVE_INFINITY;
-		let maxY = Number.NEGATIVE_INFINITY;
-		for (const item of items) {
-			const { ascentPt, descentPt } = textItemVerticalExtent(item);
-			minX = Math.min(minX, item.xPt);
-			maxX = Math.max(maxX, item.xPt + (item.widthPt ?? 0));
-			minY = Math.min(minY, item.yPt - descentPt);
-			maxY = Math.max(maxY, item.yPt + ascentPt);
-		}
-		stampFrame(cell, pageIndex, {
-			xPt: minX,
-			yPt: minY,
-			widthPt: maxX - minX,
-			heightPt: maxY - minY
-		});
+		stampFrame(cell, pageIndex, textItemsPdfBox(items));
 		cells.push(cell);
 	}
 	cells.sort((a, b) => a.row - b.row || a.column - b.column);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "4.5.0",
+  "version": "4.6.0",
   "description": "Bidirectional docx/pptx <-> PDF conversion and a read+write editable OOXML document model, built on ooxml.js and Zod 4 codecs.",
   "type": "module",
   "repository": {