odf.js 1.5.0 → 1.6.0

package/dist/index.js

@@ -1494,6 +1494,28 @@ function parseBox(element) {
 		heightPt
 	};
 }
+function parseLinePoints(element) {
+	const x1Value = attrValue(element, "svg:x1");
+	const y1Value = attrValue(element, "svg:y1");
+	const x2Value = attrValue(element, "svg:x2");
+	const y2Value = attrValue(element, "svg:y2");
+	if (x1Value === void 0 || y1Value === void 0 || x2Value === void 0 || y2Value === void 0) return;
+	const x1Pt = parseOdfLength(x1Value);
+	const y1Pt = parseOdfLength(y1Value);
+	const x2Pt = parseOdfLength(x2Value);
+	const y2Pt = parseOdfLength(y2Value);
+	if (x1Pt === void 0 || y1Pt === void 0 || x2Pt === void 0 || y2Pt === void 0) return;
+	return {
+		from: {
+			xPt: x1Pt,
+			yPt: y1Pt
+		},
+		to: {
+			xPt: x2Pt,
+			yPt: y2Pt
+		}
+	};
+}
 //#endregion
 //#region src/typed/shared/cascade.ts
 const STYLE_PARTS = ["content.xml", "styles.xml"];
@@ -1858,6 +1880,291 @@ function composeOdfGroupTransform(groupFunctions, child) {
 	};
 }
 //#endregion
