documents.js 1.43.0 → 1.44.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { AttributeSchema, BinaryPartSchema, CommentSchema, CompactPackageSchema, CompactPartSchema, CompactXmlNodeSchema, DefinedNameSchema, PackageSchema, PartSchema, XmlCdataSchema, XmlCommentSchema, XmlDeclarationSchema, XmlElementSchema, XmlNodeSchema, XmlPartSchema, XmlPiSchema, XmlTextSchema, attr, attr as attr$1, base64ToBytes, base64ToBytes as base64ToBytes$1, buildXml, bytesToBase64, bytesToBase64 as bytesToBase64$1, childrenWithTag, compactCodec, compactPackageCodec, decodeCompactPackage, decodeEntities, decodePackage, decodePackage as decodePackage$1, elementsWithTag, elementsWithTag as elementsWithTag$1, encodeCompactPackage, encodePackage, encodePackage as encodePackage$1, fromCompact, isCompactXmlNode, isXmlNode, packageCodec, parsePackage, parseXml, readDocx, readPptx, resolveRelationships, resolveRelationships as resolveRelationships$1, rootElement, rootElement as rootElement$1, serializePackage, textContent, textContent as textContent$1, toCompact, unzipPackage, walk, xmlCodec, zipPackage } from "ooxml.js";
-import { COLOR_BLACK, ContentBlockSchema, ContentCellValueSchema, ContentImageBlockSchema, ContentPageBreakSchema, ContentParagraphSchema, ContentRunSchema, ContentSectionSchema, ContentSectionSchema as ContentSectionSchema$1, ContentShapeSchema, ContentSheetCellSchema, ContentSheetColumnSchema, ContentSheetPrintRangeSchema, ContentSheetPrintSettingsSchema, ContentSheetRepeatRangeSchema, ContentSheetRowSchema, ContentSheetSchema, ContentSheetSchema as ContentSheetSchema$1, ContentSlideSchema, ContentSlideSchema as ContentSlideSchema$1, ContentTableCellSchema, ContentTableRowSchema, ContentTableSchema, DEFAULT_LAYOUT_FONT, LAYOUT_FORMAT_VERSION, LAYOUT_FORMAT_VERSION as LAYOUT_FORMAT_VERSION$1, LayoutDocumentSchema, LayoutMetadataSchema, PAGE_SIZE_A4, PAGE_SIZE_LETTER, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, colorToRgbHex, isContentBlock, rgbHexToColor } from "document-content-model";
+import { COLOR_BLACK, ContentBlockSchema, ContentCellValueSchema, ContentDrawPageSchema, ContentDrawPageSchema as ContentDrawPageSchema$1, ContentImageBlockSchema, ContentPageBreakSchema, ContentParagraphSchema, ContentPathPointSchema, ContentPathSegmentSchema, ContentRunSchema, ContentSectionSchema, ContentSectionSchema as ContentSectionSchema$1, ContentShapeSchema, ContentSheetCellSchema, ContentSheetColumnSchema, ContentSheetPrintRangeSchema, ContentSheetPrintSettingsSchema, ContentSheetRepeatRangeSchema, ContentSheetRowSchema, ContentSheetSchema, ContentSheetSchema as ContentSheetSchema$1, ContentSlideSchema, ContentSlideSchema as ContentSlideSchema$1, ContentStrokeSchema, ContentSubpathSchema, ContentTableCellSchema, ContentTableRowSchema, ContentTableSchema, ContentVectorSchema, DEFAULT_LAYOUT_FONT, LAYOUT_FORMAT_VERSION, LAYOUT_FORMAT_VERSION as LAYOUT_FORMAT_VERSION$1, LayoutDocumentSchema, LayoutMetadataSchema, PAGE_SIZE_A4, PAGE_SIZE_LETTER, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, colorToRgbHex, isContentBlock, rgbHexToColor } from "document-content-model";
 import { z } from "zod";
