odf.js 6.3.0 → 6.4.0

package/dist/typed/odt/write.cjs

@@ -10,21 +10,12 @@ const require_typed_shared_list = require("../shared/list.cjs");
 const require_typed_shared_paragraph = require("../shared/paragraph.cjs");
 const require_typed_shared_table = require("../shared/table.cjs");
 const require_package_io_scaffold = require("../../package-io/scaffold.cjs");
+const require_typed_shared_canonicalise = require("../shared/canonicalise.cjs");
 let document_schema_js = require("document-schema.js");
 //#region src/typed/odt/write.ts
 const CONTENT_PART = "content.xml";
 const STYLES_PART = "styles.xml";
 const PICTURES_DIRECTORY = "Pictures";
-function listKindOf(numId) {
-	if (numId === void 0) return;
-	if (numId.startsWith("ordered:")) return "ordered";
-	return numId.startsWith("bullet:") ? "bullet" : void 0;
-}
-const NO_NUM_ID_KEY = " ";
-function canonicalNumId(incoming, ordinal) {
-	const kind = listKindOf(incoming);
-	return kind === void 0 ? `list${ordinal}` : `${kind}:list${ordinal}`;
-}
 function unsupported(what, where) {
 	return /* @__PURE__ */ new Error(`writeOdt: ${where} carries ${what}, which this writer does not write yet -- refusing rather than producing an .odt that silently lost it. See ExaDev/documents.js for the tracked follow-up covering the fidelity constructs and embedded objects.`);
 }
@@ -36,44 +27,6 @@ function assertWritableBlock(block) {
 	if (block.kind === "embeddedObject") throw unsupported("an embedded object", "a section's block flow");
 	if (block.kind === "paragraph") assertWritableParagraph(block);
 }
