odf.js 1.13.2 → 2.1.0

package/dist/typed/odb/report.cjs

@@ -0,0 +1,161 @@
+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_odb_read = require("./read.cjs");
+//#region src/typed/odb/report.ts
+const CONTENT_PART = "content.xml";
+const GROUP_TAG = "rpt:group";
+const FUNCTION_TAG = "rpt:function";
+const REPORT_ELEMENT_TAG = "rpt:report-element";
+const REPORT_COMPONENT_TAG = "rpt:report-component";
+const RPT_TAG_PREFIX = "rpt:";
+const FIELD_FORMULA_PREFIX = "field:[";
+const FIELD_FORMULA_SUFFIX = "]";
+function reportAttr(element, name) {
+	const raw = require_xml_query.attrValue(element, name);
+	return raw === void 0 ? void 0 : require_xml_entities.decodeXmlText(raw);
+}
+function parseOptionalBoolean(raw) {
+	return raw === void 0 ? void 0 : raw === "true";
+}
+function boundFieldName(formula) {
+	if (formula === void 0 || !formula.startsWith(FIELD_FORMULA_PREFIX) || !formula.endsWith(FIELD_FORMULA_SUFFIX)) return;
+	const inner = formula.slice(7, formula.length - 1);
+	return inner.length === 0 ? void 0 : inner;
+}
+function elementText(element) {
+	let text = "";
+	for (const child of element.children) if (child.type === "text") text += require_xml_entities.decodeXmlText(child.value);
+	else if (child.type === "element") text += elementText(child);
+	return text;
+}
+function reportElementChild(element) {
+	return require_xml_query.findChildElement(element.children, REPORT_ELEMENT_TAG);
+}
+function readReportElement(element, reportElement) {
+	const control = { tag: element.tag };
+	const component = require_xml_query.findChildElement(reportElement.children, REPORT_COMPONENT_TAG);
+	const name = component === void 0 ? void 0 : reportAttr(component, "draw:name");
+	if (name !== void 0) control.name = name;
+	const formula = reportAttr(element, "rpt:formula");
+	if (formula !== void 0) control.formula = formula;
+	let text = "";
+	for (const child of element.children) if (child.type === "text") text += require_xml_entities.decodeXmlText(child.value);
+	else if (child.type === "element" && !child.tag.startsWith(RPT_TAG_PREFIX)) text += elementText(child);
+	if (text.length > 0) control.text = text;
+	const dataField = boundFieldName(formula);
+	if (dataField !== void 0) control.dataField = dataField;
+	return control;
+}
+function collectControls(nodes, controls) {
+	for (const node of nodes) {
+		if (node.type !== "element") continue;
+		if (node.tag.startsWith(RPT_TAG_PREFIX)) {
+			const reportElement = reportElementChild(node);
+			if (reportElement !== void 0) {
+				controls.push(readReportElement(node, reportElement));
+				continue;
+			}
+		}
+		collectControls(node.children, controls);
+	}
+}
+function readBand(element, kind) {
+	const elements = [];
+	collectControls(element.children, elements);
+	const band = {
+		kind,
+		elements
+	};
+	const table = require_xml_query.findChildElement(element.children, "table:table");
+	const name = table === void 0 ? void 0 : reportAttr(table, "table:name");
+	if (name !== void 0) band.name = name;
+	return band;
+}
+function readBandIfPresent(container, tag, kind) {
+	const element = require_xml_query.findChildElement(container.children, tag);
+	return element === void 0 ? void 0 : readBand(element, kind);
+}
+function readFunctions(container) {
+	const functions = [];
+	for (const child of container.children) {
+		if (child.type !== "element" || child.tag !== FUNCTION_TAG) continue;
+		const name = reportAttr(child, "rpt:name");
+		const formula = reportAttr(child, "rpt:formula");
+		if (name === void 0 || formula === void 0) continue;
+		functions.push({
+			name,
+			formula
+		});
+	}
+	return functions;
+}
+function readGroup(element) {
+	const group = {
+		functions: readFunctions(element),
+		groups: []
+	};
+	const groupExpression = reportAttr(element, "rpt:group-expression");
+	if (groupExpression !== void 0) group.groupExpression = groupExpression;
+	const sortExpression = reportAttr(element, "rpt:sort-expression");
+	if (sortExpression !== void 0) group.sortExpression = sortExpression;
+	const sortAscending = parseOptionalBoolean(require_xml_query.attrValue(element, "rpt:sort-ascending"));
+	if (sortAscending !== void 0) group.sortAscending = sortAscending;
+	const startNewColumn = parseOptionalBoolean(require_xml_query.attrValue(element, "rpt:start-new-column"));
+	if (startNewColumn !== void 0) group.startNewColumn = startNewColumn;
+	const resetPageNumber = parseOptionalBoolean(require_xml_query.attrValue(element, "rpt:reset-page-number"));
+	if (resetPageNumber !== void 0) group.resetPageNumber = resetPageNumber;
+	const keepTogether = reportAttr(element, "rpt:keep-together");
+	if (keepTogether !== void 0) group.keepTogether = keepTogether;
+	const header = readBandIfPresent(element, "rpt:group-header", "group-header");
+	if (header !== void 0) group.header = header;
+	const footer = readBandIfPresent(element, "rpt:group-footer", "group-footer");
+	if (footer !== void 0) group.footer = footer;
+	for (const child of element.children) if (child.type === "element" && child.tag === GROUP_TAG) group.groups.push(readGroup(child));
+	return group;
+}
+function findDetail(container) {
+	const detail = require_xml_query.findChildElement(container.children, "rpt:detail");
+	if (detail !== void 0) return readBand(detail, "detail");
+	const group = require_xml_query.findChildElement(container.children, GROUP_TAG);
+	return group === void 0 ? void 0 : findDetail(group);
+}
+function readOdbReport(pkg, reportName) {
+	const component = require_typed_odb_read.resolveOdbComponent(pkg, "report", reportName);
+	const contentPart = require_typed_odb_subdocument.subDocumentPackage(pkg, component.href).parts[CONTENT_PART];
+	if (contentPart?.kind !== "xml") throw new Error(`readOdbReport: report "${reportName}" sub-document ${component.href}/${CONTENT_PART} is not an XML part`);
+	const contentRoot = require_xml_query.rootElement(contentPart.nodes);
+	const body = contentRoot === void 0 ? void 0 : require_xml_query.findChildElement(contentRoot.children, "office:body");
+	const reportElement = body === void 0 ? void 0 : require_xml_query.findChildElement(body.children, "office:report");
+	if (reportElement === void 0) throw new Error(`readOdbReport: report "${reportName}" sub-document ${component.href}/${CONTENT_PART} has no office:body/office:report element`);
+	const groups = [];
+	for (const child of reportElement.children) if (child.type === "element" && child.tag === GROUP_TAG) groups.push(readGroup(child));
+	const report = {
+		name: component.name,
+		href: component.href,
+		groups,
+		functions: readFunctions(reportElement)
+	};
+	const command = reportAttr(reportElement, "rpt:command");
+	if (command !== void 0) report.command = command;
+	const commandType = reportAttr(reportElement, "rpt:command-type");
+	if (commandType !== void 0) report.commandType = commandType;
+	const caption = reportAttr(reportElement, "office:caption");
+	if (caption !== void 0) report.caption = caption;
+	const mimeType = reportAttr(reportElement, "office:mimetype");
+	if (mimeType !== void 0) report.mimeType = mimeType;
+	const reportHeader = readBandIfPresent(reportElement, "rpt:report-header", "report-header");
+	if (reportHeader !== void 0) report.reportHeader = reportHeader;
+	const pageHeader = readBandIfPresent(reportElement, "rpt:page-header", "page-header");
+	if (pageHeader !== void 0) report.pageHeader = pageHeader;
+	const detail = findDetail(reportElement);
+	if (detail !== void 0) report.detail = detail;
+	const pageFooter = readBandIfPresent(reportElement, "rpt:page-footer", "page-footer");
+	if (pageFooter !== void 0) report.pageFooter = pageFooter;
+	const reportFooter = readBandIfPresent(reportElement, "rpt:report-footer", "report-footer");
+	if (reportFooter !== void 0) report.reportFooter = reportFooter;
+	return report;
+}
+//#endregion
+exports.readOdbReport = readOdbReport;

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