+//#region src/typed/shared/masterpage.ts
+const STYLES_PART$1 = "styles.xml";
+const AUTOMATIC_STYLE_PARTS$1 = ["content.xml", STYLES_PART$1];
+function findMasterPageElement(pkg, masterPageName) {
+	if (masterPageName === void 0) return;
+	const stylesPart = pkg.parts[STYLES_PART$1];
+	if (stylesPart?.kind !== "xml") return;
+	const root = rootElement(stylesPart.nodes);
+	const masterStyles = root === void 0 ? void 0 : findChildElement(root.children, "office:master-styles");
+	if (masterStyles === void 0) return;
+	return childrenWithTag(masterStyles, "style:master-page").find((element) => attrValue(element, "style:name") === masterPageName);
+}
+function findPageLayoutElement$1(pkg, pageLayoutName) {
+	if (pageLayoutName === void 0) return;
+	for (const partPath of AUTOMATIC_STYLE_PARTS$1) {
+		const part = pkg.parts[partPath];
+		if (part?.kind !== "xml") continue;
+		const root = rootElement(part.nodes);
+		const automaticStyles = root === void 0 ? void 0 : findChildElement(root.children, "office:automatic-styles");
+		if (automaticStyles === void 0) continue;
+		const found = childrenWithTag(automaticStyles, "style:page-layout").find((element) => attrValue(element, "style:name") === pageLayoutName);
+		if (found !== void 0) return found;
+	}
+}
+function resolveDrawPageSize(page, pkg) {
+	const masterPage = findMasterPageElement(pkg, attrValue(page, "draw:master-page-name"));
+	const pageLayout = findPageLayoutElement$1(pkg, masterPage === void 0 ? void 0 : attrValue(masterPage, "style:page-layout-name"));
+	const properties = pageLayout === void 0 ? void 0 : childrenWithTag(pageLayout, "style:page-layout-properties")[0];
+	return properties === void 0 ? void 0 : parsePageSize(properties);
+}
+//#endregion
+//#region src/typed/shared/path.ts
+const VIEW_BOX_PATTERN = /^(-?\d+(?:\.\d+)?)\s+(-?\d+(?:\.\d+)?)\s+(-?\d+(?:\.\d+)?)\s+(-?\d+(?:\.\d+)?)$/;
+function parseOdfViewBox(value) {
+	const match = VIEW_BOX_PATTERN.exec(value.trim());
+	if (match === null) return;
+	const minX = Number(match[1]);
+	const minY = Number(match[2]);
+	const width = Number(match[3]);
+	const height = Number(match[4]);
+	if (width <= 0 || height <= 0) return;
+	return {
+		minX,
+		minY,
+		width,
+		height
+	};
+}
+function parseOdfPointsList(value) {
+	const points = [];
+	for (const pair of value.trim().split(/\s+/)) {
+		if (pair.length === 0) continue;
+		const [xRaw, yRaw] = pair.split(",");
+		if (xRaw === void 0 || yRaw === void 0) continue;
+		const x = Number(xRaw);
+		const y = Number(yRaw);
+		if (!Number.isFinite(x) || !Number.isFinite(y)) continue;
+		points.push({
+			x,
+			y
+		});
+	}
+	return points;
+}
+function rawSubpathFromPoints(points, closed) {
+	const start = points[0];
+	if (start === void 0) return;
+	return {
+		start,
+		segments: points.slice(1).map((to) => ({
+			kind: "line",
+			to
+		})),
+		closed
+	};
+}
+const COMMAND_LETTERS = /* @__PURE__ */ new Set([
+	"M",
+	"m",
+	"L",
+	"l",
+	"H",
+	"h",
+	"V",
+	"v",
+	"C",
+	"c",
+	"S",
+	"s",
+	"Q",
+	"q",
+	"T",
+	"t",
+	"A",
+	"a",
+	"Z",
+	"z"
+]);
+function isCommandLetter(token) {
+	return COMMAND_LETTERS.has(token);
+}
+const PATH_TOKEN_PATTERN = /[MmLlHhVvCcSsQqTtAaZz]|-?(?:\d+\.\d+|\.\d+|\d+)(?:[eE][-+]?\d+)?/g;
+function tokenizePathData(d) {
+	return d.match(PATH_TOKEN_PATTERN) ?? [];
+}
+function parseOdfPathData(d) {
+	const tokens = tokenizePathData(d);
+	const subpaths = [];
+	let current = {
+		x: 0,
+		y: 0
+	};
+	let subpathStart = {
+		x: 0,
+		y: 0
+	};
+	let activeSubpath;
+	let command;
+	let firstMInCommand = true;
+	function startSubpath(point) {
+		activeSubpath = {
+			start: point,
+			segments: [],
+			closed: false
+		};
+		subpaths.push(activeSubpath);
+		subpathStart = point;
+		current = point;
+	}
+	function pushSegment(segment, to) {
+		if (activeSubpath !== void 0) activeSubpath.segments.push(segment);
+		current = to;
+	}
+	let i = 0;
+	while (i < tokens.length) {
+		const token = tokens[i];
+		if (token === void 0) break;
+		if (isCommandLetter(token)) {
+			if (token === "Z" || token === "z") {
+				if (activeSubpath !== void 0) {
+					activeSubpath.closed = true;
+					current = subpathStart;
+				}
+				command = void 0;
+				i += 1;
+				continue;
+			}
+			command = token;
+			firstMInCommand = true;
+			i += 1;
+			continue;
+		}
+		if (command === void 0) {
+			i += 1;
+			continue;
+		}
+		const upper = command.toUpperCase();
+		const relative = command !== upper;
+		if (upper === "M" || upper === "L") {
+			const xTok = tokens[i];
+			const yTok = tokens[i + 1];
+			i += 2;
+			if (xTok === void 0 || yTok === void 0) break;
+			const x = Number(xTok);
+			const y = Number(yTok);
+			if (!Number.isFinite(x) || !Number.isFinite(y)) continue;
+			const point = relative ? {
+				x: current.x + x,
+				y: current.y + y
+			} : {
+				x,
+				y
+			};
+			if (upper === "M" && firstMInCommand) {
+				startSubpath(point);
+				firstMInCommand = false;
+			} else pushSegment({
+				kind: "line",
+				to: point
+			}, point);
+		} else if (upper === "H") {
+			const xTok = tokens[i];
+			i += 1;
+			if (xTok === void 0) break;
+			const x = Number(xTok);
+			if (!Number.isFinite(x)) continue;
+			const point = relative ? {
+				x: current.x + x,
+				y: current.y
+			} : {
+				x,
+				y: current.y
+			};
+			pushSegment({
+				kind: "line",
+				to: point
+			}, point);
+		} else if (upper === "V") {
+			const yTok = tokens[i];
+			i += 1;
+			if (yTok === void 0) break;
+			const y = Number(yTok);
+			if (!Number.isFinite(y)) continue;
+			const point = relative ? {
+				x: current.x,
+				y: current.y + y
+			} : {
+				x: current.x,
+				y
+			};
+			pushSegment({
+				kind: "line",
+				to: point
+			}, point);
+		} else if (upper === "C") {
+			const rawArgs = tokens.slice(i, i + 6);
+			i += 6;
+			if (rawArgs.length < 6) break;
+			const x1 = Number(rawArgs[0]);
+			const y1 = Number(rawArgs[1]);
+			const x2 = Number(rawArgs[2]);
+			const y2 = Number(rawArgs[3]);
+			const x = Number(rawArgs[4]);
+			const y = Number(rawArgs[5]);
+			if (![
+				x1,
+				y1,
+				x2,
+				y2,
+				x,
+				y
+			].every(Number.isFinite)) continue;
+			const control1 = relative ? {
+				x: current.x + x1,
+				y: current.y + y1
+			} : {
+				x: x1,
+				y: y1
+			};
+			const control2 = relative ? {
+				x: current.x + x2,
+				y: current.y + y2
+			} : {
+				x: x2,
+				y: y2
+			};
+			const to = relative ? {
+				x: current.x + x,
+				y: current.y + y
+			} : {
+				x,
+				y
+			};
+			pushSegment({
+				kind: "cubic",
+				control1,
+				control2,
+				to
+			}, to);
+		} else i += 1;
+	}
+	return subpaths;
+}
+function scaleOdfRawPoint(point, viewBox, frame) {
+	return {
+		xPt: (point.x - viewBox.minX) * (frame.widthPt / viewBox.width),
+		yPt: (point.y - viewBox.minY) * (frame.heightPt / viewBox.height)
+	};
+}
+function buildOdfSubpaths(rawSubpaths, viewBox, frame) {
+	return rawSubpaths.map((raw) => ({
+		start: scaleOdfRawPoint(raw.start, viewBox, frame),
+		closed: raw.closed,
+		segments: raw.segments.map((segment) => segment.kind === "line" ? {
+			kind: "line",
+			to: scaleOdfRawPoint(segment.to, viewBox, frame)
+		} : {
+			kind: "cubic",
+			control1: scaleOdfRawPoint(segment.control1, viewBox, frame),
+			control2: scaleOdfRawPoint(segment.control2, viewBox, frame),
+			to: scaleOdfRawPoint(segment.to, viewBox, frame)
+		})
+	}));
+}
+//#endregion
 //#region src/typed/draw/shapes.ts
 const ZERO_INSETS = {
 	insetLeftPt: 0,
@@ -1939,37 +2246,224 @@ function walkDrawShapes(children, groupFunctions, pkg, out) {
 		}
 	}
 }
