odf.js 5.0.9 → 5.1.1

package/dist/typed/odt/read.cjs

@@ -3,9 +3,16 @@ const require_typed_shared_units = require("../shared/units.cjs");
 const require_xml_query = require("../../xml/query.cjs");
 const require_typed_shared_geometry = require("../shared/geometry.cjs");
 const require_typed_shared_metadata = require("../shared/metadata.cjs");
-const require_typed_shared_paragraph = require("../shared/paragraph.cjs");
 const require_typed_shared_list = require("../shared/list.cjs");
+const require_typed_shared_constructs = require("../shared/constructs.cjs");
+const require_typed_shared_paragraph = require("../shared/paragraph.cjs");
 const require_typed_shared_table = require("../shared/table.cjs");
+const require_typed_draw_shapes = require("../draw/shapes.cjs");
+const require_typed_formula_read = require("../formula/read.cjs");
+const require_typed_draw_embedded = require("../draw/embedded.cjs");
+const require_typed_odp_read = require("../odp/read.cjs");
+const require_typed_shared_forms = require("../shared/forms.cjs");
+const require_typed_odg_read = require("../odg/read.cjs");
 let document_schema_js = require("document-schema.js");
 //#region src/typed/odt/read.ts
 const CONTENT_PART = "content.xml";
@@ -17,8 +24,7 @@ function readOutlineLevel(headingElement) {
 	const parsed = Number.parseInt(raw, 10);
 	return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
 }