@@ -0,0 +1,48 @@
+import { Package } from "../../model/package.cjs";
+//#region src/typed/odb/report.d.ts
+interface OdbReportElement {
+  tag: string;
+  name?: string;
+  text?: string;
+  formula?: string;
+  dataField?: string;
+}
+interface OdbReportBand {
+  kind: 'report-header' | 'page-header' | 'group-header' | 'detail' | 'group-footer' | 'page-footer' | 'report-footer';
+  name?: string;
+  elements: OdbReportElement[];
+}
+interface OdbReportFunction {
+  name: string;
+  formula: string;
+}
+interface OdbReportGroup {
+  groupExpression?: string;
+  sortExpression?: string;
+  sortAscending?: boolean;
+  startNewColumn?: boolean;
+  resetPageNumber?: boolean;
+  keepTogether?: string;
+  header?: OdbReportBand;
+  footer?: OdbReportBand;
+  functions: OdbReportFunction[];
+  groups: OdbReportGroup[];
+}
+interface OdbReport {
+  name: string;
+  href: string;
+  command?: string;
+  commandType?: string;
+  caption?: string;
+  mimeType?: string;
+  reportHeader?: OdbReportBand;
+  pageHeader?: OdbReportBand;
+  groups: OdbReportGroup[];
+  detail?: OdbReportBand;
+  pageFooter?: OdbReportBand;
+  reportFooter?: OdbReportBand;
+  functions: OdbReportFunction[];
+}
+declare function readOdbReport(pkg: Package, reportName: string): OdbReport;
+//#endregion
+export { OdbReport, OdbReportBand, OdbReportElement, OdbReportFunction, OdbReportGroup, readOdbReport };

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