-import { ODF_MEDIA_TYPES, StyleRegistry, applyOdfTransform, base64ToBytes as base64ToBytes$2, bytesToBase64 as bytesToBase64$2, decodeOdfText, decodePackage as decodePackage$2, encodePackage as encodePackage$2, formatOdfLength, parseCellReference, parseOdfLength, readOdp, readOds, readOdt, resolveOdfShapeGeometry, resolveStyle, setDocumentMediaType, syncManifest, syncManifest as syncManifest$1, xmlnsAttributes } from "odf.js";
+import { ODF_MEDIA_TYPES, StyleRegistry, applyOdfTransform, base64ToBytes as base64ToBytes$2, bytesToBase64 as bytesToBase64$2, decodeOdfText, decodePackage as decodePackage$2, encodePackage as encodePackage$2, formatOdfLength, parseCellReference, parseOdfLength, readOdg, readOdp, readOds, readOdt, resolveOdfShapeGeometry, resolveStyle, setDocumentMediaType, syncManifest, syncManifest as syncManifest$1, xmlnsAttributes } from "odf.js";
 import { Unzlib, inflateSync, unzlibSync, zlibSync } from "fflate";
 //#region src/model/content.ts
 const CONTENT_FORMAT_VERSION = 1;
@@ -23,6 +23,12 @@ const ContentDocumentSchema = z.discriminatedUnion("kind", [
 		formatVersion: z.literal(1),
 		metadata: LayoutMetadataSchema,
 		sheets: z.array(ContentSheetSchema$1)
+	}),
+	z.object({
+		kind: z.literal("drawing"),
+		formatVersion: z.literal(1),
+		metadata: LayoutMetadataSchema,
+		pages: z.array(ContentDrawPageSchema$1)
 	})
 ]);
 //#endregion
@@ -7603,11 +7609,15 @@ function writeText(writer, item, context, substitutions) {
 		writeUnderline(writer, item, item.widthPt ?? encoded.width1000 / 1e3 * item.sizePt * scale, context.measurer);
 	}
 }
