js.documents 1.60.3 → 1.62.0

package/dist/layout/reconstruct.cjs

@@ -1,6 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_model_geometry = require("../model/geometry.cjs");
+const require_model_embedded_drawing = require("../model/embedded-drawing.cjs");
 const require_ports_abort = require("../ports/abort.cjs");
+const require_layout_cell_typing = require("./cell-typing.cjs");
+const require_layout_lattice = require("./lattice.cjs");
 let document_schema_js = require("document-schema.js");
 let pdf_codec = require("pdf-codec");
 //#region src/layout/reconstruct.ts
@@ -135,7 +138,9 @@ function buildSection(pages, images) {
 	};
 }
 function reconstructPageBlocks(page, images) {
-	const textItems = page.items.filter((i) => i.kind === "text");
+	const recoveredTable = recoverTable(page);
+	const consumedText = recoveredTable?.consumedText;
+	const textItems = page.items.filter((i) => i.kind === "text" && consumedText?.has(i) !== true);
 	const imageItems = page.items.filter((i) => i.kind === "image");
 	const paragraphs = clusterIntoParagraphs(clusterIntoLines(textItems));
 	const positioned = [];
@@ -156,6 +161,15 @@ function reconstructPageBlocks(page, images) {
 			}
 		});
 	}
+	if (recoveredTable !== void 0) positioned.push({
+		yPt: recoveredTable.topYPt,
+		block: recoveredTable.table
+	});
+	const recoveredVectors = recoverPageVectors(page, recoveredTable?.latticeItems ?? NO_ITEMS);
+	if (recoveredVectors !== void 0) positioned.push({
+		yPt: recoveredVectors.topYPt,
+		block: recoveredVectors.block
+	});
 	positioned.sort((a, b) => b.yPt - a.yPt);
 	return positioned.map((p) => p.block);
 }
@@ -213,7 +227,9 @@ function reconstructPresentation(doc, options) {
 	};
 }
 function reconstructSlide(page, images) {
-	const textItems = page.items.filter((i) => i.kind === "text");
+	const recoveredTable = recoverTable(page);
+	const consumedText = recoveredTable?.consumedText;
+	const textItems = page.items.filter((i) => i.kind === "text" && consumedText?.has(i) !== true);
 	const imageItems = page.items.filter((i) => i.kind === "image");
 	const textShapes = clusterIntoBlocks(clusterIntoLines(textItems)).map((block) => blockToShape(block, page.heightPt));
 	const imageShapes = [];
@@ -221,15 +237,38 @@ function reconstructSlide(page, images) {
 		const shape = imageToShape(img, page.heightPt, images);
 		if (shape !== void 0) imageShapes.push(shape);
 	}
+	const recoveredVectors = recoverPageVectors(page, recoveredTable?.latticeItems ?? NO_ITEMS);
+	const vectorShapes = recoveredVectors === void 0 ? [] : [wrapBlockInShape(recoveredVectors.block, {
+		xPt: 0,
+		yPt: 0,
+		widthPt: page.widthPt,
+		heightPt: page.heightPt
+	})];
+	const tableShapes = recoveredTable === void 0 ? [] : [wrapBlockInShape(recoveredTable.table, recoveredTable.frame)];
 	return {
 		size: {
 			widthPt: page.widthPt,
 			heightPt: page.heightPt
 		},
-		shapes: [...imageShapes, ...textShapes],
+		shapes: [
+			...vectorShapes,
+			...imageShapes,
+			...tableShapes,
+			...textShapes
+		],
 		notes: page.notes ?? ""
 	};
 }