@@ -0,0 +1,48 @@
+import { Package } from "../../model/package.js";
+//#region src/typed/odb/report.d.ts
+interface OdbReportElement {
+  tag: string;
+  name?: string;
+  text?: string;
+  formula?: string;
+  dataField?: string;
+}
+interface OdbReportBand {
+  kind: 'report-header' | 'page-header' | 'group-header' | 'detail' | 'group-footer' | 'page-footer' | 'report-footer';
+  name?: string;
+  elements: OdbReportElement[];
+}
+interface OdbReportFunction {
+  name: string;
+  formula: string;
+}
+interface OdbReportGroup {
+  groupExpression?: string;
+  sortExpression?: string;
+  sortAscending?: boolean;
+  startNewColumn?: boolean;
+  resetPageNumber?: boolean;
+  keepTogether?: string;
+  header?: OdbReportBand;
+  footer?: OdbReportBand;
+  functions: OdbReportFunction[];
+  groups: OdbReportGroup[];
+}
+interface OdbReport {
+  name: string;
+  href: string;
+  command?: string;
+  commandType?: string;
+  caption?: string;
+  mimeType?: string;
+  reportHeader?: OdbReportBand;
+  pageHeader?: OdbReportBand;
+  groups: OdbReportGroup[];
+  detail?: OdbReportBand;
+  pageFooter?: OdbReportBand;
+  reportFooter?: OdbReportBand;
+  functions: OdbReportFunction[];
+}
+declare function readOdbReport(pkg: Package, reportName: string): OdbReport;
+//#endregion
+export { OdbReport, OdbReportBand, OdbReportElement, OdbReportFunction, OdbReportGroup, readOdbReport };

package/dist/typed/odb/report.js

