odf.js 5.0.8 → 5.1.0

package/dist/typed/draw/shapes.d.ts

@@ -1,2 +1,2 @@
-import { a as walkDrawShapes, i as readDrawPageContent, n as readDrawFrame, r as readDrawImageBlock, t as DrawPageContent } from "../../shapes-BB59aIC8.js";
+import { a as walkDrawShapes, i as readDrawPageContent, n as readDrawFrame, r as readDrawImageBlock, t as DrawPageContent } from "../../shapes-CCB8ydqD.js";
 export { DrawPageContent, readDrawFrame, readDrawImageBlock, readDrawPageContent, walkDrawShapes };

package/dist/typed/draw/shapes.js

@@ -6,8 +6,8 @@ import { attrValue, childrenWithTag, elementsWithTag } from "../../xml/query.js"
 import { decodeOdfText } from "../shared/text.js";
 import { parseLinePoints } from "../shared/geometry.js";
 import { resolveStyleElementChain } from "../shared/cascade.js";
-import { readOdfParagraph } from "../shared/paragraph.js";
 import { mintOdfListNumId, readOdfListParagraphs } from "../shared/list.js";
+import { readOdfParagraph } from "../shared/paragraph.js";
 import { readOdfTable } from "../shared/table.js";
 import { applyOdfTransform, composeOdfGroupTransform, parseOdfTransform, resolveOdfShapeGeometry } from "../shared/transform.js";
 import { buildOdfSubpaths, parseOdfPathData, parseOdfPointsList, parseOdfViewBox, rawSubpathFromPoints } from "../shared/path.js";
@@ -90,8 +90,8 @@ function readDrawFrameContent(frame, frameBox, pkg, listIdState) {
 	}
 	return [];
 }
