documents.js 1.60.3 → 1.62.0

package/dist/mathml/variant.js

@@ -823,7 +823,13 @@ const GREEK_VARIANTS = {
 			120538
 		],
 		nabla: 120513,
-		partial: 120539
+		partial: 120539,
+		epsilon: 120540,
+		theta: 120541,
+		kappa: 120542,
+		phi: 120543,
+		rho: 120544,
+		pi: 120545
 	},
 	italic: {
 		upper: [
@@ -879,7 +885,13 @@ const GREEK_VARIANTS = {
 			120596
 		],
 		nabla: 120571,
-		partial: 120597
+		partial: 120597,
+		epsilon: 120598,
+		theta: 120599,
+		kappa: 120600,
+		phi: 120601,
+		rho: 120602,
+		pi: 120603
 	},
 	"bold-italic": {
 		upper: [
@@ -935,7 +947,13 @@ const GREEK_VARIANTS = {
 			120654
 		],
 		nabla: 120629,
-		partial: 120655
+		partial: 120655,
+		epsilon: 120656,
+		theta: 120657,
+		kappa: 120658,
+		phi: 120659,
+		rho: 120660,
+		pi: 120661
 	},
 	"bold-sans-serif": {
 		upper: [
@@ -991,7 +1009,13 @@ const GREEK_VARIANTS = {
 			120712
 		],
 		nabla: 120687,
-		partial: 120713
+		partial: 120713,
+		epsilon: 120714,
+		theta: 120715,
+		kappa: 120716,
+		phi: 120717,
+		rho: 120718,
+		pi: 120719
 	},
 	"sans-serif-bold-italic": {
 		upper: [
@@ -1047,9 +1071,23 @@ const GREEK_VARIANTS = {
 			120770
 		],
 		nabla: 120745,
-		partial: 120771
+		partial: 120771,
+		epsilon: 120772,
+		theta: 120773,
+		kappa: 120774,
+		phi: 120775,
+		rho: 120776,
+		pi: 120777
 	}
 };
+const GREEK_SYMBOL_BASES = /* @__PURE__ */ new Map([
+	[1013, "epsilon"],
+	[977, "theta"],
+	[1008, "kappa"],
+	[981, "phi"],
+	[1009, "rho"],
+	[982, "pi"]
+]);
 const DIGIT_VARIANTS = {
 	bold: [
 		120782,
@@ -1123,6 +1161,11 @@ function mapMathVariant(codePoint, variant) {
 	if (greekLowerIndex !== -1) return GREEK_VARIANTS[variant]?.lower[greekLowerIndex] ?? codePoint;
 	if (codePoint === 8711) return GREEK_VARIANTS[variant]?.nabla ?? codePoint;
 	if (codePoint === 8706) return GREEK_VARIANTS[variant]?.partial ?? codePoint;
+	const symbolField = GREEK_SYMBOL_BASES.get(codePoint);
+	if (symbolField !== void 0) {
+		const entry = GREEK_VARIANTS[variant];
+		return entry === void 0 ? codePoint : entry[symbolField];
+	}
 	return codePoint;
 }
 function applyMathVariant(text, variant) {

package/dist/model/embedded-drawing.cjs

@@ -0,0 +1,32 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let document_schema_js = require("document-schema.js");
+//#region src/model/embedded-drawing.ts
+function buildDrawingBlock(size, vectors) {
+	const page = {
+		size,
+		shapes: [],
+		vectors: [...vectors]
+	};
+	return {
+		kind: "embeddedObject",
+		objectKind: "drawing",
+		document: {
+			kind: "drawing",
+			formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
+			metadata: {},
+			pages: [page]
+		},
+		frame: {
+			xPt: 0,
+			yPt: 0,
+			widthPt: size.widthPt,
+			heightPt: size.heightPt
+		}
+	};
+}
+function drawingOfBlock(block) {
+	return block.document.kind === "drawing" ? block.document : void 0;
+}
+//#endregion
+exports.buildDrawingBlock = buildDrawingBlock;
+exports.drawingOfBlock = drawingOfBlock;

package/dist/model/embedded-drawing.d.cts

@@ -0,0 +1,8 @@
+import { ContentDocument, ContentEmbeddedObjectBlock, ContentVector, PageSize } from "document-schema.js";
+//#region src/model/embedded-drawing.d.ts
+declare function buildDrawingBlock(size: PageSize, vectors: readonly ContentVector[]): ContentEmbeddedObjectBlock;
+declare function drawingOfBlock(block: ContentEmbeddedObjectBlock): Extract<ContentDocument, {
+  kind: 'drawing';
+}> | undefined;
+//#endregion
+export { buildDrawingBlock, drawingOfBlock };

package/dist/model/embedded-drawing.d.ts

@@ -0,0 +1,8 @@
+import { ContentDocument, ContentEmbeddedObjectBlock, ContentVector, PageSize } from "document-schema.js";
+//#region src/model/embedded-drawing.d.ts
+declare function buildDrawingBlock(size: PageSize, vectors: readonly ContentVector[]): ContentEmbeddedObjectBlock;
+declare function drawingOfBlock(block: ContentEmbeddedObjectBlock): Extract<ContentDocument, {
+  kind: 'drawing';
+}> | undefined;
+//#endregion
+export { buildDrawingBlock, drawingOfBlock };

package/dist/model/embedded-drawing.js

@@ -0,0 +1,30 @@
+import { CONTENT_FORMAT_VERSION } from "document-schema.js";
+//#region src/model/embedded-drawing.ts
+function buildDrawingBlock(size, vectors) {
+	const page = {
+		size,
+		shapes: [],
+		vectors: [...vectors]
+	};
+	return {
+		kind: "embeddedObject",
+		objectKind: "drawing",
+		document: {
+			kind: "drawing",
+			formatVersion: CONTENT_FORMAT_VERSION,
+			metadata: {},
+			pages: [page]
+		},
+		frame: {
+			xPt: 0,
+			yPt: 0,
+			widthPt: size.widthPt,
+			heightPt: size.heightPt
+		}
+	};
+}
+function drawingOfBlock(block) {
+	return block.document.kind === "drawing" ? block.document : void 0;
+}
+//#endregion
+export { buildDrawingBlock, drawingOfBlock };

package/dist/model/formula.cjs

@@ -0,0 +1,31 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let document_schema_js = require("document-schema.js");
+//#region src/model/formula.ts
+function formulaDocument(formula, metadata = {}) {
+	return {
+		kind: "formula",
+		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
+		metadata,
+		formula
+	};
+}
+function buildFormulaBlock(formula, frame, sourcePath) {
+	return {
+		kind: "embeddedObject",
+		objectKind: "formula",
+		document: formulaDocument(formula),
+		frame,
+		sourcePath
+	};
+}
+function formulaOfBlock(block) {
+	return block.document.kind === "formula" ? block.document.formula : void 0;
+}
+function formulaPlaceholderText(formula) {
+	return formula.starMath ?? "[formula]";
+}
+//#endregion
+exports.buildFormulaBlock = buildFormulaBlock;
+exports.formulaDocument = formulaDocument;
+exports.formulaOfBlock = formulaOfBlock;
+exports.formulaPlaceholderText = formulaPlaceholderText;

package/dist/model/formula.d.cts

@@ -1,8 +1,8 @@
-import { r as MathMlNode } from "../nodes-pArN9ilm.cjs";
+import { Box, ContentDocument, ContentEmbeddedObjectBlock, ContentFormula, LayoutMetadata } from "document-schema.js";
 //#region src/model/formula.d.ts
-interface EmbeddedFormula {
-  readonly mathml: readonly MathMlNode[];
-  readonly starMath: string | undefined;
-}
+declare function formulaDocument(formula: ContentFormula, metadata?: LayoutMetadata): ContentDocument;
+declare function buildFormulaBlock(formula: ContentFormula, frame: Box, sourcePath: string): ContentEmbeddedObjectBlock;
+declare function formulaOfBlock(block: ContentEmbeddedObjectBlock): ContentFormula | undefined;
+declare function formulaPlaceholderText(formula: ContentFormula): string;
 //#endregion
-export { EmbeddedFormula };
+export { buildFormulaBlock, formulaDocument, formulaOfBlock, formulaPlaceholderText };

package/dist/model/formula.d.ts

@@ -1,8 +1,8 @@
-import { r as MathMlNode } from "../nodes-pArN9ilm.js";
+import { Box, ContentDocument, ContentEmbeddedObjectBlock, ContentFormula, LayoutMetadata } from "document-schema.js";
 //#region src/model/formula.d.ts
-interface EmbeddedFormula {
-  readonly mathml: readonly MathMlNode[];
-  readonly starMath: string | undefined;
-}
+declare function formulaDocument(formula: ContentFormula, metadata?: LayoutMetadata): ContentDocument;
+declare function buildFormulaBlock(formula: ContentFormula, frame: Box, sourcePath: string): ContentEmbeddedObjectBlock;
+declare function formulaOfBlock(block: ContentEmbeddedObjectBlock): ContentFormula | undefined;
+declare function formulaPlaceholderText(formula: ContentFormula): string;
 //#endregion
-export { EmbeddedFormula };
+export { buildFormulaBlock, formulaDocument, formulaOfBlock, formulaPlaceholderText };

package/dist/model/formula.js

@@ -0,0 +1,27 @@
+import { CONTENT_FORMAT_VERSION } from "document-schema.js";
+//#region src/model/formula.ts
+function formulaDocument(formula, metadata = {}) {
+	return {
+		kind: "formula",
+		formatVersion: CONTENT_FORMAT_VERSION,
+		metadata,
+		formula
+	};
+}
+function buildFormulaBlock(formula, frame, sourcePath) {
+	return {
+		kind: "embeddedObject",
+		objectKind: "formula",
+		document: formulaDocument(formula),
+		frame,
+		sourcePath
+	};
+}
+function formulaOfBlock(block) {
+	return block.document.kind === "formula" ? block.document.formula : void 0;
+}
+function formulaPlaceholderText(formula) {
+	return formula.starMath ?? "[formula]";
+}
+//#endregion
+export { buildFormulaBlock, formulaDocument, formulaOfBlock, formulaPlaceholderText };

package/dist/model/geometry.d.cts

@@ -1,2 +1,2 @@
-import { a as PAGE_SIZE_A4, c as PageSizeSchema, d as flipY, i as MarginsSchema, l as SLIDE_SIZE_STANDARD, n as BoxSchema, o as PAGE_SIZE_LETTER, r as Margins, s as PageSize, t as Box, u as SLIDE_SIZE_WIDESCREEN } from "../geometry-DvwdrIij.cjs";
+import { a as PAGE_SIZE_A4, c as PageSizeSchema, d as flipY, i as MarginsSchema, l as SLIDE_SIZE_STANDARD, n as BoxSchema, o as PAGE_SIZE_LETTER, r as Margins, s as PageSize, t as Box, u as SLIDE_SIZE_WIDESCREEN } from "../geometry-DaJr8yQW.cjs";
 export { type Box, BoxSchema, type Margins, MarginsSchema, PAGE_SIZE_A4, PAGE_SIZE_LETTER, type PageSize, PageSizeSchema, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, flipY };

package/dist/model/geometry.d.ts

@@ -1,2 +1,2 @@
-import { a as PAGE_SIZE_A4, c as PageSizeSchema, d as flipY, i as MarginsSchema, l as SLIDE_SIZE_STANDARD, n as BoxSchema, o as PAGE_SIZE_LETTER, r as Margins, s as PageSize, t as Box, u as SLIDE_SIZE_WIDESCREEN } from "../geometry-DvwdrIij.js";
+import { a as PAGE_SIZE_A4, c as PageSizeSchema, d as flipY, i as MarginsSchema, l as SLIDE_SIZE_STANDARD, n as BoxSchema, o as PAGE_SIZE_LETTER, r as Margins, s as PageSize, t as Box, u as SLIDE_SIZE_WIDESCREEN } from "../geometry-DaJr8yQW.js";
 export { type Box, BoxSchema, type Margins, MarginsSchema, PAGE_SIZE_A4, PAGE_SIZE_LETTER, type PageSize, PageSizeSchema, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, flipY };

package/dist/model/paint-order.cjs

@@ -0,0 +1,15 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/model/paint-order.ts
+function mergeByPaintOrder(vectors, shapes) {
+	const entries = [...vectors.map((value) => ({
+		kind: "vector",
+		value
+	})), ...shapes.map((value) => ({
+		kind: "shape",
+		value
+	}))];
+	if (entries.some((entry) => entry.value.paintOrder === void 0)) return entries;
+	return entries.sort((a, b) => (a.value.paintOrder ?? 0) - (b.value.paintOrder ?? 0));
+}
+//#endregion
+exports.mergeByPaintOrder = mergeByPaintOrder;

package/dist/model/paint-order.d.cts

@@ -0,0 +1,14 @@
+//#region src/model/paint-order.d.ts
+interface PaintOrdered {
+  readonly paintOrder?: number;
+}
+type PaintOrderEntry<V, S> = {
+  readonly kind: 'vector';
+  readonly value: V;
+} | {
+  readonly kind: 'shape';
+  readonly value: S;
+};
+declare function mergeByPaintOrder<V extends PaintOrdered, S extends PaintOrdered>(vectors: readonly V[], shapes: readonly S[]): PaintOrderEntry<V, S>[];
+//#endregion
+export { PaintOrderEntry, PaintOrdered, mergeByPaintOrder };

package/dist/model/paint-order.d.ts

@@ -0,0 +1,14 @@
+//#region src/model/paint-order.d.ts
+interface PaintOrdered {
+  readonly paintOrder?: number;
+}
+type PaintOrderEntry<V, S> = {
+  readonly kind: 'vector';
+  readonly value: V;
+} | {
+  readonly kind: 'shape';
+  readonly value: S;
+};
+declare function mergeByPaintOrder<V extends PaintOrdered, S extends PaintOrdered>(vectors: readonly V[], shapes: readonly S[]): PaintOrderEntry<V, S>[];
+//#endregion
+export { PaintOrderEntry, PaintOrdered, mergeByPaintOrder };

package/dist/model/paint-order.js

@@ -0,0 +1,14 @@
+//#region src/model/paint-order.ts
+function mergeByPaintOrder(vectors, shapes) {
+	const entries = [...vectors.map((value) => ({
+		kind: "vector",
+		value
+	})), ...shapes.map((value) => ({
+		kind: "shape",
+		value
+	}))];
+	if (entries.some((entry) => entry.value.paintOrder === void 0)) return entries;
+	return entries.sort((a, b) => (a.value.paintOrder ?? 0) - (b.value.paintOrder ?? 0));
+}
+//#endregion
+export { mergeByPaintOrder };

package/dist/odb/components.cjs

@@ -0,0 +1,12 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let odf_js = require("odf.js");
+//#region src/odb/components.ts
+function readOdbForms(pkg) {
+	return (0, odf_js.readOdbInventory)(pkg).forms.map((component) => (0, odf_js.readOdbForm)(pkg, component.name));
+}
+function readOdbReports(pkg) {
+	return (0, odf_js.readOdbInventory)(pkg).reports.map((component) => (0, odf_js.readOdbReport)(pkg, component.name));
+}
+//#endregion
+exports.readOdbForms = readOdbForms;
+exports.readOdbReports = readOdbReports;

package/dist/odb/components.d.cts

@@ -0,0 +1,6 @@
+import { OdbForm, OdbReport, Package } from "odf.js";
+//#region src/odb/components.d.ts
+declare function readOdbForms(pkg: Package): readonly OdbForm[];
+declare function readOdbReports(pkg: Package): readonly OdbReport[];
+//#endregion
+export { readOdbForms, readOdbReports };

package/dist/odb/components.d.ts

@@ -0,0 +1,6 @@
+import { OdbForm, OdbReport, Package } from "odf.js";
+//#region src/odb/components.d.ts
+declare function readOdbForms(pkg: Package): readonly OdbForm[];
+declare function readOdbReports(pkg: Package): readonly OdbReport[];
+//#endregion
+export { readOdbForms, readOdbReports };

package/dist/odb/components.js

@@ -0,0 +1,10 @@
+import { readOdbForm, readOdbInventory, readOdbReport } from "odf.js";
+//#region src/odb/components.ts
+function readOdbForms(pkg) {
+	return readOdbInventory(pkg).forms.map((component) => readOdbForm(pkg, component.name));
+}
+function readOdbReports(pkg) {
+	return readOdbInventory(pkg).reports.map((component) => readOdbReport(pkg, component.name));
+}
+//#endregion
+export { readOdbForms, readOdbReports };

package/dist/odb/read.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_hsqldb_script = require("../hsqldb/script.cjs");
+const require_hsqldb_binary_script = require("../hsqldb/binary-script.cjs");
 const require_hsqldb_cache = require("../hsqldb/cache.cjs");
 const require_firebird_backup = require("../firebird/backup.cjs");
 let odf_js = require("odf.js");
@@ -44,7 +45,7 @@ function classifyScriptBytes(bytes) {
 	}
 	return "text";
 }
-function readOdbTables(pkg) {
+function readOdbTables(pkg, options) {
 	const inventory = (0, odf_js.readOdbInventory)(pkg);
 	if (inventory.connection === void 0 || inventory.connection.type === "external") throw new OdbNoEmbeddedDataSourceError(inventory.connection?.url);
 	const url = inventory.connection.url;
@@ -65,21 +66,24 @@ function readOdbTables(pkg) {
 	if (scriptPart.kind !== "binary") throw new Error(`readOdbTables: ${DATABASE_SCRIPT_PART} is not a binary part (found kind "${scriptPart.kind}") -- malformed .odb package`);
 	const scriptBytes = (0, odf_js.base64ToBytes)(scriptPart.base64);
 	const classification = classifyScriptBytes(scriptBytes);
-	if (classification === "compressed") throw new OdbUnsupportedFormatError("hsqldb-compressed", "HSQLDB's compressed whole-script format (hsqldb.script_format=3) -- a zlib-wrapped copy of the same length-prefixed binary DDL/DML statement encoding hsqldb.script_format=1 uses, not compressed SQL text");
-	if (classification === "binary") throw new OdbUnsupportedFormatError("hsqldb-binary", "HSQLDB's binary whole-script format (hsqldb.script_format=1) -- a length-prefixed, COMMAND-tagged binary encoding of the script's own DDL/DML statements themselves, a materially different and larger undertaking than CACHED-table row-store decoding (Tier 2)");
-	return withCachedTableRows(pkg, require_hsqldb_script.parseHsqldbScript(scriptBytes), scriptBytes);
+	if (classification !== "text") {
+		const binaryBytes = classification === "compressed" ? require_hsqldb_binary_script.inflateHsqldbCompressedScript(scriptBytes) : scriptBytes;
+		const { scriptText, tables } = require_hsqldb_binary_script.parseHsqldbBinaryScript(binaryBytes, options);
+		return withCachedTableRows(pkg, tables, scriptText, options);
+	}
+	const scriptText = new TextDecoder("utf-8", { fatal: true }).decode(scriptBytes);
+	return withCachedTableRows(pkg, require_hsqldb_script.parseHsqldbScript(scriptBytes), scriptText, options);
 }
-function withCachedTableRows(pkg, tables, scriptBytes) {
+function withCachedTableRows(pkg, tables, scriptText, options) {
 	const dataPart = pkg.parts[DATABASE_DATA_PART];
 	if (dataPart === void 0) return tables;
 	if (dataPart.kind !== "binary") throw new Error(`readOdbTables: ${DATABASE_DATA_PART} is not a binary part (found kind "${dataPart.kind}") -- malformed .odb package`);
 	const propertiesPart = pkg.parts[DATABASE_PROPERTIES_PART];
 	if (propertiesPart === void 0) throw new Error(`readOdbTables: ${DATABASE_DATA_PART} is present but ${DATABASE_PROPERTIES_PART} is not -- malformed .odb package (a CACHED-table row store always ships alongside its own properties file, which this decoder needs for the cache file's own scale)`);
 	if (propertiesPart.kind !== "binary") throw new Error(`readOdbTables: ${DATABASE_PROPERTIES_PART} is not a binary part (found kind "${propertiesPart.kind}") -- malformed .odb package`);
-	const scriptText = new TextDecoder("utf-8", { fatal: true }).decode(scriptBytes);
 	const dataBytes = (0, odf_js.base64ToBytes)(dataPart.base64);
 	const propertiesText = new TextDecoder("utf-8", { fatal: true }).decode((0, odf_js.base64ToBytes)(propertiesPart.base64));
-	return require_hsqldb_cache.decodeHsqldbCachedTables(tables, scriptText, dataBytes, propertiesText);
+	return require_hsqldb_cache.decodeHsqldbCachedTables(tables, scriptText, dataBytes, propertiesText, options);
 }
 //#endregion
 exports.OdbNoEmbeddedDataSourceError = OdbNoEmbeddedDataSourceError;

package/dist/odb/read.d.cts

@@ -1,3 +1,4 @@
+import { n as HsqldbDecodeOptions } from "../rowformat-Cl2exlEh.cjs";
 import { HsqldbTable } from "../hsqldb/script.cjs";
 import { Package } from "odf.js";
 //#region src/odb/read.d.ts
@@ -5,11 +6,11 @@ declare class OdbNoEmbeddedDataSourceError extends Error {
   readonly url: string | undefined;
   constructor(url: string | undefined);
 }
-type OdbUnsupportedFormat = 'hsqldb-binary' | 'hsqldb-compressed' | 'unrecognised-engine';
+type OdbUnsupportedFormat = 'unrecognised-engine';
 declare class OdbUnsupportedFormatError extends Error {
   readonly format: OdbUnsupportedFormat;
   constructor(format: OdbUnsupportedFormat, detail: string);
 }
-declare function readOdbTables(pkg: Package): readonly HsqldbTable[];
+declare function readOdbTables(pkg: Package, options?: HsqldbDecodeOptions): readonly HsqldbTable[];
 //#endregion
 export { OdbNoEmbeddedDataSourceError, OdbUnsupportedFormat, OdbUnsupportedFormatError, readOdbTables };

package/dist/odb/read.d.ts

@@ -1,3 +1,4 @@
+import { n as HsqldbDecodeOptions } from "../rowformat-Cl2exlEh.js";
 import { HsqldbTable } from "../hsqldb/script.js";
 import { Package } from "odf.js";
 //#region src/odb/read.d.ts
@@ -5,11 +6,11 @@ declare class OdbNoEmbeddedDataSourceError extends Error {
   readonly url: string | undefined;
   constructor(url: string | undefined);
 }
-type OdbUnsupportedFormat = 'hsqldb-binary' | 'hsqldb-compressed' | 'unrecognised-engine';
+type OdbUnsupportedFormat = 'unrecognised-engine';
 declare class OdbUnsupportedFormatError extends Error {
   readonly format: OdbUnsupportedFormat;
   constructor(format: OdbUnsupportedFormat, detail: string);
 }
-declare function readOdbTables(pkg: Package): readonly HsqldbTable[];
+declare function readOdbTables(pkg: Package, options?: HsqldbDecodeOptions): readonly HsqldbTable[];
 //#endregion
 export { OdbNoEmbeddedDataSourceError, OdbUnsupportedFormat, OdbUnsupportedFormatError, readOdbTables };

package/dist/odb/read.js

@@ -1,5 +1,6 @@
 import { readManifest } from "../odf-package/manifest.js";
 import { parseHsqldbScript } from "../hsqldb/script.js";
+import { inflateHsqldbCompressedScript, parseHsqldbBinaryScript } from "../hsqldb/binary-script.js";
 import { decodeHsqldbCachedTables } from "../hsqldb/cache.js";
 import { readFirebirdBackup } from "../firebird/backup.js";
 import { base64ToBytes, readOdbInventory } from "odf.js";
@@ -44,7 +45,7 @@ function classifyScriptBytes(bytes) {
 	}
 	return "text";
 }
-function readOdbTables(pkg) {
+function readOdbTables(pkg, options) {
 	const inventory = readOdbInventory(pkg);
 	if (inventory.connection === void 0 || inventory.connection.type === "external") throw new OdbNoEmbeddedDataSourceError(inventory.connection?.url);
 	const url = inventory.connection.url;
@@ -65,21 +66,24 @@ function readOdbTables(pkg) {
 	if (scriptPart.kind !== "binary") throw new Error(`readOdbTables: ${DATABASE_SCRIPT_PART} is not a binary part (found kind "${scriptPart.kind}") -- malformed .odb package`);
 	const scriptBytes = base64ToBytes(scriptPart.base64);
 	const classification = classifyScriptBytes(scriptBytes);
-	if (classification === "compressed") throw new OdbUnsupportedFormatError("hsqldb-compressed", "HSQLDB's compressed whole-script format (hsqldb.script_format=3) -- a zlib-wrapped copy of the same length-prefixed binary DDL/DML statement encoding hsqldb.script_format=1 uses, not compressed SQL text");
-	if (classification === "binary") throw new OdbUnsupportedFormatError("hsqldb-binary", "HSQLDB's binary whole-script format (hsqldb.script_format=1) -- a length-prefixed, COMMAND-tagged binary encoding of the script's own DDL/DML statements themselves, a materially different and larger undertaking than CACHED-table row-store decoding (Tier 2)");
-	return withCachedTableRows(pkg, parseHsqldbScript(scriptBytes), scriptBytes);
+	if (classification !== "text") {
+		const binaryBytes = classification === "compressed" ? inflateHsqldbCompressedScript(scriptBytes) : scriptBytes;
+		const { scriptText, tables } = parseHsqldbBinaryScript(binaryBytes, options);
+		return withCachedTableRows(pkg, tables, scriptText, options);
+	}
+	const scriptText = new TextDecoder("utf-8", { fatal: true }).decode(scriptBytes);
+	return withCachedTableRows(pkg, parseHsqldbScript(scriptBytes), scriptText, options);
 }
-function withCachedTableRows(pkg, tables, scriptBytes) {
+function withCachedTableRows(pkg, tables, scriptText, options) {
 	const dataPart = pkg.parts[DATABASE_DATA_PART];
 	if (dataPart === void 0) return tables;
 	if (dataPart.kind !== "binary") throw new Error(`readOdbTables: ${DATABASE_DATA_PART} is not a binary part (found kind "${dataPart.kind}") -- malformed .odb package`);
 	const propertiesPart = pkg.parts[DATABASE_PROPERTIES_PART];
 	if (propertiesPart === void 0) throw new Error(`readOdbTables: ${DATABASE_DATA_PART} is present but ${DATABASE_PROPERTIES_PART} is not -- malformed .odb package (a CACHED-table row store always ships alongside its own properties file, which this decoder needs for the cache file's own scale)`);
 	if (propertiesPart.kind !== "binary") throw new Error(`readOdbTables: ${DATABASE_PROPERTIES_PART} is not a binary part (found kind "${propertiesPart.kind}") -- malformed .odb package`);
-	const scriptText = new TextDecoder("utf-8", { fatal: true }).decode(scriptBytes);
 	const dataBytes = base64ToBytes(dataPart.base64);
 	const propertiesText = new TextDecoder("utf-8", { fatal: true }).decode(base64ToBytes(propertiesPart.base64));
-	return decodeHsqldbCachedTables(tables, scriptText, dataBytes, propertiesText);
+	return decodeHsqldbCachedTables(tables, scriptText, dataBytes, propertiesText, options);
 }
 //#endregion
 export { OdbNoEmbeddedDataSourceError, OdbUnsupportedFormatError, readOdbTables };

package/dist/odf/formula/detect.cjs

@@ -5,25 +5,93 @@ let odf_js = require("odf.js");
 function subPackagePathFromHref(href) {
 	return href.replace(/^#?\.\//, "");
 }
-function detectEmbeddedFormulaFrames(containerChildren, pkg) {
-	const out = [];
-	for (const child of containerChildren) {
-		if (child.type !== "element" || child.tag !== "draw:frame") continue;
-		const objectElement = (0, odf_js.childrenWithTag)(child, "draw:object")[0];
-		if (objectElement === void 0) continue;
-		const href = (0, odf_js.attrValue)(objectElement, "xlink:href");
-		if (href === void 0) continue;
-		const formula = require_odf_formula_read.readOdfEmbeddedFormula(pkg, subPackagePathFromHref(href));
-		if (formula === void 0) continue;
-		const shape = (0, odf_js.readDrawFrame)(child, [], pkg);
-		if (shape === void 0) continue;
-		out.push({
-			frameElement: child,
-			formula,
-			frame: shape.frame
-		});
+function formulaOfFrame(frame, pkg) {
+	const objectElement = (0, odf_js.childrenWithTag)(frame, "draw:object")[0];
+	if (objectElement === void 0) return;
+	const href = (0, odf_js.attrValue)(objectElement, "xlink:href");
+	if (href === void 0) return;
+	return require_odf_formula_read.readOdfEmbeddedFormula(pkg, subPackagePathFromHref(href));
+}
+function flowAnchoredFrameBox(frame) {
+	const widthValue = (0, odf_js.attrValue)(frame, "svg:width");
+	const heightValue = (0, odf_js.attrValue)(frame, "svg:height");
+	if (widthValue === void 0 || heightValue === void 0) return;
+	const widthPt = (0, odf_js.parseOdfLength)(widthValue);
+	const heightPt = (0, odf_js.parseOdfLength)(heightValue);
+	if (widthPt === void 0 || heightPt === void 0) return;
+	return {
+		xPt: 0,
+		yPt: 0,
+		widthPt,
+		heightPt
+	};
+}
+function nestedGroupFunctions(group, groupFunctions) {
+	const value = (0, odf_js.attrValue)(group, "draw:transform");
+	const own = value === void 0 ? [] : (0, odf_js.parseOdfTransform)(value);
+	return own.length === 0 ? groupFunctions : [...own, ...groupFunctions];
+}
+function readFormulaFrame(frame, groupFunctions, pkg, allowFlowAnchored) {
+	const formula = formulaOfFrame(frame, pkg);
+	if (formula === void 0) return;
+	const box = (0, odf_js.readDrawFrame)(frame, groupFunctions, pkg)?.frame ?? (allowFlowAnchored ? flowAnchoredFrameBox(frame) : void 0);
+	if (box === void 0) return;
+	return {
+		frameElement: frame,
+		formula,
+		frame: box
+	};
+}
+function walkForFormulaFrames(nodes, groupFunctions, pkg, out) {
+	for (const node of nodes) {
+		if (node.type !== "element") continue;
+		if (node.tag === "draw:frame") {
+			const detected = readFormulaFrame(node, groupFunctions, pkg, true);
+			if (detected !== void 0) {
+				out.push(detected);
+				continue;
+			}
+			walkForFormulaFrames(node.children, groupFunctions, pkg, out);
+			continue;
+		}
+		if (node.tag === "draw:g") {
+			walkForFormulaFrames(node.children, nestedGroupFunctions(node, groupFunctions), pkg, out);
+			continue;
+		}
+		walkForFormulaFrames(node.children, groupFunctions, pkg, out);
 	}
+}
+function collectFormulaFrames(nodes, pkg) {
+	const out = [];
+	walkForFormulaFrames(nodes, [], pkg, out);
+	return out;
+}
+function collectSlideFormulaFrames(pageChildren, pkg) {
+	const out = [];
+	const state = { nextShapeIndex: 0 };
+	const walk = (nodes, groupFunctions) => {
+		for (const node of nodes) {
+			if (node.type !== "element") continue;
+			if (node.tag === "draw:frame") {
+				const shape = (0, odf_js.readDrawFrame)(node, groupFunctions, pkg);
+				if (shape === void 0) continue;
+				const shapeIndex = state.nextShapeIndex;
+				state.nextShapeIndex += 1;
+				const formula = formulaOfFrame(node, pkg);
+				if (formula !== void 0) out.push({
+					frameElement: node,
+					formula,
+					frame: shape.frame,
+					shapeIndex
+				});
+				continue;
+			}
+			if (node.tag === "draw:g") walk(node.children, nestedGroupFunctions(node, groupFunctions));
+		}
+	};
+	walk(pageChildren, []);
 	return out;
 }
 //#endregion
-exports.detectEmbeddedFormulaFrames = detectEmbeddedFormulaFrames;
+exports.collectFormulaFrames = collectFormulaFrames;
+exports.collectSlideFormulaFrames = collectSlideFormulaFrames;