@@ -0,0 +1,160 @@
+import { decodeXmlText } from "../../xml/entities.js";
+import { attrValue, findChildElement, rootElement } from "../../xml/query.js";
+import { subDocumentPackage } from "./subdocument.js";
+import { resolveOdbComponent } from "./read.js";
+//#region src/typed/odb/report.ts
+const CONTENT_PART = "content.xml";
+const GROUP_TAG = "rpt:group";
+const FUNCTION_TAG = "rpt:function";
+const REPORT_ELEMENT_TAG = "rpt:report-element";
+const REPORT_COMPONENT_TAG = "rpt:report-component";
+const RPT_TAG_PREFIX = "rpt:";
+const FIELD_FORMULA_PREFIX = "field:[";
+const FIELD_FORMULA_SUFFIX = "]";
+function reportAttr(element, name) {
+	const raw = attrValue(element, name);
+	return raw === void 0 ? void 0 : decodeXmlText(raw);
+}
+function parseOptionalBoolean(raw) {
+	return raw === void 0 ? void 0 : raw === "true";
+}
+function boundFieldName(formula) {
+	if (formula === void 0 || !formula.startsWith(FIELD_FORMULA_PREFIX) || !formula.endsWith(FIELD_FORMULA_SUFFIX)) return;
+	const inner = formula.slice(7, formula.length - 1);
+	return inner.length === 0 ? void 0 : inner;
+}
+function elementText(element) {
+	let text = "";
+	for (const child of element.children) if (child.type === "text") text += decodeXmlText(child.value);
+	else if (child.type === "element") text += elementText(child);
+	return text;
+}
+function reportElementChild(element) {
+	return findChildElement(element.children, REPORT_ELEMENT_TAG);
+}
+function readReportElement(element, reportElement) {
+	const control = { tag: element.tag };
+	const component = findChildElement(reportElement.children, REPORT_COMPONENT_TAG);
+	const name = component === void 0 ? void 0 : reportAttr(component, "draw:name");
+	if (name !== void 0) control.name = name;
+	const formula = reportAttr(element, "rpt:formula");
+	if (formula !== void 0) control.formula = formula;
+	let text = "";
+	for (const child of element.children) if (child.type === "text") text += decodeXmlText(child.value);
+	else if (child.type === "element" && !child.tag.startsWith(RPT_TAG_PREFIX)) text += elementText(child);
+	if (text.length > 0) control.text = text;
+	const dataField = boundFieldName(formula);
+	if (dataField !== void 0) control.dataField = dataField;
+	return control;
+}
+function collectControls(nodes, controls) {
+	for (const node of nodes) {
+		if (node.type !== "element") continue;
+		if (node.tag.startsWith(RPT_TAG_PREFIX)) {
+			const reportElement = reportElementChild(node);
+			if (reportElement !== void 0) {
+				controls.push(readReportElement(node, reportElement));
+				continue;
+			}
+		}
+		collectControls(node.children, controls);
+	}
+}
+function readBand(element, kind) {
+	const elements = [];
+	collectControls(element.children, elements);
+	const band = {
+		kind,
+		elements
+	};
+	const table = findChildElement(element.children, "table:table");
+	const name = table === void 0 ? void 0 : reportAttr(table, "table:name");
+	if (name !== void 0) band.name = name;
+	return band;
+}
+function readBandIfPresent(container, tag, kind) {
+	const element = findChildElement(container.children, tag);
+	return element === void 0 ? void 0 : readBand(element, kind);
+}
+function readFunctions(container) {
+	const functions = [];
+	for (const child of container.children) {
+		if (child.type !== "element" || child.tag !== FUNCTION_TAG) continue;
+		const name = reportAttr(child, "rpt:name");
+		const formula = reportAttr(child, "rpt:formula");
+		if (name === void 0 || formula === void 0) continue;
+		functions.push({
+			name,
+			formula
+		});
+	}
+	return functions;
+}
+function readGroup(element) {
+	const group = {
+		functions: readFunctions(element),
+		groups: []
+	};
+	const groupExpression = reportAttr(element, "rpt:group-expression");
+	if (groupExpression !== void 0) group.groupExpression = groupExpression;
+	const sortExpression = reportAttr(element, "rpt:sort-expression");
+	if (sortExpression !== void 0) group.sortExpression = sortExpression;
+	const sortAscending = parseOptionalBoolean(attrValue(element, "rpt:sort-ascending"));
+	if (sortAscending !== void 0) group.sortAscending = sortAscending;
+	const startNewColumn = parseOptionalBoolean(attrValue(element, "rpt:start-new-column"));
+	if (startNewColumn !== void 0) group.startNewColumn = startNewColumn;
+	const resetPageNumber = parseOptionalBoolean(attrValue(element, "rpt:reset-page-number"));
+	if (resetPageNumber !== void 0) group.resetPageNumber = resetPageNumber;
+	const keepTogether = reportAttr(element, "rpt:keep-together");
+	if (keepTogether !== void 0) group.keepTogether = keepTogether;
+	const header = readBandIfPresent(element, "rpt:group-header", "group-header");
+	if (header !== void 0) group.header = header;
+	const footer = readBandIfPresent(element, "rpt:group-footer", "group-footer");
+	if (footer !== void 0) group.footer = footer;
+	for (const child of element.children) if (child.type === "element" && child.tag === GROUP_TAG) group.groups.push(readGroup(child));
+	return group;
+}
+function findDetail(container) {
+	const detail = findChildElement(container.children, "rpt:detail");
+	if (detail !== void 0) return readBand(detail, "detail");
+	const group = findChildElement(container.children, GROUP_TAG);
+	return group === void 0 ? void 0 : findDetail(group);
+}
+function readOdbReport(pkg, reportName) {
+	const component = resolveOdbComponent(pkg, "report", reportName);
+	const contentPart = subDocumentPackage(pkg, component.href).parts[CONTENT_PART];
+	if (contentPart?.kind !== "xml") throw new Error(`readOdbReport: report "${reportName}" sub-document ${component.href}/${CONTENT_PART} is not an XML part`);
+	const contentRoot = rootElement(contentPart.nodes);
+	const body = contentRoot === void 0 ? void 0 : findChildElement(contentRoot.children, "office:body");
+	const reportElement = body === void 0 ? void 0 : findChildElement(body.children, "office:report");
+	if (reportElement === void 0) throw new Error(`readOdbReport: report "${reportName}" sub-document ${component.href}/${CONTENT_PART} has no office:body/office:report element`);
+	const groups = [];
+	for (const child of reportElement.children) if (child.type === "element" && child.tag === GROUP_TAG) groups.push(readGroup(child));
+	const report = {
+		name: component.name,
+		href: component.href,
+		groups,
+		functions: readFunctions(reportElement)
+	};
+	const command = reportAttr(reportElement, "rpt:command");
+	if (command !== void 0) report.command = command;
+	const commandType = reportAttr(reportElement, "rpt:command-type");
+	if (commandType !== void 0) report.commandType = commandType;
+	const caption = reportAttr(reportElement, "office:caption");
+	if (caption !== void 0) report.caption = caption;
+	const mimeType = reportAttr(reportElement, "office:mimetype");
+	if (mimeType !== void 0) report.mimeType = mimeType;
+	const reportHeader = readBandIfPresent(reportElement, "rpt:report-header", "report-header");
+	if (reportHeader !== void 0) report.reportHeader = reportHeader;
+	const pageHeader = readBandIfPresent(reportElement, "rpt:page-header", "page-header");
+	if (pageHeader !== void 0) report.pageHeader = pageHeader;
+	const detail = findDetail(reportElement);
+	if (detail !== void 0) report.detail = detail;
+	const pageFooter = readBandIfPresent(reportElement, "rpt:page-footer", "page-footer");
+	if (pageFooter !== void 0) report.pageFooter = pageFooter;
+	const reportFooter = readBandIfPresent(reportElement, "rpt:report-footer", "report-footer");
+	if (reportFooter !== void 0) report.reportFooter = reportFooter;
+	return report;
+}
+//#endregion
+export { readOdbReport };