-//#endregion
-//#region src/typed/odp/read.ts
-const CONTENT_PART$1 = "content.xml";
-const STYLES_PART$1 = "styles.xml";
-const AUTOMATIC_STYLE_PARTS$1 = [CONTENT_PART$1, STYLES_PART$1];
-function findMasterPageElement(pkg, masterPageName) {
-	if (masterPageName === void 0) return;
-	const stylesPart = pkg.parts[STYLES_PART$1];
-	if (stylesPart?.kind !== "xml") return;
-	const root = rootElement(stylesPart.nodes);
-	const masterStyles = root === void 0 ? void 0 : findChildElement(root.children, "office:master-styles");
-	if (masterStyles === void 0) return;
-	return childrenWithTag(masterStyles, "style:master-page").find((element) => attrValue(element, "style:name") === masterPageName);
+function readOdfFillAndStroke(element, pkg) {
+	const { elements } = resolveStyleElementChain(attrValue(element, "draw:style-name"), "graphic", pkg);
+	let fill;
+	let stroke;
+	for (const styleElement of elements) {
+		const props = childrenWithTag(styleElement, "style:graphic-properties")[0];
+		if (props === void 0) continue;
+		if (attrValue(props, "draw:fill") === "none") fill = void 0;
+		else {
+			const fillColorValue = attrValue(props, "draw:fill-color");
+			const parsedFill = fillColorValue === void 0 ? void 0 : parseOdfColor(fillColorValue);
+			if (parsedFill !== void 0) fill = parsedFill;
+		}
+		if (attrValue(props, "draw:stroke") === "none") stroke = void 0;
+		else {
+			const strokeColorValue = attrValue(props, "svg:stroke-color");
+			const strokeWidthValue = attrValue(props, "svg:stroke-width");
+			const strokeColor = strokeColorValue === void 0 ? void 0 : parseOdfColor(strokeColorValue);
+			const strokeWidthPt = strokeWidthValue === void 0 ? void 0 : parseOdfLength(strokeWidthValue);
+			if (strokeColor !== void 0 && strokeWidthPt !== void 0 && strokeWidthPt > 0) stroke = {
+				color: strokeColor,
+				widthPt: strokeWidthPt
+			};
+		}
+	}
+	return {
+		fill,
+		stroke
+	};
 }
-function findPageLayoutElement$1(pkg, pageLayoutName) {
-	if (pageLayoutName === void 0) return;
-	for (const partPath of AUTOMATIC_STYLE_PARTS$1) {
-		const part = pkg.parts[partPath];
-		if (part?.kind !== "xml") continue;
-		const root = rootElement(part.nodes);
-		const automaticStyles = root === void 0 ? void 0 : findChildElement(root.children, "office:automatic-styles");
-		if (automaticStyles === void 0) continue;
-		const found = childrenWithTag(automaticStyles, "style:page-layout").find((element) => attrValue(element, "style:name") === pageLayoutName);
-		if (found !== void 0) return found;
+function resolveVectorFrame(element, groupFunctions) {
+	const geometry = resolveOdfShapeGeometry(element);
+	if (geometry === void 0) return;
+	return composeOdfGroupTransform(groupFunctions, geometry).frame;
+}
+function readDrawRectVector(element, groupFunctions, pkg) {
+	const frame = resolveVectorFrame(element, groupFunctions);
+	if (frame === void 0) return;
+	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
+	return {
+		kind: "rect",
+		frame,
+		fill,
+		stroke
+	};
+}
+function readDrawEllipseVector(element, groupFunctions, pkg) {
+	const frame = resolveVectorFrame(element, groupFunctions);
+	if (frame === void 0) return;
+	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
+	return {
+		kind: "ellipse",
+		frame,
+		fill,
+		stroke
+	};
+}
+function readDrawLineVector(element, groupFunctions, pkg) {
+	const raw = parseLinePoints(element);
+	if (raw === void 0) return;
+	const from = groupFunctions.length === 0 ? raw.from : applyOdfTransform(groupFunctions, raw.from);
+	const to = groupFunctions.length === 0 ? raw.to : applyOdfTransform(groupFunctions, raw.to);
+	const { stroke } = readOdfFillAndStroke(element, pkg);
+	if (stroke === void 0) return;
+	return {
+		kind: "line",
+		from,
+		to,
+		stroke
+	};
+}
+function readDrawPathVector(element, groupFunctions, pkg) {
+	const frame = resolveVectorFrame(element, groupFunctions);
+	if (frame === void 0) return;
+	const viewBoxValue = attrValue(element, "svg:viewBox");
+	const viewBox = viewBoxValue === void 0 ? void 0 : parseOdfViewBox(viewBoxValue);
+	if (viewBox === void 0) return;
+	let rawSubpaths;
+	if (element.tag === "draw:path") {
+		const d = attrValue(element, "svg:d");
+		rawSubpaths = d === void 0 ? [] : parseOdfPathData(d);
+	} else {
+		const pointsValue = attrValue(element, "draw:points");
+		const subpath = rawSubpathFromPoints(pointsValue === void 0 ? [] : parseOdfPointsList(pointsValue), element.tag === "draw:polygon");
+		rawSubpaths = subpath === void 0 ? [] : [subpath];
+	}
+	if (rawSubpaths.length === 0) return;
+	const subpaths = buildOdfSubpaths(rawSubpaths, viewBox, frame);
+	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
+	return {
+		kind: "path",
+		frame,
+		subpaths,
+		fill,
+		stroke
+	};
+}
+const RECOGNIZED_CUSTOM_SHAPE_PRESETS = /* @__PURE__ */ new Set([
+	"rectangle",
+	"round-rectangle",
+	"ellipse"
+]);
+function readCustomShapeVector(element, groupFunctions, pkg) {
+	const geometryElement = childrenWithTag(element, "draw:enhanced-geometry")[0];
+	const type = geometryElement === void 0 ? void 0 : attrValue(geometryElement, "draw:type");
+	if (type === void 0 || !RECOGNIZED_CUSTOM_SHAPE_PRESETS.has(type)) return;
+	const frame = resolveVectorFrame(element, groupFunctions);
+	if (frame === void 0) return;
+	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
+	return {
+		kind: type === "ellipse" ? "ellipse" : "rect",
+		frame,
+		fill,
+		stroke
+	};
+}
+function readCustomShapeAsTextShape(element, groupFunctions, pkg) {
+	const paragraphs = elementsWithTag(element.children, "text:p").map((p) => readOdfParagraph(p, pkg));
+	if (!paragraphs.some((paragraph) => paragraph.runs.some((run) => run.text.length > 0))) return;
+	const ownGeometry = resolveOdfShapeGeometry(element);
+	if (ownGeometry === void 0) return;
+	const geometry = composeOdfGroupTransform(groupFunctions, ownGeometry);
+	return {
+		name: attrValue(element, "draw:name"),
+		frame: geometry.frame,
+		rotationDeg: geometry.rotationDeg,
+		...readFrameInsets(element, pkg),
+		blocks: paragraphs
+	};
+}
+function nextDocumentIndex(state) {
+	const value = state.next;
+	state.next += 1;
+	return value;
+}
+function paintOrderKey(element, state) {
+	const documentIndex = nextDocumentIndex(state);
+	const raw = attrValue(element, "draw:z-index");
+	if (raw === void 0) return documentIndex;
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isInteger(parsed) && parsed >= 0 ? parsed : documentIndex;
+}
+function byPaintOrder(items) {
+	return items.slice().sort((a, b) => a.zIndex - b.zIndex).map((item) => item.value);
+}
+function walkDrawPageContent(children, groupFunctions, pkg, indexState, shapesOut, vectorsOut) {
+	for (const node of children) {
+		if (node.type !== "element") continue;
+		if (node.tag === "draw:frame") {
+			const zIndex = paintOrderKey(node, indexState);
+			const shape = readDrawFrame(node, groupFunctions, pkg);
+			if (shape !== void 0) shapesOut.push({
+				value: shape,
+				zIndex
+			});
+		} else if (node.tag === "draw:g") {
+			const ownFunctions = readOwnTransformFunctions(node);
+			const nested = ownFunctions.length === 0 ? groupFunctions : [...ownFunctions, ...groupFunctions];
+			walkDrawPageContent(node.children, nested, pkg, indexState, shapesOut, vectorsOut);
+		} else if (node.tag === "draw:rect") {
+			const zIndex = paintOrderKey(node, indexState);
+			const vector = readDrawRectVector(node, groupFunctions, pkg);
+			if (vector !== void 0) vectorsOut.push({
+				value: vector,
+				zIndex
+			});
+		} else if (node.tag === "draw:ellipse" || node.tag === "draw:circle") {
+			const zIndex = paintOrderKey(node, indexState);
+			const vector = readDrawEllipseVector(node, groupFunctions, pkg);
+			if (vector !== void 0) vectorsOut.push({
+				value: vector,
+				zIndex
+			});
+		} else if (node.tag === "draw:line") {
+			const zIndex = paintOrderKey(node, indexState);
+			const vector = readDrawLineVector(node, groupFunctions, pkg);
+			if (vector !== void 0) vectorsOut.push({
+				value: vector,
+				zIndex
+			});
+		} else if (node.tag === "draw:path" || node.tag === "draw:polygon" || node.tag === "draw:polyline") {
+			const zIndex = paintOrderKey(node, indexState);
+			const vector = readDrawPathVector(node, groupFunctions, pkg);
+			if (vector !== void 0) vectorsOut.push({
+				value: vector,
+				zIndex
+			});
+		} else if (node.tag === "draw:custom-shape") {
+			const zIndex = paintOrderKey(node, indexState);
+			const vector = readCustomShapeVector(node, groupFunctions, pkg);
+			if (vector !== void 0) vectorsOut.push({
+				value: vector,
+				zIndex
+			});
+			else {
+				const shape = readCustomShapeAsTextShape(node, groupFunctions, pkg);
+				if (shape !== void 0) shapesOut.push({
+					value: shape,
+					zIndex
+				});
+			}
+		}
 	}
 }
+function readDrawPageContent(children, pkg) {
+	const shapesOut = [];
+	const vectorsOut = [];
+	walkDrawPageContent(children, [], pkg, { next: 0 }, shapesOut, vectorsOut);
+	return {
+		shapes: byPaintOrder(shapesOut),
+		vectors: byPaintOrder(vectorsOut)
+	};
+}
+//#endregion
+//#region src/typed/odp/read.ts
+const CONTENT_PART$2 = "content.xml";
 function readSlideSize(page, pkg) {
-	const masterPage = findMasterPageElement(pkg, attrValue(page, "draw:master-page-name"));
-	const pageLayout = findPageLayoutElement$1(pkg, masterPage === void 0 ? void 0 : attrValue(masterPage, "style:page-layout-name"));
-	const properties = pageLayout === void 0 ? void 0 : childrenWithTag(pageLayout, "style:page-layout-properties")[0];
-	return (properties === void 0 ? void 0 : parsePageSize(properties)) ?? SLIDE_SIZE_WIDESCREEN;
+	return resolveDrawPageSize(page, pkg) ?? SLIDE_SIZE_WIDESCREEN;
 }
 function readSlideNotes(page) {
 	const notes = childrenWithTag(page, "presentation:notes")[0];
@@ -1986,7 +2480,7 @@ function readSlide(page, pkg) {
 	};
 }
 function readOdp(pkg) {
-	const contentPart = pkg.parts[CONTENT_PART$1];
+	const contentPart = pkg.parts[CONTENT_PART$2];
 	const root = contentPart?.kind === "xml" ? rootElement(contentPart.nodes) : void 0;
 	const body = root === void 0 ? void 0 : findChildElement(root.children, "office:body");
 	const presentation = body === void 0 ? void 0 : findChildElement(body.children, "office:presentation");
@@ -1998,9 +2492,9 @@ function readOdp(pkg) {
 }
 //#endregion
 //#region src/typed/odt/read.ts
-const CONTENT_PART = "content.xml";
+const CONTENT_PART$1 = "content.xml";
 const STYLES_PART = "styles.xml";
-const AUTOMATIC_STYLE_PARTS = [CONTENT_PART, STYLES_PART];
+const AUTOMATIC_STYLE_PARTS = [CONTENT_PART$1, STYLES_PART];
 function readOutlineLevel(headingElement) {
 	const raw = attrValue(headingElement, "text:outline-level");
 	if (raw === void 0) return 1;
@@ -2048,7 +2542,7 @@ function parseKnownOdfLength(value) {
 	if (parsed === void 0) throw new Error(`readOdt: internal error -- "${value}" is not a valid ODF length literal`);
 	return parsed;
 }
-const DEFAULT_PAGE_SIZE = PAGE_SIZE_A4;
+const DEFAULT_PAGE_SIZE$1 = PAGE_SIZE_A4;
 const DEFAULT_MARGIN_PT = parseKnownOdfLength("2cm");
 const DEFAULT_MARGINS = {
 	topPt: DEFAULT_MARGIN_PT,
@@ -2078,17 +2572,17 @@ function readFirstMasterPageGeometry(pkg) {
 	const pageSize = properties === void 0 ? void 0 : parsePageSize(properties);
 	const margins = properties === void 0 ? void 0 : parseMargins(properties);
 	return {
-		pageSize: pageSize ?? DEFAULT_PAGE_SIZE,
+		pageSize: pageSize ?? DEFAULT_PAGE_SIZE$1,
 		margins: margins ?? DEFAULT_MARGINS
 	};
 }
 function readOdt(pkg) {
-	const contentPart = pkg.parts[CONTENT_PART];
-	if (contentPart?.kind !== "xml") throw new Error(`readOdt: package has no ${CONTENT_PART} part`);
+	const contentPart = pkg.parts[CONTENT_PART$1];
+	if (contentPart?.kind !== "xml") throw new Error(`readOdt: package has no ${CONTENT_PART$1} part`);
 	const contentRoot = rootElement(contentPart.nodes);
 	const body = contentRoot === void 0 ? void 0 : findChildElement(contentRoot.children, "office:body");
 	const textElement = body === void 0 ? void 0 : findChildElement(body.children, "office:text");
-	if (textElement === void 0) throw new Error(`readOdt: ${CONTENT_PART} has no office:body/office:text element`);
+	if (textElement === void 0) throw new Error(`readOdt: ${CONTENT_PART$1} has no office:body/office:text element`);
 	const metadata = readOdfMetadata(pkg);
 	const { pageSize, margins } = readFirstMasterPageGeometry(pkg);
 	return {
@@ -2101,4 +2595,28 @@ function readOdt(pkg) {
 	};
 }
 //#endregion
-export { AlignmentSchema, AttributeSchema, BinaryPartSchema, MANIFEST_PART, META_PART, MIMETYPE_PART, ManifestEntrySchema, ManifestProblemSchema, ManifestSchema, ODF_MEDIA_TYPES, ODF_NAMESPACES, PackageSchema, PartSchema, STYLE_FAMILIES, StylePropertiesSchema, StyleRegistry, TableCursor, XmlCdataSchema, XmlCommentSchema, XmlDeclarationSchema, XmlElementSchema, XmlNodeSchema, XmlPartSchema, XmlPiSchema, XmlTextSchema, applyOdfTransform, attrValue, base64ToBytes, buildManifest, buildStylePropertyElements, buildXml, bytesToBase64, canonicalPropertiesString, cellReference, childrenWithTag, columnIndexToLetters, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseLength, parseMargins, parseOdfColor, parseOdfLength, parseOdfTransform, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, readDrawFrame, readManifest, readMimetype, readOdfMetadata, readOdfParagraph, readOdfTable, readOdp, readOdt, resolveOdfShapeGeometry, resolveStyle, resolveStyleElementChain, rootElement, serializePackage, setDocumentMediaType, sniffImageFormat, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };
+//#region src/typed/odg/read.ts
+const CONTENT_PART = "content.xml";
+const DEFAULT_PAGE_SIZE = PAGE_SIZE_A4;
+function readPage(page, pkg) {
+	const size = resolveDrawPageSize(page, pkg) ?? DEFAULT_PAGE_SIZE;
+	const { shapes, vectors } = readDrawPageContent(page.children, pkg);
+	return {
+		size,
+		shapes,
+		vectors
+	};
+}
+function readOdg(pkg) {
+	const contentPart = pkg.parts[CONTENT_PART];
+	const root = contentPart?.kind === "xml" ? rootElement(contentPart.nodes) : void 0;
+	const body = root === void 0 ? void 0 : findChildElement(root.children, "office:body");
+	const drawing = body === void 0 ? void 0 : findChildElement(body.children, "office:drawing");
+	const pages = drawing === void 0 ? [] : childrenWithTag(drawing, "draw:page");
+	return {
+		metadata: readOdfMetadata(pkg),
+		pages: pages.map((page) => readPage(page, pkg))
+	};
+}
+//#endregion
+export { AlignmentSchema, AttributeSchema, BinaryPartSchema, MANIFEST_PART, META_PART, MIMETYPE_PART, ManifestEntrySchema, ManifestProblemSchema, ManifestSchema, ODF_MEDIA_TYPES, ODF_NAMESPACES, PackageSchema, PartSchema, STYLE_FAMILIES, StylePropertiesSchema, StyleRegistry, TableCursor, XmlCdataSchema, XmlCommentSchema, XmlDeclarationSchema, XmlElementSchema, XmlNodeSchema, XmlPartSchema, XmlPiSchema, XmlTextSchema, applyOdfTransform, attrValue, base64ToBytes, buildManifest, buildOdfSubpaths, buildStylePropertyElements, buildXml, bytesToBase64, canonicalPropertiesString, cellReference, childrenWithTag, columnIndexToLetters, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseLength, parseLinePoints, parseMargins, parseOdfColor, parseOdfLength, parseOdfPathData, parseOdfPointsList, parseOdfTransform, parseOdfViewBox, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, rawSubpathFromPoints, readDrawFrame, readDrawPageContent, readManifest, readMimetype, readOdfMetadata, readOdfParagraph, readOdfTable, readOdg, readOdp, readOdt, resolveDrawPageSize, resolveOdfShapeGeometry, resolveStyle, resolveStyleElementChain, rootElement, scaleOdfRawPoint, serializePackage, setDocumentMediaType, sniffImageFormat, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "odf.js",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Type-safe, lossless round-trip conversion between OpenDocument Format packages (odt, ods, odp) and JSON, hand-written and dependency-minimal, built on Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -61,7 +61,7 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "document-content-model": "^1.1.0",
+    "document-content-model": "^1.2.0",
     "fast-xml-parser": "^5.10.1",
     "fflate": "^0.8.3",
     "zod": "^4.4.3"