js.documents 11.0.0 → 12.0.0

package/dist/edit/docx/content.cjs

@@ -210,11 +210,10 @@ function docxRowCells(positions, positionsByRow) {
 }
 function appendTable(body, block) {
 	require_edit_table_grid.assertTableObeysGridRule(block, "buildDocxPackage");
-	const columns = block.columnWidthsPt.length;
-	if (block.rows.length === 0 || columns === 0) return;
+	if (block.rows.length === 0) throw new Error("buildDocxPackage: table has no rows, and a table with no rows cannot be written in every word-processing format (ODF requires at least one table:table-row)");
 	const table = body.appendTable({
 		rows: 0,
-		columns,
+		columns: (0, document_schema_js.tableGridColumnCount)(block),
 		columnWidthsTwips: block.columnWidthsPt.map(require_model_units.ptToTwips)
 	});
 	const positionsByRow = (0, document_schema_js.walkTableGrid)(block);

package/dist/edit/docx/content.js

@@ -11,7 +11,7 @@ import { FLOW_CONTAINER_ORIGIN, drawingOfBlock, embeddedDrawingVectors } from ".
 import { formulaOfBlock, formulaPlaceholderText } from "../../model/formula.js";
 import { NUMBERING_CONTENT_TYPE, NUMBERING_PART_PATH, NUMBERING_REL_TYPE, buildNumberingRoot, declaration } from "./numbering.js";
 import { base64ToBytes } from "ooxml.js";
-import { resolveCellFillColor, tableCellColumnSpan, tableCellRowSpan, walkTableGrid } from "document-schema.js";
+import { resolveCellFillColor, tableCellColumnSpan, tableCellRowSpan, tableGridColumnCount, walkTableGrid } from "document-schema.js";
 //#region src/edit/docx/content.ts
 var ConstructMarkerState = class {
 	nextBookmarkId = 1;
@@ -209,11 +209,10 @@ function docxRowCells(positions, positionsByRow) {
 }
 function appendTable(body, block) {
 	assertTableObeysGridRule(block, "buildDocxPackage");
-	const columns = block.columnWidthsPt.length;
-	if (block.rows.length === 0 || columns === 0) return;
+	if (block.rows.length === 0) throw new Error("buildDocxPackage: table has no rows, and a table with no rows cannot be written in every word-processing format (ODF requires at least one table:table-row)");
 	const table = body.appendTable({
 		rows: 0,
-		columns,
+		columns: tableGridColumnCount(block),
 		columnWidthsTwips: block.columnWidthsPt.map(ptToTwips)
 	});
 	const positionsByRow = walkTableGrid(block);

package/dist/edit/odp/content.cjs

@@ -52,11 +52,7 @@ function appendShape(slide, shape) {
 	if (shape.blocks.length === 1 && onlyBlock?.kind === "table") {
 		const { shape: tableFrame, table } = slide.addTable({
 			frame: shape.frame,
-			table: {
-				rows: 0,
-				columns: onlyBlock.columnWidthsPt.length,
-				columnWidthsPt: onlyBlock.columnWidthsPt
-			}
+			table: require_edit_odt_content.odtTableInit(onlyBlock, "buildOdpPackage")
 		});
 		if (shape.rotationDeg !== void 0) tableFrame.rotationDeg = shape.rotationDeg;
 		require_edit_odt_content.populateOdtTable(table, onlyBlock);

package/dist/edit/odp/content.js

@@ -2,7 +2,7 @@ import { resolveMetadataTimestamps } from "../../model/metadata.js";
 import { systemClock } from "../../ports/clock.js";
 import { drawingOfBlock, embeddedDrawingVectors } from "../../model/embedded-drawing.js";
 import { formulaOfBlock, formulaPlaceholderText } from "../../model/formula.js";
-import { populateOdtTable, populateParagraph } from "../odt/content.js";
+import { odtTableInit, populateOdtTable, populateParagraph } from "../odt/content.js";
 import { createEmptyOdpPackage } from "./scaffold.js";
 import { OdpEditor } from "./editor.js";
 import { base64ToBytes } from "odf.js";
@@ -51,11 +51,7 @@ function appendShape(slide, shape) {
 	if (shape.blocks.length === 1 && onlyBlock?.kind === "table") {
 		const { shape: tableFrame, table } = slide.addTable({
 			frame: shape.frame,
-			table: {
-				rows: 0,
-				columns: onlyBlock.columnWidthsPt.length,
-				columnWidthsPt: onlyBlock.columnWidthsPt
-			}
+			table: odtTableInit(onlyBlock, "buildOdpPackage")
 		});
 		if (shape.rotationDeg !== void 0) tableFrame.rotationDeg = shape.rotationDeg;
 		populateOdtTable(table, onlyBlock);

package/dist/edit/odp/slide.d.cts

@@ -1,7 +1,7 @@
 import { t as ImageInit } from "../../image-D1z0T9Za.cjs";
 import { t as OdpShape } from "../../shape-Kmmxib5z.cjs";
 import { s as OdgVector } from "../../vector-DDP7hgvm.cjs";
-import { o as TableInit, r as OdtTable } from "../../table-CCjF09Ho.cjs";
+import { o as TableInit, r as OdtTable } from "../../table-BT3wN3Hd.cjs";
 import { Box, ContentFormula, ContentVector } from "document-schema.js";
 import { Package, XmlElement, XmlNode } from "odf.js";
 //#region src/edit/odp/slide.d.ts

package/dist/edit/odp/slide.d.ts

@@ -1,7 +1,7 @@
 import { t as ImageInit } from "../../image-D1z0T9Za.js";
 import { t as OdpShape } from "../../shape-ZAfNsCC5.js";
 import { s as OdgVector } from "../../vector-DDP7hgvm.js";
-import { o as TableInit, r as OdtTable } from "../../table-BMYJo_-F.js";
+import { o as TableInit, r as OdtTable } from "../../table-DhTy5Re7.js";
 import { Box, ContentFormula, ContentVector } from "document-schema.js";
 import { Package, XmlElement, XmlNode } from "odf.js";
 //#region src/edit/odp/slide.d.ts

package/dist/edit/odt/content.cjs

@@ -158,14 +158,23 @@ function applyCellDecoration(target, cell) {
 	if (cell.background !== void 0) target.background = (0, document_schema_js.resolveCellFillColor)(cell.background);
 	if (cell.borders !== void 0) target.borders = cell.borders;
 }
-function appendTable(body, block) {
-	const columns = block.columnWidthsPt.length;
-	if (block.rows.length === 0 || columns === 0) return;
-	populateOdtTable(body.appendTable({
+/**
+* The arguments that create the empty `table:table` a ContentTable is written into: no rows, since populateOdtTable appends one per ContentTableRow, and as many columns as the table's grid is wide.
+*
+* The grid width is what the rows and `columnWidthsPt` together state (tableGridColumnCount), so a table whose rows carry cells but which states no column widths still gets one `table:table-column` per grid column; a column with no stated width takes an equal share of the default table width, the same as any column created without one. `columnWidthsPt` is passed through untouched, so a width the table does state is always written.
+*
+* Throws when the table has no rows: ODF requires a `table:table` to hold at least one `table:table-row`, so no faithful spelling exists, and dropping the table would lose it without a trace. `entryPoint` names the caller in the message. A table that breaks the grid rule is refused by populateOdtTable before it writes anything, and a table with no rows has no grid fault to report, so the two checks never compete.
+*/
+function odtTableInit(block, entryPoint) {
+	if (block.rows.length === 0) throw new Error(`${entryPoint}: table has no rows, and ODF requires a table:table to hold at least one table:table-row`);
+	return {
 		rows: 0,
-		columns,
+		columns: (0, document_schema_js.tableGridColumnCount)(block),
 		columnWidthsPt: block.columnWidthsPt
-	}), block);
+	};
+}
+function appendTable(body, block) {
+	populateOdtTable(body.appendTable(odtTableInit(block, "buildOdtPackage")), block);
 }
 function appendCellBlock(cell, block) {
 	if (block.kind === "paragraph") populateParagraph(cell.appendParagraph(), block, { headings: "element" });
@@ -242,5 +251,6 @@ function appendEmbeddedObject(body, block) {
 }
 //#endregion
 exports.buildOdtPackage = buildOdtPackage;
+exports.odtTableInit = odtTableInit;
 exports.populateOdtTable = populateOdtTable;
 exports.populateParagraph = populateParagraph;

package/dist/edit/odt/content.d.cts

@@ -1,6 +1,6 @@
 import { t as ClockPort } from "../../clock-C7SUuYN0.cjs";
 import { t as OdtParagraph } from "../../paragraph-CRaLSzWz.cjs";
-import { r as OdtTable } from "../../table-CCjF09Ho.cjs";
+import { o as TableInit, r as OdtTable } from "../../table-BT3wN3Hd.cjs";
 import { ContentDocument, ContentParagraph, ContentTable } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/content.d.ts
@@ -13,5 +13,13 @@ interface PopulateParagraphOptions {
 }
 declare function populateParagraph(paragraph: OdtParagraph, block: ContentParagraph, options: PopulateParagraphOptions): void;
 declare function populateOdtTable(table: OdtTable, block: ContentTable): void;
+/**
+ * The arguments that create the empty `table:table` a ContentTable is written into: no rows, since populateOdtTable appends one per ContentTableRow, and as many columns as the table's grid is wide.
+ *
+ * The grid width is what the rows and `columnWidthsPt` together state (tableGridColumnCount), so a table whose rows carry cells but which states no column widths still gets one `table:table-column` per grid column; a column with no stated width takes an equal share of the default table width, the same as any column created without one. `columnWidthsPt` is passed through untouched, so a width the table does state is always written.
+ *
+ * Throws when the table has no rows: ODF requires a `table:table` to hold at least one `table:table-row`, so no faithful spelling exists, and dropping the table would lose it without a trace. `entryPoint` names the caller in the message. A table that breaks the grid rule is refused by populateOdtTable before it writes anything, and a table with no rows has no grid fault to report, so the two checks never compete.
+ */
+declare function odtTableInit(block: ContentTable, entryPoint: string): TableInit;
 //#endregion
-export { BuildOdtPackageOptions, PopulateParagraphOptions, buildOdtPackage, populateOdtTable, populateParagraph };
+export { BuildOdtPackageOptions, PopulateParagraphOptions, buildOdtPackage, odtTableInit, populateOdtTable, populateParagraph };

package/dist/edit/odt/content.d.ts

@@ -1,6 +1,6 @@
 import { t as ClockPort } from "../../clock-C7SUuYN0.js";
 import { t as OdtParagraph } from "../../paragraph-D4f705GG.js";
-import { r as OdtTable } from "../../table-BMYJo_-F.js";
+import { o as TableInit, r as OdtTable } from "../../table-DhTy5Re7.js";
 import { ContentDocument, ContentParagraph, ContentTable } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/content.d.ts
@@ -13,5 +13,13 @@ interface PopulateParagraphOptions {
 }
 declare function populateParagraph(paragraph: OdtParagraph, block: ContentParagraph, options: PopulateParagraphOptions): void;
 declare function populateOdtTable(table: OdtTable, block: ContentTable): void;
+/**
+ * The arguments that create the empty `table:table` a ContentTable is written into: no rows, since populateOdtTable appends one per ContentTableRow, and as many columns as the table's grid is wide.
+ *
+ * The grid width is what the rows and `columnWidthsPt` together state (tableGridColumnCount), so a table whose rows carry cells but which states no column widths still gets one `table:table-column` per grid column; a column with no stated width takes an equal share of the default table width, the same as any column created without one. `columnWidthsPt` is passed through untouched, so a width the table does state is always written.
+ *
+ * Throws when the table has no rows: ODF requires a `table:table` to hold at least one `table:table-row`, so no faithful spelling exists, and dropping the table would lose it without a trace. `entryPoint` names the caller in the message. A table that breaks the grid rule is refused by populateOdtTable before it writes anything, and a table with no rows has no grid fault to report, so the two checks never compete.
+ */
+declare function odtTableInit(block: ContentTable, entryPoint: string): TableInit;
 //#endregion
-export { BuildOdtPackageOptions, PopulateParagraphOptions, buildOdtPackage, populateOdtTable, populateParagraph };
+export { BuildOdtPackageOptions, PopulateParagraphOptions, buildOdtPackage, odtTableInit, populateOdtTable, populateParagraph };

package/dist/edit/odt/content.js

@@ -6,7 +6,7 @@ import { formulaOfBlock, formulaPlaceholderText } from "../../model/formula.js";
 import { headingStyleName } from "./paragraph.js";
 import { createEmptyOdtPackage } from "./scaffold.js";
 import { OdtEditor } from "./editor.js";
-import { resolveCellFillColor, tableCellColumnSpan, tableCellRowSpan, walkTableGrid } from "document-schema.js";
+import { resolveCellFillColor, tableCellColumnSpan, tableCellRowSpan, tableGridColumnCount, walkTableGrid } from "document-schema.js";
 import { base64ToBytes } from "odf.js";
 //#region src/edit/odt/content.ts
 function buildOdtPackage(content, options) {
@@ -157,14 +157,23 @@ function applyCellDecoration(target, cell) {
 	if (cell.background !== void 0) target.background = resolveCellFillColor(cell.background);
 	if (cell.borders !== void 0) target.borders = cell.borders;
 }
-function appendTable(body, block) {
-	const columns = block.columnWidthsPt.length;
-	if (block.rows.length === 0 || columns === 0) return;
-	populateOdtTable(body.appendTable({
+/**
+* The arguments that create the empty `table:table` a ContentTable is written into: no rows, since populateOdtTable appends one per ContentTableRow, and as many columns as the table's grid is wide.
+*
+* The grid width is what the rows and `columnWidthsPt` together state (tableGridColumnCount), so a table whose rows carry cells but which states no column widths still gets one `table:table-column` per grid column; a column with no stated width takes an equal share of the default table width, the same as any column created without one. `columnWidthsPt` is passed through untouched, so a width the table does state is always written.
+*
+* Throws when the table has no rows: ODF requires a `table:table` to hold at least one `table:table-row`, so no faithful spelling exists, and dropping the table would lose it without a trace. `entryPoint` names the caller in the message. A table that breaks the grid rule is refused by populateOdtTable before it writes anything, and a table with no rows has no grid fault to report, so the two checks never compete.
+*/
+function odtTableInit(block, entryPoint) {
+	if (block.rows.length === 0) throw new Error(`${entryPoint}: table has no rows, and ODF requires a table:table to hold at least one table:table-row`);
+	return {
 		rows: 0,
-		columns,
+		columns: tableGridColumnCount(block),
 		columnWidthsPt: block.columnWidthsPt
-	}), block);
+	};
+}
+function appendTable(body, block) {
+	populateOdtTable(body.appendTable(odtTableInit(block, "buildOdtPackage")), block);
 }
 function appendCellBlock(cell, block) {
 	if (block.kind === "paragraph") populateParagraph(cell.appendParagraph(), block, { headings: "element" });
@@ -240,4 +249,4 @@ function appendEmbeddedObject(body, block) {
 	body.appendFormula(formula, block.frame);
 }
 //#endregion
-export { buildOdtPackage, populateOdtTable, populateParagraph };
+export { buildOdtPackage, odtTableInit, populateOdtTable, populateParagraph };

package/dist/edit/odt/editor.d.cts

@@ -1,7 +1,7 @@
 import { t as ClockPort } from "../../clock-C7SUuYN0.cjs";
 import { n as ParagraphInit, t as OdtParagraph } from "../../paragraph-CRaLSzWz.cjs";
 import { t as OdtList } from "../../list-C_UPIZWM.cjs";
-import { o as TableInit, r as OdtTable } from "../../table-CCjF09Ho.cjs";
+import { o as TableInit, r as OdtTable } from "../../table-BT3wN3Hd.cjs";
 import { Box, ContentControlDescriptor, ContentFormula, ContentVector, DivisionDescriptor, LayoutMetadata } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/editor.d.ts

package/dist/edit/odt/editor.d.ts

@@ -1,7 +1,7 @@
 import { t as ClockPort } from "../../clock-C7SUuYN0.js";
 import { n as ParagraphInit, t as OdtParagraph } from "../../paragraph-D4f705GG.js";
 import { t as OdtList } from "../../list-C2GWIe6E.js";
-import { o as TableInit, r as OdtTable } from "../../table-BMYJo_-F.js";
+import { o as TableInit, r as OdtTable } from "../../table-DhTy5Re7.js";
 import { Box, ContentControlDescriptor, ContentFormula, ContentVector, DivisionDescriptor, LayoutMetadata } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/editor.d.ts

package/dist/edit/odt/table.cjs

@@ -5,6 +5,7 @@ const require_edit_table_grid = require("../table-grid.cjs");
 const require_edit_odt_automatic_styles = require("./automatic-styles.cjs");
 const require_edit_odt_paragraph = require("./paragraph.cjs");
 let ooxml_js = require("ooxml.js");
+let document_schema_js = require("document-schema.js");
 let odf_js = require("odf.js");
 //#region src/edit/odt/table.ts
 const DEFAULT_TABLE_WIDTH_PT = 468;
@@ -254,12 +255,106 @@ function gridCellElements(row) {
 	for (const child of row.children) if (child.type === "element" && (child.tag === "table:table-cell" || child.tag === "table:covered-table-cell")) out.push(child);
 	return out;
 }
+function tableRowElements(table) {
+	return table.children.filter((child) => child.type === "element" && child.tag === "table:table-row");
+}
+function placedCells(row, pkg) {
+	return gridCellElements(row).flatMap((element, columnIndex) => {
+		if (element.tag !== "table:table-cell") return [];
+		const cell = new OdtTableCell(element, pkg);
+		return [{
+			columnIndex,
+			cell,
+			colSpan: cell.colSpan,
+			rowSpan: cell.rowSpan
+		}];
+	});
+}
+function resolveOdtGrid(table, pkg) {
+	const placedRows = [];
+	let declaredColumns = 0;
+	for (const child of table.children) {
+		if (child.type !== "element") continue;
+		if (child.tag === "table:table-column") declaredColumns++;
+		else if (child.tag === "table:table-row") placedRows.push(placedCells(child, pkg));
+	}
+	return require_edit_table_grid.resolveLiveTableGrid(placedRows, declaredColumns);
+}
+function regionCovers(region, rowIndex, columnIndex) {
+	return region.row <= rowIndex && rowIndex < region.row + region.rowSpan && region.column <= columnIndex && columnIndex < region.column + region.columnSpan;
+}
+function regionsIntersect(a, b) {
+	return a.row < b.row + b.rowSpan && b.row < a.row + a.rowSpan && a.column < b.column + b.columnSpan && b.column < a.column + a.columnSpan;
+}
+function regionContains(outer, inner) {
+	return outer.row <= inner.row && outer.column <= inner.column && inner.row + inner.rowSpan <= outer.row + outer.rowSpan && inner.column + inner.columnSpan <= outer.column + outer.columnSpan;
+}
+function anchorRegions(grid) {
+	return grid.rows.flatMap((positions, row) => positions.flatMap((position, column) => {
+		if (!position?.isAnchor) return [];
+		const spans = {
+			blocks: [],
+			colSpan: position.cell.colSpan,
+			rowSpan: position.cell.rowSpan
+		};
+		return [{
+			row,
+			column,
+			rowSpan: (0, document_schema_js.tableCellRowSpan)(spans),
+			columnSpan: (0, document_schema_js.tableCellColumnSpan)(spans)
+		}];
+	}));
+}
+function isUnchangedAnchor(region, target) {
+	return target.rowSpan === 1 && region.column === target.column && region.columnSpan === target.columnSpan;
+}
+function describeRegionAnchor(region) {
+	return `the merge anchored at row ${region.row}, column ${region.column}`;
+}
+function refuseMerge(rowIndex, reason) {
+	return { refusal: {
+		rowIndex,
+		reason
+	} };
+}
+function planMerge(table, pkg, target, rows) {
+	const [anchorRow, ...coveredRows] = rows;
+	const anchorCells = gridCellElements(anchorRow);
+	const coveredCells = coveredRows.map(gridCellElements);
+	const anchor = anchorCells[target.column];
+	if (anchor === void 0) return refuseMerge(target.row, `column ${target.column} does not exist in this row`);
+	const endColumn = target.column + target.columnSpan;
+	for (const [offset, cells] of [anchorCells, ...coveredCells].entries()) if (endColumn > cells.length) return refuseMerge(target.row + offset, `colSpan ${target.columnSpan} starting at column ${target.column} exceeds this row's own ${cells.length} grid columns`);
+	const regions = anchorRegions(resolveOdtGrid(table, pkg));
+	if (anchor.tag === "table:covered-table-cell") {
+		const covering = regions.find((region) => regionCovers(region, target.row, target.column));
+		return refuseMerge(target.row, covering === void 0 ? `column ${target.column} is a covered position that no merge anchors` : `column ${target.column} is covered by ${describeRegionAnchor(covering)}`);
+	}
+	const cutting = regions.find((region) => regionsIntersect(region, target) && !regionContains(target, region) && !isUnchangedAnchor(region, target));
+	if (cutting !== void 0) {
+		const column = Math.max(cutting.column, target.column);
+		return refuseMerge(Math.max(cutting.row, target.row), `column ${column} belongs to ${describeRegionAnchor(cutting)}, which reaches outside the region being merged and cannot be merged over`);
+	}
+	return {
+		anchor,
+		consumed: [...anchorCells.slice(target.column + 1, endColumn), ...coveredCells.flatMap((cells) => cells.slice(target.column, endColumn))]
+	};
+}
+function applyMerge(plan, target, pkg) {
+	for (const element of plan.consumed) retagAsCovered(element);
+	const anchor = new OdtTableCell(plan.anchor, pkg);
+	anchor.colSpan = target.columnSpan;
+	if (target.rowSpan > 1) anchor.rowSpan = target.rowSpan;
+	return anchor;
+}
 var OdtTableRow = class {
 	node;
 	pkg;
-	constructor(node, pkg) {
+	table;
+	constructor(node, pkg, table) {
 		this.node = node;
 		this.pkg = pkg;
+		this.table = table;
 	}
 	cells() {
 		const out = [];
@@ -296,22 +391,22 @@ var OdtTableRow = class {
 	}
 	mergeCellsHorizontally(startColumnIndex, colSpan) {
 		if (!Number.isInteger(colSpan) || colSpan < 1) throw new Error(`mergeCellsHorizontally: colSpan must be a positive integer, got ${colSpan}`);
-		const gridCells = gridCellElements(this.node);
-		const anchorElement = gridCells[startColumnIndex];
-		if (anchorElement === void 0) throw new Error(`mergeCellsHorizontally: column ${startColumnIndex} does not exist in this row`);
-		if (anchorElement.tag === "table:covered-table-cell") throw new Error(`mergeCellsHorizontally: column ${startColumnIndex} is already covered by another merge -- address that merge's own anchor cell instead`);
-		if (startColumnIndex + colSpan > gridCells.length) throw new Error(`mergeCellsHorizontally: colSpan ${colSpan} starting at column ${startColumnIndex} exceeds this row's own ${gridCells.length} grid columns`);
-		for (let i = 1; i < colSpan; i++) {
-			const consumedElement = gridCells[startColumnIndex + i];
-			if (consumedElement !== void 0) retagAsCovered(consumedElement);
-		}
-		const anchor = new OdtTableCell(anchorElement, this.pkg);
-		anchor.colSpan = colSpan;
-		return anchor;
+		const target = {
+			row: tableRowElements(this.table).indexOf(this.node),
+			column: startColumnIndex,
+			rowSpan: 1,
+			columnSpan: colSpan
+		};
+		const plan = planMerge(this.table, this.pkg, target, [this.node]);
+		if (plan.refusal !== void 0) throw new Error(`mergeCellsHorizontally: ${plan.refusal.reason}`);
+		return applyMerge(plan, target, this.pkg);
 	}
 	markCellCovered(columnIndex) {
 		const element = gridCellElements(this.node)[columnIndex];
 		if (element === void 0) throw new Error(`markCellCovered: column ${columnIndex} does not exist in this row`);
+		const rowIndex = tableRowElements(this.table).indexOf(this.node);
+		const anchored = anchorRegions(resolveOdtGrid(this.table, this.pkg)).find((region) => region.row === rowIndex && region.column === columnIndex && (region.rowSpan > 1 || region.columnSpan > 1));
+		if (anchored !== void 0) throw new Error(`markCellCovered: column ${columnIndex} anchors a merge with rowSpan ${anchored.rowSpan} and colSpan ${anchored.columnSpan}, so covering it would leave the rest of that merge without an anchor`);
 		retagAsCovered(element);
 	}
 };
@@ -339,7 +434,7 @@ var OdtTable = class {
 	}
 	rows() {
 		const out = [];
-		for (const child of this.live().children) if (child.type === "element" && child.tag === "table:table-row") out.push(new OdtTableRow(child, this.pkg));
+		for (const child of this.live().children) if (child.type === "element" && child.tag === "table:table-row") out.push(new OdtTableRow(child, this.pkg, this.node));
 		return out;
 	}
 	gridRows() {
@@ -349,27 +444,7 @@ var OdtTable = class {
 		return this.grid().columnCount;
 	}
 	grid() {
-		const table = this.live();
-		const placedRows = [];
-		let declaredColumns = 0;
-		for (const child of table.children) {
-			if (child.type !== "element") continue;
-			if (child.tag === "table:table-column") declaredColumns++;
-			else if (child.tag === "table:table-row") placedRows.push(this.placedCells(child));
-		}
-		return require_edit_table_grid.resolveLiveTableGrid(placedRows, declaredColumns);
-	}
-	placedCells(row) {
-		return gridCellElements(row).flatMap((element, columnIndex) => {
-			if (element.tag !== "table:table-cell") return [];
-			const cell = new OdtTableCell(element, this.pkg);
-			return [{
-				columnIndex,
-				cell,
-				colSpan: cell.colSpan,
-				rowSpan: cell.rowSpan
-			}];
-		});
+		return resolveOdtGrid(this.live(), this.pkg);
 	}
 	cell(rowIndex, columnIndex) {
 		const row = this.rows()[rowIndex];
@@ -382,29 +457,29 @@ var OdtTable = class {
 		const node = this.live();
 		const row = buildRow(this.pkg, columnCount);
 		node.children.push(row);
-		return new OdtTableRow(row, this.pkg);
+		return new OdtTableRow(row, this.pkg, node);
 	}
 	appendEmptyRow() {
 		const node = this.live();
 		const row = require_xml_fragment.el("table:table-row");
 		node.children.push(row);
-		return new OdtTableRow(row, this.pkg);
+		return new OdtTableRow(row, this.pkg, node);
 	}
 	mergeCells(startRow, startColumn, rowSpan, colSpan) {
 		if (!Number.isInteger(rowSpan) || rowSpan < 1 || !Number.isInteger(colSpan) || colSpan < 1) throw new Error(`mergeCells: rowSpan and colSpan must be positive integers, got rowSpan=${rowSpan}, colSpan=${colSpan}`);
-		const rows = this.rows();
+		const rows = tableRowElements(this.live());
 		const anchorRow = rows[startRow];
 		if (anchorRow === void 0) throw new Error(`mergeCells: row ${startRow} does not exist in this table`);
-		const anchor = anchorRow.mergeCellsHorizontally(startColumn, colSpan);
-		if (rowSpan > 1) {
-			anchor.rowSpan = rowSpan;
-			for (let r = 1; r < rowSpan; r++) {
-				const coveredRow = rows[startRow + r];
-				if (coveredRow === void 0) throw new Error(`mergeCells: rowSpan ${rowSpan} starting at row ${startRow} exceeds this table's own ${rows.length} rows`);
-				for (let c = 0; c < colSpan; c++) coveredRow.markCellCovered(startColumn + c);
-			}
-		}
-		return anchor;
+		if (startRow + rowSpan > rows.length) throw new Error(`mergeCells: rowSpan ${rowSpan} starting at row ${startRow} exceeds this table's own ${rows.length} rows`);
+		const target = {
+			row: startRow,
+			column: startColumn,
+			rowSpan,
+			columnSpan: colSpan
+		};
+		const plan = planMerge(this.live(), this.pkg, target, [anchorRow, ...rows.slice(startRow + 1, startRow + rowSpan)]);
+		if (plan.refusal !== void 0) throw new Error(`mergeCells: row ${plan.refusal.rowIndex}: ${plan.refusal.reason}`);
+		return applyMerge(plan, target, this.pkg);
 	}
 	remove() {
 		require_xml_edit.removeChild(this.container, this.live());

package/dist/edit/odt/table.d.cts

@@ -1,2 +1,2 @@
-import { a as OdtTableRow, c as buildTable, i as OdtTableCell, l as readCellDecoration, n as OdtCoveredTableCell, o as TableInit, r as OdtTable, s as buildCellStyle, t as CellDecoration } from "../../table-CCjF09Ho.cjs";
+import { a as OdtTableRow, c as buildTable, i as OdtTableCell, l as readCellDecoration, n as OdtCoveredTableCell, o as TableInit, r as OdtTable, s as buildCellStyle, t as CellDecoration } from "../../table-BT3wN3Hd.cjs";
 export { CellDecoration, OdtCoveredTableCell, OdtTable, OdtTableCell, OdtTableRow, TableInit, buildCellStyle, buildTable, readCellDecoration };

package/dist/edit/odt/table.d.ts

@@ -1,2 +1,2 @@
-import { a as OdtTableRow, c as buildTable, i as OdtTableCell, l as readCellDecoration, n as OdtCoveredTableCell, o as TableInit, r as OdtTable, s as buildCellStyle, t as CellDecoration } from "../../table-BMYJo_-F.js";
+import { a as OdtTableRow, c as buildTable, i as OdtTableCell, l as readCellDecoration, n as OdtCoveredTableCell, o as TableInit, r as OdtTable, s as buildCellStyle, t as CellDecoration } from "../../table-DhTy5Re7.js";
 export { CellDecoration, OdtCoveredTableCell, OdtTable, OdtTableCell, OdtTableRow, TableInit, buildCellStyle, buildTable, readCellDecoration };

package/dist/edit/odt/table.js

@@ -4,6 +4,7 @@ import { resolveLiveTableGrid } from "../table-grid.js";
 import { ensureAutomaticStyles, nextStyleName } from "./automatic-styles.js";
 import { OdtParagraph, buildParagraph } from "./paragraph.js";
 import { attr } from "ooxml.js";
+import { tableCellColumnSpan, tableCellRowSpan } from "document-schema.js";
 import { findStyleElement, formatOdfColor, formatOdfLength, parseOdfColor, parseOdfLength } from "odf.js";
 //#region src/edit/odt/table.ts
 const DEFAULT_TABLE_WIDTH_PT = 468;
@@ -253,12 +254,106 @@ function gridCellElements(row) {
 	for (const child of row.children) if (child.type === "element" && (child.tag === "table:table-cell" || child.tag === "table:covered-table-cell")) out.push(child);
 	return out;
 }
+function tableRowElements(table) {
+	return table.children.filter((child) => child.type === "element" && child.tag === "table:table-row");
+}
+function placedCells(row, pkg) {
+	return gridCellElements(row).flatMap((element, columnIndex) => {
+		if (element.tag !== "table:table-cell") return [];
+		const cell = new OdtTableCell(element, pkg);
+		return [{
+			columnIndex,
+			cell,
+			colSpan: cell.colSpan,
+			rowSpan: cell.rowSpan
+		}];
+	});
+}
+function resolveOdtGrid(table, pkg) {
+	const placedRows = [];
+	let declaredColumns = 0;
+	for (const child of table.children) {
+		if (child.type !== "element") continue;
+		if (child.tag === "table:table-column") declaredColumns++;
+		else if (child.tag === "table:table-row") placedRows.push(placedCells(child, pkg));
+	}
+	return resolveLiveTableGrid(placedRows, declaredColumns);
+}
+function regionCovers(region, rowIndex, columnIndex) {
+	return region.row <= rowIndex && rowIndex < region.row + region.rowSpan && region.column <= columnIndex && columnIndex < region.column + region.columnSpan;
+}
+function regionsIntersect(a, b) {
+	return a.row < b.row + b.rowSpan && b.row < a.row + a.rowSpan && a.column < b.column + b.columnSpan && b.column < a.column + a.columnSpan;
+}
+function regionContains(outer, inner) {
+	return outer.row <= inner.row && outer.column <= inner.column && inner.row + inner.rowSpan <= outer.row + outer.rowSpan && inner.column + inner.columnSpan <= outer.column + outer.columnSpan;
+}
+function anchorRegions(grid) {
+	return grid.rows.flatMap((positions, row) => positions.flatMap((position, column) => {
+		if (!position?.isAnchor) return [];
+		const spans = {
+			blocks: [],
+			colSpan: position.cell.colSpan,
+			rowSpan: position.cell.rowSpan
+		};
+		return [{
+			row,
+			column,
+			rowSpan: tableCellRowSpan(spans),
+			columnSpan: tableCellColumnSpan(spans)
+		}];
+	}));
+}
+function isUnchangedAnchor(region, target) {
+	return target.rowSpan === 1 && region.column === target.column && region.columnSpan === target.columnSpan;
+}
+function describeRegionAnchor(region) {
+	return `the merge anchored at row ${region.row}, column ${region.column}`;
+}
+function refuseMerge(rowIndex, reason) {
+	return { refusal: {
+		rowIndex,
+		reason
+	} };
+}
+function planMerge(table, pkg, target, rows) {
+	const [anchorRow, ...coveredRows] = rows;
+	const anchorCells = gridCellElements(anchorRow);
+	const coveredCells = coveredRows.map(gridCellElements);
+	const anchor = anchorCells[target.column];
+	if (anchor === void 0) return refuseMerge(target.row, `column ${target.column} does not exist in this row`);
+	const endColumn = target.column + target.columnSpan;
+	for (const [offset, cells] of [anchorCells, ...coveredCells].entries()) if (endColumn > cells.length) return refuseMerge(target.row + offset, `colSpan ${target.columnSpan} starting at column ${target.column} exceeds this row's own ${cells.length} grid columns`);
+	const regions = anchorRegions(resolveOdtGrid(table, pkg));
+	if (anchor.tag === "table:covered-table-cell") {
+		const covering = regions.find((region) => regionCovers(region, target.row, target.column));
+		return refuseMerge(target.row, covering === void 0 ? `column ${target.column} is a covered position that no merge anchors` : `column ${target.column} is covered by ${describeRegionAnchor(covering)}`);
+	}
+	const cutting = regions.find((region) => regionsIntersect(region, target) && !regionContains(target, region) && !isUnchangedAnchor(region, target));
+	if (cutting !== void 0) {
+		const column = Math.max(cutting.column, target.column);
+		return refuseMerge(Math.max(cutting.row, target.row), `column ${column} belongs to ${describeRegionAnchor(cutting)}, which reaches outside the region being merged and cannot be merged over`);
+	}
+	return {
+		anchor,
+		consumed: [...anchorCells.slice(target.column + 1, endColumn), ...coveredCells.flatMap((cells) => cells.slice(target.column, endColumn))]
+	};
+}
+function applyMerge(plan, target, pkg) {
+	for (const element of plan.consumed) retagAsCovered(element);
+	const anchor = new OdtTableCell(plan.anchor, pkg);
+	anchor.colSpan = target.columnSpan;
+	if (target.rowSpan > 1) anchor.rowSpan = target.rowSpan;
+	return anchor;
+}
 var OdtTableRow = class {
 	node;
 	pkg;
-	constructor(node, pkg) {
+	table;
+	constructor(node, pkg, table) {
 		this.node = node;
 		this.pkg = pkg;
+		this.table = table;
 	}
 	cells() {
 		const out = [];
@@ -295,22 +390,22 @@ var OdtTableRow = class {
 	}
 	mergeCellsHorizontally(startColumnIndex, colSpan) {
 		if (!Number.isInteger(colSpan) || colSpan < 1) throw new Error(`mergeCellsHorizontally: colSpan must be a positive integer, got ${colSpan}`);
-		const gridCells = gridCellElements(this.node);
-		const anchorElement = gridCells[startColumnIndex];
-		if (anchorElement === void 0) throw new Error(`mergeCellsHorizontally: column ${startColumnIndex} does not exist in this row`);
-		if (anchorElement.tag === "table:covered-table-cell") throw new Error(`mergeCellsHorizontally: column ${startColumnIndex} is already covered by another merge -- address that merge's own anchor cell instead`);
-		if (startColumnIndex + colSpan > gridCells.length) throw new Error(`mergeCellsHorizontally: colSpan ${colSpan} starting at column ${startColumnIndex} exceeds this row's own ${gridCells.length} grid columns`);
-		for (let i = 1; i < colSpan; i++) {
-			const consumedElement = gridCells[startColumnIndex + i];
-			if (consumedElement !== void 0) retagAsCovered(consumedElement);
-		}
-		const anchor = new OdtTableCell(anchorElement, this.pkg);
-		anchor.colSpan = colSpan;
-		return anchor;
+		const target = {
+			row: tableRowElements(this.table).indexOf(this.node),
+			column: startColumnIndex,
+			rowSpan: 1,
+			columnSpan: colSpan
+		};
+		const plan = planMerge(this.table, this.pkg, target, [this.node]);
+		if (plan.refusal !== void 0) throw new Error(`mergeCellsHorizontally: ${plan.refusal.reason}`);
+		return applyMerge(plan, target, this.pkg);
 	}
 	markCellCovered(columnIndex) {
 		const element = gridCellElements(this.node)[columnIndex];
 		if (element === void 0) throw new Error(`markCellCovered: column ${columnIndex} does not exist in this row`);
+		const rowIndex = tableRowElements(this.table).indexOf(this.node);
+		const anchored = anchorRegions(resolveOdtGrid(this.table, this.pkg)).find((region) => region.row === rowIndex && region.column === columnIndex && (region.rowSpan > 1 || region.columnSpan > 1));
+		if (anchored !== void 0) throw new Error(`markCellCovered: column ${columnIndex} anchors a merge with rowSpan ${anchored.rowSpan} and colSpan ${anchored.columnSpan}, so covering it would leave the rest of that merge without an anchor`);
 		retagAsCovered(element);
 	}
 };
@@ -338,7 +433,7 @@ var OdtTable = class {
 	}
 	rows() {
 		const out = [];
-		for (const child of this.live().children) if (child.type === "element" && child.tag === "table:table-row") out.push(new OdtTableRow(child, this.pkg));
+		for (const child of this.live().children) if (child.type === "element" && child.tag === "table:table-row") out.push(new OdtTableRow(child, this.pkg, this.node));
 		return out;
 	}
 	gridRows() {
@@ -348,27 +443,7 @@ var OdtTable = class {
 		return this.grid().columnCount;
 	}
 	grid() {
-		const table = this.live();
-		const placedRows = [];
-		let declaredColumns = 0;
-		for (const child of table.children) {
-			if (child.type !== "element") continue;
-			if (child.tag === "table:table-column") declaredColumns++;
-			else if (child.tag === "table:table-row") placedRows.push(this.placedCells(child));
-		}
-		return resolveLiveTableGrid(placedRows, declaredColumns);
-	}
-	placedCells(row) {
-		return gridCellElements(row).flatMap((element, columnIndex) => {
-			if (element.tag !== "table:table-cell") return [];
-			const cell = new OdtTableCell(element, this.pkg);
-			return [{
-				columnIndex,
-				cell,
-				colSpan: cell.colSpan,
-				rowSpan: cell.rowSpan
-			}];
-		});
+		return resolveOdtGrid(this.live(), this.pkg);
 	}
 	cell(rowIndex, columnIndex) {
 		const row = this.rows()[rowIndex];
@@ -381,29 +456,29 @@ var OdtTable = class {
 		const node = this.live();
 		const row = buildRow(this.pkg, columnCount);
 		node.children.push(row);
-		return new OdtTableRow(row, this.pkg);
+		return new OdtTableRow(row, this.pkg, node);
 	}
 	appendEmptyRow() {
 		const node = this.live();
 		const row = el("table:table-row");
 		node.children.push(row);
-		return new OdtTableRow(row, this.pkg);
+		return new OdtTableRow(row, this.pkg, node);
 	}
 	mergeCells(startRow, startColumn, rowSpan, colSpan) {
 		if (!Number.isInteger(rowSpan) || rowSpan < 1 || !Number.isInteger(colSpan) || colSpan < 1) throw new Error(`mergeCells: rowSpan and colSpan must be positive integers, got rowSpan=${rowSpan}, colSpan=${colSpan}`);
-		const rows = this.rows();
+		const rows = tableRowElements(this.live());
 		const anchorRow = rows[startRow];
 		if (anchorRow === void 0) throw new Error(`mergeCells: row ${startRow} does not exist in this table`);
-		const anchor = anchorRow.mergeCellsHorizontally(startColumn, colSpan);
-		if (rowSpan > 1) {
-			anchor.rowSpan = rowSpan;
-			for (let r = 1; r < rowSpan; r++) {
-				const coveredRow = rows[startRow + r];
-				if (coveredRow === void 0) throw new Error(`mergeCells: rowSpan ${rowSpan} starting at row ${startRow} exceeds this table's own ${rows.length} rows`);
-				for (let c = 0; c < colSpan; c++) coveredRow.markCellCovered(startColumn + c);
-			}
-		}
-		return anchor;
+		if (startRow + rowSpan > rows.length) throw new Error(`mergeCells: rowSpan ${rowSpan} starting at row ${startRow} exceeds this table's own ${rows.length} rows`);
+		const target = {
+			row: startRow,
+			column: startColumn,
+			rowSpan,
+			columnSpan: colSpan
+		};
+		const plan = planMerge(this.live(), this.pkg, target, [anchorRow, ...rows.slice(startRow + 1, startRow + rowSpan)]);
+		if (plan.refusal !== void 0) throw new Error(`mergeCells: row ${plan.refusal.rowIndex}: ${plan.refusal.reason}`);
+		return applyMerge(plan, target, this.pkg);
 	}
 	remove() {
 		removeChild(this.container, this.live());

package/dist/edit/pptx/content.cjs

@@ -56,12 +56,13 @@ function appendShape(slide, shape, options) {
 		return;
 	}
 	if (shape.blocks.length === 1 && onlyBlock?.kind === "table") {
+		if (onlyBlock.rows.length === 0) throw new Error("buildPptxPackage: table has no rows, and a table with no rows cannot be written in every presentation format (ODF requires at least one table:table-row)");
 		populatePptxTable(slide.addTable({
 			frame: shape.frame,
 			rotationDeg: shape.rotationDeg,
 			table: {
 				rows: onlyBlock.rows.length,
-				columns: onlyBlock.columnWidthsPt.length,
+				columns: (0, document_schema_js.tableGridColumnCount)(onlyBlock),
 				columnWidthsPt: onlyBlock.columnWidthsPt
 			}
 		}), onlyBlock, (url) => slide.registerHyperlink(url));

package/dist/edit/pptx/content.js

@@ -6,7 +6,7 @@ import { formulaOfBlock, formulaPlaceholderText } from "../../model/formula.js";
 import { createEmptyPptxPackage } from "./scaffold.js";
 import { PptxEditor } from "./editor.js";
 import { base64ToBytes, encodePackage } from "ooxml.js";
-import { resolveCellFillColor, tableCellColumnSpan, tableCellRowSpan, walkTableGrid } from "document-schema.js";
+import { resolveCellFillColor, tableCellColumnSpan, tableCellRowSpan, tableGridColumnCount, walkTableGrid } from "document-schema.js";
 //#region src/edit/pptx/content.ts
 function buildPptxPackage(content, options) {
 	if (content.kind !== "presentation") throw new Error("buildPptxPackage requires a presentation ContentDocument");
@@ -55,12 +55,13 @@ function appendShape(slide, shape, options) {
 		return;
 	}
 	if (shape.blocks.length === 1 && onlyBlock?.kind === "table") {
+		if (onlyBlock.rows.length === 0) throw new Error("buildPptxPackage: table has no rows, and a table with no rows cannot be written in every presentation format (ODF requires at least one table:table-row)");
 		populatePptxTable(slide.addTable({
 			frame: shape.frame,
 			rotationDeg: shape.rotationDeg,
 			table: {
 				rows: onlyBlock.rows.length,
-				columns: onlyBlock.columnWidthsPt.length,
+				columns: tableGridColumnCount(onlyBlock),
 				columnWidthsPt: onlyBlock.columnWidthsPt
 			}
 		}), onlyBlock, (url) => slide.registerHyperlink(url));

package/dist/index.d.cts

@@ -47,7 +47,7 @@ import { OdgPage, PageImageInit, TextBoxInit } from "./edit/odg/page.cjs";
 import { CreateOdgOptions, OdgEditor, createOdg, openOdg } from "./edit/odg/editor.cjs";
 import { CreateEmptyOdgPackageOptions } from "./edit/odg/scaffold.cjs";
 import { BuildOdpPackageOptions, buildOdpPackage } from "./edit/odp/content.cjs";
-import { a as OdtTableRow, i as OdtTableCell, n as OdtCoveredTableCell, o as TableInit$2, r as OdtTable } from "./table-CCjF09Ho.cjs";
+import { a as OdtTableRow, i as OdtTableCell, n as OdtCoveredTableCell, o as TableInit$2, r as OdtTable } from "./table-BT3wN3Hd.cjs";
 import { OdpSlide, SlideImageInit, SlideTableInit, TextBoxInit as TextBoxInit$1 } from "./edit/odp/slide.cjs";
 import { CreateOdpOptions, OdpEditor, createOdp, openOdp } from "./edit/odp/editor.cjs";
 import { CreateEmptyOdpPackageOptions } from "./edit/odp/scaffold.cjs";

package/dist/index.d.ts

@@ -47,7 +47,7 @@ import { OdgPage, PageImageInit, TextBoxInit } from "./edit/odg/page.js";
 import { CreateOdgOptions, OdgEditor, createOdg, openOdg } from "./edit/odg/editor.js";
 import { CreateEmptyOdgPackageOptions } from "./edit/odg/scaffold.js";
 import { BuildOdpPackageOptions, buildOdpPackage } from "./edit/odp/content.js";
-import { a as OdtTableRow, i as OdtTableCell, n as OdtCoveredTableCell, o as TableInit$2, r as OdtTable } from "./table-BMYJo_-F.js";
+import { a as OdtTableRow, i as OdtTableCell, n as OdtCoveredTableCell, o as TableInit$2, r as OdtTable } from "./table-DhTy5Re7.js";
 import { OdpSlide, SlideImageInit, SlideTableInit, TextBoxInit as TextBoxInit$1 } from "./edit/odp/slide.js";
 import { CreateOdpOptions, OdpEditor, createOdp, openOdp } from "./edit/odp/editor.js";
 import { CreateEmptyOdpPackageOptions } from "./edit/odp/scaffold.js";

package/dist/{table-CCjF09Ho.d.cts → table-BT3wN3Hd.d.cts}

@@ -42,7 +42,8 @@ declare class OdtCoveredTableCell {
 declare class OdtTableRow {
   private readonly node;
   private readonly pkg;
-  constructor(node: XmlElement, pkg: Package);
+  private readonly table;
+  constructor(node: XmlElement, pkg: Package, table: XmlElement);
   cells(): OdtTableCell[];
   get heightPt(): number | undefined;
   set heightPt(value: number | undefined);
@@ -62,7 +63,6 @@ declare class OdtTable {
   gridRows(): TableGridRows<OdtTableCell>;
   gridColumnCount(): number;
   private grid;
-  private placedCells;
   cell(rowIndex: number, columnIndex: number): OdtTableCell;
   appendRow(columnCount: number): OdtTableRow;
   appendEmptyRow(): OdtTableRow;

package/dist/{table-BMYJo_-F.d.ts → table-DhTy5Re7.d.ts}

@@ -42,7 +42,8 @@ declare class OdtCoveredTableCell {
 declare class OdtTableRow {
   private readonly node;
   private readonly pkg;
-  constructor(node: XmlElement, pkg: Package);
+  private readonly table;
+  constructor(node: XmlElement, pkg: Package, table: XmlElement);
   cells(): OdtTableCell[];
   get heightPt(): number | undefined;
   set heightPt(value: number | undefined);
@@ -62,7 +63,6 @@ declare class OdtTable {
   gridRows(): TableGridRows<OdtTableCell>;
   gridColumnCount(): number;
   private grid;
-  private placedCells;
   cell(rowIndex: number, columnIndex: number): OdtTableCell;
   appendRow(columnCount: number): OdtTableRow;
   appendEmptyRow(): OdtTableRow;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "11.0.0",
+  "version": "12.0.0",
   "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": {