js.documents 1.60.1 → 1.60.2

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/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;

package/dist/ooxml/pptx/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/pptx/read.d.ts
 declare function readPptxContent(pkg: Package): ContentDocument;
 //#endregion

package/dist/ooxml/pptx/read.js

@@ -1,11 +1,11 @@
-import "../../model/content.js";
 import { readPptx } from "ooxml.js";
+import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 //#region src/ooxml/pptx/read.ts
 function readPptxContent(pkg) {
 	const pptxDoc = readPptx(pkg);
 	return {
 		kind: "presentation",
-		formatVersion: 1,
+		formatVersion: CONTENT_FORMAT_VERSION,
 		metadata: { ...pptxDoc.metadata },
 		slides: pptxDoc.slides
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "1.60.1",
+  "version": "1.60.2",
   "description": "Bidirectional docx/pptx <-> PDF conversion and a read+write editable OOXML document model, built on ooxml.js and Zod 4 codecs.",
   "type": "module",
   "repository": {

package/dist/model/content.cjs

@@ -1,34 +0,0 @@
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-let document_schema_js = require("document-schema.js");
-let zod = require("zod");
-//#region src/model/content.ts
-const CONTENT_FORMAT_VERSION = 1;
-const ContentDocumentSchema = zod.z.discriminatedUnion("kind", [
-	zod.z.object({
-		kind: zod.z.literal("wordprocessing"),
-		formatVersion: zod.z.literal(1),
-		metadata: document_schema_js.LayoutMetadataSchema,
-		sections: zod.z.array(document_schema_js.ContentSectionSchema)
-	}),
-	zod.z.object({
-		kind: zod.z.literal("presentation"),
-		formatVersion: zod.z.literal(1),
-		metadata: document_schema_js.LayoutMetadataSchema,
-		slides: zod.z.array(document_schema_js.ContentSlideSchema)
-	}),
-	zod.z.object({
-		kind: zod.z.literal("spreadsheet"),
-		formatVersion: zod.z.literal(1),
-		metadata: document_schema_js.LayoutMetadataSchema,
-		sheets: zod.z.array(document_schema_js.ContentSheetSchema)
-	}),
-	zod.z.object({
-		kind: zod.z.literal("drawing"),
-		formatVersion: zod.z.literal(1),
-		metadata: document_schema_js.LayoutMetadataSchema,
-		pages: zod.z.array(document_schema_js.ContentDrawPageSchema)
-	})
-]);
-//#endregion
-exports.CONTENT_FORMAT_VERSION = CONTENT_FORMAT_VERSION;
-exports.ContentDocumentSchema = ContentDocumentSchema;