+function wrapBlockInShape(block, frame) {
+	return {
+		frame,
+		insetLeftPt: 0,
+		insetTopPt: 0,
+		insetRightPt: 0,
+		insetBottomPt: 0,
+		blocks: [block]
+	};
+}
 function splitLineByLargeGaps(line) {
 	const segments = [];
 	let current = [];
@@ -353,14 +392,27 @@ function reconstructDrawing(doc, options) {
 function reconstructDrawPage(page, images) {
 	const vectors = [];
 	const shapes = [];
-	for (const item of page.items) if (item.kind === "rect") vectors.push(layoutRectToVector(item, page.heightPt));
-	else if (item.kind === "ellipse") vectors.push(layoutEllipseToVector(item, page.heightPt));
-	else if (item.kind === "line") vectors.push(layoutLineToVector(item, page.heightPt));
-	else if (item.kind === "path") vectors.push(layoutPathToVector(item, page.heightPt));
-	else if (item.kind === "text") shapes.push(layoutTextToShape(item, page.heightPt));
-	else if (item.kind === "image") {
-		const shape = imageToShape(item, page.heightPt, images);
-		if (shape !== void 0) shapes.push(shape);
+	let paintOrder = 0;
+	for (const item of page.items) {
+		const vector = layoutItemToVector(item, page.heightPt);
+		if (vector !== void 0) {
+			vectors.push({
+				...vector,
+				paintOrder: paintOrder++
+			});
+			continue;
+		}
+		if (item.kind === "text") shapes.push({
+			...layoutTextToShape(item, page.heightPt),
+			paintOrder: paintOrder++
+		});
+		else if (item.kind === "image") {
+			const shape = imageToShape(item, page.heightPt, images);
+			if (shape !== void 0) shapes.push({
+				...shape,
+				paintOrder: paintOrder++
+			});
+		}
 	}
 	return {
 		size: {
@@ -371,6 +423,12 @@ function reconstructDrawPage(page, images) {
 		vectors
 	};
 }
+function layoutItemToVector(item, pageHeightPt) {
+	if (item.kind === "rect") return layoutRectToVector(item, pageHeightPt);
+	if (item.kind === "ellipse") return layoutEllipseToVector(item, pageHeightPt);
+	if (item.kind === "line") return layoutLineToVector(item, pageHeightPt);
+	if (item.kind === "path") return layoutPathToVector(item, pageHeightPt);
+}
 function layoutRectToVector(item, pageHeightPt) {
 	return {
 		kind: "rect",
@@ -533,99 +591,82 @@ function layoutTextToShape(item, pageHeightPt) {
 		}]
 	};
 }
-function extractLineCandidates(items) {
-	const segments = [];
-	for (const item of items) {
-		if (item.kind === "line") {
-			segments.push({
-				x1Pt: item.x1Pt,
-				y1Pt: item.y1Pt,
-				x2Pt: item.x2Pt,
-				y2Pt: item.y2Pt
-			});
-			continue;
-		}
-		if (item.kind === "path" && item.stroke !== void 0 && item.subpaths.length === 1) {
-			const subpath = item.subpaths[0];
-			if (subpath.segments.length === 1 && subpath.segments[0].kind === "line") {
-				const segment = subpath.segments[0];
-				segments.push({
-					x1Pt: subpath.startXPt,
-					y1Pt: subpath.startYPt,
-					x2Pt: segment.xPt,
-					y2Pt: segment.yPt
-				});
-			}
-		}
-	}
-	return segments;
+function vectorTopYDownPt(vector) {
+	return vector.kind === "line" ? Math.min(vector.from.yPt, vector.to.yPt) : vector.frame.yPt;
 }
-const AXIS_ALIGNMENT_TOLERANCE_PT = .5;
-const MIN_GRIDLINE_LENGTH_PT = 4;
-function classifyAxisLine(seg) {
-	const dx = Math.abs(seg.x2Pt - seg.x1Pt);
-	const dy = Math.abs(seg.y2Pt - seg.y1Pt);
-	if (dy <= AXIS_ALIGNMENT_TOLERANCE_PT && dx >= MIN_GRIDLINE_LENGTH_PT) return {
-		axis: "horizontal",
-		position: (seg.y1Pt + seg.y2Pt) / 2,
-		spanPt: dx
-	};
-	if (dx <= AXIS_ALIGNMENT_TOLERANCE_PT && dy >= MIN_GRIDLINE_LENGTH_PT) return {
-		axis: "vertical",
-		position: (seg.x1Pt + seg.x2Pt) / 2,
-		spanPt: dy
-	};
-}
-const POSITION_DEDUPE_TOLERANCE_PT = .5;
-function dedupeAxisLines(lines, descending) {
-	const sorted = [...lines].sort((a, b) => descending ? b.position - a.position : a.position - b.position);
-	const result = [];
-	for (const candidate of sorted) {
-		const last = result[result.length - 1];
-		if (last !== void 0 && Math.abs(candidate.position - last.position) <= POSITION_DEDUPE_TOLERANCE_PT) last.spanPt = Math.max(last.spanPt, candidate.spanPt);
-		else result.push({
-			position: candidate.position,
-			spanPt: candidate.spanPt
+function recoverPageVectors(page, excluded) {
+	const vectors = [];
+	for (const item of page.items) {
+		if (excluded.has(item)) continue;
+		const vector = layoutItemToVector(item, page.heightPt);
+		if (vector !== void 0) vectors.push({
+			...vector,
+			paintOrder: vectors.length
 		});
 	}
-	return result;
-}
-const MIN_GRIDLINE_COUNT_PER_AXIS = 3;
-const GRID_SPAN_CONSISTENCY_RATIO = .9;
-function isRegularLattice(lines) {
-	if (lines.length < MIN_GRIDLINE_COUNT_PER_AXIS) return false;
-	const maxSpanPt = Math.max(...lines.map((l) => l.spanPt));
-	return lines.filter((l) => l.spanPt >= maxSpanPt * GRID_SPAN_CONSISTENCY_RATIO).length >= MIN_GRIDLINE_COUNT_PER_AXIS;
-}
-function detectGridLattice(items) {
-	const horizontal = [];
-	const vertical = [];
-	for (const seg of extractLineCandidates(items)) {
-		const classified = classifyAxisLine(seg);
-		if (classified === void 0) continue;
-		(classified.axis === "horizontal" ? horizontal : vertical).push(classified);
-	}
-	const rowBoundaries = dedupeAxisLines(horizontal, true);
-	const columnBoundaries = dedupeAxisLines(vertical, false);
-	if (!isRegularLattice(rowBoundaries) || !isRegularLattice(columnBoundaries)) return;
+	if (vectors.length === 0) return;
+	const topYDownPt = Math.min(...vectors.map(vectorTopYDownPt));
 	return {
-		rowBoundariesDescPt: rowBoundaries.map((l) => l.position),
-		columnBoundariesAscPt: columnBoundaries.map((l) => l.position)
+		block: require_model_embedded_drawing.buildDrawingBlock({
+			widthPt: page.widthPt,
+			heightPt: page.heightPt
+		}, vectors),
+		topYPt: page.heightPt - topYDownPt
 	};
 }
-const OUTER_EDGE_TOLERANCE_PT = 3;
-function findRowIndex(rowBoundariesDescPt, yPt) {
-	const lastIndex = rowBoundariesDescPt.length - 1;
-	if (yPt > rowBoundariesDescPt[0] + OUTER_EDGE_TOLERANCE_PT || yPt < rowBoundariesDescPt[lastIndex] - OUTER_EDGE_TOLERANCE_PT) return;
-	for (let i = 0; i < lastIndex; i++) if (yPt > rowBoundariesDescPt[i + 1]) return i;
-	return lastIndex - 1;
+function cellBlocksFromItems(items) {
+	return clusterIntoLines(items).map(lineToParagraph);
 }
-function findColumnIndex(columnBoundariesAscPt, xPt) {
-	const lastIndex = columnBoundariesAscPt.length - 1;
-	if (xPt < columnBoundariesAscPt[0] - OUTER_EDGE_TOLERANCE_PT || xPt > columnBoundariesAscPt[lastIndex] + OUTER_EDGE_TOLERANCE_PT) return;
-	for (let j = 0; j < lastIndex; j++) if (xPt < columnBoundariesAscPt[j + 1]) return j;
-	return lastIndex - 1;
+function recoverTable(page) {
+	const lattice = require_layout_lattice.detectGridLattice(page.items);
+	if (lattice === void 0) return;
+	const rowCount = lattice.rowBoundariesDescPt.length - 1;
+	const columnCount = lattice.columnBoundariesAscPt.length - 1;
+	const groups = /* @__PURE__ */ new Map();
+	const consumedText = /* @__PURE__ */ new Set();
+	for (const item of page.items) {
+		if (item.kind !== "text") continue;
+		const row = require_layout_lattice.findRowIndex(lattice.rowBoundariesDescPt, item.yPt);
+		const column = require_layout_lattice.findColumnIndex(lattice.columnBoundariesAscPt, item.xPt);
+		if (row === void 0 || column === void 0) continue;
+		addToGroup(groups, row, column, item);
+		consumedText.add(item);
+	}
+	if (consumedText.size === 0) return;
+	const columnWidthsPt = [];
+	for (let j = 0; j < columnCount; j++) columnWidthsPt.push(lattice.columnBoundariesAscPt[j + 1] - lattice.columnBoundariesAscPt[j]);
+	const rows = [];
+	for (let i = 0; i < rowCount; i++) {
+		const cells = [];
+		for (let j = 0; j < columnCount; j++) cells.push({ blocks: cellBlocksFromItems(groups.get(groupKey(i, j)) ?? []) });
+		rows.push({
+			cells,
+			heightPt: lattice.rowBoundariesDescPt[i] - lattice.rowBoundariesDescPt[i + 1]
+		});
+	}
+	const leftXPt = lattice.columnBoundariesAscPt[0];
+	const rightXPt = lattice.columnBoundariesAscPt[columnCount];
+	const topYPt = lattice.rowBoundariesDescPt[0];
+	const bottomYPt = lattice.rowBoundariesDescPt[rowCount];
+	const frame = require_model_geometry.flipY({
+		xPt: leftXPt,
+		yPt: bottomYPt,
+		widthPt: rightXPt - leftXPt,
+		heightPt: topYPt - bottomYPt
+	}, page.heightPt);
+	return {
+		table: {
+			kind: "table",
+			rows,
+			columnWidthsPt
+		},
+		frame,
+		topYPt,
+		consumedText,
+		latticeItems: lattice.sourceItems
+	};
 }
+const NO_ITEMS = /* @__PURE__ */ new Set();
 function joinCellText(items) {
 	const sorted = [...items].sort((a, b) => a.xPt - b.xPt);
 	let text = "";
@@ -647,30 +688,48 @@ function addToGroup(groups, row, column, item) {
 	if (existing === void 0) groups.set(key, [item]);
 	else existing.push(item);
 }
-function buildCellsFromGroups(groups) {
+function buildCellsFromGroups(groups, context) {
 	const cells = [];
 	for (const [key, items] of groups) {
 		const displayText = joinCellText(items);
 		if (displayText.length === 0) continue;
 		const [rowPart, columnPart] = key.split(",");
+		const row = Number(rowPart);
+		const column = Number(columnPart);
 		cells.push({
-			row: Number(rowPart),
-			column: Number(columnPart),
-			value: {
-				kind: "string",
-				value: displayText
-			},
+			row,
+			column,
+			value: inferredCellValue(displayText, row, column, context),
 			displayText
 		});
 	}
 	cells.sort((a, b) => a.row - b.row || a.column - b.column);
 	return cells;
 }
-function buildGridFromLattice(textItems, lattice) {
+function inferredCellValue(displayText, row, column, context) {
+	const inference = require_layout_cell_typing.inferCellValue(displayText);
+	if (inference === void 0) return {
+		kind: "string",
+		value: displayText
+	};
+	const reported = {
+		sheetIndex: context.sheetIndex,
+		row,
+		column,
+		displayText,
+		...inference
+	};
+	context.sink?.(reported);
+	return inference.outcome === "retyped" ? inference.value : {
+		kind: "string",
+		value: displayText
+	};
+}
+function buildGridFromLattice(textItems, lattice, context) {
 	const groups = /* @__PURE__ */ new Map();
 	for (const item of textItems) {
-		const row = findRowIndex(lattice.rowBoundariesDescPt, item.yPt);
-		const column = findColumnIndex(lattice.columnBoundariesAscPt, item.xPt);
+		const row = require_layout_lattice.findRowIndex(lattice.rowBoundariesDescPt, item.yPt);
+		const column = require_layout_lattice.findColumnIndex(lattice.columnBoundariesAscPt, item.xPt);
 		if (row === void 0 || column === void 0) continue;
 		addToGroup(groups, row, column, item);
 	}
@@ -685,7 +744,7 @@ function buildGridFromLattice(textItems, lattice) {
 		heightPt: lattice.rowBoundariesDescPt[i] - lattice.rowBoundariesDescPt[i + 1]
 	});
 	return {
-		cells: buildCellsFromGroups(groups),
+		cells: buildCellsFromGroups(groups, context),
 		columns,
 		rows,
 		gridlines: true
@@ -724,7 +783,7 @@ function lastColumnWidthPt(groups, columnIndex, anchorXPt) {
 	}
 	return maxWidthPt > 0 ? maxWidthPt : DEFAULT_COLUMN_WIDTH_FALLBACK_PT;
 }
-function buildGridFromTextClustering(textItems) {
+function buildGridFromTextClustering(textItems, context) {
 	const lines = clusterIntoLines(textItems);
 	if (lines.length === 0) return {
 		cells: [],
@@ -760,16 +819,20 @@ function buildGridFromTextClustering(textItems) {
 		};
 	});
 	return {
-		cells: buildCellsFromGroups(groups),
+		cells: buildCellsFromGroups(groups, context),
 		columns,
 		rows,
 		gridlines: false
 	};
 }
-function reconstructSheet(page, pageIndex) {
+function reconstructSheet(page, pageIndex, sink) {
 	const textItems = page.items.filter((i) => i.kind === "text");
-	const lattice = detectGridLattice(page.items);
-	const grid = lattice !== void 0 ? buildGridFromLattice(textItems, lattice) : buildGridFromTextClustering(textItems);
+	const lattice = require_layout_lattice.detectGridLattice(page.items);
+	const context = {
+		sheetIndex: pageIndex,
+		sink
+	};
+	const grid = lattice !== void 0 ? buildGridFromLattice(textItems, lattice, context) : buildGridFromTextClustering(textItems, context);
 	const printSettings = {
 		pageSize: {
 			widthPt: page.widthPt,
@@ -793,7 +856,7 @@ function reconstructSpreadsheet(doc, options) {
 	const signal = options?.signal;
 	const sheets = doc.pages.map((page, index) => {
 		require_ports_abort.throwIfAborted(signal);
-		return reconstructSheet(page, index);
+		return reconstructSheet(page, index, options?.onCellTypeInference);
 	});
 	return {
 		kind: "spreadsheet",

package/dist/layout/reconstruct.d.cts

@@ -1,7 +1,9 @@
+import { CellTypeInferenceSink } from "./cell-typing.cjs";
 import { ContentDocument, LayoutDocument } from "document-schema.js";
 //#region src/layout/reconstruct.d.ts
 interface ReconstructOptions {
   readonly signal?: AbortSignal;
+  readonly onCellTypeInference?: CellTypeInferenceSink;
 }
 declare function reconstructWordprocessing(doc: LayoutDocument, options?: ReconstructOptions): ContentDocument;
 declare function reconstructPresentation(doc: LayoutDocument, options?: ReconstructOptions): ContentDocument;

package/dist/layout/reconstruct.d.ts

@@ -1,7 +1,9 @@
+import { CellTypeInferenceSink } from "./cell-typing.js";
 import { ContentDocument, LayoutDocument } from "document-schema.js";
 //#region src/layout/reconstruct.d.ts
 interface ReconstructOptions {
   readonly signal?: AbortSignal;
+  readonly onCellTypeInference?: CellTypeInferenceSink;
 }
 declare function reconstructWordprocessing(doc: LayoutDocument, options?: ReconstructOptions): ContentDocument;
 declare function reconstructPresentation(doc: LayoutDocument, options?: ReconstructOptions): ContentDocument;