documents.js 1.102.2 → 2.0.0

package/dist/layout/slides.js

@@ -2,8 +2,8 @@ import { flipY, rotatePointAboutCenter } from "../model/geometry.js";
 import { formulaOfBlock } from "../model/formula.js";
 import { layoutFormula } from "../mathml/layout.js";
 import { wrapRunsToWidth } from "./text-layout.js";
-import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, justifyLineGapsPt, lineNaturalHeightPt, registerImage, sumColumnWidthsPt } from "./shared.js";
-import { COLOR_BLACK, LAYOUT_FORMAT_VERSION } from "document-schema.js";
+import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, registerImage, stampFragmentFrame, stampFrame, sumColumnWidthsPt } from "./shared.js";
+import { COLOR_BLACK } from "document-schema.js";
 //#region src/layout/slides.ts
 function shapePlacement(flippedFrame, rotationDeg) {
 	if (rotationDeg === void 0 || rotationDeg === 0) return {
@@ -20,7 +20,7 @@ function shapePlacement(flippedFrame, rotationDeg) {
 		layoutRotationDeg: ccwDeg
 	};
 }
-function layoutParagraph(paragraph, contentLeftXDown, contentWidthPt, startYDown, slideHeightPt, placement, fontScale, spacingScale, measurer, out) {
+function layoutParagraph(paragraph, contentLeftXDown, contentWidthPt, startYDown, slideHeightPt, pageIndex, placement, fontScale, spacingScale, measurer, out) {
 	let cursorYDown = startYDown + (paragraph.spacingBeforePt ?? 0);
 	const effectiveRuns = effectiveStyledRuns(paragraph.runs, fontScale);
 	const fallbackRun = effectiveRuns[0];
@@ -52,6 +52,7 @@ function layoutParagraph(paragraph, contentLeftXDown, contentWidthPt, startYDown
 				sourcePath: fragment.sourcePath
 			};
 			out.push(textItem);
+			stampFragmentFrame(paragraph.runs, fragment, pageIndex, textItem, measurer, line);
 			if (fragment.hyperlink !== void 0) {
 				const fragmentWidthPt = measurer.widthOfTextAtSize(fragment.text, fragment.font, fragment.sizePt);
 				const linkBottomLeft = placement.place({
@@ -75,7 +76,7 @@ function layoutParagraph(paragraph, contentLeftXDown, contentWidthPt, startYDown
 	cursorYDown += paragraph.spacingAfterPt ?? 0;
 	return cursorYDown;
 }
-function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideHeightPt, placement, measurer, out) {
+function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideHeightPt, pageIndex, placement, measurer, out) {
 	let cursorYDown = startYDown;
 	const gridWidthPt = table.columnWidthsPt.reduce((sum, w) => sum + w, 0);
 	const scale = gridWidthPt > 0 ? contentWidthPt / gridWidthPt : 1;
@@ -86,25 +87,24 @@ function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideH
 		for (const cell of row.cells) {
 			const span = cell.colSpan ?? 1;
 			const cellWidthPt = sumColumnWidthsPt(table.columnWidthsPt, colIndex, span) * scale;
-			if (cell.background !== void 0 && placement.layoutRotationDeg === void 0) {
-				const cellFrame = flipY({
-					xPt: cellXDown,
-					yPt: cursorYDown,
-					widthPt: cellWidthPt,
-					heightPt: rowHeightPt
-				}, slideHeightPt);
-				out.push({
-					kind: "rect",
-					xPt: cellFrame.xPt,
-					yPt: cellFrame.yPt,
-					widthPt: cellFrame.widthPt,
-					heightPt: cellFrame.heightPt,
-					fill: cell.background,
-					sourcePath: table.sourcePath
-				});
-			}
+			const cellFrame = flipY({
+				xPt: cellXDown,
+				yPt: cursorYDown,
+				widthPt: cellWidthPt,
+				heightPt: rowHeightPt
+			}, slideHeightPt);
+			if (placement.layoutRotationDeg === void 0) stampFrame(cell, pageIndex, cellFrame);
+			if (cell.background !== void 0 && placement.layoutRotationDeg === void 0) out.push({
+				kind: "rect",
+				xPt: cellFrame.xPt,
+				yPt: cellFrame.yPt,
+				widthPt: cellFrame.widthPt,
+				heightPt: cellFrame.heightPt,
+				fill: cell.background,
+				sourcePath: table.sourcePath
+			});
 			let cellCursorYDown = cursorYDown;
-			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraph(block, cellXDown, cellWidthPt, cellCursorYDown, slideHeightPt, placement, 1, 1, measurer, out);
+			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraph(block, cellXDown, cellWidthPt, cellCursorYDown, slideHeightPt, pageIndex, placement, 1, 1, measurer, out);
 			cellXDown += cellWidthPt;
 			colIndex += span;
 		}
@@ -128,16 +128,18 @@ function layoutShapeFormula(block, flippedFrame, formulaContext) {
 		yPt: flippedFrame.yPt,
 		box
 	});
+	stampFrame(block, formulaContext.pageIndex, flippedFrame);
 }
-function convertShape(shape, slideHeightPt, measurer, images, out, formulaContext) {
+function convertShape(shape, slideHeightPt, pageIndex, measurer, images, out, formulaContext) {
 	const flippedFrame = flipY(shape.frame, slideHeightPt);
+	stampFrame(shape, pageIndex, flippedFrame);
 	const placement = shapePlacement(flippedFrame, shape.rotationDeg);
 	const contentLeftXDown = shape.frame.xPt + shape.insetLeftPt;
 	const contentWidthPt = Math.max(0, shape.frame.widthPt - shape.insetLeftPt - shape.insetRightPt);
 	const fontScale = shape.fontScale ?? 1;
 	const spacingScale = 1 - (shape.lineSpacingReduction ?? 0);
 	let cursorYDown = shape.frame.yPt + shape.insetTopPt;
-	for (const block of shape.blocks) if (block.kind === "paragraph") cursorYDown = layoutParagraph(block, contentLeftXDown, contentWidthPt, cursorYDown, slideHeightPt, placement, fontScale, spacingScale, measurer, out);
+	for (const block of shape.blocks) if (block.kind === "paragraph") cursorYDown = layoutParagraph(block, contentLeftXDown, contentWidthPt, cursorYDown, slideHeightPt, pageIndex, placement, fontScale, spacingScale, measurer, out);
 	else if (block.kind === "image") {
 		const imageId = registerImage(block, images);
 		const placed = placement.place({
@@ -155,7 +157,13 @@ function convertShape(shape, slideHeightPt, measurer, images, out, formulaContex
 			sourcePath: block.sourcePath
 		};
 		out.push(imageItem);
-	} else if (block.kind === "table") cursorYDown = layoutTable(block, contentLeftXDown, contentWidthPt, cursorYDown, slideHeightPt, placement, measurer, out);
+		stampFrame(block, pageIndex, {
+			xPt: placed.x,
+			yPt: placed.y,
+			widthPt: imageItem.widthPt,
+			heightPt: imageItem.heightPt
+		});
+	} else if (block.kind === "table") cursorYDown = layoutTable(block, contentLeftXDown, contentWidthPt, cursorYDown, slideHeightPt, pageIndex, placement, measurer, out);
 	else if (block.kind === "embeddedObject" && block.objectKind === "formula" && formulaContext !== void 0) layoutShapeFormula(block, flippedFrame, formulaContext);
 }
 function convertSlide(slide, slideIndex, measurer, images, positioned, mathMetricsAt) {
@@ -165,7 +173,7 @@ function convertSlide(slide, slideIndex, measurer, images, positioned, mathMetri
 		positioned,
 		mathMetricsAt
 	};
-	for (const shape of slide.shapes) convertShape(shape, slide.size.heightPt, measurer, images, items, formulaContext);
+	for (const shape of slide.shapes) convertShape(shape, slide.size.heightPt, slideIndex, measurer, images, items, formulaContext);
 	return {
 		widthPt: slide.size.widthPt,
 		heightPt: slide.size.heightPt,
@@ -178,13 +186,9 @@ function convertPresentationToLayout(doc, options) {
 	const formulas = [];
 	const pages = doc.slides.map((slide, slideIndex) => convertSlide(slide, slideIndex, options.measurer, images, formulas, options.mathMetricsAt));
 	return {
-		document: {
-			formatVersion: LAYOUT_FORMAT_VERSION,
-			metadata: doc.metadata,
-			pages,
-			images
-		},
-		formulas
+		document: layoutDocumentOf(doc.metadata, pages, images),
+		formulas,
+		pages: packagePagesOf(pages)
 	};
 }
 //#endregion

package/dist/layout/text-layout.cjs

@@ -38,7 +38,8 @@ function atomizeRuns(runs, measurer) {
 				color: run.color,
 				underline: run.underline,
 				hyperlink: run.hyperlink,
-				sourcePath: run.sourcePath
+				sourcePath: run.sourcePath,
+				runIndex: run.runIndex
 			});
 			wordWidth += measurer.widthOfTextAtSize(token, run.font, run.sizePt);
 		}

package/dist/layout/text-layout.d.cts

@@ -1,5 +1,16 @@
-import { StyledRun, TextMeasurer, WrapOptions, WrappedLine } from "document-schema.js";
+import { StyledFragment, StyledRun, TextMeasurer, WrapOptions, WrappedLine } from "document-schema.js";
 //#region src/layout/text-layout.d.ts
-declare function wrapRunsToWidth(runs: readonly StyledRun[], measurer: TextMeasurer, maxWidthPt: number, options?: WrapOptions): WrappedLine[];
+interface SourcedRun extends StyledRun {
+  readonly runIndex?: number;
+}
+interface SourcedFragment extends StyledFragment {
+  readonly runIndex?: number;
+}
+interface SourcedWrappedLine extends Omit<WrappedLine, 'fragments'> {
+  readonly fragments: readonly (SourcedFragment & {
+    readonly xOffsetPt: number;
+  })[];
+}
+declare function wrapRunsToWidth(runs: readonly SourcedRun[], measurer: TextMeasurer, maxWidthPt: number, options?: WrapOptions): SourcedWrappedLine[];
 //#endregion
-export { wrapRunsToWidth };
+export { SourcedFragment, SourcedRun, SourcedWrappedLine, wrapRunsToWidth };

package/dist/layout/text-layout.d.ts

@@ -1,5 +1,16 @@
-import { StyledRun, TextMeasurer, WrapOptions, WrappedLine } from "document-schema.js";
+import { StyledFragment, StyledRun, TextMeasurer, WrapOptions, WrappedLine } from "document-schema.js";
 //#region src/layout/text-layout.d.ts
-declare function wrapRunsToWidth(runs: readonly StyledRun[], measurer: TextMeasurer, maxWidthPt: number, options?: WrapOptions): WrappedLine[];
+interface SourcedRun extends StyledRun {
+  readonly runIndex?: number;
+}
+interface SourcedFragment extends StyledFragment {
+  readonly runIndex?: number;
+}
+interface SourcedWrappedLine extends Omit<WrappedLine, 'fragments'> {
+  readonly fragments: readonly (SourcedFragment & {
+    readonly xOffsetPt: number;
+  })[];
+}
+declare function wrapRunsToWidth(runs: readonly SourcedRun[], measurer: TextMeasurer, maxWidthPt: number, options?: WrapOptions): SourcedWrappedLine[];
 //#endregion
-export { wrapRunsToWidth };
+export { SourcedFragment, SourcedRun, SourcedWrappedLine, wrapRunsToWidth };

package/dist/layout/text-layout.js

@@ -37,7 +37,8 @@ function atomizeRuns(runs, measurer) {
 				color: run.color,
 				underline: run.underline,
 				hyperlink: run.hyperlink,
-				sourcePath: run.sourcePath
+				sourcePath: run.sourcePath,
+				runIndex: run.runIndex
 			});
 			wordWidth += measurer.widthOfTextAtSize(token, run.font, run.sizePt);
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "documents.js",
-  "version": "1.102.2",
+  "version": "2.0.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": {
@@ -84,11 +84,11 @@
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
     "byte-codec": "^1.1.9",
-    "document-schema.js": "^2.7.17",
+    "document-schema.js": "^3.2.0",
     "fflate": "^0.8.3",
-    "markdown-codec": "^1.4.2",
-    "odf.js": "^2.7.23",
-    "ooxml.js": "^2.11.31",
+    "markdown-codec": "^2.0.0",
+    "odf.js": "^3.0.1",
+    "ooxml.js": "^2.16.0",
     "pdf-codec": "^2.2.35",
     "zod": "^4.4.3"
   },