-function readParagraphOrHeading(element, pkg) {
-	const paragraph = require_typed_shared_paragraph.readOdfParagraph(element, pkg);
+function readParagraphOrHeading(element, paragraph) {
 	if (element.tag === "text:h") {
 		const outlineLevel = readOutlineLevel(element);
 		paragraph.styleId = `Heading${outlineLevel}`;
@@ -26,19 +32,175 @@ function readParagraphOrHeading(element, pkg) {
 	}
 	return paragraph;
 }
-function readBlocks(nodes, pkg, listIdState) {
+function readOdtEmbeddedDocument(reference, frame) {
+	switch (reference.objectKind) {
+		case "wordprocessing": {
+			const { metadata, sections } = readOdtContent(reference.package);
+			return {
+				kind: "wordprocessing",
+				metadata,
+				sections
+			};
+		}
+		case "presentation": {
+			const { metadata, slides } = require_typed_odp_read.readOdpContent(reference.package);
+			return {
+				kind: "presentation",
+				metadata,
+				slides
+			};
+		}
+		case "drawing": {
+			const { metadata, pages } = require_typed_odg_read.readOdgContent(reference.package);
+			return {
+				kind: "drawing",
+				metadata,
+				pages
+			};
+		}
+		case "formula": return require_typed_formula_read.readOdfFormulaContent(reference.package);
+		case "chart": return require_typed_draw_embedded.readOdfChartContent(reference.package, frame, "odt").document;
+		case "spreadsheet": return;
+	}
+}
+function readAnchoredFrameSources(paragraphElement, pkg, state) {
+	if (!state.liftFrames) return [];
+	const sources = [];
+	const readFrameInto = (blocks, frameElement) => {
+		const shape = require_typed_draw_shapes.readDrawFrame(frameElement, [], pkg, state.listIdState, true);
+		if (shape === void 0) return;
+		const reference = require_typed_draw_embedded.readDrawObjectReference(frameElement, pkg);
+		if (reference?.objectKind === "chart") {
+			const { document, residue } = require_typed_draw_embedded.readOdfChartContent(reference.package, shape.frame, "odt");
+			const embeddedBlock = {
+				kind: "embeddedObject",
+				objectKind: "chart",
+				document,
+				frame: shape.frame
+			};
+			if (residue !== void 0) embeddedBlock.source = residue;
+			blocks.push(embeddedBlock);
+			return;
+		}
+		if (reference !== void 0) {
+			const document = readOdtEmbeddedDocument(reference, shape.frame);
+			if (document !== void 0) {
+				blocks.push({
+					kind: "embeddedObject",
+					objectKind: reference.objectKind,
+					document,
+					frame: shape.frame
+				});
+				return;
+			}
+		}
+		blocks.push(...shape.blocks);
+	};
+	for (const child of paragraphElement.children) {
+		if (child.type !== "element") continue;
+		if (child.tag === "draw:frame") {
+			const blocks = [];
+			readFrameInto(blocks, child);
+			if (blocks.length > 0) sources.push({
+				child,
+				blocks
+			});
+		} else if (child.tag === "draw:g") {
+			const blocks = [];
+			for (const grandChild of child.children) if (grandChild.type === "element" && grandChild.tag === "draw:frame") readFrameInto(blocks, grandChild);
+			if (blocks.length > 0) sources.push({
+				child,
+				blocks
+			});
+		}
+	}
+	return sources;
+}
+function liftedBlocksBeforeHalf(read, half) {
+	const halfIndex = read.element.children.indexOf(half);
+	if (halfIndex === -1) return 0;
+	let count = 0;
+	for (const source of read.liftedSources) if (read.element.children.indexOf(source.child) < halfIndex) count += source.blocks.length;
+	return count;
+}
+function readBlocks(nodes, pkg, state, baseIndex = 0) {
 	const blocks = [];
+	const emitParagraphs = (reads) => {
+		let cursor = baseIndex + blocks.length;
+		for (const read of reads) {
+			const lifted = read.liftedSources.flatMap((source) => source.blocks);
+			for (const half of read.halves) {
+				const eventIndex = require_typed_shared_constructs.odfMarkerHalfEventIndex(half, read.element, cursor, liftedBlocksBeforeHalf(read, half.element));
+				if (eventIndex !== void 0) state.markerEvents.push({
+					kind: half.kind,
+					side: half.side,
+					key: half.key,
+					index: eventIndex,
+					qualified: true,
+					order: state.order++,
+					descriptor: half.descriptor,
+					element: half.element
+				});
+			}
+			blocks.push(read.paragraph);
+			for (const block of lifted) blocks.push(block);
+			cursor += 1 + lifted.length;
+		}
+	};
+	const readOneParagraph = (element) => {
+		const halves = [];
+		return {
+			element,
+			paragraph: readParagraphOrHeading(element, require_typed_shared_paragraph.readOdfParagraph(element, pkg, {
+				provenanceRegions: state.provenanceRegions,
+				markersOut: halves,
+				definitions: state.definitions,
+				listIdState: state.listIdState,
+				format: "odt"
+			})),
+			halves,
+			liftedSources: readAnchoredFrameSources(element, pkg, state)
+		};
+	};
 	for (const node of nodes) {
 		if (node.type !== "element") continue;
-		if (node.tag === "text:p" || node.tag === "text:h") blocks.push(readParagraphOrHeading(node, pkg));
+		if (node.tag === "text:p" || node.tag === "text:h") emitParagraphs([readOneParagraph(node)]);
 		else if (node.tag === "text:list") {
-			const numId = require_typed_shared_list.mintOdfListNumId(pkg, node, listIdState);
-			blocks.push(...require_typed_shared_list.readOdfListParagraphs(node, {
+			const numId = require_typed_shared_list.mintOdfListNumId(pkg, node, state.listIdState);
+			const reads = [];
+			require_typed_shared_list.readOdfListParagraphs(node, {
 				numId,
 				level: 0
-			}, (element) => readParagraphOrHeading(element, pkg)));
+			}, (element) => {
+				const read = readOneParagraph(element);
+				reads.push(read);
+				return read.paragraph;
+			});
+			emitParagraphs(reads);
 		} else if (node.tag === "table:table") blocks.push(require_typed_shared_table.readOdfTable(node, pkg));
-		else if (node.tag === "text:section") blocks.push(...readBlocks(node.children, pkg, listIdState));
+		else if (node.tag === "text:section") {
+			const startIndex = baseIndex + blocks.length;
+			const order = state.order++;
+			blocks.push(...readBlocks(node.children, pkg, state, startIndex));
+			state.wrapperExtents.push({
+				startIndex,
+				endIndex: baseIndex + blocks.length,
+				order,
+				descriptor: require_typed_shared_constructs.odfDivisionDescriptor(node, pkg)
+			});
+		} else if (require_typed_shared_constructs.isOdfIndexWrapper(node)) {
+			const startIndex = baseIndex + blocks.length;
+			const order = state.order++;
+			const body = node.children.find((child) => child.type === "element" && child.tag === "text:index-body");
+			blocks.push(...body === void 0 ? [] : readBlocks(body.children, pkg, state, startIndex));
+			state.wrapperExtents.push({
+				startIndex,
+				endIndex: baseIndex + blocks.length,
+				order,
+				descriptor: require_typed_shared_constructs.odfIndexControlDescriptor(node)
+			});
+		} else if (node.tag === "text:index-title") blocks.push(...readBlocks(node.children, pkg, state, baseIndex + blocks.length));
+		else if (node.tag === "office:forms") blocks.push(...require_typed_shared_forms.readOdfFormControlConstructs(node, "odt"));
 	}
 	return blocks;
 }
@@ -80,7 +242,7 @@ function readFirstMasterPageGeometry(pkg) {
 		margins: margins ?? DEFAULT_MARGINS
 	};
 }
-function readOdtContent(pkg) {
+function readOdtContent(pkg, options = {}) {
 	const contentPart = pkg.parts[CONTENT_PART];
 	if (contentPart?.kind !== "xml") throw new Error(`readOdtContent: package has no ${CONTENT_PART} part`);
 	const contentRoot = require_xml_query.rootElement(contentPart.nodes);
@@ -89,22 +251,60 @@ function readOdtContent(pkg) {
 	if (textElement === void 0) throw new Error(`readOdtContent: ${CONTENT_PART} has no office:body/office:text element`);
 	const metadata = require_typed_shared_metadata.readOdfMetadata(pkg);
 	const { pageSize, margins } = readFirstMasterPageGeometry(pkg);
+	const provenanceRegions = /* @__PURE__ */ new Map();
+	require_typed_shared_constructs.collectOdfProvenanceRegions(textElement.children, provenanceRegions);
+	const definitions = {
+		entries: {},
+		nextNoteOrdinal: 1,
+		nextAnnotationOrdinal: 1
+	};
+	require_typed_shared_constructs.collectOdfFieldMasterDefinitions(textElement.children, definitions.entries);
+	for (const partPath of AUTOMATIC_STYLE_PARTS) {
+		const part = pkg.parts[partPath];
+		if (part?.kind !== "xml") continue;
+		require_typed_shared_constructs.collectOdfDataStyleDefinitions(part.nodes, definitions.entries);
+		require_typed_shared_constructs.collectOdfFontFaceDefinitions(part.nodes, definitions.entries);
+	}
+	const state = {
+		listIdState: { next: 1 },
+		provenanceRegions,
+		definitions,
+		wrapperExtents: [],
+		markerEvents: [],
+		liftFrames: options.frames !== "none",
+		order: 0
+	};
+	const walked = readBlocks(textElement.children, pkg, state);
+	const { extents: markerExtents, paired } = require_typed_shared_constructs.resolveOdfMarkerEvents(state.markerEvents);
+	const extents = [...state.wrapperExtents, ...markerExtents];
+	for (const event of state.markerEvents) if (event.kind === "annotation" && event.side === "start" && !paired.has(event.element)) {
+		const descriptor = event.descriptor();
+		if (descriptor !== void 0) extents.push({
+			startIndex: event.index,
+			endIndex: event.index,
+			order: event.order,
+			descriptor
+		});
+	}
 	return {
 		metadata,
 		sections: [{
 			pageSize,
 			margins,
-			blocks: readBlocks(textElement.children, pkg, { next: 1 })
-		}]
+			blocks: require_typed_shared_constructs.insertOdfConstructMarkers(walked, extents)
+		}],
+		...Object.keys(definitions.entries).length > 0 ? { definitions: definitions.entries } : {}
 	};
 }
-function readOdt(pkg) {
-	const { metadata, sections } = readOdtContent(pkg);
-	return (0, document_schema_js.assemblePackage)({
+function readOdt(pkg, options = {}) {
+	const { metadata, sections, definitions } = readOdtContent(pkg, options);
+	const assembled = (0, document_schema_js.assemblePackage)({
 		kind: "wordprocessing",
 		metadata,
 		sections
 	});
+	if (definitions !== void 0) assembled.definitions = definitions;
+	return assembled;
 }
 //#endregion
 exports.readOdt = readOdt;

package/dist/typed/odt/read.d.cts

@@ -1,2 +1,2 @@
-import { n as readOdt, r as readOdtContent, t as OdtDocument } from "../../read-CszvDMMt.cjs";
-export { OdtDocument, readOdt, readOdtContent };
+import { i as readOdtContent, n as OdtReadOptions, r as readOdt, t as OdtDocument } from "../../read-Cs1ktkWB.cjs";
+export { OdtDocument, OdtReadOptions, readOdt, readOdtContent };

package/dist/typed/odt/read.d.ts

@@ -1,2 +1,2 @@
-import { n as readOdt, r as readOdtContent, t as OdtDocument } from "../../read-C6MhadqG.js";
-export { OdtDocument, readOdt, readOdtContent };
+import { i as readOdtContent, n as OdtReadOptions, r as readOdt, t as OdtDocument } from "../../read-DHuiGh_y.js";
+export { OdtDocument, OdtReadOptions, readOdt, readOdtContent };

package/dist/typed/odt/read.js

@@ -2,9 +2,16 @@ import { parseOdfLength } from "../shared/units.js";
 import { attrValue, childrenWithTag, findChildElement, rootElement } from "../../xml/query.js";
 import { parseMargins, parsePageSize } from "../shared/geometry.js";
 import { readOdfMetadata } from "../shared/metadata.js";
-import { readOdfParagraph } from "../shared/paragraph.js";
 import { mintOdfListNumId, readOdfListParagraphs } from "../shared/list.js";
+import { collectOdfDataStyleDefinitions, collectOdfFieldMasterDefinitions, collectOdfFontFaceDefinitions, collectOdfProvenanceRegions, insertOdfConstructMarkers, isOdfIndexWrapper, odfDivisionDescriptor, odfIndexControlDescriptor, odfMarkerHalfEventIndex, resolveOdfMarkerEvents } from "../shared/constructs.js";
+import { readOdfParagraph } from "../shared/paragraph.js";
 import { readOdfTable } from "../shared/table.js";
+import { readDrawFrame } from "../draw/shapes.js";
+import { readOdfFormulaContent } from "../formula/read.js";
+import { readDrawObjectReference, readOdfChartContent } from "../draw/embedded.js";
+import { readOdpContent } from "../odp/read.js";
+import { readOdfFormControlConstructs } from "../shared/forms.js";
+import { readOdgContent } from "../odg/read.js";
 import { PAGE_SIZE_A4, assemblePackage } from "document-schema.js";
 //#region src/typed/odt/read.ts
 const CONTENT_PART = "content.xml";
@@ -16,8 +23,7 @@ function readOutlineLevel(headingElement) {
 	const parsed = Number.parseInt(raw, 10);
 	return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
 }
-function readParagraphOrHeading(element, pkg) {
-	const paragraph = readOdfParagraph(element, pkg);
+function readParagraphOrHeading(element, paragraph) {
 	if (element.tag === "text:h") {
 		const outlineLevel = readOutlineLevel(element);
 		paragraph.styleId = `Heading${outlineLevel}`;
@@ -25,19 +31,175 @@ function readParagraphOrHeading(element, pkg) {
 	}
 	return paragraph;
 }
-function readBlocks(nodes, pkg, listIdState) {
+function readOdtEmbeddedDocument(reference, frame) {
+	switch (reference.objectKind) {
+		case "wordprocessing": {
+			const { metadata, sections } = readOdtContent(reference.package);
+			return {
+				kind: "wordprocessing",
+				metadata,
+				sections
+			};
+		}
+		case "presentation": {
+			const { metadata, slides } = readOdpContent(reference.package);
+			return {
+				kind: "presentation",
+				metadata,
+				slides
+			};
+		}
+		case "drawing": {
+			const { metadata, pages } = readOdgContent(reference.package);
+			return {
+				kind: "drawing",
+				metadata,
+				pages
+			};
+		}
+		case "formula": return readOdfFormulaContent(reference.package);
+		case "chart": return readOdfChartContent(reference.package, frame, "odt").document;
+		case "spreadsheet": return;
+	}
+}
+function readAnchoredFrameSources(paragraphElement, pkg, state) {
+	if (!state.liftFrames) return [];
+	const sources = [];
+	const readFrameInto = (blocks, frameElement) => {
+		const shape = readDrawFrame(frameElement, [], pkg, state.listIdState, true);
+		if (shape === void 0) return;
+		const reference = readDrawObjectReference(frameElement, pkg);
+		if (reference?.objectKind === "chart") {
+			const { document, residue } = readOdfChartContent(reference.package, shape.frame, "odt");
+			const embeddedBlock = {
+				kind: "embeddedObject",
+				objectKind: "chart",
+				document,
+				frame: shape.frame
+			};
+			if (residue !== void 0) embeddedBlock.source = residue;
+			blocks.push(embeddedBlock);
+			return;
+		}
+		if (reference !== void 0) {
+			const document = readOdtEmbeddedDocument(reference, shape.frame);
+			if (document !== void 0) {
+				blocks.push({
+					kind: "embeddedObject",
+					objectKind: reference.objectKind,
+					document,
+					frame: shape.frame
+				});
+				return;
+			}
+		}
+		blocks.push(...shape.blocks);
+	};
+	for (const child of paragraphElement.children) {
+		if (child.type !== "element") continue;
+		if (child.tag === "draw:frame") {
+			const blocks = [];
+			readFrameInto(blocks, child);
+			if (blocks.length > 0) sources.push({
+				child,
+				blocks
+			});
+		} else if (child.tag === "draw:g") {
+			const blocks = [];
+			for (const grandChild of child.children) if (grandChild.type === "element" && grandChild.tag === "draw:frame") readFrameInto(blocks, grandChild);
+			if (blocks.length > 0) sources.push({
+				child,
+				blocks
+			});
+		}
+	}
+	return sources;
+}
+function liftedBlocksBeforeHalf(read, half) {
+	const halfIndex = read.element.children.indexOf(half);
+	if (halfIndex === -1) return 0;
+	let count = 0;
+	for (const source of read.liftedSources) if (read.element.children.indexOf(source.child) < halfIndex) count += source.blocks.length;
+	return count;
+}
+function readBlocks(nodes, pkg, state, baseIndex = 0) {
 	const blocks = [];
+	const emitParagraphs = (reads) => {
+		let cursor = baseIndex + blocks.length;
+		for (const read of reads) {
+			const lifted = read.liftedSources.flatMap((source) => source.blocks);
+			for (const half of read.halves) {
+				const eventIndex = odfMarkerHalfEventIndex(half, read.element, cursor, liftedBlocksBeforeHalf(read, half.element));
+				if (eventIndex !== void 0) state.markerEvents.push({
+					kind: half.kind,
+					side: half.side,
+					key: half.key,
+					index: eventIndex,
+					qualified: true,
+					order: state.order++,
+					descriptor: half.descriptor,
+					element: half.element
+				});
+			}
+			blocks.push(read.paragraph);
+			for (const block of lifted) blocks.push(block);
+			cursor += 1 + lifted.length;
+		}
+	};
+	const readOneParagraph = (element) => {
+		const halves = [];
+		return {
+			element,
+			paragraph: readParagraphOrHeading(element, readOdfParagraph(element, pkg, {
+				provenanceRegions: state.provenanceRegions,
+				markersOut: halves,
+				definitions: state.definitions,
+				listIdState: state.listIdState,
+				format: "odt"
+			})),
+			halves,
+			liftedSources: readAnchoredFrameSources(element, pkg, state)
+		};
+	};
 	for (const node of nodes) {
 		if (node.type !== "element") continue;
-		if (node.tag === "text:p" || node.tag === "text:h") blocks.push(readParagraphOrHeading(node, pkg));
+		if (node.tag === "text:p" || node.tag === "text:h") emitParagraphs([readOneParagraph(node)]);
 		else if (node.tag === "text:list") {
-			const numId = mintOdfListNumId(pkg, node, listIdState);
-			blocks.push(...readOdfListParagraphs(node, {
+			const numId = mintOdfListNumId(pkg, node, state.listIdState);
+			const reads = [];
+			readOdfListParagraphs(node, {
 				numId,
 				level: 0
-			}, (element) => readParagraphOrHeading(element, pkg)));
+			}, (element) => {
+				const read = readOneParagraph(element);
+				reads.push(read);
+				return read.paragraph;
+			});
+			emitParagraphs(reads);
 		} else if (node.tag === "table:table") blocks.push(readOdfTable(node, pkg));
-		else if (node.tag === "text:section") blocks.push(...readBlocks(node.children, pkg, listIdState));
+		else if (node.tag === "text:section") {
+			const startIndex = baseIndex + blocks.length;
+			const order = state.order++;
+			blocks.push(...readBlocks(node.children, pkg, state, startIndex));
+			state.wrapperExtents.push({
+				startIndex,
+				endIndex: baseIndex + blocks.length,
+				order,
+				descriptor: odfDivisionDescriptor(node, pkg)
+			});
+		} else if (isOdfIndexWrapper(node)) {
+			const startIndex = baseIndex + blocks.length;
+			const order = state.order++;
+			const body = node.children.find((child) => child.type === "element" && child.tag === "text:index-body");
+			blocks.push(...body === void 0 ? [] : readBlocks(body.children, pkg, state, startIndex));
+			state.wrapperExtents.push({
+				startIndex,
+				endIndex: baseIndex + blocks.length,
+				order,
+				descriptor: odfIndexControlDescriptor(node)
+			});
+		} else if (node.tag === "text:index-title") blocks.push(...readBlocks(node.children, pkg, state, baseIndex + blocks.length));
+		else if (node.tag === "office:forms") blocks.push(...readOdfFormControlConstructs(node, "odt"));
 	}
 	return blocks;
 }
@@ -79,7 +241,7 @@ function readFirstMasterPageGeometry(pkg) {
 		margins: margins ?? DEFAULT_MARGINS
 	};
 }
-function readOdtContent(pkg) {
+function readOdtContent(pkg, options = {}) {
 	const contentPart = pkg.parts[CONTENT_PART];
 	if (contentPart?.kind !== "xml") throw new Error(`readOdtContent: package has no ${CONTENT_PART} part`);
 	const contentRoot = rootElement(contentPart.nodes);
@@ -88,22 +250,60 @@ function readOdtContent(pkg) {
 	if (textElement === void 0) throw new Error(`readOdtContent: ${CONTENT_PART} has no office:body/office:text element`);
 	const metadata = readOdfMetadata(pkg);
 	const { pageSize, margins } = readFirstMasterPageGeometry(pkg);
+	const provenanceRegions = /* @__PURE__ */ new Map();
+	collectOdfProvenanceRegions(textElement.children, provenanceRegions);
+	const definitions = {
+		entries: {},
+		nextNoteOrdinal: 1,
+		nextAnnotationOrdinal: 1
+	};
+	collectOdfFieldMasterDefinitions(textElement.children, definitions.entries);
+	for (const partPath of AUTOMATIC_STYLE_PARTS) {
+		const part = pkg.parts[partPath];
+		if (part?.kind !== "xml") continue;
+		collectOdfDataStyleDefinitions(part.nodes, definitions.entries);
+		collectOdfFontFaceDefinitions(part.nodes, definitions.entries);
+	}
+	const state = {
+		listIdState: { next: 1 },
+		provenanceRegions,
+		definitions,
+		wrapperExtents: [],
+		markerEvents: [],
+		liftFrames: options.frames !== "none",
+		order: 0
+	};
+	const walked = readBlocks(textElement.children, pkg, state);
+	const { extents: markerExtents, paired } = resolveOdfMarkerEvents(state.markerEvents);
+	const extents = [...state.wrapperExtents, ...markerExtents];
+	for (const event of state.markerEvents) if (event.kind === "annotation" && event.side === "start" && !paired.has(event.element)) {
+		const descriptor = event.descriptor();
+		if (descriptor !== void 0) extents.push({
+			startIndex: event.index,
+			endIndex: event.index,
+			order: event.order,
+			descriptor
+		});
+	}
 	return {
 		metadata,
 		sections: [{
 			pageSize,
 			margins,
-			blocks: readBlocks(textElement.children, pkg, { next: 1 })
-		}]
+			blocks: insertOdfConstructMarkers(walked, extents)
+		}],
+		...Object.keys(definitions.entries).length > 0 ? { definitions: definitions.entries } : {}
 	};
 }
-function readOdt(pkg) {
-	const { metadata, sections } = readOdtContent(pkg);
-	return assemblePackage({
+function readOdt(pkg, options = {}) {
+	const { metadata, sections, definitions } = readOdtContent(pkg, options);
+	const assembled = assemblePackage({
 		kind: "wordprocessing",
 		metadata,
 		sections
 	});
+	if (definitions !== void 0) assembled.definitions = definitions;
+	return assembled;
 }
 //#endregion
 export { readOdt, readOdtContent };

package/dist/typed/shared/cascade.d.cts

@@ -1,2 +1,2 @@
-import { a as resolveStyle, i as findStyleElement, n as StyleCascadeResult, o as resolveStyleElementChain, r as StyleElementChainResult, t as CascadeDiagnostic } from "../../cascade-qYa3mgnE.cjs";
+import { a as resolveStyle, i as findStyleElement, n as StyleCascadeResult, o as resolveStyleElementChain, r as StyleElementChainResult, t as CascadeDiagnostic } from "../../cascade-BmvsXcAz.cjs";
 export { CascadeDiagnostic, StyleCascadeResult, StyleElementChainResult, findStyleElement, resolveStyle, resolveStyleElementChain };

package/dist/typed/shared/cascade.d.ts

@@ -1,2 +1,2 @@
-import { a as resolveStyle, i as findStyleElement, n as StyleCascadeResult, o as resolveStyleElementChain, r as StyleElementChainResult, t as CascadeDiagnostic } from "../../cascade-8u4q16_U.js";
+import { a as resolveStyle, i as findStyleElement, n as StyleCascadeResult, o as resolveStyleElementChain, r as StyleElementChainResult, t as CascadeDiagnostic } from "../../cascade-rhqUQrUa.js";
 export { CascadeDiagnostic, StyleCascadeResult, StyleElementChainResult, findStyleElement, resolveStyle, resolveStyleElementChain };