documents.js 1.45.0 → 1.46.0

package/dist/index.cjs

@@ -7544,6 +7544,7 @@ function readInlineImage(reader, sink) {
 //#region src/pdf/interpret.ts
 const MAX_FORM_XOBJECT_DEPTH = 12;
 const FALLBACK_GLYPH_WIDTH_PER_1000 = 500;
+const DEFAULT_LINE_WIDTH_PT = 1;
 function defaultTextState() {
 	return {
 		tm: IDENTITY_MATRIX,
@@ -7636,16 +7637,118 @@ function interpretContentStream(bytes, resources, context) {
 	runContentStream(bytes, resources, {
 		ctm: IDENTITY_MATRIX,
 		fillColor: document_content_model.COLOR_BLACK,
-		strokeColor: document_content_model.COLOR_BLACK
+		strokeColor: document_content_model.COLOR_BLACK,
+		lineWidth: DEFAULT_LINE_WIDTH_PT
 	}, context, items, 0);
 	return items;
 }
+function lastPointOf(subpath) {
+	const last = subpath.segments[subpath.segments.length - 1];
+	return last === void 0 ? {
+		x: subpath.startXPt,
+		y: subpath.startYPt
+	} : {
+		x: last.xPt,
+		y: last.yPt
+	};
+}
 function runContentStream(bytes, resources, initialState, context, items, depth) {
 	const operations = readContentStream(bytes, context.sink);
 	const gsStack = [];
 	let gs = initialState;
 	let ts = defaultTextState();
 	let pendingRect;
+	let pathSubpaths = [];
+	let currentSubpath;
+	const finalizeCurrentSubpath = () => {
+		if (currentSubpath !== void 0) {
+			pathSubpaths.push(currentSubpath);
+			currentSubpath = void 0;
+		}
+	};
+	const resetPath = () => {
+		pendingRect = void 0;
+		pathSubpaths = [];
+		currentSubpath = void 0;
+	};
+	const appendRectSubpath = (operands, ctm) => {
+		finalizeCurrentSubpath();
+		const x = numAt(operands, 0);
+		const y = numAt(operands, 1);
+		const w = numAt(operands, 2);
+		const h = numAt(operands, 3);
+		const p1 = applyMatrix(ctm, {
+			x,
+			y
+		});
+		const p2 = applyMatrix(ctm, {
+			x: x + w,
+			y
+		});
+		const p3 = applyMatrix(ctm, {
+			x: x + w,
+			y: y + h
+		});
+		const p4 = applyMatrix(ctm, {
+			x,
+			y: y + h
+		});
+		pathSubpaths.push({
+			startXPt: p1.x,
+			startYPt: p1.y,
+			segments: [
+				{
+					kind: "line",
+					xPt: p2.x,
+					yPt: p2.y
+				},
+				{
+					kind: "line",
+					xPt: p3.x,
+					yPt: p3.y
+				},
+				{
+					kind: "line",
+					xPt: p4.x,
+					yPt: p4.y
+				}
+			],
+			closed: true
+		});
+	};
+	const paintFillRuleFor = (operator) => operator.endsWith("*") ? "evenodd" : "nonzero";
+	const emitPaint = (operator) => {
+		if (operator === "n") {
+			resetPath();
+			return;
+		}
+		if ((operator === "s" || operator === "b" || operator === "b*") && currentSubpath !== void 0) currentSubpath.closed = true;
+		if ((operator === "f" || operator === "F" || operator === "f*") && currentSubpath === void 0 && pathSubpaths.length === 1 && pendingRect !== void 0) {
+			items.push({
+				kind: "rect",
+				...pendingRect,
+				color: gs.fillColor
+			});
+			resetPath();
+			return;
+		}
+		finalizeCurrentSubpath();
+		if (pathSubpaths.length > 0) {
+			const isFillOp = operator === "f" || operator === "F" || operator === "f*" || operator === "B" || operator === "B*" || operator === "b" || operator === "b*";
+			const isStrokeOp = operator === "S" || operator === "s" || operator === "B" || operator === "B*" || operator === "b" || operator === "b*";
+			items.push({
+				kind: "path",
+				subpaths: pathSubpaths,
+				fillRule: paintFillRuleFor(operator),
+				fill: isFillOp ? gs.fillColor : void 0,
+				stroke: isStrokeOp ? {
+					color: gs.strokeColor,
+					widthPt: gs.lineWidth
+				} : void 0
+			});
+		}
+		resetPath();
+	};
 	const advanceThroughString = (codes) => {
 		if (ts.fontResourceName === void 0) return;
 		let offset = 0;
@@ -7829,25 +7932,118 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 			}
 			case "re":
 				pendingRect = rectFromOperands(operands, gs.ctm);
+				appendRectSubpath(operands, gs.ctm);
+				break;
+			case "m": {
+				finalizeCurrentSubpath();
+				const p = applyMatrix(gs.ctm, {
+					x: numAt(operands, 0),
+					y: numAt(operands, 1)
+				});
+				currentSubpath = {
+					startXPt: p.x,
+					startYPt: p.y,
+					segments: [],
+					closed: false
+				};
+				pendingRect = void 0;
+				break;
+			}
+			case "l": {
+				const p = applyMatrix(gs.ctm, {
+					x: numAt(operands, 0),
+					y: numAt(operands, 1)
+				});
+				currentSubpath?.segments.push({
+					kind: "line",
+					xPt: p.x,
+					yPt: p.y
+				});
+				pendingRect = void 0;
 				break;
-			case "m":
-			case "l":
-			case "c":
+			}
+			case "c": {
+				const c1 = applyMatrix(gs.ctm, {
+					x: numAt(operands, 0),
+					y: numAt(operands, 1)
+				});
+				const c2 = applyMatrix(gs.ctm, {
+					x: numAt(operands, 2),
+					y: numAt(operands, 3)
+				});
+				const p = applyMatrix(gs.ctm, {
+					x: numAt(operands, 4),
+					y: numAt(operands, 5)
+				});
+				currentSubpath?.segments.push({
+					kind: "cubic",
+					c1xPt: c1.x,
+					c1yPt: c1.y,
+					c2xPt: c2.x,
+					c2yPt: c2.y,
+					xPt: p.x,
+					yPt: p.y
+				});
+				pendingRect = void 0;
+				break;
+			}
 			case "v":
-			case "y":
+				if (currentSubpath !== void 0) {
+					const cur = lastPointOf(currentSubpath);
+					const c2 = applyMatrix(gs.ctm, {
+						x: numAt(operands, 0),
+						y: numAt(operands, 1)
+					});
+					const p = applyMatrix(gs.ctm, {
+						x: numAt(operands, 2),
+						y: numAt(operands, 3)
+					});
+					currentSubpath.segments.push({
+						kind: "cubic",
+						c1xPt: cur.x,
+						c1yPt: cur.y,
+						c2xPt: c2.x,
+						c2yPt: c2.y,
+						xPt: p.x,
+						yPt: p.y
+					});
+				}
+				pendingRect = void 0;
+				break;
+			case "y": {
+				const c1 = applyMatrix(gs.ctm, {
+					x: numAt(operands, 0),
+					y: numAt(operands, 1)
+				});
+				const p = applyMatrix(gs.ctm, {
+					x: numAt(operands, 2),
+					y: numAt(operands, 3)
+				});
+				currentSubpath?.segments.push({
+					kind: "cubic",
+					c1xPt: c1.x,
+					c1yPt: c1.y,
+					c2xPt: p.x,
+					c2yPt: p.y,
+					xPt: p.x,
+					yPt: p.y
+				});
+				pendingRect = void 0;
+				break;
+			}
 			case "h":
+				if (currentSubpath !== void 0) currentSubpath.closed = true;
 				pendingRect = void 0;
 				break;
+			case "w":
+				gs = {
+					...gs,
+					lineWidth: numAt(operands, 0)
+				};
+				break;
 			case "f":
 			case "F":
 			case "f*":
-				if (pendingRect !== void 0) items.push({
-					kind: "rect",
-					...pendingRect,
-					color: gs.fillColor
-				});
-				pendingRect = void 0;
-				break;
 			case "S":
 			case "s":
 			case "B":
@@ -7855,7 +8051,7 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 			case "b":
 			case "b*":
 			case "n":
-				pendingRect = void 0;
+				emitPaint(operator);
 				break;
 			case "BT":
 				ts = defaultTextState();
@@ -8837,6 +9033,7 @@ function readPage(page, resolver, fontResolver, images, imageIdCache, sink) {
 function convertExtractedItem(item, pageMatrix, fontResolver, images, imageIdCache, resolver, sink) {
 	if (item.kind === "text") return convertText(item, pageMatrix, fontResolver);
 	if (item.kind === "rect") return convertRect(item, pageMatrix);
+	if (item.kind === "path") return convertPath(item, pageMatrix);
 	if (item.kind === "image") return convertImage(item, pageMatrix, images, imageIdCache, resolver, sink);
 	return convertInlineImage(item, pageMatrix, images, resolver, sink);
 }
@@ -8884,6 +9081,61 @@ function convertRect(item, pageMatrix) {
 		fill: item.color
 	};
 }
+function transformSubpath(subpath, pageMatrix) {
+	const start = applyMatrix(pageMatrix, {
+		x: subpath.startXPt,
+		y: subpath.startYPt
+	});
+	const segments = subpath.segments.map((segment) => {
+		if (segment.kind === "line") {
+			const p = applyMatrix(pageMatrix, {
+				x: segment.xPt,
+				y: segment.yPt
+			});
+			return {
+				kind: "line",
+				xPt: p.x,
+				yPt: p.y
+			};
+		}
+		const c1 = applyMatrix(pageMatrix, {
+			x: segment.c1xPt,
+			y: segment.c1yPt
+		});
+		const c2 = applyMatrix(pageMatrix, {
+			x: segment.c2xPt,
+			y: segment.c2yPt
+		});
+		const p = applyMatrix(pageMatrix, {
+			x: segment.xPt,
+			y: segment.yPt
+		});
+		return {
+			kind: "cubic",
+			c1xPt: c1.x,
+			c1yPt: c1.y,
+			c2xPt: c2.x,
+			c2yPt: c2.y,
+			xPt: p.x,
+			yPt: p.y
+		};
+	});
+	return {
+		startXPt: start.x,
+		startYPt: start.y,
+		segments,
+		closed: subpath.closed
+	};
+}
+function convertPath(item, pageMatrix) {
+	return {
+		kind: "path",
+		subpaths: item.subpaths.map((subpath) => transformSubpath(subpath, pageMatrix)),
+		...item.fill !== void 0 ? { fill: item.fill } : {},
+		...item.fill !== void 0 && item.fillRule === "evenodd" ? { fillRule: "evenodd" } : {},
+		...item.stroke !== void 0 ? { stroke: item.stroke } : {}
+	};
+}
 function imagePlacementFrom(matrix) {
 	const rotationDeg = matrixRotationDegrees(matrix);
 	return {

package/dist/index.js

@@ -7543,6 +7543,7 @@ function readInlineImage(reader, sink) {
 //#region src/pdf/interpret.ts
 const MAX_FORM_XOBJECT_DEPTH = 12;
 const FALLBACK_GLYPH_WIDTH_PER_1000 = 500;
+const DEFAULT_LINE_WIDTH_PT = 1;
 function defaultTextState() {
 	return {
 		tm: IDENTITY_MATRIX,
@@ -7635,16 +7636,118 @@ function interpretContentStream(bytes, resources, context) {
 	runContentStream(bytes, resources, {
 		ctm: IDENTITY_MATRIX,
 		fillColor: COLOR_BLACK,
-		strokeColor: COLOR_BLACK
+		strokeColor: COLOR_BLACK,
+		lineWidth: DEFAULT_LINE_WIDTH_PT
 	}, context, items, 0);
 	return items;
 }
+function lastPointOf(subpath) {
+	const last = subpath.segments[subpath.segments.length - 1];
+	return last === void 0 ? {
+		x: subpath.startXPt,
+		y: subpath.startYPt
+	} : {
+		x: last.xPt,
+		y: last.yPt
+	};
+}
 function runContentStream(bytes, resources, initialState, context, items, depth) {
 	const operations = readContentStream(bytes, context.sink);
 	const gsStack = [];
 	let gs = initialState;
 	let ts = defaultTextState();
 	let pendingRect;
+	let pathSubpaths = [];
+	let currentSubpath;
+	const finalizeCurrentSubpath = () => {
+		if (currentSubpath !== void 0) {
+			pathSubpaths.push(currentSubpath);
+			currentSubpath = void 0;
+		}
+	};
+	const resetPath = () => {
+		pendingRect = void 0;
+		pathSubpaths = [];
+		currentSubpath = void 0;
+	};
+	const appendRectSubpath = (operands, ctm) => {
+		finalizeCurrentSubpath();
+		const x = numAt(operands, 0);
+		const y = numAt(operands, 1);
+		const w = numAt(operands, 2);
+		const h = numAt(operands, 3);
+		const p1 = applyMatrix(ctm, {
+			x,
+			y
+		});
+		const p2 = applyMatrix(ctm, {
+			x: x + w,
+			y
+		});
+		const p3 = applyMatrix(ctm, {
+			x: x + w,
+			y: y + h
+		});
+		const p4 = applyMatrix(ctm, {
+			x,
+			y: y + h
+		});
+		pathSubpaths.push({
+			startXPt: p1.x,
+			startYPt: p1.y,
+			segments: [
+				{
+					kind: "line",
+					xPt: p2.x,
+					yPt: p2.y
+				},
+				{
+					kind: "line",
+					xPt: p3.x,
+					yPt: p3.y
+				},
+				{
+					kind: "line",
+					xPt: p4.x,
+					yPt: p4.y
+				}
+			],
+			closed: true
+		});
+	};
+	const paintFillRuleFor = (operator) => operator.endsWith("*") ? "evenodd" : "nonzero";
+	const emitPaint = (operator) => {
+		if (operator === "n") {
+			resetPath();
+			return;
+		}
+		if ((operator === "s" || operator === "b" || operator === "b*") && currentSubpath !== void 0) currentSubpath.closed = true;
+		if ((operator === "f" || operator === "F" || operator === "f*") && currentSubpath === void 0 && pathSubpaths.length === 1 && pendingRect !== void 0) {
+			items.push({
+				kind: "rect",
+				...pendingRect,
+				color: gs.fillColor
+			});
+			resetPath();
+			return;
+		}
+		finalizeCurrentSubpath();
+		if (pathSubpaths.length > 0) {
+			const isFillOp = operator === "f" || operator === "F" || operator === "f*" || operator === "B" || operator === "B*" || operator === "b" || operator === "b*";
+			const isStrokeOp = operator === "S" || operator === "s" || operator === "B" || operator === "B*" || operator === "b" || operator === "b*";
+			items.push({
+				kind: "path",
+				subpaths: pathSubpaths,
+				fillRule: paintFillRuleFor(operator),
+				fill: isFillOp ? gs.fillColor : void 0,
+				stroke: isStrokeOp ? {
+					color: gs.strokeColor,
+					widthPt: gs.lineWidth
+				} : void 0
+			});
+		}
+		resetPath();
+	};
 	const advanceThroughString = (codes) => {
 		if (ts.fontResourceName === void 0) return;
 		let offset = 0;
@@ -7828,25 +7931,118 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 			}
 			case "re":
 				pendingRect = rectFromOperands(operands, gs.ctm);
+				appendRectSubpath(operands, gs.ctm);
+				break;
+			case "m": {
+				finalizeCurrentSubpath();
+				const p = applyMatrix(gs.ctm, {
+					x: numAt(operands, 0),
+					y: numAt(operands, 1)
+				});
+				currentSubpath = {
+					startXPt: p.x,
+					startYPt: p.y,
+					segments: [],
+					closed: false
+				};
+				pendingRect = void 0;
+				break;
+			}
+			case "l": {
+				const p = applyMatrix(gs.ctm, {
+					x: numAt(operands, 0),
+					y: numAt(operands, 1)
+				});
+				currentSubpath?.segments.push({
+					kind: "line",
+					xPt: p.x,
+					yPt: p.y
+				});
+				pendingRect = void 0;
 				break;
-			case "m":
-			case "l":
-			case "c":
+			}
+			case "c": {
+				const c1 = applyMatrix(gs.ctm, {
+					x: numAt(operands, 0),
+					y: numAt(operands, 1)
+				});
+				const c2 = applyMatrix(gs.ctm, {
+					x: numAt(operands, 2),
+					y: numAt(operands, 3)
+				});
+				const p = applyMatrix(gs.ctm, {
+					x: numAt(operands, 4),
+					y: numAt(operands, 5)
+				});
+				currentSubpath?.segments.push({
+					kind: "cubic",
+					c1xPt: c1.x,
+					c1yPt: c1.y,
+					c2xPt: c2.x,
+					c2yPt: c2.y,
+					xPt: p.x,
+					yPt: p.y
+				});
+				pendingRect = void 0;
+				break;
+			}
 			case "v":
-			case "y":
+				if (currentSubpath !== void 0) {
+					const cur = lastPointOf(currentSubpath);
+					const c2 = applyMatrix(gs.ctm, {
+						x: numAt(operands, 0),
+						y: numAt(operands, 1)
+					});
+					const p = applyMatrix(gs.ctm, {
+						x: numAt(operands, 2),
+						y: numAt(operands, 3)
+					});
+					currentSubpath.segments.push({
+						kind: "cubic",
+						c1xPt: cur.x,
+						c1yPt: cur.y,
+						c2xPt: c2.x,
+						c2yPt: c2.y,
+						xPt: p.x,
+						yPt: p.y
+					});
+				}
+				pendingRect = void 0;
+				break;
+			case "y": {
+				const c1 = applyMatrix(gs.ctm, {
+					x: numAt(operands, 0),
+					y: numAt(operands, 1)
+				});
+				const p = applyMatrix(gs.ctm, {
+					x: numAt(operands, 2),
+					y: numAt(operands, 3)
+				});
+				currentSubpath?.segments.push({
+					kind: "cubic",
+					c1xPt: c1.x,
+					c1yPt: c1.y,
+					c2xPt: p.x,
+					c2yPt: p.y,
+					xPt: p.x,
+					yPt: p.y
+				});
+				pendingRect = void 0;
+				break;
+			}
 			case "h":
+				if (currentSubpath !== void 0) currentSubpath.closed = true;
 				pendingRect = void 0;
 				break;
+			case "w":
+				gs = {
+					...gs,
+					lineWidth: numAt(operands, 0)
+				};
+				break;
 			case "f":
 			case "F":
 			case "f*":
-				if (pendingRect !== void 0) items.push({
-					kind: "rect",
-					...pendingRect,
-					color: gs.fillColor
-				});
-				pendingRect = void 0;
-				break;
 			case "S":
 			case "s":
 			case "B":
@@ -7854,7 +8050,7 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 			case "b":
 			case "b*":
 			case "n":
-				pendingRect = void 0;
+				emitPaint(operator);
 				break;
 			case "BT":
 				ts = defaultTextState();
@@ -8836,6 +9032,7 @@ function readPage(page, resolver, fontResolver, images, imageIdCache, sink) {
 function convertExtractedItem(item, pageMatrix, fontResolver, images, imageIdCache, resolver, sink) {
 	if (item.kind === "text") return convertText(item, pageMatrix, fontResolver);
 	if (item.kind === "rect") return convertRect(item, pageMatrix);
+	if (item.kind === "path") return convertPath(item, pageMatrix);
 	if (item.kind === "image") return convertImage(item, pageMatrix, images, imageIdCache, resolver, sink);
 	return convertInlineImage(item, pageMatrix, images, resolver, sink);
 }
@@ -8883,6 +9080,61 @@ function convertRect(item, pageMatrix) {
 		fill: item.color
 	};
 }
+function transformSubpath(subpath, pageMatrix) {
+	const start = applyMatrix(pageMatrix, {
+		x: subpath.startXPt,
+		y: subpath.startYPt
+	});
+	const segments = subpath.segments.map((segment) => {
+		if (segment.kind === "line") {
+			const p = applyMatrix(pageMatrix, {
+				x: segment.xPt,
+				y: segment.yPt
+			});
+			return {
+				kind: "line",
+				xPt: p.x,
+				yPt: p.y
+			};
+		}
+		const c1 = applyMatrix(pageMatrix, {
+			x: segment.c1xPt,
+			y: segment.c1yPt
+		});
+		const c2 = applyMatrix(pageMatrix, {
+			x: segment.c2xPt,
+			y: segment.c2yPt
+		});
+		const p = applyMatrix(pageMatrix, {
+			x: segment.xPt,
+			y: segment.yPt
+		});
+		return {
+			kind: "cubic",
+			c1xPt: c1.x,
+			c1yPt: c1.y,
+			c2xPt: c2.x,
+			c2yPt: c2.y,
+			xPt: p.x,
+			yPt: p.y
+		};
+	});
+	return {
+		startXPt: start.x,
+		startYPt: start.y,
+		segments,
+		closed: subpath.closed
+	};
+}
+function convertPath(item, pageMatrix) {
+	return {
+		kind: "path",
+		subpaths: item.subpaths.map((subpath) => transformSubpath(subpath, pageMatrix)),
+		...item.fill !== void 0 ? { fill: item.fill } : {},
+		...item.fill !== void 0 && item.fillRule === "evenodd" ? { fillRule: "evenodd" } : {},
+		...item.stroke !== void 0 ? { stroke: item.stroke } : {}
+	};
+}
 function imagePlacementFrom(matrix) {
 	const rotationDeg = matrixRotationDegrees(matrix);
 	return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "documents.js",
-  "version": "1.45.0",
+  "version": "1.46.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": {