package/dist/typed/odb/subdocument.cjs

@@ -0,0 +1,16 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/typed/odb/subdocument.ts
+const CONTENT_PART = "content.xml";
+function subDocumentPackage(pkg, prefix, options = {}) {
+	const normalised = prefix.endsWith("/") ? prefix : `${prefix}/`;
+	const parts = {};
+	for (const [path, part] of Object.entries(pkg.parts)) {
+		if (!path.startsWith(normalised)) continue;
+		const relative = path.slice(normalised.length);
+		if (relative.length > 0) parts[relative] = part;
+	}
+	if (options.allowMissingContent !== true && parts[CONTENT_PART] === void 0) throw new Error(`subDocumentPackage: package has no ${normalised}${CONTENT_PART} part`);
+	return { parts };
+}
+//#endregion
+exports.subDocumentPackage = subDocumentPackage;

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

@@ -0,0 +1,8 @@
+import { Package } from "../../model/package.cjs";
+//#region src/typed/odb/subdocument.d.ts
+interface SubDocumentPackageOptions {
+  allowMissingContent?: boolean;
+}
+declare function subDocumentPackage(pkg: Package, prefix: string, options?: SubDocumentPackageOptions): Package;
+//#endregion
+export { SubDocumentPackageOptions, subDocumentPackage };

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

