odf.js 1.13.1 → 2.0.0

package/README.md

@@ -52,12 +52,15 @@ This package is under active development. What's built and shipped:
 - **Style interning** (`src/styles/`) — `StyleRegistry`: adopts a part's existing automatic styles on construction, finds-or-mints on `intern()`, fingerprints on canonical serialized properties plus parent style name (never `JSON.stringify`), and is collision-checked across all four style containers a document can have.
 - **Shared typed primitives** (`src/typed/shared/`) — ODF length-unit parsing (`cm`/`mm`/`in`/`pt`/`pc`/`px`), A1-style spreadsheet cell-reference computation with repeat-count cursor advancement, colour/geometry/master-page-size parsing into `document-schema.js`'s own types, ODF's `text:s`/`text:tab`/`text:line-break` whitespace-run decoding, the read-side style cascade (`style:default-style` → parent chain → the referenced style — one layer shorter than OOXML's, since ODF has no separate direct-formatting layer on top), the shared `text:p` → `ContentParagraph`/`ContentRun` and `table:table` → `ContentTable` readers (`readOdfParagraph`/`readOdfTable`) every typed reader below builds on, the `draw:transform`/`draw:g` group-flattening geometry resolver, an `svg:d`/`draw:points` vector-path grammar parser, and `meta.xml` reading.
 - **Typed readers** — `readOdt` (wordprocessing), `readOdp` (presentation slides: `draw:frame`/`draw:g` text/image/table content), `readOdg` (drawing pages: every vector primitive — `draw:rect`/`draw:ellipse`/`draw:circle`/`draw:line`/`draw:path`/`draw:polygon`/`draw:polyline`, plus a recognised `draw:custom-shape` preset subset — in real `draw:z-index`-aware paint order), and `readOds` (spreadsheets: geometry- and print-settings-rich, every `office:value-type` variant with its own OpenFormula string) each resolve a `Package` into `document-schema.js`'s own `ContentSection`/`ContentSlide`/`ContentDrawPage`/`ContentSheet` shapes.
-- **`readOdfFormula`** resolves a standalone or embedded `.odf` formula's `content.xml` — bare MathML with no `office:document-content` wrapper, confirmed against real LibreOffice output — into its raw MathML nodes plus, when present, the formula's own native StarMath annotation string. There is no `document-schema.js` pivot type for MathML, so this reader's own output type is its own.
+- **`readOdfFormula`** resolves a standalone or embedded `.odf` formula's `content.xml` — bare MathML with no `office:document-content` wrapper, confirmed against real LibreOffice output — into its raw MathML nodes plus, when present, the formula's own native StarMath annotation string, in this reader's own bespoke `OdfFormulaDocument` shape. **`readOdfFormulaDocument`** wraps that same result into a real `document-schema.js` `ContentDocument` of kind `'formula'` — `document-schema.js` 2.0.0 added a `MathMlNode`/`ContentFormula` pivot shape for exactly this, a structural mirror of this package's own `XmlNode` that `readOdfFormula`'s real output assigns to with zero cast.
 - **`readOdm`** resolves a `.odm` master document's own `content.xml` into an ordered list of chapter references (`{ name, href, filterName? }`, one per top-level linked `text:section`) without opening the external `.odt` files those references point at. A master document's chapters are genuinely external files by ODF design, not embedded package sub-documents — confirmed against real LibreOffice output, which never caches a chapter's own content inside the master document itself (see `src/typed/odm/read.ts`'s own top-of-file note).