-function readDrawFrame(frame, groupFunctions, pkg, listIdState = { next: 1 }) {
-	const ownGeometry = resolveOdfShapeGeometry(frame);
+function readDrawFrame(frame, groupFunctions, pkg, listIdState = { next: 1 }, flowPositioning = false) {
+	const ownGeometry = resolveOdfShapeGeometry(frame) ?? (flowPositioning ? flowFrameGeometry(frame) : void 0);
 	if (ownGeometry === void 0) return;
 	const geometry = composeOdfGroupTransform(groupFunctions, ownGeometry);
 	return {
@@ -102,6 +102,23 @@ function readDrawFrame(frame, groupFunctions, pkg, listIdState = { next: 1 }) {
 		blocks: readDrawFrameContent(frame, geometry.frame, pkg, listIdState)
 	};
 }
+function flowFrameGeometry(frame) {
+	const widthValue = attrValue(frame, "svg:width");
+	const heightValue = attrValue(frame, "svg:height");
+	if (widthValue === void 0 || heightValue === void 0) return;
+	const widthPt = parseOdfLength(widthValue);
+	const heightPt = parseOdfLength(heightValue);
+	if (widthPt === void 0 || heightPt === void 0) return;
+	return {
+		frame: {
+			xPt: 0,
+			yPt: 0,
+			widthPt,
+			heightPt
+		},
+		rotationDeg: void 0
+	};
+}
 function readOwnTransformFunctions(element) {
 	const value = attrValue(element, "draw:transform");
 	return value === void 0 ? [] : parseOdfTransform(value);

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

@@ -1,2 +1,2 @@
-import { a as readOdfFormulaMathMl, i as readOdfFormulaContent, n as findMathRoot, r as readOdfFormula, t as OdfFormulaDocument } from "../../read-xCmo7cec.cjs";
+import { a as readOdfFormulaMathMl, i as readOdfFormulaContent, n as findMathRoot, r as readOdfFormula, t as OdfFormulaDocument } from "../../read-DUCm1nUv.cjs";
 export { OdfFormulaDocument, findMathRoot, readOdfFormula, readOdfFormulaContent, readOdfFormulaMathMl };

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

@@ -1,2 +1,2 @@
-import { a as readOdfFormulaMathMl, i as readOdfFormulaContent, n as findMathRoot, r as readOdfFormula, t as OdfFormulaDocument } from "../../read-DOuXgPhP.js";
+import { a as readOdfFormulaMathMl, i as readOdfFormulaContent, n as findMathRoot, r as readOdfFormula, t as OdfFormulaDocument } from "../../read-BnN7u9Y2.js";
 export { OdfFormulaDocument, findMathRoot, readOdfFormula, readOdfFormulaContent, readOdfFormulaMathMl };

package/dist/typed/odb/form.cjs

@@ -1,73 +1,16 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_xml_entities = require("../../xml/entities.cjs");
 const require_xml_query = require("../../xml/query.cjs");
 const require_typed_odb_subdocument = require("./subdocument.cjs");
+const require_typed_shared_forms = require("../shared/forms.cjs");
 const require_typed_odt_read = require("../odt/read.cjs");
 const require_typed_odb_read = require("./read.cjs");
 //#region src/typed/odb/form.ts
 const CONTENT_PART = "content.xml";
-const FORM_ELEMENT_TAG = "form:form";
-const FORM_PROPERTIES_TAG = "form:properties";
-const FORM_TAG_PREFIX = "form:";
-function formAttr(element, name) {
-	const raw = require_xml_query.attrValue(element, name);
-	return raw === void 0 ? void 0 : require_xml_entities.decodeXmlText(raw);
-}
-function readControl(element) {
-	const control = {
-		tag: element.tag,
-		controls: readControls(element)
-	};
-	const name = formAttr(element, "form:name");
-	if (name !== void 0) control.name = name;
-	const controlImplementation = formAttr(element, "form:control-implementation");
-	if (controlImplementation !== void 0) control.controlImplementation = controlImplementation;
-	const dataField = formAttr(element, "form:data-field");
-	if (dataField !== void 0) control.dataField = dataField;
-	const id = formAttr(element, "form:id");
-	if (id !== void 0) control.id = id;
-	const label = formAttr(element, "form:label");
-	if (label !== void 0) control.label = label;
-	return control;
-}
-function readControls(container) {
-	const controls = [];
-	for (const child of container.children) {
-		if (child.type !== "element" || !child.tag.startsWith(FORM_TAG_PREFIX)) continue;
-		if (child.tag === FORM_ELEMENT_TAG || child.tag === FORM_PROPERTIES_TAG) continue;
-		controls.push(readControl(child));
-	}
-	return controls;
-}
-function readFormDefinition(element) {
-	const subForms = [];
-	for (const child of element.children) if (child.type === "element" && child.tag === FORM_ELEMENT_TAG) subForms.push(readFormDefinition(child));
-	const definition = {
-		controls: readControls(element),
-		subForms
-	};
-	const name = formAttr(element, "form:name");
-	if (name !== void 0) definition.name = name;
-	const command = formAttr(element, "form:command");
-	if (command !== void 0) definition.command = command;
-	const commandType = formAttr(element, "form:command-type");
-	if (commandType !== void 0) definition.commandType = commandType;
-	const datasource = formAttr(element, "form:datasource");
-	if (datasource !== void 0) definition.datasource = datasource;
-	const filter = formAttr(element, "form:filter");
-	if (filter !== void 0) definition.filter = filter;
-	const order = formAttr(element, "form:order");
-	if (order !== void 0) definition.order = order;
-	return definition;
-}
 function readFormDefinitions(contentRoot) {
 	const body = contentRoot === void 0 ? void 0 : require_xml_query.findChildElement(contentRoot.children, "office:body");
 	const text = body === void 0 ? void 0 : require_xml_query.findChildElement(body.children, "office:text");
 	const forms = text === void 0 ? void 0 : require_xml_query.findChildElement(text.children, "office:forms");
-	if (forms === void 0) return [];
-	const definitions = [];
-	for (const child of forms.children) if (child.type === "element" && child.tag === FORM_ELEMENT_TAG) definitions.push(readFormDefinition(child));
-	return definitions;
+	return forms === void 0 ? [] : require_typed_shared_forms.readOdfFormDefinitions(forms);
 }
 function readOdbForm(pkg, formName) {
 	const component = require_typed_odb_read.resolveOdbComponent(pkg, "form", formName);

package/dist/typed/odb/form.d.cts

@@ -1,2 +1,2 @@
-import { i as readOdbForm, n as OdbFormControl, r as OdbFormDefinition, t as OdbForm } from "../../form-DSIbHxog.cjs";
-export { OdbForm, OdbFormControl, OdbFormDefinition, readOdbForm };
+import { n as readOdbForm, t as OdbForm } from "../../form-BGCT81ss.cjs";
+export { OdbForm, readOdbForm };

package/dist/typed/odb/form.d.ts

@@ -1,2 +1,2 @@
-import { i as readOdbForm, n as OdbFormControl, r as OdbFormDefinition, t as OdbForm } from "../../form-BsAAx5-p.js";
-export { OdbForm, OdbFormControl, OdbFormDefinition, readOdbForm };
+import { n as readOdbForm, t as OdbForm } from "../../form-D3H5H2NL.js";
+export { OdbForm, readOdbForm };

package/dist/typed/odb/form.js

@@ -1,72 +1,15 @@
-import { decodeXmlText } from "../../xml/entities.js";
-import { attrValue, findChildElement, rootElement } from "../../xml/query.js";
+import { findChildElement, rootElement } from "../../xml/query.js";
 import { subDocumentPackage } from "./subdocument.js";
+import { readOdfFormDefinitions } from "../shared/forms.js";
 import { readOdtContent } from "../odt/read.js";
 import { resolveOdbComponent } from "./read.js";
 //#region src/typed/odb/form.ts
 const CONTENT_PART = "content.xml";
-const FORM_ELEMENT_TAG = "form:form";
-const FORM_PROPERTIES_TAG = "form:properties";
-const FORM_TAG_PREFIX = "form:";
-function formAttr(element, name) {
-	const raw = attrValue(element, name);
-	return raw === void 0 ? void 0 : decodeXmlText(raw);
-}
-function readControl(element) {
-	const control = {
-		tag: element.tag,
-		controls: readControls(element)
-	};
-	const name = formAttr(element, "form:name");
-	if (name !== void 0) control.name = name;
-	const controlImplementation = formAttr(element, "form:control-implementation");
-	if (controlImplementation !== void 0) control.controlImplementation = controlImplementation;
-	const dataField = formAttr(element, "form:data-field");
-	if (dataField !== void 0) control.dataField = dataField;
-	const id = formAttr(element, "form:id");
-	if (id !== void 0) control.id = id;
-	const label = formAttr(element, "form:label");
-	if (label !== void 0) control.label = label;
-	return control;
-}
-function readControls(container) {
-	const controls = [];
-	for (const child of container.children) {
-		if (child.type !== "element" || !child.tag.startsWith(FORM_TAG_PREFIX)) continue;
-		if (child.tag === FORM_ELEMENT_TAG || child.tag === FORM_PROPERTIES_TAG) continue;
-		controls.push(readControl(child));
-	}
-	return controls;
-}
-function readFormDefinition(element) {
-	const subForms = [];
-	for (const child of element.children) if (child.type === "element" && child.tag === FORM_ELEMENT_TAG) subForms.push(readFormDefinition(child));
-	const definition = {
-		controls: readControls(element),
-		subForms
-	};
-	const name = formAttr(element, "form:name");
-	if (name !== void 0) definition.name = name;
-	const command = formAttr(element, "form:command");
-	if (command !== void 0) definition.command = command;
-	const commandType = formAttr(element, "form:command-type");
-	if (commandType !== void 0) definition.commandType = commandType;
-	const datasource = formAttr(element, "form:datasource");
-	if (datasource !== void 0) definition.datasource = datasource;
-	const filter = formAttr(element, "form:filter");
-	if (filter !== void 0) definition.filter = filter;
-	const order = formAttr(element, "form:order");
-	if (order !== void 0) definition.order = order;
-	return definition;
-}
 function readFormDefinitions(contentRoot) {
 	const body = contentRoot === void 0 ? void 0 : findChildElement(contentRoot.children, "office:body");
 	const text = body === void 0 ? void 0 : findChildElement(body.children, "office:text");
 	const forms = text === void 0 ? void 0 : findChildElement(text.children, "office:forms");
-	if (forms === void 0) return [];
-	const definitions = [];
-	for (const child of forms.children) if (child.type === "element" && child.tag === FORM_ELEMENT_TAG) definitions.push(readFormDefinition(child));
-	return definitions;
+	return forms === void 0 ? [] : readOdfFormDefinitions(forms);
 }
 function readOdbForm(pkg, formName) {
 	const component = resolveOdbComponent(pkg, "form", formName);

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

@@ -1,2 +1,2 @@
-import { a as readOdbInventory, i as OdbQueryInfo, n as OdbConnectionInfo, o as resolveOdbComponent, r as OdbInventory, t as OdbComponentInfo } from "../../read-DrdmKX0x.cjs";
+import { a as readOdbInventory, i as OdbQueryInfo, n as OdbConnectionInfo, o as resolveOdbComponent, r as OdbInventory, t as OdbComponentInfo } from "../../read-BV2an1ok.cjs";
 export { OdbComponentInfo, OdbConnectionInfo, OdbInventory, OdbQueryInfo, readOdbInventory, resolveOdbComponent };

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

@@ -1,2 +1,2 @@
-import { a as readOdbInventory, i as OdbQueryInfo, n as OdbConnectionInfo, o as resolveOdbComponent, r as OdbInventory, t as OdbComponentInfo } from "../../read-BoIUENWq.js";
+import { a as readOdbInventory, i as OdbQueryInfo, n as OdbConnectionInfo, o as resolveOdbComponent, r as OdbInventory, t as OdbComponentInfo } from "../../read-CvjbdgH3.js";
 export { OdbComponentInfo, OdbConnectionInfo, OdbInventory, OdbQueryInfo, readOdbInventory, resolveOdbComponent };

package/dist/typed/odb/report.d.cts

@@ -1,2 +1,2 @@
-import { a as OdbReportGroup, i as OdbReportFunction, n as OdbReportBand, o as readOdbReport, r as OdbReportElement, t as OdbReport } from "../../report-BuCJ7_YU.cjs";
+import { a as OdbReportGroup, i as OdbReportFunction, n as OdbReportBand, o as readOdbReport, r as OdbReportElement, t as OdbReport } from "../../report-D6WNYaVn.cjs";
 export { OdbReport, OdbReportBand, OdbReportElement, OdbReportFunction, OdbReportGroup, readOdbReport };

package/dist/typed/odb/report.d.ts

@@ -1,2 +1,2 @@
-import { a as OdbReportGroup, i as OdbReportFunction, n as OdbReportBand, o as readOdbReport, r as OdbReportElement, t as OdbReport } from "../../report-MpwUgXbA.js";
+import { a as OdbReportGroup, i as OdbReportFunction, n as OdbReportBand, o as readOdbReport, r as OdbReportElement, t as OdbReport } from "../../report-DbslT2OR.js";
 export { OdbReport, OdbReportBand, OdbReportElement, OdbReportFunction, OdbReportGroup, readOdbReport };

package/dist/typed/odb/subdocument.d.cts

@@ -1,2 +1,2 @@
-import { n as subDocumentPackage, t as SubDocumentPackageOptions } from "../../subdocument-CIxH3a5V.cjs";
+import { n as subDocumentPackage, t as SubDocumentPackageOptions } from "../../subdocument-yY8ASE4N.cjs";
 export { SubDocumentPackageOptions, subDocumentPackage };

package/dist/typed/odb/subdocument.d.ts

@@ -1,2 +1,2 @@
-import { n as subDocumentPackage, t as SubDocumentPackageOptions } from "../../subdocument-DQNQF7wV.js";
+import { n as subDocumentPackage, t as SubDocumentPackageOptions } from "../../subdocument-BwW3FZC_.js";
 export { SubDocumentPackageOptions, subDocumentPackage };

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

@@ -1,2 +1,2 @@
-import { n as readOdg, r as readOdgContent, t as OdgDocument } from "../../read-BM8KaFQS.cjs";
+import { n as readOdg, r as readOdgContent, t as OdgDocument } from "../../read-DOYWO6BM.cjs";
 export { OdgDocument, readOdg, readOdgContent };

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

@@ -1,2 +1,2 @@
-import { n as readOdg, r as readOdgContent, t as OdgDocument } from "../../read-B9zz_ax1.js";
+import { n as readOdg, r as readOdgContent, t as OdgDocument } from "../../read-lc0t0UHK.js";
 export { OdgDocument, readOdg, readOdgContent };

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

@@ -1,2 +1,2 @@
-import { n as OdmSection, r as readOdm, t as OdmDocument } from "../../read-DNNf5_6n.cjs";
+import { n as OdmSection, r as readOdm, t as OdmDocument } from "../../read-ydLJ8bid.cjs";
 export { OdmDocument, OdmSection, readOdm };

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

@@ -1,2 +1,2 @@
-import { n as OdmSection, r as readOdm, t as OdmDocument } from "../../read-BkFbEves.js";
+import { n as OdmSection, r as readOdm, t as OdmDocument } from "../../read-DYYxbvfo.js";
 export { OdmDocument, OdmSection, readOdm };

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

@@ -1,2 +1,2 @@
-import { n as readOdp, r as readOdpContent, t as OdpDocument } from "../../read-KpU38maT.cjs";
+import { n as readOdp, r as readOdpContent, t as OdpDocument } from "../../read-CTfeWaWq.cjs";
 export { OdpDocument, readOdp, readOdpContent };

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

@@ -1,2 +1,2 @@
-import { n as readOdp, r as readOdpContent, t as OdpDocument } from "../../read-YSIwlhrk.js";
+import { n as readOdp, r as readOdpContent, t as OdpDocument } from "../../read-Db_GZ0ZH.js";
 export { OdpDocument, readOdp, readOdpContent };

package/dist/typed/ods/read.cjs

@@ -5,6 +5,7 @@ const require_typed_shared_a1 = require("../shared/a1.cjs");
 const require_typed_shared_geometry = require("../shared/geometry.cjs");
 const require_typed_shared_cascade = require("../shared/cascade.cjs");
 const require_typed_shared_metadata = require("../shared/metadata.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_shared_transform = require("../shared/transform.cjs");
@@ -13,8 +14,8 @@ 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_odt_read = require("../odt/read.cjs");
 const require_typed_odg_read = require("../odg/read.cjs");
+const require_typed_odt_read = require("../odt/read.cjs");
 let document_schema_js = require("document-schema.js");
 //#region src/typed/ods/read.ts
 const CONTENT_PART = "content.xml";
@@ -165,7 +166,7 @@ function parseNonNegativeInteger(value) {
 	const parsed = Number.parseInt(value, 10);
 	return Number.isInteger(parsed) && parsed >= 0 ? parsed : void 0;
 }
-function readEmbeddedObjectDocument(reference) {
+function readEmbeddedObjectDocument(reference, frame) {
 	switch (reference.objectKind) {
 		case "wordprocessing": {
 			const { metadata, sections } = require_typed_odt_read.readOdtContent(reference.package);
@@ -200,16 +201,32 @@ function readEmbeddedObjectDocument(reference) {
 			};
 		}
 		case "formula": return require_typed_formula_read.readOdfFormulaContent(reference.package);
+		case "chart": return require_typed_draw_embedded.readOdfChartContent(reference.package, frame, "ods").document;
 	}
 }
 function collectAnchoredFrame(frameElement, groupFunctions, pkg, anchorRow, anchorColumn, images, embeddedObjects) {
 	const shape = require_typed_draw_shapes.readDrawFrame(frameElement, groupFunctions, pkg);
 	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, "ods");
+		const chartObject = {
+			objectKind: "chart",
+			document,
+			frame: shape.frame,
+			anchorRow,
+			anchorColumn,
+			offsetXPt: shape.frame.xPt,
+			offsetYPt: shape.frame.yPt
+		};
+		if (residue !== void 0) chartObject.source = residue;
+		embeddedObjects.push(chartObject);
+		return;
+	}
 	if (reference !== void 0) {
 		embeddedObjects.push({
 			objectKind: reference.objectKind,
-			document: readEmbeddedObjectDocument(reference),
+			document: readEmbeddedObjectDocument(reference, shape.frame),
 			frame: shape.frame,
 			anchorRow,
 			anchorColumn,
@@ -407,18 +424,23 @@ function readOdsContent(pkg) {
 		const sheet = readSheet(table, pkg);
 		if (sheet !== void 0) sheets.push(sheet);
 	}
+	const definitions = {};
+	if (spreadsheet !== void 0) require_typed_shared_constructs.collectOdfNamedExpressions(spreadsheet.children, definitions);
 	return {
 		metadata: require_typed_shared_metadata.readOdfMetadata(pkg),
-		sheets
+		sheets,
+		...Object.keys(definitions).length > 0 ? { definitions } : {}
 	};
 }
 function readOds(pkg) {
-	const { metadata, sheets } = readOdsContent(pkg);
-	return (0, document_schema_js.assemblePackage)({
+	const { metadata, sheets, definitions } = readOdsContent(pkg);
+	const assembled = (0, document_schema_js.assemblePackage)({
 		kind: "spreadsheet",
 		metadata,
 		sheets
 	});
+	if (definitions !== void 0) assembled.definitions = definitions;
+	return assembled;
 }
 //#endregion
 exports.readOds = readOds;

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

@@ -1,2 +1,2 @@
-import { n as readOds, r as readOdsContent, t as OdsDocument } from "../../read-BHpPvhzR.cjs";
+import { n as readOds, r as readOdsContent, t as OdsDocument } from "../../read-B4238IGr.cjs";
 export { OdsDocument, readOds, readOdsContent };

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

@@ -1,2 +1,2 @@
-import { n as readOds, r as readOdsContent, t as OdsDocument } from "../../read-B4zS8bGb.js";
+import { n as readOds, r as readOdsContent, t as OdsDocument } from "../../read-CdvX2qnz.js";
 export { OdsDocument, readOds, readOdsContent };

package/dist/typed/ods/read.js

@@ -4,16 +4,17 @@ import { TableCursor, parseCellReference as parseCellReference$1 } from "../shar
 import { parseMargins, parsePageSize } from "../shared/geometry.js";
 import { findStyleElement, resolveStyleElementChain } from "../shared/cascade.js";
 import { readOdfMetadata } from "../shared/metadata.js";
+import { collectOdfNamedExpressions } from "../shared/constructs.js";
 import { readOdfParagraph } from "../shared/paragraph.js";
 import { readCellStyleDecoration } from "../shared/table.js";
 import { parseOdfTransform } from "../shared/transform.js";
 import { resolvePageLayoutProperties } from "../shared/masterpage.js";
 import { readDrawFrame } from "../draw/shapes.js";
 import { readOdfFormulaContent } from "../formula/read.js";
-import { readDrawObjectReference } from "../draw/embedded.js";
+import { readDrawObjectReference, readOdfChartContent } from "../draw/embedded.js";
 import { readOdpContent } from "../odp/read.js";
-import { readOdtContent } from "../odt/read.js";
 import { readOdgContent } from "../odg/read.js";
+import { readOdtContent } from "../odt/read.js";
 import { PAGE_SIZE_A4, assemblePackage } from "document-schema.js";
 //#region src/typed/ods/read.ts
 const CONTENT_PART = "content.xml";
@@ -164,7 +165,7 @@ function parseNonNegativeInteger(value) {
 	const parsed = Number.parseInt(value, 10);
 	return Number.isInteger(parsed) && parsed >= 0 ? parsed : void 0;
 }
-function readEmbeddedObjectDocument(reference) {
+function readEmbeddedObjectDocument(reference, frame) {
 	switch (reference.objectKind) {
 		case "wordprocessing": {
 			const { metadata, sections } = readOdtContent(reference.package);
@@ -199,16 +200,32 @@ function readEmbeddedObjectDocument(reference) {
 			};
 		}
 		case "formula": return readOdfFormulaContent(reference.package);
+		case "chart": return readOdfChartContent(reference.package, frame, "ods").document;
 	}
 }
 function collectAnchoredFrame(frameElement, groupFunctions, pkg, anchorRow, anchorColumn, images, embeddedObjects) {
 	const shape = readDrawFrame(frameElement, groupFunctions, pkg);
 	if (shape === void 0) return;
 	const reference = readDrawObjectReference(frameElement, pkg);
+	if (reference?.objectKind === "chart") {
+		const { document, residue } = readOdfChartContent(reference.package, shape.frame, "ods");
+		const chartObject = {
+			objectKind: "chart",
+			document,
+			frame: shape.frame,
+			anchorRow,
+			anchorColumn,
+			offsetXPt: shape.frame.xPt,
+			offsetYPt: shape.frame.yPt
+		};
+		if (residue !== void 0) chartObject.source = residue;
+		embeddedObjects.push(chartObject);
+		return;
+	}
 	if (reference !== void 0) {
 		embeddedObjects.push({
 			objectKind: reference.objectKind,
-			document: readEmbeddedObjectDocument(reference),
+			document: readEmbeddedObjectDocument(reference, shape.frame),
 			frame: shape.frame,
 			anchorRow,
 			anchorColumn,
@@ -406,18 +423,23 @@ function readOdsContent(pkg) {
 		const sheet = readSheet(table, pkg);
 		if (sheet !== void 0) sheets.push(sheet);
 	}
+	const definitions = {};
+	if (spreadsheet !== void 0) collectOdfNamedExpressions(spreadsheet.children, definitions);
 	return {
 		metadata: readOdfMetadata(pkg),
-		sheets
+		sheets,
+		...Object.keys(definitions).length > 0 ? { definitions } : {}
 	};
 }
 function readOds(pkg) {
-	const { metadata, sheets } = readOdsContent(pkg);
-	return assemblePackage({
+	const { metadata, sheets, definitions } = readOdsContent(pkg);
+	const assembled = assemblePackage({
 		kind: "spreadsheet",
 		metadata,
 		sheets
 	});
+	if (definitions !== void 0) assembled.definitions = definitions;
+	return assembled;
 }
 //#endregion
 export { readOds, readOdsContent };