-function canonicalColor(color) {
-	return (0, document_schema_js.rgbHexToColor)((0, document_schema_js.colorToRgbHex)(color));
-}
-function canonicalRun(run) {
-	const canonical = { text: run.text };
-	if (run.bold !== void 0) canonical.bold = run.bold;
-	if (run.italic !== void 0) canonical.italic = run.italic;
-	if (run.underline !== void 0) canonical.underline = run.underline;
-	if (run.strike !== void 0) canonical.strike = run.strike;
-	if (run.fontFamily !== void 0) canonical.fontFamily = run.fontFamily;
-	if (run.sizePt !== void 0) canonical.sizePt = run.sizePt;
-	if (run.color !== void 0) canonical.color = canonicalColor(run.color);
-	if (run.hyperlink !== void 0) canonical.hyperlink = run.hyperlink;
-	return canonical;
-}
-function canonicalParagraph(paragraph, listNumId) {
-	const canonical = {
-		kind: "paragraph",
-		runs: require_typed_shared_paragraph.segmentOdfParagraphRuns(paragraph.runs).map(canonicalRun)
-	};
-	if (paragraph.headingLevel !== void 0) {
-		canonical.headingLevel = paragraph.headingLevel;
-		canonical.styleId = `Heading${paragraph.headingLevel}`;
-	}
-	if (paragraph.alignment !== void 0) canonical.alignment = paragraph.alignment;
-	if (listNumId !== void 0 && paragraph.list !== void 0) canonical.list = {
-		numId: listNumId,
-		level: paragraph.list.level
-	};
-	if (paragraph.spacingBeforePt !== void 0) canonical.spacingBeforePt = paragraph.spacingBeforePt;
-	if (paragraph.spacingAfterPt !== void 0) canonical.spacingAfterPt = paragraph.spacingAfterPt;
-	if (paragraph.lineSpacing !== void 0) canonical.lineSpacing = paragraph.lineSpacing;
-	if (paragraph.indentLeftPt !== void 0) canonical.indentLeftPt = paragraph.indentLeftPt;
-	if (paragraph.indentFirstLinePt !== void 0) canonical.indentFirstLinePt = paragraph.indentFirstLinePt;
-	if (paragraph.pageBreakBefore !== void 0) canonical.pageBreakBefore = paragraph.pageBreakBefore;
-	if (paragraph.pageBreakAfter !== void 0) canonical.pageBreakAfter = paragraph.pageBreakAfter;
-	return canonical;
-}
 function emptyAnchorParagraph(pageBreakBefore) {
 	return pageBreakBefore ? {
 		kind: "paragraph",
@@ -98,8 +51,7 @@ function planSection(section, needsLeadingParagraph, listState) {
 		return false;
 	};
 	const closeListRun = () => {
-		listState.openNumId = void 0;
-		listState.openCanonicalNumId = void 0;
+		require_typed_shared_list.closeListPlan(listState);
 	};
 	const flushPendingPageBreak = () => {
 		if (pendingPageBreak) {
@@ -119,17 +71,8 @@ function planSection(section, needsLeadingParagraph, listState) {
 			continue;
 		}
 		if (block.kind === "paragraph") {
-			const membership = block.list;
-			if (membership === void 0) closeListRun();
-			else {
-				const incomingKey = membership.numId ?? NO_NUM_ID_KEY;
-				if (listState.openNumId !== incomingKey) {
-					listState.openNumId = incomingKey;
-					listState.openCanonicalNumId = canonicalNumId(membership.numId, listState.next);
-					listState.next += 1;
-				}
-			}
-			const paragraph = canonicalParagraph(block, membership === void 0 ? void 0 : listState.openCanonicalNumId);
+			const canonicalId = require_typed_shared_list.planListMembership(block.list, listState);
+			const paragraph = require_typed_shared_canonicalise.canonicalParagraph(block, canonicalId);
 			pushParagraph(pendingPageBreak ? {
 				...paragraph,
 				pageBreakBefore: true
@@ -165,92 +108,18 @@ function planDocument(sections) {
 	const listState = { next: 1 };
 	return sections.map((section, index) => planSection(section, index > 0, listState));
 }
-function canonicalCell(cell, covered) {
-	if (covered) return { blocks: [] };
-	const canonical = { blocks: cell.blocks.map((block) => {
-		if (block.kind !== "paragraph") throw unsupported(`a "${block.kind}" block`, "a table cell");
-		assertWritableParagraph(block);
-		return canonicalParagraph(block, void 0);
-	}) };
-	if (cell.colSpan !== void 0) canonical.colSpan = cell.colSpan;
-	if (cell.rowSpan !== void 0) canonical.rowSpan = cell.rowSpan;
-	if (cell.background !== void 0) canonical.background = canonicalColor(cell.background);
-	if (cell.borders !== void 0) {
-		const borders = {};
-		for (const edge of [
-			"left",
-			"right",
-			"top",
-			"bottom"
-		]) {
-			const border = cell.borders[edge];
-			if (border !== void 0) borders[edge] = {
-				color: canonicalColor(border.color),
-				widthPt: border.widthPt,
-				style: border.style ?? "solid"
-			};
-		}
-		canonical.borders = borders;
-	}
-	return canonical;
-}
-function canonicalTable(table) {
-	const covered = /* @__PURE__ */ new Set();
-	return {
-		kind: "table",
-		columnWidthsPt: [...table.columnWidthsPt],
-		rows: table.rows.map((row, rowIndex) => {
-			const cells = row.cells.map((cell, columnIndex) => {
-				const key = `${rowIndex},${columnIndex}`;
-				const isCovered = covered.has(key);
-				if (!isCovered) {
-					const colSpan = cell.colSpan ?? 1;
-					const rowSpan = cell.rowSpan ?? 1;
-					for (let r = rowIndex; r < rowIndex + rowSpan; r += 1) for (let c = columnIndex; c < columnIndex + colSpan; c += 1) if (r !== rowIndex || c !== columnIndex) covered.add(`${r},${c}`);
-				}
-				return canonicalCell(cell, isCovered);
-			});
-			return row.heightPt === void 0 ? { cells } : {
-				cells,
-				heightPt: row.heightPt
-			};
-		})
-	};
-}
-function canonicalImage(image) {
-	const canonical = {
-		kind: "image",
-		format: image.format,
-		base64: image.base64,
-		widthPt: image.widthPt,
-		heightPt: image.heightPt
-	};
-	if (image.altText !== void 0) canonical.altText = image.altText;
-	return canonical;
-}
-function canonicalMetadata(metadata) {
-	const canonical = {};
-	if (metadata.title !== void 0) canonical.title = metadata.title;
-	if (metadata.author !== void 0) canonical.author = metadata.author;
-	if (metadata.subject !== void 0) canonical.subject = metadata.subject;
-	if (metadata.keywords !== void 0 && metadata.keywords.length > 0) canonical.keywords = [...metadata.keywords];
-	if (metadata.creator !== void 0) canonical.creator = metadata.creator;
-	if (metadata.createdIso !== void 0) canonical.createdIso = metadata.createdIso;
-	if (metadata.modifiedIso !== void 0) canonical.modifiedIso = metadata.modifiedIso;
-	return canonical;
-}
 function normaliseOdtContent(document) {
 	if (document.kind !== "wordprocessing") throw new Error(`normaliseOdtContent: expected a 'wordprocessing' document, got '${document.kind}'`);
 	const planned = planDocument(document.sections);
 	return {
 		kind: "wordprocessing",
-		metadata: canonicalMetadata(document.metadata),
+		metadata: require_typed_shared_canonicalise.canonicalMetadata(document.metadata),
 		sections: planned.map((section, index) => {
 			const blocks = section.blocks.map((block) => {
 				switch (block.kind) {
 					case "paragraph": return block.paragraph;
-					case "table": return canonicalTable(block.table);
-					case "image": return canonicalImage(block.image);
+					case "table": return require_typed_shared_canonicalise.canonicalTable(block.table);
+					case "image": return require_typed_shared_canonicalise.canonicalImage(block.image);
 				}
 			});
 			return index === 0 ? {
@@ -319,7 +188,7 @@ function writeSectionBlocks(section, parentStyleName, state, out) {
 	let openList;
 	const closeList = () => {
 		if (openList === void 0) return;
-		const kind = listKindOf(openList.numId);
+		const kind = require_typed_shared_list.listKindOf(openList.numId);
 		const built = require_typed_shared_list.writeOdfList(openList.entries, kind === void 0 ? void 0 : listStyleNameFor(kind, state));
 		openList.element.attributes = built.attributes;
 		openList.element.children = built.children;
@@ -368,7 +237,7 @@ function writeOdtContent(document, options = {}) {
 	if (document.kind !== "wordprocessing") throw new Error(`writeOdtContent: expected a 'wordprocessing' document, got '${document.kind}' -- odf.js writes .odt from the wordprocessing arm only`);
 	const version = options.version ?? "1.3";
 	const textElement = require_xml_fragment.el("office:text");
-	const pkg = require_package_io_scaffold.createOdfPackage(require_media_type.ODF_MEDIA_TYPES.odt, textElement, version);
+	const pkg = require_package_io_scaffold.createOdfPackage(options.template ? require_media_type.ODF_MEDIA_TYPES.ott : require_media_type.ODF_MEDIA_TYPES.odt, textElement, version);
 	const state = {
 		pkg,
 		registry: require_styles_registry.StyleRegistry.forPart(pkg, CONTENT_PART, { otherPart: {

package/dist/typed/odt/write.d.cts

@@ -1,2 +1,2 @@
-import { i as writeOdtContent, n as normaliseOdtContent, r as writeOdt, t as OdtWriteOptions } from "../../write-7Uu_wlkL.cjs";
+import { i as writeOdtContent, n as normaliseOdtContent, r as writeOdt, t as OdtWriteOptions } from "../../write-CPATqG4v.cjs";
 export { OdtWriteOptions, normaliseOdtContent, writeOdt, writeOdtContent };

package/dist/typed/odt/write.d.ts

@@ -1,2 +1,2 @@
-import { i as writeOdtContent, n as normaliseOdtContent, r as writeOdt, t as OdtWriteOptions } from "../../write-DGcI9W7Z.js";
+import { i as writeOdtContent, n as normaliseOdtContent, r as writeOdt, t as OdtWriteOptions } from "../../write-JERychL3.js";
 export { OdtWriteOptions, normaliseOdtContent, writeOdt, writeOdtContent };

package/dist/typed/odt/write.js

@@ -5,25 +5,16 @@ import { syncManifest } from "../../manifest.js";
 import { formatOdfLength } from "../shared/units.js";
 import { StyleRegistry } from "../../styles/registry.js";
 import { writeOdfMetadata } from "../shared/metadata.js";
-import { buildOdfListStyle, writeOdfList } from "../shared/list.js";
-import { segmentOdfParagraphRuns, writeOdfParagraph } from "../shared/paragraph.js";
+import { buildOdfListStyle, closeListPlan, listKindOf, planListMembership, writeOdfList } from "../shared/list.js";
+import { writeOdfParagraph } from "../shared/paragraph.js";
 import { writeOdfTable } from "../shared/table.js";
 import { createOdfPackage, odfPartContainer } from "../../package-io/scaffold.js";
-import { colorToRgbHex, flattenTree, rgbHexToColor } from "document-schema.js";
+import { canonicalImage, canonicalMetadata, canonicalParagraph, canonicalTable } from "../shared/canonicalise.js";
+import { flattenTree } from "document-schema.js";
 //#region src/typed/odt/write.ts
 const CONTENT_PART = "content.xml";
 const STYLES_PART = "styles.xml";
 const PICTURES_DIRECTORY = "Pictures";
-function listKindOf(numId) {
-	if (numId === void 0) return;
-	if (numId.startsWith("ordered:")) return "ordered";
-	return numId.startsWith("bullet:") ? "bullet" : void 0;
-}
-const NO_NUM_ID_KEY = " ";
-function canonicalNumId(incoming, ordinal) {
-	const kind = listKindOf(incoming);
-	return kind === void 0 ? `list${ordinal}` : `${kind}:list${ordinal}`;
-}
 function unsupported(what, where) {
 	return /* @__PURE__ */ new Error(`writeOdt: ${where} carries ${what}, which this writer does not write yet -- refusing rather than producing an .odt that silently lost it. See ExaDev/documents.js for the tracked follow-up covering the fidelity constructs and embedded objects.`);
 }
@@ -35,44 +26,6 @@ function assertWritableBlock(block) {
 	if (block.kind === "embeddedObject") throw unsupported("an embedded object", "a section's block flow");
 	if (block.kind === "paragraph") assertWritableParagraph(block);
 }
-function canonicalColor(color) {
-	return rgbHexToColor(colorToRgbHex(color));
-}
-function canonicalRun(run) {
-	const canonical = { text: run.text };
-	if (run.bold !== void 0) canonical.bold = run.bold;
-	if (run.italic !== void 0) canonical.italic = run.italic;
-	if (run.underline !== void 0) canonical.underline = run.underline;
-	if (run.strike !== void 0) canonical.strike = run.strike;
-	if (run.fontFamily !== void 0) canonical.fontFamily = run.fontFamily;
-	if (run.sizePt !== void 0) canonical.sizePt = run.sizePt;
-	if (run.color !== void 0) canonical.color = canonicalColor(run.color);
-	if (run.hyperlink !== void 0) canonical.hyperlink = run.hyperlink;
-	return canonical;
-}
-function canonicalParagraph(paragraph, listNumId) {
-	const canonical = {
-		kind: "paragraph",
-		runs: segmentOdfParagraphRuns(paragraph.runs).map(canonicalRun)
-	};
-	if (paragraph.headingLevel !== void 0) {
-		canonical.headingLevel = paragraph.headingLevel;
-		canonical.styleId = `Heading${paragraph.headingLevel}`;
-	}
-	if (paragraph.alignment !== void 0) canonical.alignment = paragraph.alignment;
-	if (listNumId !== void 0 && paragraph.list !== void 0) canonical.list = {
-		numId: listNumId,
-		level: paragraph.list.level
-	};
-	if (paragraph.spacingBeforePt !== void 0) canonical.spacingBeforePt = paragraph.spacingBeforePt;
-	if (paragraph.spacingAfterPt !== void 0) canonical.spacingAfterPt = paragraph.spacingAfterPt;
-	if (paragraph.lineSpacing !== void 0) canonical.lineSpacing = paragraph.lineSpacing;
-	if (paragraph.indentLeftPt !== void 0) canonical.indentLeftPt = paragraph.indentLeftPt;
-	if (paragraph.indentFirstLinePt !== void 0) canonical.indentFirstLinePt = paragraph.indentFirstLinePt;
-	if (paragraph.pageBreakBefore !== void 0) canonical.pageBreakBefore = paragraph.pageBreakBefore;
-	if (paragraph.pageBreakAfter !== void 0) canonical.pageBreakAfter = paragraph.pageBreakAfter;
-	return canonical;
-}
 function emptyAnchorParagraph(pageBreakBefore) {
 	return pageBreakBefore ? {
 		kind: "paragraph",
@@ -97,8 +50,7 @@ function planSection(section, needsLeadingParagraph, listState) {
 		return false;
 	};
 	const closeListRun = () => {
-		listState.openNumId = void 0;
-		listState.openCanonicalNumId = void 0;
+		closeListPlan(listState);
 	};
 	const flushPendingPageBreak = () => {
 		if (pendingPageBreak) {
@@ -118,17 +70,8 @@ function planSection(section, needsLeadingParagraph, listState) {
 			continue;
 		}
 		if (block.kind === "paragraph") {
-			const membership = block.list;
-			if (membership === void 0) closeListRun();
-			else {
-				const incomingKey = membership.numId ?? NO_NUM_ID_KEY;
-				if (listState.openNumId !== incomingKey) {
-					listState.openNumId = incomingKey;
-					listState.openCanonicalNumId = canonicalNumId(membership.numId, listState.next);
-					listState.next += 1;
-				}
-			}
-			const paragraph = canonicalParagraph(block, membership === void 0 ? void 0 : listState.openCanonicalNumId);
+			const canonicalId = planListMembership(block.list, listState);
+			const paragraph = canonicalParagraph(block, canonicalId);
 			pushParagraph(pendingPageBreak ? {
 				...paragraph,
 				pageBreakBefore: true
@@ -164,80 +107,6 @@ function planDocument(sections) {
 	const listState = { next: 1 };
 	return sections.map((section, index) => planSection(section, index > 0, listState));
 }
-function canonicalCell(cell, covered) {
-	if (covered) return { blocks: [] };
-	const canonical = { blocks: cell.blocks.map((block) => {
-		if (block.kind !== "paragraph") throw unsupported(`a "${block.kind}" block`, "a table cell");
-		assertWritableParagraph(block);
-		return canonicalParagraph(block, void 0);
-	}) };
-	if (cell.colSpan !== void 0) canonical.colSpan = cell.colSpan;
-	if (cell.rowSpan !== void 0) canonical.rowSpan = cell.rowSpan;
-	if (cell.background !== void 0) canonical.background = canonicalColor(cell.background);
-	if (cell.borders !== void 0) {
-		const borders = {};
-		for (const edge of [
-			"left",
-			"right",
-			"top",
-			"bottom"
-		]) {
-			const border = cell.borders[edge];
-			if (border !== void 0) borders[edge] = {
-				color: canonicalColor(border.color),
-				widthPt: border.widthPt,
-				style: border.style ?? "solid"
-			};
-		}
-		canonical.borders = borders;
-	}
-	return canonical;
-}
-function canonicalTable(table) {
-	const covered = /* @__PURE__ */ new Set();
-	return {
-		kind: "table",
-		columnWidthsPt: [...table.columnWidthsPt],
-		rows: table.rows.map((row, rowIndex) => {
-			const cells = row.cells.map((cell, columnIndex) => {
-				const key = `${rowIndex},${columnIndex}`;
-				const isCovered = covered.has(key);
-				if (!isCovered) {
-					const colSpan = cell.colSpan ?? 1;
-					const rowSpan = cell.rowSpan ?? 1;
-					for (let r = rowIndex; r < rowIndex + rowSpan; r += 1) for (let c = columnIndex; c < columnIndex + colSpan; c += 1) if (r !== rowIndex || c !== columnIndex) covered.add(`${r},${c}`);
-				}
-				return canonicalCell(cell, isCovered);
-			});
-			return row.heightPt === void 0 ? { cells } : {
-				cells,
-				heightPt: row.heightPt
-			};
-		})
-	};
-}
-function canonicalImage(image) {
-	const canonical = {
-		kind: "image",
-		format: image.format,
-		base64: image.base64,
-		widthPt: image.widthPt,
-		heightPt: image.heightPt
-	};
-	if (image.altText !== void 0) canonical.altText = image.altText;
-	return canonical;
-}
-function canonicalMetadata(metadata) {
-	const canonical = {};
-	if (metadata.title !== void 0) canonical.title = metadata.title;
-	if (metadata.author !== void 0) canonical.author = metadata.author;
-	if (metadata.subject !== void 0) canonical.subject = metadata.subject;
-	if (metadata.keywords !== void 0 && metadata.keywords.length > 0) canonical.keywords = [...metadata.keywords];
-	if (metadata.creator !== void 0) canonical.creator = metadata.creator;
-	if (metadata.createdIso !== void 0) canonical.createdIso = metadata.createdIso;
-	if (metadata.modifiedIso !== void 0) canonical.modifiedIso = metadata.modifiedIso;
-	return canonical;
-}
 function normaliseOdtContent(document) {
 	if (document.kind !== "wordprocessing") throw new Error(`normaliseOdtContent: expected a 'wordprocessing' document, got '${document.kind}'`);
 	const planned = planDocument(document.sections);
@@ -367,7 +236,7 @@ function writeOdtContent(document, options = {}) {
 	if (document.kind !== "wordprocessing") throw new Error(`writeOdtContent: expected a 'wordprocessing' document, got '${document.kind}' -- odf.js writes .odt from the wordprocessing arm only`);
 	const version = options.version ?? "1.3";
 	const textElement = el("office:text");
-	const pkg = createOdfPackage(ODF_MEDIA_TYPES.odt, textElement, version);
+	const pkg = createOdfPackage(options.template ? ODF_MEDIA_TYPES.ott : ODF_MEDIA_TYPES.odt, textElement, version);
 	const state = {
 		pkg,
 		registry: StyleRegistry.forPart(pkg, CONTENT_PART, { otherPart: {

package/dist/typed/shared/canonicalise.cjs

@@ -0,0 +1,126 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_typed_shared_paragraph = require("./paragraph.cjs");
+let document_schema_js = require("document-schema.js");
+//#region src/typed/shared/canonicalise.ts
+function unsupportedContent(what, where) {
+	return /* @__PURE__ */ new Error(`${where} carries ${what}, which no ODF writer in this package can produce yet -- refusing to state a canonical form for content that would be silently lost on write. See ExaDev/documents.js for the tracked follow-up covering the fidelity constructs and embedded objects.`);
+}
+function canonicalColor(color) {
+	return (0, document_schema_js.rgbHexToColor)((0, document_schema_js.colorToRgbHex)(color));
+}
+function canonicalRun(run) {
+	const canonical = { text: run.text };
+	if (run.bold !== void 0) canonical.bold = run.bold;
+	if (run.italic !== void 0) canonical.italic = run.italic;
+	if (run.underline !== void 0) canonical.underline = run.underline;
+	if (run.strike !== void 0) canonical.strike = run.strike;
+	if (run.fontFamily !== void 0) canonical.fontFamily = run.fontFamily;
+	if (run.sizePt !== void 0) canonical.sizePt = run.sizePt;
+	if (run.color !== void 0) canonical.color = canonicalColor(run.color);
+	if (run.hyperlink !== void 0) canonical.hyperlink = run.hyperlink;
+	return canonical;
+}
+function canonicalParagraph(paragraph, listNumId) {
+	if (paragraph.constructs !== void 0 && paragraph.constructs.length > 0) throw unsupportedContent("run-level construct extents (a field, bookmark, note, annotation, or tracked change)", "a paragraph");
+	const canonical = {
+		kind: "paragraph",
+		runs: require_typed_shared_paragraph.segmentOdfParagraphRuns(paragraph.runs).map(canonicalRun)
+	};
+	if (paragraph.headingLevel !== void 0) {
+		canonical.headingLevel = paragraph.headingLevel;
+		canonical.styleId = `Heading${paragraph.headingLevel}`;
+	}
+	if (paragraph.alignment !== void 0) canonical.alignment = paragraph.alignment;
+	if (listNumId !== void 0 && paragraph.list !== void 0) canonical.list = {
+		numId: listNumId,
+		level: paragraph.list.level
+	};
+	if (paragraph.spacingBeforePt !== void 0) canonical.spacingBeforePt = paragraph.spacingBeforePt;
+	if (paragraph.spacingAfterPt !== void 0) canonical.spacingAfterPt = paragraph.spacingAfterPt;
+	if (paragraph.lineSpacing !== void 0) canonical.lineSpacing = paragraph.lineSpacing;
+	if (paragraph.indentLeftPt !== void 0) canonical.indentLeftPt = paragraph.indentLeftPt;
+	if (paragraph.indentFirstLinePt !== void 0) canonical.indentFirstLinePt = paragraph.indentFirstLinePt;
+	if (paragraph.pageBreakBefore !== void 0) canonical.pageBreakBefore = paragraph.pageBreakBefore;
+	if (paragraph.pageBreakAfter !== void 0) canonical.pageBreakAfter = paragraph.pageBreakAfter;
+	return canonical;
+}
+function canonicalCell(cell, covered) {
+	if (covered) return { blocks: [] };
+	const canonical = { blocks: cell.blocks.map((block) => {
+		if (block.kind !== "paragraph") throw unsupportedContent(`a "${block.kind}" block`, "a table cell");
+		return canonicalParagraph(block, void 0);
+	}) };
+	if (cell.colSpan !== void 0) canonical.colSpan = cell.colSpan;
+	if (cell.rowSpan !== void 0) canonical.rowSpan = cell.rowSpan;
+	if (cell.background !== void 0) canonical.background = canonicalColor(cell.background);
+	if (cell.borders !== void 0) {
+		const borders = {};
+		for (const edge of [
+			"left",
+			"right",
+			"top",
+			"bottom"
+		]) {
+			const border = cell.borders[edge];
+			if (border !== void 0) borders[edge] = {
+				color: canonicalColor(border.color),
+				widthPt: border.widthPt,
+				style: border.style ?? "solid"
+			};
+		}
+		canonical.borders = borders;
+	}
+	return canonical;
+}
+function canonicalTable(table) {
+	const covered = /* @__PURE__ */ new Set();
+	return {
+		kind: "table",
+		columnWidthsPt: [...table.columnWidthsPt],
+		rows: table.rows.map((row, rowIndex) => {
+			const cells = row.cells.map((cell, columnIndex) => {
+				const key = `${rowIndex},${columnIndex}`;
+				const isCovered = covered.has(key);
+				if (!isCovered) {
+					const colSpan = cell.colSpan ?? 1;
+					const rowSpan = cell.rowSpan ?? 1;
+					for (let r = rowIndex; r < rowIndex + rowSpan; r += 1) for (let c = columnIndex; c < columnIndex + colSpan; c += 1) if (r !== rowIndex || c !== columnIndex) covered.add(`${r},${c}`);
+				}
+				return canonicalCell(cell, isCovered);
+			});
+			return row.heightPt === void 0 ? { cells } : {
+				cells,
+				heightPt: row.heightPt
+			};
+		})
+	};
+}
+function canonicalMetadata(metadata) {
+	const canonical = {};
+	if (metadata.title !== void 0) canonical.title = metadata.title;
+	if (metadata.author !== void 0) canonical.author = metadata.author;
+	if (metadata.subject !== void 0) canonical.subject = metadata.subject;
+	if (metadata.keywords !== void 0 && metadata.keywords.length > 0) canonical.keywords = [...metadata.keywords];
+	if (metadata.creator !== void 0) canonical.creator = metadata.creator;
+	if (metadata.createdIso !== void 0) canonical.createdIso = metadata.createdIso;
+	if (metadata.modifiedIso !== void 0) canonical.modifiedIso = metadata.modifiedIso;
+	return canonical;
+}
+function canonicalImage(image) {
+	const canonical = {
+		kind: "image",
+		format: image.format,
+		base64: image.base64,
+		widthPt: image.widthPt,
+		heightPt: image.heightPt
+	};
+	if (image.altText !== void 0) canonical.altText = image.altText;
+	return canonical;
+}
+//#endregion
+exports.canonicalColor = canonicalColor;
+exports.canonicalImage = canonicalImage;
+exports.canonicalMetadata = canonicalMetadata;
+exports.canonicalParagraph = canonicalParagraph;
+exports.canonicalRun = canonicalRun;
+exports.canonicalTable = canonicalTable;

package/dist/typed/shared/canonicalise.d.cts

@@ -0,0 +1,10 @@
+import { Color, ContentImageBlock, ContentParagraph, ContentRun, ContentTable, LayoutMetadata } from "document-schema.js";
+//#region src/typed/shared/canonicalise.d.ts
+declare function canonicalColor(color: Color): Color;
+declare function canonicalRun(run: ContentRun): ContentRun;
+declare function canonicalParagraph(paragraph: ContentParagraph, listNumId: string | undefined): ContentParagraph;
+declare function canonicalTable(table: ContentTable): ContentTable;
+declare function canonicalMetadata(metadata: LayoutMetadata): LayoutMetadata;
+declare function canonicalImage(image: ContentImageBlock): ContentImageBlock;
+//#endregion
+export { canonicalColor, canonicalImage, canonicalMetadata, canonicalParagraph, canonicalRun, canonicalTable };

package/dist/typed/shared/canonicalise.d.ts

@@ -0,0 +1,10 @@
+import { Color, ContentImageBlock, ContentParagraph, ContentRun, ContentTable, LayoutMetadata } from "document-schema.js";
+//#region src/typed/shared/canonicalise.d.ts
+declare function canonicalColor(color: Color): Color;
+declare function canonicalRun(run: ContentRun): ContentRun;
+declare function canonicalParagraph(paragraph: ContentParagraph, listNumId: string | undefined): ContentParagraph;
+declare function canonicalTable(table: ContentTable): ContentTable;
+declare function canonicalMetadata(metadata: LayoutMetadata): LayoutMetadata;
+declare function canonicalImage(image: ContentImageBlock): ContentImageBlock;
+//#endregion
+export { canonicalColor, canonicalImage, canonicalMetadata, canonicalParagraph, canonicalRun, canonicalTable };