-- **`readOdbInventory`** resolves a `.odb` database front-end package into connection info plus the *names* of its forms/queries/reports/tables — never their content, and never the embedded/external database engine's own binary or script storage. Confirmed against real LibreOffice output that `office:database` lives directly in the package's ordinary `content.xml` (no separate `database/connection.xml` part, contrary to the OASIS schema's own chapter layout suggesting one), that queries are named inline (`db:queries/db:query`, no manifest part of their own), and that a live engine's own tables have no ODF-level manifest listing at all — only forms/reports genuinely are separate manifest sub-document parts (`forms/<Name>/content.xml`, `reports/<Name>/content.xml`). See `src/typed/odb/read.ts`'s own top-of-file note for the full findings.
+- **`readOdbInventory`** resolves a `.odb` database front-end package into connection info, its table *names*, its query *definitions* (name, real `db:command` SQL text, and `db:escape-processing` when declared), and its forms/reports as `{ name, href }` pairs. Confirmed against real LibreOffice output that `office:database` lives directly in the package's ordinary `content.xml` (no separate `database/connection.xml` part, contrary to the OASIS schema's own chapter layout suggesting one), that queries are declared inline (`db:queries/db:query`, no manifest part of their own), and that a live engine's own tables have no ODF-level manifest listing at all. A form's/report's sub-document directory is named after an opaque *persistent* name (`forms/Obj11`), **not** after the form/report — the user-visible name lives only in `content.xml`'s own `db:forms`/`db:reports` registry, which is where this reader takes both the name and the href from. See `src/typed/odb/read.ts`'s own top-of-file note for the full findings.
+- **`readOdbForm`** and **`readOdbReport`** open one of those sub-documents and extract its *static structure*, executing nothing. A form sub-document is a complete, ordinary ODF text document (`readOdt` reads it unmodified through `subDocumentPackage`, a synthetic sub-`Package` view over the sub-document's own directory) plus an `office:text/office:forms` control tree: per form, its `form:command`/`form:command-type` binding, every control's real element tag, UNO control implementation and `form:data-field` binding, and any genuinely nested sub-form with its own independent binding. A report sub-document uses the `rpt:` Report Builder vocabulary: the `rpt:command`/`rpt:command-type` data binding, the band stack (report header, page header, detail, page footer, report footer), the recursive group tree with each group's own expression/sort/page-break attributes and header/footer bands, every band's bound fields (`field:[COLUMN]`, unwrapped into a real column name) and computed expressions (`rpt:SUM([AMOUNT])`, left verbatim), and the report's own `rpt:function` declarations. Both are grounded in a real, LibreOffice-generated fixture rather than in the schema — which is what caught the two shapes an assumed reading gets wrong: the detail band is nested *inside the innermost group*, not a sibling of the other bands, and a group's key is a formula (`rpt:HASCHANGED("REGION")`), not a bare column name. See `src/typed/odb/form.ts`'s and `src/typed/odb/report.ts`'s own top-of-file notes.
 
 Not yet built: live-view editors and the `.odb` database-table-export subsystem. This section will be replaced with real usage examples once those land — see the [Architecture](#architecture) section below for the intended shape, and this repository's own commit history/releases for current progress.
 
+A general-purpose SQL query engine for actually rendering a Report against its data — as opposed to reading the report's own static `rpt:command`/band/group definition, which `readOdbReport` already does — has been deliberately **not attempted**, not merely left unstarted. `readOdbInventory` already extracts a query's or report's real `db:command`/`rpt:command` SQL text verbatim, and a rough survey against the one real fixture this package has (`src/typed/odb/fixtures/form-and-report.odb`) suggests the underlying query text itself would often fall inside a plausible bounded SQL subset (single-table `SELECT`/`WHERE`/`ORDER BY`, no `JOIN`s or subqueries) — but that survey is a sample size of one report and should not be read as a real coverage figure. Building even a bounded engine against it means reimplementing a slice of HSQLDB's/Firebird's own query semantics, which is a materially different undertaking from decoding their file formats (already done safely elsewhere in this package's `.odb` support) and raises its own licensing questions that have not yet been reviewed. This is gated on the requesting engineer's own explicit sign-off on that licensing posture, given after reading the relevant engine source — not given yet — before any such engine is built.
+
 ## Getting started
 
 Requires Node.js `>=20` and pnpm `11.6.0` (pinned via `packageManager` in `package.json`).
@@ -123,7 +126,7 @@ Layered from a lossless core outward, mirroring `ooxml.js`'s own structure:
 - **`src/manifest.ts`** — unlike `ooxml.js` (which only ever *reads* OPC relationships, leaving writing to `documents.js`), `odf.js` owns manifest read **and** write, since the manifest is ODF's one mandatory part and its correctness is exhaustive.
 - **`src/styles/`** — `properties.ts` (the property-bag shape + real ODF attribute parsing), `serialize.ts` (canonical, deterministic property-bag → XML attributes), `registry.ts` (`StyleRegistry`, ODF's mandatory style-interning layer, no OOXML equivalent), `span.ts` (character-range wrapping into a formattable `text:span`, correctly splitting `text:s`/`text:tab` elements that straddle a boundary).
 - **`src/typed/shared/`** — the ODF-specific typed primitives every future format reader builds on: `units.ts`, `a1.ts`, `color.ts`/`geometry.ts` (parsing into `document-schema.js`'s own types, never redefining them), `style.ts` (a thin re-export — ODF's style-properties concern is fully covered by `styles/properties.ts` and the cascade below), `text.ts` (whitespace-run decoding), `cascade.ts` (the read-side style-resolution walk), `paragraph.ts`/`table.ts` (`readOdfParagraph`/`readOdfTable`, the shared `text:p` → `ContentParagraph`/`ContentRun` and `table:table` → `ContentTable` readers `readOdt`, `readOds`, and `typed/draw/shapes.ts` all call), `transform.ts` (the `draw:transform`/`draw:g` group-flattening geometry resolver), `masterpage.ts` (master-page → page-layout page-size/print-settings resolution, shared by a `draw:page`'s own size and a spreadsheet's print settings), `path.ts` (an `svg:d`/`draw:points` vector-path grammar parser), `metadata.ts` (`meta.xml` reading).
-- **`src/typed/odt/`, `src/typed/odp/`, `src/typed/odg/`, `src/typed/ods/`** — the built `readOdt`/`readOdp`/`readOdg`/`readOds` readers; **`src/typed/draw/`** — the `draw:frame`/`draw:g`/vector-primitive shape vocabulary `readOdp` and `readOdg` both share; **`src/typed/formula/`, `src/typed/odm/`** — `readOdfFormula` (raw MathML, no `document-schema.js` pivot) and `readOdm` (a `.odm` master document's own external chapter references — name/href/filter-name per linked `text:section`, never the linked content itself); **`src/typed/odb/`** — `readOdbInventory` (a `.odb` package's own connection info plus form/query/report/table *names*, never their content or the database engine's own storage).
+- **`src/typed/odt/`, `src/typed/odp/`, `src/typed/odg/`, `src/typed/ods/`** — the built `readOdt`/`readOdp`/`readOdg`/`readOds` readers; **`src/typed/draw/`** — the `draw:frame`/`draw:g`/vector-primitive shape vocabulary `readOdp` and `readOdg` both share; **`src/typed/formula/`, `src/typed/odm/`** — `readOdfFormula`/`readOdfFormulaDocument` (raw MathML, and the `document-schema.js` `ContentDocument` 'formula'-kind pivot built on top of it) and `readOdm` (a `.odm` master document's own external chapter references — name/href/filter-name per linked `text:section`, never the linked content itself); **`src/typed/odb/`** — `readOdbInventory` (a `.odb` package's own connection info, table/query/form/report registry, never the database engine's own storage), plus `readOdbForm`/`readOdbReport` (static, execution-free structure extraction from a form's or report's own ODF sub-document) and `subDocumentPackage` (the synthetic sub-`Package` view they read those sub-documents through).
 
 ## Why no `ooxml.js` dependency
 
@@ -144,6 +147,15 @@ See the top of this README — the short version: `ooxml.js`'s branding and sign
 - **`meta:keyword` appears once per keyword**, unlike OOXML's single comma-separated `cp:keywords` element.
 - **`table:number-columns-repeated`/`table:number-rows-repeated` must be cursor-advanced, never materialized.** A real spreadsheet has trailing cells/rows with repeat counts over a million; `typed/shared/a1.ts`'s cursor advances in O(1) without allocating that many objects — tested against a real repeat count taken from a genuine LibreOffice template.
 - **ODF cells carry no explicit cell-reference attribute at all** (unlike xlsx's `r="B7"`) — `typed/shared/a1.ts` computes A1-style references from a running column/row cursor as a reader walks cells in document order.
+- **A rotated `draw:rect`/`draw:ellipse`/`draw:path`/`draw:custom-shape` vector primitive now reads its own `rotationDeg`, not just its unrotated bounding frame.** `resolveVectorGeometry` (`typed/draw/shapes.ts`) replaces the old frame-only `resolveVectorFrame`, reusing the exact same `resolveOdfShapeGeometry`/`composeOdfGroupTransform` machinery `draw:frame` already resolved rotation through, including composing an enclosing `draw:g`'s own rotation the same way it already did for a frame. `ContentVectorSchema`'s rect/ellipse/path variants already carried a `rotationDeg` field before this change — it was being discarded on the read side, not missing from the schema.
+- **Every `ContentShape`/`ContentVector` a drawing or presentation reader produces is now stamped with its own resolved `paintOrder`, not merely sorted by it and discarded.** `walkDrawPageContent` (odg) and `walkDrawShapes` (odp) both compute a real z-index per element — an explicit `draw:z-index` when present, otherwise a monotonic document-encounter counter — purely to order their own output arrays; that value is now attached to each produced value via the same single counter threaded across the whole walk. Because `shapes` and `vectors` are stamped from the identical counter, a caller can recover their true relative paint order across the two independently-ordered arrays by comparing `paintOrder` directly — closing the cross-array ordering gap `documents.js`'s own README previously described as unrecoverable, even though `ContentDrawPageSchema` itself still keeps the two arrays with no shared ordering field of its own.
+- **`svg:fill-rule` (`nonzero`/`evenodd`) and `draw:stroke`'s `solid`/`dash` enumeration are now read and mapped onto `ContentVector`'s path-variant `fillRule` and `ContentStroke.style`.** Both mappings are confirmed against the OASIS schema reference rather than only against real-world producer output — `typed/draw/shapes.ts`'s own comment notes that a live-LibreOffice re-verification of `svg:fill-rule` specifically was blocked by the same headless-`soffice`-hang constraint `documents.js`'s own README documents. A genuinely dotted (as opposed to dashed) stroke pattern, and a `"double"` stroke style ODF's own vector-stroke model has no concept of at all, both remain unread — real, permanent boundaries rather than oversights (see that file's own comment for why each).
+- **`readOds` and the shared `readTableCell` (odt/odp table cells) now resolve `fo:background-color`, the `fo:border`/`fo:border-(left|right|top|bottom)` shorthand-and-per-edge-override chain, `style:vertical-align`, and a cell style's own `style:paragraph-properties` `fo:text-align` from the real ODF style cascade**, populating `ContentSheetCell`/`ContentTableCell`'s `background`/`borders` (plus `ContentSheetCell`'s own `alignment`/`verticalAlignment`) rather than leaving them unpopulated. `readCellStyleDecoration` (`typed/shared/table.ts`) is the one fold both callers share: `readOds` resolves it over the full root-to-target `style:parent-style-name` chain (`resolveStyleElementChain`, confirmed against this package's own `kitchen-sink.ods` fixture's real `ce1`..`ce5` → `Default` chain), `readTableCell` over the single style element `findStyleElement` already resolves. An explicit `fo:border-*` override of `"none"`/`"hidden"` genuinely clears an inherited edge rather than merely leaving it unmentioned.
+- **`readOdfFormulaDocument` now wraps a formula's raw MathML into a real `document-schema.js` `ContentDocument` of kind `'formula'`**, alongside (not instead of) this package's own pre-existing bespoke `OdfFormulaDocument` shape from `readOdfFormula`, which is unchanged. `document-schema.js` 2.0.0 added the `MathMlNode`/`ContentFormula` pivot specifically for this — a structural mirror of this package's own `XmlNode` that `readOdfFormula`'s existing return value assigns into with zero cast.
+- **`readOdbInventory`'s `queries` now carry each query's real `db:command` SQL text (plus `db:escape-processing` when declared) instead of only a bare name.** `OdbInventory.queries` is now `OdbQueryInfo[]` (`{ name, command, escapeProcessing? }`), a breaking rename from the previous `string[]` — a query's own `db:command` is already inline in `content.xml`, unlike a form/report/table's real content, which lives in a separate sub-document or database engine this reader never opens, so the "content lives elsewhere, only names are read" rule that correctly applies to those does not hold for a query. `db:command` is entity-decoded before being returned, matching every other typed reader's convention.
+- **`.odb` Form/Report structure extraction is real and working, grounded in a genuine LibreOffice-generated fixture, not blocked.** `readOdbForm`/`readOdbReport` open a form's or report's own sub-document (via `subDocumentPackage`, a synthetic sub-`Package` view over its directory) and extract its complete static structure — command bindings, control trees, nested sub-forms, the band/group hierarchy, bound and computed expressions — executing nothing. See the Architecture section above and `src/typed/odb/form.ts`/`report.ts`'s own top-of-file notes for the two real shapes this fixture caught that an assumed reading would have got wrong. **A SQL/`rpt:` rendering engine to actually execute a query or evaluate a report's own totals against real data is deliberately not attempted**, not merely unstarted — that is a materially different, larger undertaking (reimplementing a slice of HSQLDB's/Firebird's own query semantics) with its own unreviewed licensing question, gated on the requesting engineer's explicit sign-off after reading the relevant engine source. See the bounded-SQL-subset assessment immediately below for exactly how far the *reading* side alone gets you.
+
+- **A bounded-SQL-subset assessment for Report rendering exists for exactly one real report, and it should be read that way.** `src/typed/odb/fixtures/form-and-report.odb`'s own "SalesByRegion" report is bound (`rpt:command-type="query"`) to a saved query whose real SQL text is `SELECT "SALES"."REGION", "SALES"."QUARTER", "SALES"."CUSTOMER", "SALES"."AMOUNT" FROM "SALES" WHERE "SALES"."AMOUNT" >= 100 ORDER BY "SALES"."REGION" ASC, "SALES"."QUARTER" ASC, "SALES"."AMOUNT" DESC` — single-table, a simple comparison `WHERE`, a multi-column `ORDER BY`, no `JOIN`, no subquery, and (in the SQL itself) no `GROUP BY` or aggregate function at all. That one query sits entirely inside the bounded subset described above. The fixture's bound form is even simpler: its top-level `form:form` binds directly to the bare table name `SALES` (`form:command-type="table"`), equivalent to an unconditional `SELECT * FROM "SALES"`. On this single data point, 100% of the real `.odb` command bindings seen so far (one query, one table binding, one repeat use of the same query from a nested sub-form) fall inside the bounded subset — but a sample of one report from one fixture says essentially nothing about the real-world distribution of `.odb` files in the wild, and should not be quoted as a coverage percentage beyond "the one file we have." **A more consequential finding sits alongside the SQL text itself: even a fully bounded SQL engine would not be sufficient to render this one report.** The report's own grouping breaks (`rpt:HASCHANGED("REGION")`, `rpt:HASCHANGED("LEFT_QUARTER")`), its prefix-character grouping function (`rpt:LEFT([QUARTER];2)`), and its running per-group/per-report totals (`rpt:SUM([AMOUNT])`) are all evaluated by Report Builder's own `rpt:` formula language over the plain, ungrouped, ordered row stream the SQL query returns — LibreOffice does not express any of that as SQL `GROUP BY`/aggregate syntax at all. Rendering even this one simple report therefore needs a bounded SQL engine *and* a separate `rpt:` formula evaluator (`HASCHANGED`, `LEFT`, `SUM`, and whatever else real reports use) — two genuinely different pieces of engine-semantics reimplementation, not one.
 
 ## Release and publishing
 

package/dist/index.cjs

@@ -41,6 +41,9 @@ const require_typed_ods_read = require("./typed/ods/read.cjs");
 const require_typed_formula_read = require("./typed/formula/read.cjs");
 const require_typed_odm_read = require("./typed/odm/read.cjs");
 const require_typed_odb_read = require("./typed/odb/read.cjs");
+const require_typed_odb_subdocument = require("./typed/odb/subdocument.cjs");
+const require_typed_odb_form = require("./typed/odb/form.cjs");
+const require_typed_odb_report = require("./typed/odb/report.cjs");
 let document_schema_js = require("document-schema.js");
 Object.defineProperty(exports, "AlignmentSchema", {
 	enumerable: true,
@@ -130,8 +133,11 @@ exports.readDrawFrame = require_typed_draw_shapes.readDrawFrame;
 exports.readDrawPageContent = require_typed_draw_shapes.readDrawPageContent;
 exports.readManifest = require_manifest.readManifest;
 exports.readMimetype = require_mimetype.readMimetype;
+exports.readOdbForm = require_typed_odb_form.readOdbForm;
 exports.readOdbInventory = require_typed_odb_read.readOdbInventory;
+exports.readOdbReport = require_typed_odb_report.readOdbReport;
 exports.readOdfFormula = require_typed_formula_read.readOdfFormula;
+exports.readOdfFormulaDocument = require_typed_formula_read.readOdfFormulaDocument;
 exports.readOdfMetadata = require_typed_shared_metadata.readOdfMetadata;
 exports.readOdfParagraph = require_typed_shared_paragraph.readOdfParagraph;
 exports.readOdfTable = require_typed_shared_table.readOdfTable;
@@ -141,6 +147,7 @@ exports.readOdp = require_typed_odp_read.readOdp;
 exports.readOds = require_typed_ods_read.readOds;
 exports.readOdt = require_typed_odt_read.readOdt;
 exports.resolveDrawPageSize = require_typed_shared_masterpage.resolveDrawPageSize;
+exports.resolveOdbComponent = require_typed_odb_read.resolveOdbComponent;
 exports.resolveOdfShapeGeometry = require_typed_shared_transform.resolveOdfShapeGeometry;
 exports.resolvePageLayoutProperties = require_typed_shared_masterpage.resolvePageLayoutProperties;
 exports.resolveStyle = require_typed_shared_cascade.resolveStyle;
@@ -150,6 +157,7 @@ exports.scaleOdfRawPoint = require_typed_shared_path.scaleOdfRawPoint;
 exports.serializePackage = require_package_io_write.serializePackage;
 exports.setDocumentMediaType = require_manifest.setDocumentMediaType;
 exports.sniffImageFormat = require_image_sniff.sniffImageFormat;
+exports.subDocumentPackage = require_typed_odb_subdocument.subDocumentPackage;
 exports.sumOdfNodeLength = require_typed_shared_text.sumOdfNodeLength;
 exports.syncManifest = require_manifest.syncManifest;
 exports.textPropertiesToAttributes = require_styles_properties.textPropertiesToAttributes;

package/dist/index.d.cts

@@ -37,7 +37,10 @@ import { OdpDocument, readOdp } from "./typed/odp/read.cjs";
 import { OdtDocument, readOdt } from "./typed/odt/read.cjs";
 import { OdgDocument, readOdg } from "./typed/odg/read.cjs";
 import { OdsDocument, readOds } from "./typed/ods/read.cjs";
-import { OdfFormulaDocument, readOdfFormula } from "./typed/formula/read.cjs";
+import { OdfFormulaDocument, readOdfFormula, readOdfFormulaDocument } from "./typed/formula/read.cjs";
 import { OdmDocument, OdmSection, readOdm } from "./typed/odm/read.cjs";
-import { OdbConnectionInfo, OdbInventory, readOdbInventory } from "./typed/odb/read.cjs";
-export { type Alignment, AlignmentSchema, type Attribute, AttributeSchema, type BinaryPart, BinaryPartSchema, type BuildManifestOptions, type CascadeDiagnostic, type DrawPageContent, type ImageFormat, type InternRequest, type LengthUnit, MANIFEST_PART, META_PART, MIMETYPE_PART, type Manifest, type ManifestEntry, ManifestEntrySchema, type ManifestProblem, ManifestProblemSchema, ManifestSchema, ODF_MEDIA_TYPES, ODF_NAMESPACES, type OdbConnectionInfo, type OdbInventory, type OdfExtension, type OdfFormulaDocument, type OdfNamespacePrefix, type OdfPoint, type OdfRawPoint, type OdfRawSegment, type OdfRawSubpath, type OdfShapeGeometry, type OdfTransformFunction, type OdfViewBox, type OdgDocument, type OdmDocument, type OdmSection, type OdpDocument, type OdsDocument, type OdtDocument, type OtherPartRef, type Package, PackageSchema, type ParsedProperties, type Part, PartSchema, STYLE_FAMILIES, type StyleCascadeResult, type StyleElementChainResult, type StyleFamily, type StyleProperties, StylePropertiesSchema, StyleRegistry, type StyleRegistryOptions, TableCursor, type XmlCdata, XmlCdataSchema, type XmlComment, XmlCommentSchema, type XmlDeclaration, XmlDeclarationSchema, type XmlElement, XmlElementSchema, type XmlNode, XmlNodeSchema, type XmlPart, XmlPartSchema, type XmlPi, XmlPiSchema, type XmlText, XmlTextSchema, type ZipEntry, applyOdfTransform, attrValue, base64ToBytes, buildManifest, buildOdfSubpaths, buildStylePropertyElements, buildXml, bytesToBase64, canonicalPropertiesString, cellReference, childrenWithTag, columnIndexToLetters, columnLettersToIndex, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseCellReference, parseOdfLength as parseLength, parseOdfLength, parseLinePoints, parseMargins, parseOdfColor, parseOdfPathData, parseOdfPointsList, parseOdfTransform, parseOdfViewBox, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, rawSubpathFromPoints, readDrawFrame, readDrawPageContent, readManifest, readMimetype, readOdbInventory, readOdfFormula, readOdfMetadata, readOdfParagraph, readOdfTable, readOdg, readOdm, readOdp, readOds, readOdt, resolveDrawPageSize, resolveOdfShapeGeometry, resolvePageLayoutProperties, resolveStyle, resolveStyleElementChain, rootElement, scaleOdfRawPoint, serializePackage, setDocumentMediaType, sniffImageFormat, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };
+import { OdbComponentInfo, OdbConnectionInfo, OdbInventory, OdbQueryInfo, readOdbInventory, resolveOdbComponent } from "./typed/odb/read.cjs";
+import { SubDocumentPackageOptions, subDocumentPackage } from "./typed/odb/subdocument.cjs";
+import { OdbForm, OdbFormControl, OdbFormDefinition, readOdbForm } from "./typed/odb/form.cjs";
+import { OdbReport, OdbReportBand, OdbReportElement, OdbReportFunction, OdbReportGroup, readOdbReport } from "./typed/odb/report.cjs";
+export { type Alignment, AlignmentSchema, type Attribute, AttributeSchema, type BinaryPart, BinaryPartSchema, type BuildManifestOptions, type CascadeDiagnostic, type DrawPageContent, type ImageFormat, type InternRequest, type LengthUnit, MANIFEST_PART, META_PART, MIMETYPE_PART, type Manifest, type ManifestEntry, ManifestEntrySchema, type ManifestProblem, ManifestProblemSchema, ManifestSchema, ODF_MEDIA_TYPES, ODF_NAMESPACES, type OdbComponentInfo, type OdbConnectionInfo, type OdbForm, type OdbFormControl, type OdbFormDefinition, type OdbInventory, type OdbQueryInfo, type OdbReport, type OdbReportBand, type OdbReportElement, type OdbReportFunction, type OdbReportGroup, type OdfExtension, type OdfFormulaDocument, type OdfNamespacePrefix, type OdfPoint, type OdfRawPoint, type OdfRawSegment, type OdfRawSubpath, type OdfShapeGeometry, type OdfTransformFunction, type OdfViewBox, type OdgDocument, type OdmDocument, type OdmSection, type OdpDocument, type OdsDocument, type OdtDocument, type OtherPartRef, type Package, PackageSchema, type ParsedProperties, type Part, PartSchema, STYLE_FAMILIES, type StyleCascadeResult, type StyleElementChainResult, type StyleFamily, type StyleProperties, StylePropertiesSchema, StyleRegistry, type StyleRegistryOptions, type SubDocumentPackageOptions, TableCursor, type XmlCdata, XmlCdataSchema, type XmlComment, XmlCommentSchema, type XmlDeclaration, XmlDeclarationSchema, type XmlElement, XmlElementSchema, type XmlNode, XmlNodeSchema, type XmlPart, XmlPartSchema, type XmlPi, XmlPiSchema, type XmlText, XmlTextSchema, type ZipEntry, applyOdfTransform, attrValue, base64ToBytes, buildManifest, buildOdfSubpaths, buildStylePropertyElements, buildXml, bytesToBase64, canonicalPropertiesString, cellReference, childrenWithTag, columnIndexToLetters, columnLettersToIndex, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseCellReference, parseOdfLength as parseLength, parseOdfLength, parseLinePoints, parseMargins, parseOdfColor, parseOdfPathData, parseOdfPointsList, parseOdfTransform, parseOdfViewBox, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, rawSubpathFromPoints, readDrawFrame, readDrawPageContent, readManifest, readMimetype, readOdbForm, readOdbInventory, readOdbReport, readOdfFormula, readOdfFormulaDocument, readOdfMetadata, readOdfParagraph, readOdfTable, readOdg, readOdm, readOdp, readOds, readOdt, resolveDrawPageSize, resolveOdbComponent, resolveOdfShapeGeometry, resolvePageLayoutProperties, resolveStyle, resolveStyleElementChain, rootElement, scaleOdfRawPoint, serializePackage, setDocumentMediaType, sniffImageFormat, subDocumentPackage, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };

package/dist/index.d.ts

@@ -37,7 +37,10 @@ import { OdpDocument, readOdp } from "./typed/odp/read.js";
 import { OdtDocument, readOdt } from "./typed/odt/read.js";
 import { OdgDocument, readOdg } from "./typed/odg/read.js";
 import { OdsDocument, readOds } from "./typed/ods/read.js";
-import { OdfFormulaDocument, readOdfFormula } from "./typed/formula/read.js";
+import { OdfFormulaDocument, readOdfFormula, readOdfFormulaDocument } from "./typed/formula/read.js";
 import { OdmDocument, OdmSection, readOdm } from "./typed/odm/read.js";
-import { OdbConnectionInfo, OdbInventory, readOdbInventory } from "./typed/odb/read.js";
-export { type Alignment, AlignmentSchema, type Attribute, AttributeSchema, type BinaryPart, BinaryPartSchema, type BuildManifestOptions, type CascadeDiagnostic, type DrawPageContent, type ImageFormat, type InternRequest, type LengthUnit, MANIFEST_PART, META_PART, MIMETYPE_PART, type Manifest, type ManifestEntry, ManifestEntrySchema, type ManifestProblem, ManifestProblemSchema, ManifestSchema, ODF_MEDIA_TYPES, ODF_NAMESPACES, type OdbConnectionInfo, type OdbInventory, type OdfExtension, type OdfFormulaDocument, type OdfNamespacePrefix, type OdfPoint, type OdfRawPoint, type OdfRawSegment, type OdfRawSubpath, type OdfShapeGeometry, type OdfTransformFunction, type OdfViewBox, type OdgDocument, type OdmDocument, type OdmSection, type OdpDocument, type OdsDocument, type OdtDocument, type OtherPartRef, type Package, PackageSchema, type ParsedProperties, type Part, PartSchema, STYLE_FAMILIES, type StyleCascadeResult, type StyleElementChainResult, type StyleFamily, type StyleProperties, StylePropertiesSchema, StyleRegistry, type StyleRegistryOptions, TableCursor, type XmlCdata, XmlCdataSchema, type XmlComment, XmlCommentSchema, type XmlDeclaration, XmlDeclarationSchema, type XmlElement, XmlElementSchema, type XmlNode, XmlNodeSchema, type XmlPart, XmlPartSchema, type XmlPi, XmlPiSchema, type XmlText, XmlTextSchema, type ZipEntry, applyOdfTransform, attrValue, base64ToBytes, buildManifest, buildOdfSubpaths, buildStylePropertyElements, buildXml, bytesToBase64, canonicalPropertiesString, cellReference, childrenWithTag, columnIndexToLetters, columnLettersToIndex, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseCellReference, parseOdfLength as parseLength, parseOdfLength, parseLinePoints, parseMargins, parseOdfColor, parseOdfPathData, parseOdfPointsList, parseOdfTransform, parseOdfViewBox, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, rawSubpathFromPoints, readDrawFrame, readDrawPageContent, readManifest, readMimetype, readOdbInventory, readOdfFormula, readOdfMetadata, readOdfParagraph, readOdfTable, readOdg, readOdm, readOdp, readOds, readOdt, resolveDrawPageSize, resolveOdfShapeGeometry, resolvePageLayoutProperties, resolveStyle, resolveStyleElementChain, rootElement, scaleOdfRawPoint, serializePackage, setDocumentMediaType, sniffImageFormat, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };
+import { OdbComponentInfo, OdbConnectionInfo, OdbInventory, OdbQueryInfo, readOdbInventory, resolveOdbComponent } from "./typed/odb/read.js";
+import { SubDocumentPackageOptions, subDocumentPackage } from "./typed/odb/subdocument.js";
+import { OdbForm, OdbFormControl, OdbFormDefinition, readOdbForm } from "./typed/odb/form.js";
+import { OdbReport, OdbReportBand, OdbReportElement, OdbReportFunction, OdbReportGroup, readOdbReport } from "./typed/odb/report.js";
+export { type Alignment, AlignmentSchema, type Attribute, AttributeSchema, type BinaryPart, BinaryPartSchema, type BuildManifestOptions, type CascadeDiagnostic, type DrawPageContent, type ImageFormat, type InternRequest, type LengthUnit, MANIFEST_PART, META_PART, MIMETYPE_PART, type Manifest, type ManifestEntry, ManifestEntrySchema, type ManifestProblem, ManifestProblemSchema, ManifestSchema, ODF_MEDIA_TYPES, ODF_NAMESPACES, type OdbComponentInfo, type OdbConnectionInfo, type OdbForm, type OdbFormControl, type OdbFormDefinition, type OdbInventory, type OdbQueryInfo, type OdbReport, type OdbReportBand, type OdbReportElement, type OdbReportFunction, type OdbReportGroup, type OdfExtension, type OdfFormulaDocument, type OdfNamespacePrefix, type OdfPoint, type OdfRawPoint, type OdfRawSegment, type OdfRawSubpath, type OdfShapeGeometry, type OdfTransformFunction, type OdfViewBox, type OdgDocument, type OdmDocument, type OdmSection, type OdpDocument, type OdsDocument, type OdtDocument, type OtherPartRef, type Package, PackageSchema, type ParsedProperties, type Part, PartSchema, STYLE_FAMILIES, type StyleCascadeResult, type StyleElementChainResult, type StyleFamily, type StyleProperties, StylePropertiesSchema, StyleRegistry, type StyleRegistryOptions, type SubDocumentPackageOptions, TableCursor, type XmlCdata, XmlCdataSchema, type XmlComment, XmlCommentSchema, type XmlDeclaration, XmlDeclarationSchema, type XmlElement, XmlElementSchema, type XmlNode, XmlNodeSchema, type XmlPart, XmlPartSchema, type XmlPi, XmlPiSchema, type XmlText, XmlTextSchema, type ZipEntry, applyOdfTransform, attrValue, base64ToBytes, buildManifest, buildOdfSubpaths, buildStylePropertyElements, buildXml, bytesToBase64, canonicalPropertiesString, cellReference, childrenWithTag, columnIndexToLetters, columnLettersToIndex, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseCellReference, parseOdfLength as parseLength, parseOdfLength, parseLinePoints, parseMargins, parseOdfColor, parseOdfPathData, parseOdfPointsList, parseOdfTransform, parseOdfViewBox, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, rawSubpathFromPoints, readDrawFrame, readDrawPageContent, readManifest, readMimetype, readOdbForm, readOdbInventory, readOdbReport, readOdfFormula, readOdfFormulaDocument, readOdfMetadata, readOdfParagraph, readOdfTable, readOdg, readOdm, readOdp, readOds, readOdt, resolveDrawPageSize, resolveOdbComponent, resolveOdfShapeGeometry, resolvePageLayoutProperties, resolveStyle, resolveStyleElementChain, rootElement, scaleOdfRawPoint, serializePackage, setDocumentMediaType, sniffImageFormat, subDocumentPackage, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };

package/dist/index.js

@@ -37,7 +37,10 @@ import { readOdp } from "./typed/odp/read.js";
 import { readOdt } from "./typed/odt/read.js";
 import { readOdg } from "./typed/odg/read.js";
 import { readOds } from "./typed/ods/read.js";
-import { readOdfFormula } from "./typed/formula/read.js";
+import { readOdfFormula, readOdfFormulaDocument } from "./typed/formula/read.js";
 import { readOdm } from "./typed/odm/read.js";
-import { readOdbInventory } from "./typed/odb/read.js";
-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, columnLettersToIndex, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseCellReference, parseOdfLength as parseLength, parseOdfLength, parseLinePoints, parseMargins, parseOdfColor, parseOdfPathData, parseOdfPointsList, parseOdfTransform, parseOdfViewBox, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, rawSubpathFromPoints, readDrawFrame, readDrawPageContent, readManifest, readMimetype, readOdbInventory, readOdfFormula, readOdfMetadata, readOdfParagraph, readOdfTable, readOdg, readOdm, readOdp, readOds, readOdt, resolveDrawPageSize, resolveOdfShapeGeometry, resolvePageLayoutProperties, resolveStyle, resolveStyleElementChain, rootElement, scaleOdfRawPoint, serializePackage, setDocumentMediaType, sniffImageFormat, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };
+import { readOdbInventory, resolveOdbComponent } from "./typed/odb/read.js";
+import { subDocumentPackage } from "./typed/odb/subdocument.js";
+import { readOdbForm } from "./typed/odb/form.js";
+import { readOdbReport } from "./typed/odb/report.js";
+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, columnLettersToIndex, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseCellReference, parseOdfLength as parseLength, parseOdfLength, parseLinePoints, parseMargins, parseOdfColor, parseOdfPathData, parseOdfPointsList, parseOdfTransform, parseOdfViewBox, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, rawSubpathFromPoints, readDrawFrame, readDrawPageContent, readManifest, readMimetype, readOdbForm, readOdbInventory, readOdbReport, readOdfFormula, readOdfFormulaDocument, readOdfMetadata, readOdfParagraph, readOdfTable, readOdg, readOdm, readOdp, readOds, readOdt, resolveDrawPageSize, resolveOdbComponent, resolveOdfShapeGeometry, resolvePageLayoutProperties, resolveStyle, resolveStyleElementChain, rootElement, scaleOdfRawPoint, serializePackage, setDocumentMediaType, sniffImageFormat, subDocumentPackage, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };

package/dist/ns.cjs

@@ -25,7 +25,8 @@ const ODF_NAMESPACES = Object.freeze({
 	xsd: "http://www.w3.org/2001/XMLSchema",
 	xsi: "http://www.w3.org/2001/XMLSchema-instance",
 	manifest: "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0",
-	db: "urn:oasis:names:tc:opendocument:xmlns:database:1.0"
+	db: "urn:oasis:names:tc:opendocument:xmlns:database:1.0",
+	rpt: "http://openoffice.org/2005/report"
 });
 function xmlnsAttributes(prefixes) {
 	const attrs = {};

package/dist/ns.d.cts

@@ -25,6 +25,7 @@ declare const ODF_NAMESPACES: Readonly<{
   xsi: "http://www.w3.org/2001/XMLSchema-instance";
   manifest: "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
   db: "urn:oasis:names:tc:opendocument:xmlns:database:1.0";
+  rpt: "http://openoffice.org/2005/report";
 }>;
 type OdfNamespacePrefix = keyof typeof ODF_NAMESPACES;
 declare function xmlnsAttributes(prefixes: readonly OdfNamespacePrefix[]): Record<string, string>;

package/dist/ns.d.ts

@@ -25,6 +25,7 @@ declare const ODF_NAMESPACES: Readonly<{
   xsi: "http://www.w3.org/2001/XMLSchema-instance";
   manifest: "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
   db: "urn:oasis:names:tc:opendocument:xmlns:database:1.0";
+  rpt: "http://openoffice.org/2005/report";
 }>;
 type OdfNamespacePrefix = keyof typeof ODF_NAMESPACES;
 declare function xmlnsAttributes(prefixes: readonly OdfNamespacePrefix[]): Record<string, string>;

package/dist/ns.js

@@ -24,7 +24,8 @@ const ODF_NAMESPACES = Object.freeze({
 	xsd: "http://www.w3.org/2001/XMLSchema",
 	xsi: "http://www.w3.org/2001/XMLSchema-instance",
 	manifest: "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0",
-	db: "urn:oasis:names:tc:opendocument:xmlns:database:1.0"
+	db: "urn:oasis:names:tc:opendocument:xmlns:database:1.0",
+	rpt: "http://openoffice.org/2005/report"
 });
 function xmlnsAttributes(prefixes) {
 	const attrs = {};

package/dist/typed/draw/shapes.cjs

@@ -80,16 +80,20 @@ function readOwnTransformFunctions(element) {
 	const value = require_xml_query.attrValue(element, "draw:transform");
 	return value === void 0 ? [] : require_typed_shared_transform.parseOdfTransform(value);
 }
-function walkDrawShapes(children, groupFunctions, pkg, out) {
+function walkDrawShapes(children, groupFunctions, pkg, out, indexState = { next: 0 }) {
 	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) out.push(shape);
+			if (shape !== void 0) out.push({
+				...shape,
+				paintOrder: zIndex
+			});
 		} else if (node.tag === "draw:g") {
 			const ownFunctions = readOwnTransformFunctions(node);
 			const nested = ownFunctions.length === 0 ? groupFunctions : [...ownFunctions, ...groupFunctions];
-			walkDrawShapes(node.children, nested, pkg, out);
+			walkDrawShapes(node.children, nested, pkg, out, indexState);
 		}
 	}
 }
@@ -97,7 +101,9 @@ function readOdfFillAndStroke(element, pkg) {
 	const styleName = require_xml_query.attrValue(element, "draw:style-name");
 	const { elements } = require_typed_shared_cascade.resolveStyleElementChain(styleName, "graphic", pkg);
 	let fill;
+	let fillRule;
 	let stroke;
+	let strokeStyle;
 	for (const styleElement of elements) {
 		const props = require_xml_query.childrenWithTag(styleElement, "style:graphic-properties")[0];
 		if (props === void 0) continue;
@@ -107,8 +113,15 @@ function readOdfFillAndStroke(element, pkg) {
 			const parsedFill = fillColorValue === void 0 ? void 0 : require_typed_shared_color.parseOdfColor(fillColorValue);
 			if (parsedFill !== void 0) fill = parsedFill;
 		}
-		if (require_xml_query.attrValue(props, "draw:stroke") === "none") stroke = void 0;
-		else {
+		const fillRuleValue = require_xml_query.attrValue(props, "svg:fill-rule");
+		if (fillRuleValue === "nonzero" || fillRuleValue === "evenodd") fillRule = fillRuleValue;
+		const strokeMode = require_xml_query.attrValue(props, "draw:stroke");
+		if (strokeMode === "none") {
+			stroke = void 0;
+			strokeStyle = void 0;
+		} else {
+			if (strokeMode === "dash") strokeStyle = "dashed";
+			else if (strokeMode === "solid") strokeStyle = "solid";
 			const strokeColorValue = require_xml_query.attrValue(props, "svg:stroke-color");
 			const strokeWidthValue = require_xml_query.attrValue(props, "svg:stroke-width");
 			const strokeColor = strokeColorValue === void 0 ? void 0 : require_typed_shared_color.parseOdfColor(strokeColorValue);
@@ -121,32 +134,38 @@ function readOdfFillAndStroke(element, pkg) {
 	}
 	return {
 		fill,
-		stroke
+		fillRule,
+		stroke: stroke === void 0 || strokeStyle === void 0 ? stroke : {
+			...stroke,
+			style: strokeStyle
+		}
 	};
 }
-function resolveVectorFrame(element, groupFunctions) {
+function resolveVectorGeometry(element, groupFunctions) {
 	const geometry = require_typed_shared_transform.resolveOdfShapeGeometry(element);
 	if (geometry === void 0) return;
-	return require_typed_shared_transform.composeOdfGroupTransform(groupFunctions, geometry).frame;
+	return require_typed_shared_transform.composeOdfGroupTransform(groupFunctions, geometry);
 }
 function readDrawRectVector(element, groupFunctions, pkg) {
-	const frame = resolveVectorFrame(element, groupFunctions);
-	if (frame === void 0) return;
+	const geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
 	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: "rect",
-		frame,
+		frame: geometry.frame,
+		rotationDeg: geometry.rotationDeg,
 		fill,
 		stroke
 	};
 }
 function readDrawEllipseVector(element, groupFunctions, pkg) {
-	const frame = resolveVectorFrame(element, groupFunctions);
-	if (frame === void 0) return;
+	const geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
 	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: "ellipse",
-		frame,
+		frame: geometry.frame,
+		rotationDeg: geometry.rotationDeg,
 		fill,
 		stroke
 	};
@@ -166,8 +185,9 @@ function readDrawLineVector(element, groupFunctions, pkg) {
 	};
 }
 function readDrawPathVector(element, groupFunctions, pkg) {
-	const frame = resolveVectorFrame(element, groupFunctions);
-	if (frame === void 0) return;
+	const geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
+	const frame = geometry.frame;
 	const viewBoxValue = require_xml_query.attrValue(element, "svg:viewBox");
 	const viewBox = viewBoxValue === void 0 ? void 0 : require_typed_shared_path.parseOdfViewBox(viewBoxValue);
 	if (viewBox === void 0) return;
@@ -183,12 +203,14 @@ function readDrawPathVector(element, groupFunctions, pkg) {
 	}
 	if (rawSubpaths.length === 0) return;
 	const subpaths = require_typed_shared_path.buildOdfSubpaths(rawSubpaths, viewBox, frame);
-	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
+	const { fill, fillRule, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: "path",
 		frame,
+		rotationDeg: geometry.rotationDeg,
 		subpaths,
 		fill,
+		fillRule,
 		stroke
 	};
 }
@@ -201,12 +223,13 @@ function readCustomShapeVector(element, groupFunctions, pkg) {
 	const geometryElement = require_xml_query.childrenWithTag(element, "draw:enhanced-geometry")[0];
 	const type = geometryElement === void 0 ? void 0 : require_xml_query.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 geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
 	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: type === "ellipse" ? "ellipse" : "rect",
-		frame,
+		frame: geometry.frame,
+		rotationDeg: geometry.rotationDeg,
 		fill,
 		stroke
 	};
@@ -247,7 +270,10 @@ function walkDrawPageContent(children, groupFunctions, pkg, indexState, shapesOu
 			const zIndex = paintOrderKey(node, indexState);
 			const shape = readDrawFrame(node, groupFunctions, pkg);
 			if (shape !== void 0) shapesOut.push({
-				value: shape,
+				value: {
+					...shape,
+					paintOrder: zIndex
+				},
 				zIndex
 			});
 		} else if (node.tag === "draw:g") {
@@ -258,41 +284,59 @@ function walkDrawPageContent(children, groupFunctions, pkg, indexState, shapesOu
 			const zIndex = paintOrderKey(node, indexState);
 			const vector = readDrawRectVector(node, groupFunctions, pkg);
 			if (vector !== void 0) vectorsOut.push({
-				value: vector,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				zIndex
 			});
 			else {
 				const shape = readCustomShapeAsTextShape(node, groupFunctions, pkg);
 				if (shape !== void 0) shapesOut.push({
-					value: shape,
+					value: {
+						...shape,
+						paintOrder: zIndex
+					},
 					zIndex
 				});
 			}

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

@@ -4,7 +4,10 @@ import { OdfTransformFunction } from "../shared/transform.cjs";
 import { ContentShape, ContentVector } from "document-schema.js";
 //#region src/typed/draw/shapes.d.ts
 declare function readDrawFrame(frame: XmlElement, groupFunctions: readonly OdfTransformFunction[], pkg: Package): ContentShape | undefined;
-declare function walkDrawShapes(children: readonly XmlNode[], groupFunctions: readonly OdfTransformFunction[], pkg: Package, out: ContentShape[]): void;
+declare function walkDrawShapes(children: readonly XmlNode[], groupFunctions: readonly OdfTransformFunction[], pkg: Package, out: ContentShape[], indexState?: DocumentIndexState): void;
+interface DocumentIndexState {
+  next: number;
+}
 interface DrawPageContent {
   readonly shapes: ContentShape[];
   readonly vectors: ContentVector[];

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

@@ -4,7 +4,10 @@ import { OdfTransformFunction } from "../shared/transform.js";
 import { ContentShape, ContentVector } from "document-schema.js";
 //#region src/typed/draw/shapes.d.ts
 declare function readDrawFrame(frame: XmlElement, groupFunctions: readonly OdfTransformFunction[], pkg: Package): ContentShape | undefined;
-declare function walkDrawShapes(children: readonly XmlNode[], groupFunctions: readonly OdfTransformFunction[], pkg: Package, out: ContentShape[]): void;
+declare function walkDrawShapes(children: readonly XmlNode[], groupFunctions: readonly OdfTransformFunction[], pkg: Package, out: ContentShape[], indexState?: DocumentIndexState): void;
+interface DocumentIndexState {
+  next: number;
+}
 interface DrawPageContent {
   readonly shapes: ContentShape[];
   readonly vectors: ContentVector[];