@@ -0,0 +1,8 @@
+import { Package } from "../../model/package.js";
+//#region src/typed/odb/subdocument.d.ts
+interface SubDocumentPackageOptions {
+  allowMissingContent?: boolean;
+}
+declare function subDocumentPackage(pkg: Package, prefix: string, options?: SubDocumentPackageOptions): Package;
+//#endregion
+export { SubDocumentPackageOptions, subDocumentPackage };

package/dist/typed/odb/subdocument.js

@@ -0,0 +1,15 @@
+//#region src/typed/odb/subdocument.ts
+const CONTENT_PART = "content.xml";
+function subDocumentPackage(pkg, prefix, options = {}) {
+	const normalised = prefix.endsWith("/") ? prefix : `${prefix}/`;
+	const parts = {};
+	for (const [path, part] of Object.entries(pkg.parts)) {
+		if (!path.startsWith(normalised)) continue;
+		const relative = path.slice(normalised.length);
+		if (relative.length > 0) parts[relative] = part;
+	}
+	if (options.allowMissingContent !== true && parts[CONTENT_PART] === void 0) throw new Error(`subDocumentPackage: package has no ${normalised}${CONTENT_PART} part`);
+	return { parts };
+}
+//#endregion
+export { subDocumentPackage };

package/dist/typed/ods/read.cjs

@@ -6,7 +6,14 @@ 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_paragraph = require("../shared/paragraph.cjs");
+const require_typed_shared_table = require("../shared/table.cjs");
+const require_typed_shared_transform = require("../shared/transform.cjs");
 const require_typed_shared_masterpage = require("../shared/masterpage.cjs");
+const require_typed_draw_shapes = require("../draw/shapes.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");
 let document_schema_js = require("document-schema.js");
 //#region src/typed/ods/read.ts
 const CONTENT_PART = "content.xml";
@@ -155,10 +162,84 @@ function parseNonNegativeInteger(value) {
 	const parsed = Number.parseInt(value, 10);
 	return Number.isInteger(parsed) && parsed >= 0 ? parsed : void 0;
 }
