documents.js 1.60.1 → 1.60.3

package/dist/layout/sheets.cjs

@@ -53,7 +53,7 @@ function resolveAxis(entries, start, end, defaultSizePt) {
 	let currentHidden = false;
 	for (let index = start; index <= end; index++) {
 		while (pointer < sorted.length && sorted[pointer].index <= index) {
-			currentSizePt = sorted[pointer].sizePt;
+			currentSizePt = sorted[pointer].sizePt ?? defaultSizePt;
 			currentHidden = sorted[pointer].hidden ?? false;
 			pointer++;
 		}
@@ -77,7 +77,7 @@ function computeHeaderGutter(printSettings, range, measurer) {
 	};
 }
 function resolveScale(printSettings, availableWidthPt, availableHeightPt, totalContentWidthPt, totalContentHeightPt) {
-	if (printSettings.scale !== void 0) return Math.max(printSettings.scale / 100, MINIMUM_SCALE);
+	if (printSettings.scalePercent !== void 0) return Math.max(printSettings.scalePercent / 100, MINIMUM_SCALE);
 	if (printSettings.fitToPages !== void 0) {
 		const budgetWidthPt = availableWidthPt * printSettings.fitToPages.width;
 		const budgetHeightPt = availableHeightPt * printSettings.fitToPages.height;
@@ -125,7 +125,7 @@ function cellStyledRuns(cell) {
 	}];
 }
 function isNumericLikeValue(kind) {
-	return kind === "number" || kind === "percentage" || kind === "currency" || kind === "date" || kind === "time";
+	return kind === "number" || kind === "percentage" || kind === "currency" || kind === "date" || kind === "time" || kind === "dateTime";
 }
 function defaultAlignmentForValue(kind) {
 	if (isNumericLikeValue(kind)) return "right";

package/dist/layout/sheets.d.cts

@@ -1,5 +1,4 @@
-import { ContentDocument } from "../model/content.cjs";
-import { LayoutDocument } from "document-schema.js";
+import { ContentDocument, LayoutDocument } from "document-schema.js";
 import { TextMeasurer } from "pdf-codec";
 //#region src/layout/sheets.d.ts
 interface SheetsLayoutOptions {

package/dist/layout/sheets.d.ts

@@ -1,5 +1,4 @@
-import { ContentDocument } from "../model/content.js";
-import { LayoutDocument } from "document-schema.js";
+import { ContentDocument, LayoutDocument } from "document-schema.js";
 import { TextMeasurer } from "pdf-codec";
 //#region src/layout/sheets.d.ts
 interface SheetsLayoutOptions {

package/dist/layout/sheets.js

@@ -54,7 +54,7 @@ function resolveAxis(entries, start, end, defaultSizePt) {
 	let currentHidden = false;
 	for (let index = start; index <= end; index++) {
 		while (pointer < sorted.length && sorted[pointer].index <= index) {
-			currentSizePt = sorted[pointer].sizePt;
+			currentSizePt = sorted[pointer].sizePt ?? defaultSizePt;
 			currentHidden = sorted[pointer].hidden ?? false;
 			pointer++;
 		}
@@ -78,7 +78,7 @@ function computeHeaderGutter(printSettings, range, measurer) {
 	};
 }
 function resolveScale(printSettings, availableWidthPt, availableHeightPt, totalContentWidthPt, totalContentHeightPt) {
-	if (printSettings.scale !== void 0) return Math.max(printSettings.scale / 100, MINIMUM_SCALE);
+	if (printSettings.scalePercent !== void 0) return Math.max(printSettings.scalePercent / 100, MINIMUM_SCALE);
 	if (printSettings.fitToPages !== void 0) {
 		const budgetWidthPt = availableWidthPt * printSettings.fitToPages.width;
 		const budgetHeightPt = availableHeightPt * printSettings.fitToPages.height;
@@ -126,7 +126,7 @@ function cellStyledRuns(cell) {
 	}];
 }
 function isNumericLikeValue(kind) {
-	return kind === "number" || kind === "percentage" || kind === "currency" || kind === "date" || kind === "time";
+	return kind === "number" || kind === "percentage" || kind === "currency" || kind === "date" || kind === "time" || kind === "dateTime";
 }
 function defaultAlignmentForValue(kind) {
 	if (isNumericLikeValue(kind)) return "right";

package/dist/layout/slides.d.cts

@@ -1,6 +1,5 @@
-import { ContentDocument } from "../model/content.cjs";
 import { EmbeddedFormula } from "../model/formula.cjs";
-import { ContentShape, LayoutDocument, LayoutImageAsset, LayoutItem } from "document-schema.js";
+import { ContentDocument, ContentShape, LayoutDocument, LayoutImageAsset, LayoutItem } from "document-schema.js";
 import { PositionedFormula, TextMeasurer } from "pdf-codec";
 //#region src/layout/slides.d.ts
 interface SlidesLayoutOptions {

package/dist/layout/slides.d.ts

@@ -1,6 +1,5 @@
-import { ContentDocument } from "../model/content.js";
 import { EmbeddedFormula } from "../model/formula.js";
-import { ContentShape, LayoutDocument, LayoutImageAsset, LayoutItem } from "document-schema.js";
+import { ContentDocument, ContentShape, LayoutDocument, LayoutImageAsset, LayoutItem } from "document-schema.js";
 import { PositionedFormula, TextMeasurer } from "pdf-codec";
 //#region src/layout/slides.d.ts
 interface SlidesLayoutOptions {

package/dist/markdown/read.cjs

@@ -1,16 +1,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../model/content.cjs");
+let document_schema_js = require("document-schema.js");
 let markdown_codec = require("markdown-codec");
 //#region src/markdown/read.ts
 function readMarkdownContent(text, options) {
 	const { document } = (0, markdown_codec.readMarkdown)(text, options);
 	if (document.kind !== "wordprocessing") throw new Error("readMarkdown returned a non-wordprocessing ContentDocument");
-	return {
-		kind: "wordprocessing",
-		formatVersion: 1,
-		metadata: { ...document.metadata },
-		sections: document.sections
-	};
+	return document_schema_js.ContentDocumentSchema.parse({
+		...document,
+		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION
+	});
 }
 //#endregion
 exports.readMarkdownContent = readMarkdownContent;

package/dist/markdown/read.d.cts

@@ -1,4 +1,4 @@
-import { ContentDocument } from "../model/content.cjs";
+import { ContentDocument } from "document-schema.js";
 import { ReadMarkdownOptions } from "markdown-codec";
 //#region src/markdown/read.d.ts
 declare function readMarkdownContent(text: string, options?: ReadMarkdownOptions): ContentDocument;

package/dist/markdown/read.d.ts

@@ -1,4 +1,4 @@
-import { ContentDocument } from "../model/content.js";
+import { ContentDocument } from "document-schema.js";
 import { ReadMarkdownOptions } from "markdown-codec";
 //#region src/markdown/read.d.ts
 declare function readMarkdownContent(text: string, options?: ReadMarkdownOptions): ContentDocument;

package/dist/markdown/read.js

@@ -1,15 +1,13 @@
-import "../model/content.js";
+import { CONTENT_FORMAT_VERSION, ContentDocumentSchema } from "document-schema.js";
 import { readMarkdown } from "markdown-codec";
 //#region src/markdown/read.ts
 function readMarkdownContent(text, options) {
 	const { document } = readMarkdown(text, options);
 	if (document.kind !== "wordprocessing") throw new Error("readMarkdown returned a non-wordprocessing ContentDocument");
-	return {
-		kind: "wordprocessing",
-		formatVersion: 1,
-		metadata: { ...document.metadata },
-		sections: document.sections
-	};
+	return ContentDocumentSchema.parse({
+		...document,
+		formatVersion: CONTENT_FORMAT_VERSION
+	});
 }
 //#endregion
 export { readMarkdownContent };

package/dist/markdown/write.cjs

@@ -1,8 +1,41 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let markdown_codec = require("markdown-codec");
 //#region src/markdown/write.ts
+function toLegacyEmbeddedDocument(document) {
+	if (document.kind !== "wordprocessing") throw new markdown_codec.MarkdownUnsupportedDocumentKindError(document.kind);
+	return toLegacyWordprocessingDocument(document);
+}
+function toLegacyBlock(block) {
+	if (block.kind === "table") return {
+		...block,
+		rows: block.rows.map((row) => ({
+			...row,
+			cells: row.cells.map((cell) => ({
+				...cell,
+				blocks: cell.blocks.map(toLegacyBlock)
+			}))
+		}))
+	};
+	if (block.kind === "embeddedObject") return {
+		...block,
+		document: toLegacyEmbeddedDocument(block.document)
+	};
+	return block;
+}
+function toLegacyWordprocessingDocument(document) {
+	return {
+		kind: "wordprocessing",
+		formatVersion: 1,
+		metadata: document.metadata,
+		sections: document.sections.map((section) => ({
+			...section,
+			blocks: section.blocks.map(toLegacyBlock)
+		}))
+	};
+}
 function buildMarkdownText(document, options) {
-	return (0, markdown_codec.writeMarkdown)(document, options);
+	if (document.kind !== "wordprocessing") throw new markdown_codec.MarkdownUnsupportedDocumentKindError(document.kind);
+	return (0, markdown_codec.writeMarkdown)(toLegacyWordprocessingDocument(document), options);
 }
 //#endregion
 exports.buildMarkdownText = buildMarkdownText;

package/dist/markdown/write.d.cts

@@ -1,4 +1,4 @@
-import { ContentDocument } from "../model/content.cjs";
+import { ContentDocument } from "document-schema.js";
 import { WriteMarkdownOptions } from "markdown-codec";
 //#region src/markdown/write.d.ts
 declare function buildMarkdownText(document: ContentDocument, options?: WriteMarkdownOptions): string;

package/dist/markdown/write.d.ts

@@ -1,4 +1,4 @@
-import { ContentDocument } from "../model/content.js";
+import { ContentDocument } from "document-schema.js";
 import { WriteMarkdownOptions } from "markdown-codec";
 //#region src/markdown/write.d.ts
 declare function buildMarkdownText(document: ContentDocument, options?: WriteMarkdownOptions): string;

package/dist/markdown/write.js

@@ -1,7 +1,40 @@
-import { writeMarkdown } from "markdown-codec";
+import { MarkdownUnsupportedDocumentKindError, writeMarkdown } from "markdown-codec";
 //#region src/markdown/write.ts
+function toLegacyEmbeddedDocument(document) {
+	if (document.kind !== "wordprocessing") throw new MarkdownUnsupportedDocumentKindError(document.kind);
+	return toLegacyWordprocessingDocument(document);
+}
+function toLegacyBlock(block) {
+	if (block.kind === "table") return {
+		...block,
+		rows: block.rows.map((row) => ({
+			...row,
+			cells: row.cells.map((cell) => ({
+				...cell,
+				blocks: cell.blocks.map(toLegacyBlock)
+			}))
+		}))
+	};
+	if (block.kind === "embeddedObject") return {
+		...block,
+		document: toLegacyEmbeddedDocument(block.document)
+	};
+	return block;
+}
+function toLegacyWordprocessingDocument(document) {
+	return {
+		kind: "wordprocessing",
+		formatVersion: 1,
+		metadata: document.metadata,
+		sections: document.sections.map((section) => ({
+			...section,
+			blocks: section.blocks.map(toLegacyBlock)
+		}))
+	};
+}
 function buildMarkdownText(document, options) {
-	return writeMarkdown(document, options);
+	if (document.kind !== "wordprocessing") throw new MarkdownUnsupportedDocumentKindError(document.kind);
+	return writeMarkdown(toLegacyWordprocessingDocument(document), options);
 }
 //#endregion
 export { buildMarkdownText };

package/dist/odb/spreadsheet.cjs

@@ -1,5 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../model/content.cjs");
 const require_hsqldb_script = require("../hsqldb/script.cjs");
 let document_schema_js = require("document-schema.js");
 //#region src/odb/spreadsheet.ts
@@ -59,7 +58,7 @@ function tableToSheet(table) {
 function odbTablesToSpreadsheetDocument(tables) {
 	return {
 		kind: "spreadsheet",
-		formatVersion: 1,
+		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
 		metadata: {},
 		sheets: tables.map(tableToSheet)
 	};

package/dist/odb/spreadsheet.d.cts

@@ -1,5 +1,5 @@
-import { ContentDocument } from "../model/content.cjs";
 import { HsqldbTable } from "../hsqldb/script.cjs";
+import { ContentDocument } from "document-schema.js";
 //#region src/odb/spreadsheet.d.ts
 declare function odbTablesToSpreadsheetDocument(tables: readonly HsqldbTable[]): ContentDocument;
 //#endregion

package/dist/odb/spreadsheet.d.ts

@@ -1,5 +1,5 @@
-import { ContentDocument } from "../model/content.js";
 import { HsqldbTable } from "../hsqldb/script.js";
+import { ContentDocument } from "document-schema.js";
 //#region src/odb/spreadsheet.d.ts
 declare function odbTablesToSpreadsheetDocument(tables: readonly HsqldbTable[]): ContentDocument;
 //#endregion

package/dist/odb/spreadsheet.js

@@ -1,6 +1,6 @@
-import "../model/content.js";
 import { PAGE_SIZE_A4 } from "../model/geometry.js";
 import { displayTextFor } from "../hsqldb/script.js";
+import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 //#region src/odb/spreadsheet.ts
 const HEADER_ROW_INDEX = 0;
 const COLUMN_WIDTH_PT = 64;
@@ -58,7 +58,7 @@ function tableToSheet(table) {
 function odbTablesToSpreadsheetDocument(tables) {
 	return {
 		kind: "spreadsheet",
-		formatVersion: 1,
+		formatVersion: CONTENT_FORMAT_VERSION,
 		metadata: {},
 		sheets: tables.map(tableToSheet)
 	};

package/dist/odf/formula/placeholder.cjs

@@ -1,5 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../model/content.cjs");
 let document_schema_js = require("document-schema.js");
 //#region src/odf/formula/placeholder.ts
 const ZERO_MARGINS = {
@@ -12,7 +11,7 @@ function placeholderFormulaDocument(formula) {
 	const text = formula.starMath ?? "[formula]";
 	return {
 		kind: "wordprocessing",
-		formatVersion: 1,
+		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
 		metadata: {},
 		sections: [{
 			pageSize: document_schema_js.PAGE_SIZE_A4,

package/dist/odf/formula/placeholder.d.cts

@@ -1,14 +1,14 @@
-import { ContentDocument } from "../../model/content.cjs";
-import { t as Box } from "../../geometry-DvwdrIij.cjs";
+import { t as Box$1 } from "../../geometry-DvwdrIij.cjs";
 import { EmbeddedFormula } from "../../model/formula.cjs";
+import { ContentDocument } from "document-schema.js";
 //#region src/odf/formula/placeholder.d.ts
 interface FormulaPlaceholderBlock {
   readonly kind: 'embeddedObject';
   readonly objectKind: 'formula';
   readonly document: ContentDocument;
-  readonly frame: Box;
+  readonly frame: Box$1;
   readonly sourcePath: string;
 }
-declare function buildFormulaPlaceholderBlock(formula: EmbeddedFormula, frame: Box, sourcePath: string): FormulaPlaceholderBlock;
+declare function buildFormulaPlaceholderBlock(formula: EmbeddedFormula, frame: Box$1, sourcePath: string): FormulaPlaceholderBlock;
 //#endregion
 export { FormulaPlaceholderBlock, buildFormulaPlaceholderBlock };

package/dist/odf/formula/placeholder.d.ts

@@ -1,14 +1,14 @@
-import { ContentDocument } from "../../model/content.js";
-import { t as Box } from "../../geometry-DvwdrIij.js";
+import { t as Box$1 } from "../../geometry-DvwdrIij.js";
 import { EmbeddedFormula } from "../../model/formula.js";
+import { ContentDocument } from "document-schema.js";
 //#region src/odf/formula/placeholder.d.ts
 interface FormulaPlaceholderBlock {
   readonly kind: 'embeddedObject';
   readonly objectKind: 'formula';
   readonly document: ContentDocument;
-  readonly frame: Box;
+  readonly frame: Box$1;
   readonly sourcePath: string;
 }
-declare function buildFormulaPlaceholderBlock(formula: EmbeddedFormula, frame: Box, sourcePath: string): FormulaPlaceholderBlock;
+declare function buildFormulaPlaceholderBlock(formula: EmbeddedFormula, frame: Box$1, sourcePath: string): FormulaPlaceholderBlock;
 //#endregion
 export { FormulaPlaceholderBlock, buildFormulaPlaceholderBlock };

package/dist/odf/formula/placeholder.js

@@ -1,5 +1,5 @@
-import "../../model/content.js";
 import { PAGE_SIZE_A4 } from "../../model/geometry.js";
+import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 //#region src/odf/formula/placeholder.ts
 const ZERO_MARGINS = {
 	topPt: 0,
@@ -11,7 +11,7 @@ function placeholderFormulaDocument(formula) {
 	const text = formula.starMath ?? "[formula]";
 	return {
 		kind: "wordprocessing",
-		formatVersion: 1,
+		formatVersion: CONTENT_FORMAT_VERSION,
 		metadata: {},
 		sections: [{
 			pageSize: PAGE_SIZE_A4,

package/dist/odf/odg/read.cjs

@@ -1,12 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../model/content.cjs");
+let document_schema_js = require("document-schema.js");
 let odf_js = require("odf.js");
 //#region src/odf/odg/read.ts
 function readOdgContent(pkg) {
 	const odgDoc = (0, odf_js.readOdg)(pkg);
 	return {
 		kind: "drawing",
-		formatVersion: 1,
+		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
 		metadata: { ...odgDoc.metadata },
 		pages: odgDoc.pages
 	};

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

@@ -1,4 +1,4 @@
-import { ContentDocument } from "../../model/content.cjs";
+import { ContentDocument } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/odf/odg/read.d.ts
 declare function readOdgContent(pkg: Package): ContentDocument;

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

@@ -1,4 +1,4 @@
-import { ContentDocument } from "../../model/content.js";
+import { ContentDocument } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/odf/odg/read.d.ts
 declare function readOdgContent(pkg: Package): ContentDocument;

package/dist/odf/odg/read.js

@@ -1,11 +1,11 @@
-import "../../model/content.js";
+import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 import { readOdg } from "odf.js";
 //#region src/odf/odg/read.ts
 function readOdgContent(pkg) {
 	const odgDoc = readOdg(pkg);
 	return {
 		kind: "drawing",
-		formatVersion: 1,
+		formatVersion: CONTENT_FORMAT_VERSION,
 		metadata: { ...odgDoc.metadata },
 		pages: odgDoc.pages
 	};

package/dist/odf/odp/read.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../model/content.cjs");
 const require_odf_formula_detect = require("../formula/detect.cjs");
 const require_odf_formula_placeholder = require("../formula/placeholder.cjs");
+let document_schema_js = require("document-schema.js");
 let odf_js = require("odf.js");
 //#region src/odf/odp/read.ts
 function readOdpContent(pkg) {
@@ -34,7 +34,7 @@ function readOdpContent(pkg) {
 	return {
 		document: {
 			kind: "presentation",
-			formatVersion: 1,
+			formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
 			metadata: { ...odpDoc.metadata },
 			slides: odpDoc.slides
 		},

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

@@ -1,5 +1,5 @@
-import { ContentDocument } from "../../model/content.cjs";
 import { EmbeddedFormula } from "../../model/formula.cjs";
+import { ContentDocument } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/odf/odp/read.d.ts
 interface OdpContentResult {

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

@@ -1,5 +1,5 @@
-import { ContentDocument } from "../../model/content.js";
 import { EmbeddedFormula } from "../../model/formula.js";
+import { ContentDocument } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/odf/odp/read.d.ts
 interface OdpContentResult {

package/dist/odf/odp/read.js

@@ -1,6 +1,6 @@
-import "../../model/content.js";
 import { detectEmbeddedFormulaFrames } from "../formula/detect.js";
 import { buildFormulaPlaceholderBlock } from "../formula/placeholder.js";
+import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 import { childrenWithTag, findChildElement, readOdp, rootElement } from "odf.js";
 //#region src/odf/odp/read.ts
 function readOdpContent(pkg) {
@@ -33,7 +33,7 @@ function readOdpContent(pkg) {
 	return {
 		document: {
 			kind: "presentation",
-			formatVersion: 1,
+			formatVersion: CONTENT_FORMAT_VERSION,
 			metadata: { ...odpDoc.metadata },
 			slides: odpDoc.slides
 		},

package/dist/odf/ods/read.cjs

@@ -1,12 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../model/content.cjs");
+let document_schema_js = require("document-schema.js");
 let odf_js = require("odf.js");
 //#region src/odf/ods/read.ts
 function readOdsContent(pkg) {
 	const odsDoc = (0, odf_js.readOds)(pkg);
 	return {
 		kind: "spreadsheet",
-		formatVersion: 1,
+		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
 		metadata: { ...odsDoc.metadata },
 		sheets: odsDoc.sheets
 	};

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

@@ -1,4 +1,4 @@
-import { ContentDocument } from "../../model/content.cjs";
+import { ContentDocument } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/odf/ods/read.d.ts
 declare function readOdsContent(pkg: Package): ContentDocument;

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

@@ -1,4 +1,4 @@
-import { ContentDocument } from "../../model/content.js";
+import { ContentDocument } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/odf/ods/read.d.ts
 declare function readOdsContent(pkg: Package): ContentDocument;

package/dist/odf/ods/read.js

@@ -1,11 +1,11 @@
-import "../../model/content.js";
+import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 import { readOds } from "odf.js";
 //#region src/odf/ods/read.ts
 function readOdsContent(pkg) {
 	const odsDoc = readOds(pkg);
 	return {
 		kind: "spreadsheet",
-		formatVersion: 1,
+		formatVersion: CONTENT_FORMAT_VERSION,
 		metadata: { ...odsDoc.metadata },
 		sheets: odsDoc.sheets
 	};

package/dist/odf/odt/read.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../model/content.cjs");
 const require_odf_formula_detect = require("../formula/detect.cjs");
 const require_odf_formula_placeholder = require("../formula/placeholder.cjs");
+let document_schema_js = require("document-schema.js");
 let odf_js = require("odf.js");
 //#region src/odf/odt/read.ts
 function readOdtContent(pkg) {
@@ -32,7 +32,7 @@ function readOdtContent(pkg) {
 	return {
 		document: {
 			kind: "wordprocessing",
-			formatVersion: 1,
+			formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
 			metadata: { ...odtDoc.metadata },
 			sections: odtDoc.sections
 		},

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

@@ -1,5 +1,5 @@
-import { ContentDocument } from "../../model/content.cjs";
 import { EmbeddedFormula } from "../../model/formula.cjs";
+import { ContentDocument } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/odf/odt/read.d.ts
 interface OdtContentResult {

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

@@ -1,5 +1,5 @@
-import { ContentDocument } from "../../model/content.js";
 import { EmbeddedFormula } from "../../model/formula.js";
+import { ContentDocument } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/odf/odt/read.d.ts
 interface OdtContentResult {

package/dist/odf/odt/read.js

@@ -1,6 +1,6 @@
-import "../../model/content.js";
 import { detectEmbeddedFormulaFrames } from "../formula/detect.js";
 import { buildFormulaPlaceholderBlock } from "../formula/placeholder.js";
+import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 import { findChildElement, readOdt, rootElement } from "odf.js";
 //#region src/odf/odt/read.ts
 function readOdtContent(pkg) {
@@ -31,7 +31,7 @@ function readOdtContent(pkg) {
 	return {
 		document: {
 			kind: "wordprocessing",
-			formatVersion: 1,
+			formatVersion: CONTENT_FORMAT_VERSION,
 			metadata: { ...odtDoc.metadata },
 			sections: odtDoc.sections
 		},

package/dist/ooxml/docx/read.cjs

@@ -1,12 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../model/content.cjs");
 let ooxml_js = require("ooxml.js");
+let document_schema_js = require("document-schema.js");
 //#region src/ooxml/docx/read.ts
 function readDocxContent(pkg) {
 	const docxDoc = (0, ooxml_js.readDocx)(pkg);
 	return {
 		kind: "wordprocessing",
-		formatVersion: 1,
+		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
 		metadata: { ...docxDoc.metadata },
 		sections: docxDoc.sections
 	};

package/dist/ooxml/docx/read.d.cts

@@ -1,4 +1,4 @@
-import { ContentDocument } from "../../model/content.cjs";
+import { ContentDocument } from "document-schema.js";
 import { Package } from "ooxml.js";
 //#region src/ooxml/docx/read.d.ts
 declare function readDocxContent(pkg: Package): ContentDocument;

package/dist/ooxml/docx/read.d.ts

@@ -1,5 +1,5 @@
-import { ContentDocument } from "../../model/content.js";
 import { Package } from "ooxml.js";
+import { ContentDocument } from "document-schema.js";
 //#region src/ooxml/docx/read.d.ts
 declare function readDocxContent(pkg: Package): ContentDocument;
 //#endregion

package/dist/ooxml/docx/read.js

@@ -1,11 +1,11 @@
-import "../../model/content.js";
 import { readDocx } from "ooxml.js";
+import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 //#region src/ooxml/docx/read.ts
 function readDocxContent(pkg) {
 	const docxDoc = readDocx(pkg);
 	return {
 		kind: "wordprocessing",
-		formatVersion: 1,
+		formatVersion: CONTENT_FORMAT_VERSION,
 		metadata: { ...docxDoc.metadata },
 		sections: docxDoc.sections
 	};

package/dist/ooxml/pptx/read.cjs

@@ -1,12 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../model/content.cjs");
 let ooxml_js = require("ooxml.js");
+let document_schema_js = require("document-schema.js");
 //#region src/ooxml/pptx/read.ts
 function readPptxContent(pkg) {
 	const pptxDoc = (0, ooxml_js.readPptx)(pkg);
 	return {
 		kind: "presentation",
-		formatVersion: 1,
+		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
 		metadata: { ...pptxDoc.metadata },
 		slides: pptxDoc.slides
 	};

package/dist/ooxml/pptx/read.d.cts

@@ -1,4 +1,4 @@
-import { ContentDocument } from "../../model/content.cjs";
+import { ContentDocument } from "document-schema.js";
 import { Package } from "ooxml.js";
 //#region src/ooxml/pptx/read.d.ts
 declare function readPptxContent(pkg: Package): ContentDocument;