-function paintOperatorFor(fill, stroke) {
-	if (fill !== void 0 && stroke !== void 0) return "B";
-	if (fill !== void 0) return "f";
+function paintOperatorFor(fill, stroke, fillRule) {
+	const evenOdd = fillRule === "evenodd";
+	if (fill !== void 0 && stroke !== void 0) return evenOdd ? "B*" : "B";
+	if (fill !== void 0) return evenOdd ? "f*" : "f";
 	if (stroke !== void 0) return "S";
 }
+function formatPoint(x, y) {
+	return `${formatNumber(x)} ${formatNumber(y)}`;
+}
 function writeFillAndStroke(writer, fill, stroke) {
 	if (fill !== void 0) writeRgbOperator(writer, fill, "rg");
 	if (stroke !== void 0) {
@@ -7638,12 +7648,24 @@ function writeEllipse(writer, item) {
 	const ry = item.heightPt / 2;
 	const kx = rx * BEZIER_KAPPA;
 	const ky = ry * BEZIER_KAPPA;
-	const point = (x, y) => `${formatNumber(x)} ${formatNumber(y)}`;
-	writer.writeAscii(`${point(cx + rx, cy)} m\n`);
-	writer.writeAscii(`${point(cx + rx, cy + ky)} ${point(cx + kx, cy + ry)} ${point(cx, cy + ry)} c\n`);
-	writer.writeAscii(`${point(cx - kx, cy + ry)} ${point(cx - rx, cy + ky)} ${point(cx - rx, cy)} c\n`);
-	writer.writeAscii(`${point(cx - rx, cy - ky)} ${point(cx - kx, cy - ry)} ${point(cx, cy - ry)} c\n`);
-	writer.writeAscii(`${point(cx + kx, cy - ry)} ${point(cx + rx, cy - ky)} ${point(cx + rx, cy)} c\n`);
+	writer.writeAscii(`${formatPoint(cx + rx, cy)} m\n`);
+	writer.writeAscii(`${formatPoint(cx + rx, cy + ky)} ${formatPoint(cx + kx, cy + ry)} ${formatPoint(cx, cy + ry)} c\n`);
+	writer.writeAscii(`${formatPoint(cx - kx, cy + ry)} ${formatPoint(cx - rx, cy + ky)} ${formatPoint(cx - rx, cy)} c\n`);
+	writer.writeAscii(`${formatPoint(cx - rx, cy - ky)} ${formatPoint(cx - kx, cy - ry)} ${formatPoint(cx, cy - ry)} c\n`);
+	writer.writeAscii(`${formatPoint(cx + kx, cy - ry)} ${formatPoint(cx + rx, cy - ky)} ${formatPoint(cx + rx, cy)} c\n`);
+	writer.writeAscii(`${paint}\n`);
+}
+function writeSubpath(writer, subpath) {
+	writer.writeAscii(`${formatPoint(subpath.startXPt, subpath.startYPt)} m\n`);
+	for (const segment of subpath.segments) if (segment.kind === "line") writer.writeAscii(`${formatPoint(segment.xPt, segment.yPt)} l\n`);
+	else writer.writeAscii(`${formatPoint(segment.c1xPt, segment.c1yPt)} ${formatPoint(segment.c2xPt, segment.c2yPt)} ${formatPoint(segment.xPt, segment.yPt)} c\n`);
+	if (subpath.closed) writer.writeAscii("h\n");
+}
+function writePath(writer, item) {
+	const paint = paintOperatorFor(item.fill, item.stroke, item.fillRule);
+	if (paint === void 0) return;
+	writeFillAndStroke(writer, item.fill, item.stroke);
+	for (const subpath of item.subpaths) writeSubpath(writer, subpath);
 	writer.writeAscii(`${paint}\n`);
 }
 function writeImage(writer, item, context) {
@@ -7662,6 +7684,7 @@ function writeContentStream(items, context) {
 	else if (item.kind === "rect") writeRect(writer, item);
 	else if (item.kind === "line") writeLine(writer, item);
 	else if (item.kind === "ellipse") writeEllipse(writer, item);
+	else if (item.kind === "path") writePath(writer, item);
 	return {
 		bytes: writer.toBytes(),
 		substitutions
@@ -8468,6 +8491,17 @@ function readOdsContent(pkg) {
 	};
 }
 //#endregion
+//#region src/odf/odg/read.ts
+function readOdgContent(pkg) {
+	const odgDoc = readOdg(pkg);
+	return {
+		kind: "drawing",
+		formatVersion: 1,
+		metadata: { ...odgDoc.metadata },
+		pages: odgDoc.pages
+	};
+}
+//#endregion
 //#region src/pdf/text-layout.ts
 const WORD_OR_WHITESPACE_PATTERN = /\n|\s+|\S+/g;
 function atomizeRuns(runs, measurer) {
@@ -9499,6 +9533,118 @@ function convertSpreadsheetToLayout(doc, options) {
 	};
 }
 //#endregion
+//#region src/layout/drawing.ts
+function convertRectVector(vector, pageHeightPt, out) {
+	const flipped = flipY(vector.frame, pageHeightPt);
+	out.push({
+		kind: "rect",
+		xPt: flipped.xPt,
+		yPt: flipped.yPt,
+		widthPt: flipped.widthPt,
+		heightPt: flipped.heightPt,
+		fill: vector.fill,
+		stroke: vector.stroke,
+		sourcePath: vector.sourcePath
+	});
+}
+function convertEllipseVector(vector, pageHeightPt, out) {
+	const flipped = flipY(vector.frame, pageHeightPt);
+	out.push({
+		kind: "ellipse",
+		xPt: flipped.xPt,
+		yPt: flipped.yPt,
+		widthPt: flipped.widthPt,
+		heightPt: flipped.heightPt,
+		fill: vector.fill,
+		stroke: vector.stroke,
+		sourcePath: vector.sourcePath
+	});
+}
+function convertLineVector(vector, pageHeightPt, out) {
+	out.push({
+		kind: "line",
+		x1Pt: vector.from.xPt,
+		y1Pt: pageHeightPt - vector.from.yPt,
+		x2Pt: vector.to.xPt,
+		y2Pt: pageHeightPt - vector.to.yPt,
+		color: vector.stroke.color,
+		widthPt: vector.stroke.widthPt,
+		sourcePath: vector.sourcePath
+	});
+}
+function placePathPoint(frame, point, pageHeightPt) {
+	return {
+		xPt: frame.xPt + point.xPt,
+		yPt: pageHeightPt - frame.yPt - point.yPt
+	};
+}
+function convertPathVector(vector, pageHeightPt, out) {
+	const subpaths = vector.subpaths.map((subpath) => {
+		const start = placePathPoint(vector.frame, subpath.start, pageHeightPt);
+		return {
+			startXPt: start.xPt,
+			startYPt: start.yPt,
+			closed: subpath.closed,
+			segments: subpath.segments.map((segment) => {
+				if (segment.kind === "line") {
+					const to = placePathPoint(vector.frame, segment.to, pageHeightPt);
+					return {
+						kind: "line",
+						xPt: to.xPt,
+						yPt: to.yPt
+					};
+				}
+				const control1 = placePathPoint(vector.frame, segment.control1, pageHeightPt);
+				const control2 = placePathPoint(vector.frame, segment.control2, pageHeightPt);
+				const to = placePathPoint(vector.frame, segment.to, pageHeightPt);
+				return {
+					kind: "cubic",
+					c1xPt: control1.xPt,
+					c1yPt: control1.yPt,
+					c2xPt: control2.xPt,
+					c2yPt: control2.yPt,
+					xPt: to.xPt,
+					yPt: to.yPt
+				};
+			})
+		};
+	});
+	out.push({
+		kind: "path",
+		subpaths,
+		fill: vector.fill,
+		fillRule: vector.fillRule,
+		stroke: vector.stroke,
+		sourcePath: vector.sourcePath
+	});
+}
+function convertVector(vector, pageHeightPt, out) {
+	if (vector.kind === "rect") convertRectVector(vector, pageHeightPt, out);
+	else if (vector.kind === "ellipse") convertEllipseVector(vector, pageHeightPt, out);
+	else if (vector.kind === "line") convertLineVector(vector, pageHeightPt, out);
+	else convertPathVector(vector, pageHeightPt, out);
+}
+function convertPage(page, measurer, images) {
+	const items = [];
+	for (const vector of page.vectors) convertVector(vector, page.size.heightPt, items);
+	for (const shape of page.shapes) convertShape(shape, page.size.heightPt, measurer, images, items);
+	return {
+		widthPt: page.size.widthPt,
+		heightPt: page.size.heightPt,
+		items
+	};
+}
+function convertDrawingToLayout(doc, options) {
+	const images = {};
+	const pages = doc.pages.map((page) => convertPage(page, options.measurer, images));
+	return {
+		formatVersion: LAYOUT_FORMAT_VERSION$1,
+		metadata: doc.metadata,
+		pages,
+		images
+	};
+}
+//#endregion
 //#region src/layout/reconstruct.ts
 const ZERO_MARGINS = {
 	topPt: 0,
@@ -9878,6 +10024,14 @@ function odsToPdf(bytes, options) {
 		onSubstitution: options?.onSubstitution
 	});
 }
+function odgToPdf(bytes, options) {
+	const content = readOdgContent(decodePackage$2(bytes));
+	if (content.kind !== "drawing") throw new Error("readOdgContent returned a non-drawing ContentDocument");
+	return writePdf(convertDrawingToLayout(content, { measurer: createStandardFontMeasurer() }), {
+		signal: options?.signal,
+		onSubstitution: options?.onSubstitution
+	});
+}
 function pdfToDocx(bytes, options) {
 	const content = reconstructWordprocessing(readPdf(bytes, {
 		signal: options?.signal,
@@ -9947,6 +10101,10 @@ const SUPPORTED_CONVERSIONS = [
 		source: "ods",
 		target: "pdf"
 	},
+	{
+		source: "odg",
+		target: "pdf"
+	},
 	{
 		source: "pdf",
 		target: "docx"
@@ -10052,6 +10210,19 @@ function createLocalDocumentConverter() {
 					diagnostics
 				});
 			}
+			if (source.format === "odg" && targetFormat === "pdf") {
+				const bytes = odgToPdf(source.bytes, {
+					signal: options.signal,
+					onSubstitution: (s, c) => diagnostics.push(substitutionDiagnostic(s, c))
+				});
+				return Promise.resolve({
+					document: {
+						format: "pdf",
+						bytes
+					},
+					diagnostics
+				});
+			}
 			if (source.format === "pdf" && targetFormat === "docx") {
 				const bytes = pdfToDocx(source.bytes, {
 					signal: options.signal,
@@ -10115,4 +10286,4 @@ function fixedClock(date) {
 	return { now: () => date };
 }
 //#endregion
-export { AttributeSchema, BinaryPartSchema, COLOR_BLACK, CONTENT_FORMAT_VERSION, CommentSchema, CompactPackageSchema, CompactPartSchema, CompactXmlNodeSchema, ContentBlockSchema, ContentCellValueSchema, ContentDocumentSchema, ContentImageBlockSchema, ContentPageBreakSchema, ContentParagraphSchema, ContentRunSchema, ContentSectionSchema, ContentShapeSchema, ContentSheetCellSchema, ContentSheetColumnSchema, ContentSheetPrintRangeSchema, ContentSheetPrintSettingsSchema, ContentSheetRepeatRangeSchema, ContentSheetRowSchema, ContentSheetSchema, ContentSlideSchema, ContentTableCellSchema, ContentTableRowSchema, ContentTableSchema, DEFAULT_LAYOUT_FONT, DefinedNameSchema, DocxBytesSchema, DocxEditor, DocxParagraph, DocxRun, DocxTable, DocxTableCell, DocxTableRow, LAYOUT_FORMAT_VERSION, NOOP_DIAGNOSTIC_SINK, OdgBytesSchema, OdpBytesSchema, OdpEditor, OdpShape, OdpSlide, OdsBytesSchema, OdsCell, OdsEditor, OdsSheet, OdtBytesSchema, OdtEditor, OdtList, OdtListItem, OdtParagraph, OdtRun, OdtTable, OdtTableCell, OdtTableRow, PAGE_SIZE_A4, PAGE_SIZE_LETTER, PackageSchema, PartSchema, PdfBytesSchema, PdfEncryptedError, PdfParseError, PptxBytesSchema, PptxEditor, PptxShape, PptxSlide, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, XmlCdataSchema, XmlCommentSchema, XmlDeclarationSchema, XmlElementSchema, XmlNodeSchema, XmlPartSchema, XmlPiSchema, XmlTextSchema, attr, base64ToBytes, buildDocxPackage, buildOdpPackage, buildOdsPackage, buildOdtPackage, buildPptxPackage, buildXml, bytesToBase64, childrenWithTag, compactCodec, compactPackageCodec, convertPresentationToLayout, convertSpreadsheetToLayout, convertWordprocessingToLayout, createDocx, createLocalDocumentConverter, createOdp, createOds, createOdt, createPptx, decodeCompactPackage, decodeEntities, decodePackage, docxPdfCodec, docxToPdf, elementsWithTag, encodeCompactPackage, encodePackage, fixedClock, flipY, fromCompact, isCompactXmlNode, isContentBlock, isXmlNode, odpPdfCodec, odpToPdf, odsToPdf, odtPdfCodec, odtToPdf, openDocx, openOdp, openOds, openOdt, openPptx, packageCodec, parsePackage, parseXml, pdfCodec, pdfToDocx, pdfToOdp, pdfToOdt, pdfToPptx, pptxPdfCodec, pptxToPdf, readDocxContent, readOdpContent, readOdsContent, readOdtContent, readPdf, readPptxContent, reconstructPresentation, reconstructWordprocessing, resolveRelationships, rgbHexToColor, rootElement, serializePackage, systemClock, textContent, throwIfAborted, toCompact, unzipPackage, walk, writePdf, xmlCodec, zipPackage };
+export { AttributeSchema, BinaryPartSchema, COLOR_BLACK, CONTENT_FORMAT_VERSION, CommentSchema, CompactPackageSchema, CompactPartSchema, CompactXmlNodeSchema, ContentBlockSchema, ContentCellValueSchema, ContentDocumentSchema, ContentDrawPageSchema, ContentImageBlockSchema, ContentPageBreakSchema, ContentParagraphSchema, ContentPathPointSchema, ContentPathSegmentSchema, ContentRunSchema, ContentSectionSchema, ContentShapeSchema, ContentSheetCellSchema, ContentSheetColumnSchema, ContentSheetPrintRangeSchema, ContentSheetPrintSettingsSchema, ContentSheetRepeatRangeSchema, ContentSheetRowSchema, ContentSheetSchema, ContentSlideSchema, ContentStrokeSchema, ContentSubpathSchema, ContentTableCellSchema, ContentTableRowSchema, ContentTableSchema, ContentVectorSchema, DEFAULT_LAYOUT_FONT, DefinedNameSchema, DocxBytesSchema, DocxEditor, DocxParagraph, DocxRun, DocxTable, DocxTableCell, DocxTableRow, LAYOUT_FORMAT_VERSION, NOOP_DIAGNOSTIC_SINK, OdgBytesSchema, OdpBytesSchema, OdpEditor, OdpShape, OdpSlide, OdsBytesSchema, OdsCell, OdsEditor, OdsSheet, OdtBytesSchema, OdtEditor, OdtList, OdtListItem, OdtParagraph, OdtRun, OdtTable, OdtTableCell, OdtTableRow, PAGE_SIZE_A4, PAGE_SIZE_LETTER, PackageSchema, PartSchema, PdfBytesSchema, PdfEncryptedError, PdfParseError, PptxBytesSchema, PptxEditor, PptxShape, PptxSlide, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, XmlCdataSchema, XmlCommentSchema, XmlDeclarationSchema, XmlElementSchema, XmlNodeSchema, XmlPartSchema, XmlPiSchema, XmlTextSchema, attr, base64ToBytes, buildDocxPackage, buildOdpPackage, buildOdsPackage, buildOdtPackage, buildPptxPackage, buildXml, bytesToBase64, childrenWithTag, compactCodec, compactPackageCodec, convertDrawingToLayout, convertPresentationToLayout, convertSpreadsheetToLayout, convertWordprocessingToLayout, createDocx, createLocalDocumentConverter, createOdp, createOds, createOdt, createPptx, decodeCompactPackage, decodeEntities, decodePackage, docxPdfCodec, docxToPdf, elementsWithTag, encodeCompactPackage, encodePackage, fixedClock, flipY, fromCompact, isCompactXmlNode, isContentBlock, isXmlNode, odgToPdf, odpPdfCodec, odpToPdf, odsToPdf, odtPdfCodec, odtToPdf, openDocx, openOdp, openOds, openOdt, openPptx, packageCodec, parsePackage, parseXml, pdfCodec, pdfToDocx, pdfToOdp, pdfToOdt, pdfToPptx, pptxPdfCodec, pptxToPdf, readDocxContent, readOdgContent, readOdpContent, readOdsContent, readOdtContent, readPdf, readPptxContent, reconstructPresentation, reconstructWordprocessing, resolveRelationships, rgbHexToColor, rootElement, serializePackage, systemClock, textContent, throwIfAborted, toCompact, unzipPackage, walk, writePdf, xmlCodec, zipPackage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "documents.js",
-  "version": "1.43.0",
+  "version": "1.44.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": {
@@ -64,7 +64,7 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "document-content-model": "^1.2.0",
+    "document-content-model": "^1.3.0",
     "fflate": "^0.8.3",
     "odf.js": "^1.8.0",
     "ooxml.js": "^2.1.0",