+function readEmbeddedObjectDocument(reference) {
+	switch (reference.objectKind) {
+		case "wordprocessing": {
+			const { metadata, sections } = require_typed_odt_read.readOdt(reference.package);
+			return {
+				kind: "wordprocessing",
+				formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
+				metadata,
+				sections
+			};
+		}
+		case "presentation": {
+			const { metadata, slides } = require_typed_odp_read.readOdp(reference.package);
+			return {
+				kind: "presentation",
+				formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
+				metadata,
+				slides
+			};
+		}
+		case "drawing": {
+			const { metadata, pages } = require_typed_odg_read.readOdg(reference.package);
+			return {
+				kind: "drawing",
+				formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
+				metadata,
+				pages
+			};
+		}
+		case "spreadsheet": {
+			const { metadata, sheets } = readOds(reference.package);
+			return {
+				kind: "spreadsheet",
+				formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
+				metadata,
+				sheets
+			};
+		}
+	}
+}
+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 !== void 0) {
+		embeddedObjects.push({
+			objectKind: reference.objectKind,
+			document: readEmbeddedObjectDocument(reference),
+			frame: shape.frame
+		});
+		return;
+	}
+	for (const block of shape.blocks) if (block.kind === "image") images.push({
+		...block,
+		anchorRow,
+		anchorColumn,
+		offsetXPt: shape.frame.xPt,
+		offsetYPt: shape.frame.yPt
+	});
+}
+function collectAnchoredFrames(children, groupFunctions, pkg, anchorRow, anchorColumn, images, embeddedObjects) {
+	for (const child of children) {
+		if (child.type !== "element") continue;
+		if (child.tag === "draw:frame") collectAnchoredFrame(child, groupFunctions, pkg, anchorRow, anchorColumn, images, embeddedObjects);
+		else if (child.tag === "draw:g") {
+			const ownValue = require_xml_query.attrValue(child, "draw:transform");
+			const ownFunctions = ownValue === void 0 ? [] : require_typed_shared_transform.parseOdfTransform(ownValue);
+			const nested = ownFunctions.length === 0 ? groupFunctions : [...ownFunctions, ...groupFunctions];
+			collectAnchoredFrames(child.children, nested, pkg, anchorRow, anchorColumn, images, embeddedObjects);
+		}
+	}
+}
 function readTable(tableElement, pkg) {
 	const columns = [];
 	const rows = [];
 	const cells = [];
+	const images = [];
+	const embeddedObjects = [];
 	const manualBreakRows = [];
 	const manualBreakColumns = [];
 	let repeatColumns;
@@ -183,6 +264,7 @@ function readTable(tableElement, pkg) {
 				const columnIndex = cursor.columnIndex;
 				const rowIndex = cursor.rowIndex;
 				cursor.nextCell(readRepeatCount(child, "table:number-columns-repeated"));
+				collectAnchoredFrames(child.children, [], pkg, rowIndex, columnIndex, images, embeddedObjects);
 				const formula = require_xml_query.attrValue(child, "table:formula");
 				const { runs, displayText } = readCellText(child, pkg);
 				if (!(require_xml_query.attrValue(child, "office:value-type") !== void 0) && formula === void 0 && displayText.length === 0) continue;
@@ -199,6 +281,13 @@ function readTable(tableElement, pkg) {
 				if (runs.length > 0) cell.runs = runs;
 				if (colSpan !== void 0) cell.colSpan = colSpan;
 				if (rowSpan !== void 0) cell.rowSpan = rowSpan;
+				const cellStyleName = require_xml_query.attrValue(child, "table:style-name");
+				const { elements: cellStyleChain } = require_typed_shared_cascade.resolveStyleElementChain(cellStyleName, "table-cell", pkg);
+				const decoration = require_typed_shared_table.readCellStyleDecoration(cellStyleChain);
+				if (decoration.background !== void 0) cell.background = decoration.background;
+				if (decoration.borders !== void 0) cell.borders = decoration.borders;
+				if (decoration.alignment !== void 0) cell.alignment = decoration.alignment;
+				if (decoration.verticalAlignment !== void 0) cell.verticalAlignment = decoration.verticalAlignment;
 				cells.push(cell);
 			}
 		}
@@ -217,7 +306,8 @@ function readTable(tableElement, pkg) {
 	}
 	for (const child of tableElement.children) {
 		if (child.type !== "element") continue;
-		if (child.tag === "table:table-column") processColumn(child);
+		if (child.tag === "table:shapes") collectAnchoredFrames(child.children, [], pkg, 0, 0, images, embeddedObjects);
+		else if (child.tag === "table:table-column") processColumn(child);
 		else if (child.tag === "table:table-header-columns") {
 			const startIndex = columnCursor;
 			for (const headerChild of child.children) if (headerChild.type === "element" && headerChild.tag === "table:table-column") processColumn(headerChild);
@@ -239,6 +329,8 @@ function readTable(tableElement, pkg) {
 		columns,
 		rows,
 		cells,
+		images,
+		embeddedObjects,
 		repeatColumns,
 		repeatRows,
 		manualBreakRows,
@@ -288,15 +380,17 @@ function readPrintSettings(tableElement, pkg, repeatColumns, repeatRows, manualB
 function readSheet(tableElement, pkg) {
 	const name = require_xml_query.attrValue(tableElement, "table:name");
 	if (name === void 0) return;
-	const { columns, rows, cells, repeatColumns, repeatRows, manualBreakRows, manualBreakColumns } = readTable(tableElement, pkg);
-	return {
+	const { columns, rows, cells, images, embeddedObjects, repeatColumns, repeatRows, manualBreakRows, manualBreakColumns } = readTable(tableElement, pkg);
+	const sheet = {
 		name,
 		cells,
 		columns,
 		rows,
-		images: [],
+		images,
 		printSettings: readPrintSettings(tableElement, pkg, repeatColumns, repeatRows, manualBreakRows, manualBreakColumns)
 	};
+	if (embeddedObjects.length > 0) sheet.embeddedObjects = embeddedObjects;
+	return sheet;
 }
 function readOds(pkg) {
 	const contentPart = pkg.parts[CONTENT_PART];