js.documents 8.0.1 → 10.0.0

package/dist/edit/doc/table.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_edit_table_grid = require("../table-grid.cjs");
 const require_edit_doc_paragraph = require("./paragraph.cjs");
 let document_schema_js = require("document-schema.js");
 //#region src/edit/doc/table.ts
@@ -69,6 +70,15 @@ var DocTable = class {
 	rows() {
 		return this.live().rows.map((row) => new DocTableRow(row));
 	}
+	gridRows() {
+		return this.grid().rows;
+	}
+	gridColumnCount() {
+		return this.grid().columnCount;
+	}
+	grid() {
+		return require_edit_table_grid.resolvePivotTableGrid(this.live(), (cell) => new DocTableCell(cell));
+	}
 	appendRow() {
 		const node = this.live();
 		const row = buildRow(node.columnWidthsPt.length);

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

@@ -1,4 +1,5 @@
 import { n as ParagraphInit, t as DocParagraph } from "../../paragraph-DM9n9I4T.cjs";
+import { i as TableGridRows } from "../../table-grid-Xbaddzz3.cjs";
 import { ContentBlock, ContentTable, ContentTableCell, ContentTableRow } from "document-schema.js";
 //#region src/edit/doc/table.d.ts
 interface TableInit {
@@ -29,6 +30,9 @@ declare class DocTable {
   constructor(container: ContentBlock[], node: ContentTable);
   private live;
   rows(): DocTableRow[];
+  gridRows(): TableGridRows<DocTableCell>;
+  gridColumnCount(): number;
+  private grid;
   appendRow(): DocTableRow;
   mergeCells(startRow: number, startColumn: number, rowSpan: number, colSpan: number): DocTableCell;
   remove(): void;

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

@@ -1,4 +1,5 @@
 import { n as ParagraphInit, t as DocParagraph } from "../../paragraph-Byw2Y7xu.js";
+import { i as TableGridRows } from "../../table-grid-Xbaddzz3.js";
 import { ContentBlock, ContentTable, ContentTableCell, ContentTableRow } from "document-schema.js";
 //#region src/edit/doc/table.d.ts
 interface TableInit {
@@ -29,6 +30,9 @@ declare class DocTable {
   constructor(container: ContentBlock[], node: ContentTable);
   private live;
   rows(): DocTableRow[];
+  gridRows(): TableGridRows<DocTableCell>;
+  gridColumnCount(): number;
+  private grid;
   appendRow(): DocTableRow;
   mergeCells(startRow: number, startColumn: number, rowSpan: number, colSpan: number): DocTableCell;
   remove(): void;

package/dist/edit/doc/table.js

@@ -1,3 +1,4 @@
+import { resolvePivotTableGrid } from "../table-grid.js";
 import { DocParagraph, buildParagraph } from "./paragraph.js";
 import { tableCellColumnSpan, tableCellRowSpan, tableGridColumnCount, walkTableGrid } from "document-schema.js";
 //#region src/edit/doc/table.ts
@@ -68,6 +69,15 @@ var DocTable = class {
 	rows() {
 		return this.live().rows.map((row) => new DocTableRow(row));
 	}
+	gridRows() {
+		return this.grid().rows;
+	}
+	gridColumnCount() {
+		return this.grid().columnCount;
+	}
+	grid() {
+		return resolvePivotTableGrid(this.live(), (cell) => new DocTableCell(cell));
+	}
 	appendRow() {
 		const node = this.live();
 		const row = buildRow(node.columnWidthsPt.length);

package/dist/edit/docx/content.cjs

@@ -6,6 +6,7 @@ const require_ports_clock = require("../../ports/clock.cjs");
 const require_model_units = require("../../model/units.cjs");
 const require_edit_docx_image = require("./image.cjs");
 const require_edit_docx_scaffold = require("./scaffold.cjs");
+const require_edit_table_grid = require("../table-grid.cjs");
 const require_edit_docx_editor = require("./editor.cjs");
 const require_model_embedded_drawing = require("../../model/embedded-drawing.cjs");
 const require_model_formula = require("../../model/formula.cjs");
@@ -208,6 +209,7 @@ 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;
 	const table = body.appendTable({

package/dist/edit/docx/content.js

@@ -5,6 +5,7 @@ import { systemClock } from "../../ports/clock.js";
 import { ptToTwips } from "../../model/units.js";
 import { assertDocxWritableImageFormat } from "./image.js";
 import { createEmptyDocxPackage } from "./scaffold.js";
+import { assertTableObeysGridRule } from "../table-grid.js";
 import { DocxEditor } from "./editor.js";
 import { FLOW_CONTAINER_ORIGIN, drawingOfBlock, embeddedDrawingVectors } from "../../model/embedded-drawing.js";
 import { formulaOfBlock, formulaPlaceholderText } from "../../model/formula.js";
@@ -207,6 +208,7 @@ function docxRowCells(positions, positionsByRow) {
 	});
 }
 function appendTable(body, block) {
+	assertTableObeysGridRule(block, "buildDocxPackage");
 	const columns = block.columnWidthsPt.length;
 	if (block.rows.length === 0 || columns === 0) return;
 	const table = body.appendTable({

package/dist/edit/docx/table.cjs

@@ -3,6 +3,7 @@ const require_xml_fragment = require("../../xml/fragment.cjs");
 const require_model_units = require("../../model/units.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
 const require_edit_docx_paragraph = require("./paragraph.cjs");
+const require_edit_table_grid = require("../table-grid.cjs");
 let ooxml_js = require("ooxml.js");
 let document_schema_js = require("document-schema.js");
 //#region src/edit/docx/table.ts
@@ -197,23 +198,93 @@ var DocxTableRow = class {
 	}
 	mergeCellsHorizontally(startColumnIndex, colSpan) {
 		if (!Number.isInteger(colSpan) || colSpan < 1) throw new Error(`mergeCellsHorizontally: colSpan must be a positive integer, got ${colSpan}`);
-		const cellElements = [];
-		for (const child of this.node.children) if (child.type === "element" && child.tag === "w:tc") cellElements.push(child);
-		const anchorElement = cellElements[startColumnIndex];
-		if (anchorElement === void 0) throw new Error(`mergeCellsHorizontally: column ${startColumnIndex} does not exist in this row`);
-		if (startColumnIndex + colSpan > cellElements.length) throw new Error(`mergeCellsHorizontally: colSpan ${colSpan} starting at column ${startColumnIndex} exceeds this row's own ${cellElements.length} columns`);
-		for (let i = 1; i < colSpan; i++) {
-			const consumedElement = cellElements[startColumnIndex + i];
-			if (consumedElement !== void 0) require_xml_edit.removeChild(this.node.children, consumedElement);
-		}
-		const anchor = new DocxTableCell(anchorElement);
-		anchor.colSpan = colSpan;
-		return anchor;
+		const plan = planHorizontalMerge(this.node, startColumnIndex, colSpan, false);
+		if ("refusal" in plan) throw new Error(`mergeCellsHorizontally: ${plan.refusal}`);
+		return applyHorizontalMerge(plan, colSpan);
 	}
 };
+function rowCells(row) {
+	const out = [];
+	let column = 0;
+	for (const child of row.children) if (child.type === "element" && child.tag === "w:tc") {
+		const cell = new DocxTableCell(child);
+		const span = cell.colSpan ?? 1;
+		out.push({
+			element: child,
+			startColumn: column,
+			span,
+			takesPartInVerticalMerge: cell.verticalMerge !== void 0
+		});
+		column += span;
+	}
+	return out;
+}
+function refuse(refusal) {
+	return { refusal };
+}
+function planHorizontalMerge(row, startColumn, colSpan, joinsVerticalMerge) {
+	const cells = rowCells(row);
+	const last = cells[cells.length - 1];
+	const width = last === void 0 ? 0 : last.startColumn + last.span;
+	const anchor = cells.find((cell) => cell.startColumn <= startColumn && startColumn < cell.startColumn + cell.span);
+	if (anchor === void 0) return refuse(`column ${startColumn} does not exist in this row`);
+	if (anchor.startColumn !== startColumn) return refuse(`column ${startColumn} is covered by the cell starting at column ${anchor.startColumn}`);
+	const endColumn = startColumn + colSpan;
+	if (endColumn > width) return refuse(`colSpan ${colSpan} starting at column ${startColumn} exceeds this row's own ${width} grid columns`);
+	const region = cells.filter((cell) => cell.startColumn >= startColumn && cell.startColumn < endColumn);
+	const straddling = region.find((cell) => cell.startColumn + cell.span > endColumn);
+	if (straddling !== void 0) return refuse(`the cell at column ${straddling.startColumn} spans columns ${straddling.startColumn} to ${straddling.startColumn + straddling.span - 1}, past the last merged column ${endColumn - 1}`);
+	const consumed = region.filter((cell) => cell !== anchor);
+	const verticallyMerged = joinsVerticalMerge || consumed.length > 0 ? region.find((cell) => cell.takesPartInVerticalMerge) : void 0;
+	if (verticallyMerged !== void 0) return refuse(`column ${verticallyMerged.startColumn} takes part in a vertical merge and cannot be merged over`);
+	return {
+		row,
+		anchor: anchor.element,
+		consumed: consumed.map((cell) => cell.element)
+	};
+}
+function applyHorizontalMerge(plan, colSpan) {
+	for (const consumed of plan.consumed) require_xml_edit.removeChild(plan.row.children, consumed);
+	const anchor = new DocxTableCell(plan.anchor);
+	anchor.colSpan = colSpan;
+	return anchor;
+}
+function physicalCells(cells) {
+	let column = 0;
+	return cells.map((cell) => {
+		const columnIndex = column;
+		column += cell.colSpan ?? 1;
+		return {
+			cell,
+			columnIndex,
+			continuesVerticalMerge: cell.verticalMerge === "continue"
+		};
+	});
+}
+function verticalSpan(rowsBelow, columnIndex) {
+	let span = 1;
+	for (const row of rowsBelow) {
+		if (!row.find((cell) => cell.columnIndex === columnIndex)?.continuesVerticalMerge) break;
+		span++;
+	}
+	return span;
+}
+function placeCells(rows) {
+	const physical = rows.map(physicalCells);
+	return physical.map((row, rowIndex) => row.map(({ cell, columnIndex, continuesVerticalMerge }) => ({
+		cell,
+		columnIndex,
+		colSpan: continuesVerticalMerge ? void 0 : cell.colSpan,
+		rowSpan: continuesVerticalMerge ? void 0 : verticalSpan(physical.slice(rowIndex + 1), columnIndex)
+	})));
+}
 function buildCell() {
 	return require_xml_fragment.el("w:tc", {}, [require_edit_docx_paragraph.buildParagraph()]);
 }
+function declaredGridColumnCount(table) {
+	const tblGrid = require_xml_edit.directChildElement(table, "w:tblGrid");
+	return tblGrid === void 0 ? 0 : tblGrid.children.filter((child) => child.type === "element" && child.tag === "w:gridCol").length;
+}
 var DocxTable = class {
 	container;
 	node;
@@ -226,11 +297,24 @@ var DocxTable = class {
 		if (this.removed) throw new Error("this DocxTable has been removed and can no longer be used");
 		return this.node;
 	}
-	rows() {
+	rowElements() {
 		const out = [];
-		for (const child of this.live().children) if (child.type === "element" && child.tag === "w:tr") out.push(new DocxTableRow(child));
+		for (const child of this.live().children) if (child.type === "element" && child.tag === "w:tr") out.push(child);
 		return out;
 	}
+	rows() {
+		return this.rowElements().map((row) => new DocxTableRow(row));
+	}
+	gridRows() {
+		return this.grid().rows;
+	}
+	gridColumnCount() {
+		return this.grid().columnCount;
+	}
+	grid() {
+		const table = this.live();
+		return require_edit_table_grid.resolveLiveTableGrid(placeCells(this.rows().map((row) => row.cells())), declaredGridColumnCount(table));
+	}
 	cell(rowIndex, columnIndex) {
 		const row = this.rows()[rowIndex];
 		if (row === void 0) throw new Error(`row ${rowIndex} does not exist in this table`);
@@ -248,18 +332,22 @@ var DocxTable = class {
 	}
 	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 = this.rowElements();
 		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 (startRow + rowSpan > rows.length) throw new Error(`mergeCells: rowSpan ${rowSpan} starting at row ${startRow} exceeds this table's own ${rows.length} rows`);
+		const planRow = (row, rowIndex) => {
+			const plan = planHorizontalMerge(row, startColumn, colSpan, rowSpan > 1);
+			if ("refusal" in plan) throw new Error(`mergeCells: row ${rowIndex}: ${plan.refusal}`);
+			return plan;
+		};
+		const anchorPlan = planRow(anchorRow, startRow);
+		const coveredPlans = rows.slice(startRow + 1, startRow + rowSpan).map((row, offset) => planRow(row, startRow + 1 + offset));
+		const anchor = applyHorizontalMerge(anchorPlan, colSpan);
+		const coveredCells = coveredPlans.map((plan) => applyHorizontalMerge(plan, colSpan));
 		if (rowSpan > 1) {
 			anchor.verticalMerge = "restart";
-			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`);
-				const coveredAnchor = coveredRow.mergeCellsHorizontally(startColumn, colSpan);
-				coveredAnchor.verticalMerge = "continue";
-			}
+			for (const covered of coveredCells) covered.verticalMerge = "continue";
 		}
 		return anchor;
 	}

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

@@ -1,3 +1,4 @@
+import { i as TableGridRows } from "../../table-grid-Xbaddzz3.cjs";
 import { DocxParagraph, ParagraphInit } from "./paragraph.cjs";
 import { Color, ContentCellBorders } from "document-schema.js";
 import { XmlElement, XmlNode } from "ooxml.js";
@@ -40,7 +41,11 @@ declare class DocxTable {
   private removed;
   constructor(container: XmlNode[], node: XmlElement);
   private live;
+  private rowElements;
   rows(): DocxTableRow[];
+  gridRows(): TableGridRows<DocxTableCell>;
+  gridColumnCount(): number;
+  private grid;
   cell(rowIndex: number, columnIndex: number): DocxTableCell;
   appendRow(columnCount: number): DocxTableRow;
   mergeCells(startRow: number, startColumn: number, rowSpan: number, colSpan: number): DocxTableCell;

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

@@ -1,3 +1,4 @@
+import { i as TableGridRows } from "../../table-grid-Xbaddzz3.js";
 import { DocxParagraph, ParagraphInit } from "./paragraph.js";
 import { XmlElement, XmlNode } from "ooxml.js";
 import { Color, ContentCellBorders } from "document-schema.js";
@@ -40,7 +41,11 @@ declare class DocxTable {
   private removed;
   constructor(container: XmlNode[], node: XmlElement);
   private live;
+  private rowElements;
   rows(): DocxTableRow[];
+  gridRows(): TableGridRows<DocxTableCell>;
+  gridColumnCount(): number;
+  private grid;
   cell(rowIndex: number, columnIndex: number): DocxTableCell;
   appendRow(columnCount: number): DocxTableRow;
   mergeCells(startRow: number, startColumn: number, rowSpan: number, colSpan: number): DocxTableCell;

package/dist/edit/docx/table.js

@@ -2,6 +2,7 @@ import { el } from "../../xml/fragment.js";
 import { ptToTwips, twipsToPt } from "../../model/units.js";
 import { directChildElement, insertInSchemaOrder, removeChild } from "../../xml/edit.js";
 import { DocxParagraph, buildParagraph } from "./paragraph.js";
+import { resolveLiveTableGrid } from "../table-grid.js";
 import { attr, readCellShading } from "ooxml.js";
 import { colorToRgbHex, resolveCellFillColor, rgbHexToColor } from "document-schema.js";
 //#region src/edit/docx/table.ts
@@ -196,23 +197,93 @@ var DocxTableRow = class {
 	}
 	mergeCellsHorizontally(startColumnIndex, colSpan) {
 		if (!Number.isInteger(colSpan) || colSpan < 1) throw new Error(`mergeCellsHorizontally: colSpan must be a positive integer, got ${colSpan}`);
-		const cellElements = [];
-		for (const child of this.node.children) if (child.type === "element" && child.tag === "w:tc") cellElements.push(child);
-		const anchorElement = cellElements[startColumnIndex];
-		if (anchorElement === void 0) throw new Error(`mergeCellsHorizontally: column ${startColumnIndex} does not exist in this row`);
-		if (startColumnIndex + colSpan > cellElements.length) throw new Error(`mergeCellsHorizontally: colSpan ${colSpan} starting at column ${startColumnIndex} exceeds this row's own ${cellElements.length} columns`);
-		for (let i = 1; i < colSpan; i++) {
-			const consumedElement = cellElements[startColumnIndex + i];
-			if (consumedElement !== void 0) removeChild(this.node.children, consumedElement);
-		}
-		const anchor = new DocxTableCell(anchorElement);
-		anchor.colSpan = colSpan;
-		return anchor;
+		const plan = planHorizontalMerge(this.node, startColumnIndex, colSpan, false);
+		if ("refusal" in plan) throw new Error(`mergeCellsHorizontally: ${plan.refusal}`);
+		return applyHorizontalMerge(plan, colSpan);
 	}
 };
+function rowCells(row) {
+	const out = [];
+	let column = 0;
+	for (const child of row.children) if (child.type === "element" && child.tag === "w:tc") {
+		const cell = new DocxTableCell(child);
+		const span = cell.colSpan ?? 1;
+		out.push({
+			element: child,
+			startColumn: column,
+			span,
+			takesPartInVerticalMerge: cell.verticalMerge !== void 0
+		});
+		column += span;
+	}
+	return out;
+}
+function refuse(refusal) {
+	return { refusal };
+}
+function planHorizontalMerge(row, startColumn, colSpan, joinsVerticalMerge) {
+	const cells = rowCells(row);
+	const last = cells[cells.length - 1];
+	const width = last === void 0 ? 0 : last.startColumn + last.span;
+	const anchor = cells.find((cell) => cell.startColumn <= startColumn && startColumn < cell.startColumn + cell.span);
+	if (anchor === void 0) return refuse(`column ${startColumn} does not exist in this row`);
+	if (anchor.startColumn !== startColumn) return refuse(`column ${startColumn} is covered by the cell starting at column ${anchor.startColumn}`);
+	const endColumn = startColumn + colSpan;
+	if (endColumn > width) return refuse(`colSpan ${colSpan} starting at column ${startColumn} exceeds this row's own ${width} grid columns`);
+	const region = cells.filter((cell) => cell.startColumn >= startColumn && cell.startColumn < endColumn);
+	const straddling = region.find((cell) => cell.startColumn + cell.span > endColumn);
+	if (straddling !== void 0) return refuse(`the cell at column ${straddling.startColumn} spans columns ${straddling.startColumn} to ${straddling.startColumn + straddling.span - 1}, past the last merged column ${endColumn - 1}`);
+	const consumed = region.filter((cell) => cell !== anchor);
+	const verticallyMerged = joinsVerticalMerge || consumed.length > 0 ? region.find((cell) => cell.takesPartInVerticalMerge) : void 0;
+	if (verticallyMerged !== void 0) return refuse(`column ${verticallyMerged.startColumn} takes part in a vertical merge and cannot be merged over`);
+	return {
+		row,
+		anchor: anchor.element,
+		consumed: consumed.map((cell) => cell.element)
+	};
+}
+function applyHorizontalMerge(plan, colSpan) {
+	for (const consumed of plan.consumed) removeChild(plan.row.children, consumed);
+	const anchor = new DocxTableCell(plan.anchor);
+	anchor.colSpan = colSpan;
+	return anchor;
+}
+function physicalCells(cells) {
+	let column = 0;
+	return cells.map((cell) => {
+		const columnIndex = column;
+		column += cell.colSpan ?? 1;
+		return {
+			cell,
+			columnIndex,
+			continuesVerticalMerge: cell.verticalMerge === "continue"
+		};
+	});
+}
+function verticalSpan(rowsBelow, columnIndex) {
+	let span = 1;
+	for (const row of rowsBelow) {
+		if (!row.find((cell) => cell.columnIndex === columnIndex)?.continuesVerticalMerge) break;
+		span++;
+	}
+	return span;
+}
+function placeCells(rows) {
+	const physical = rows.map(physicalCells);
+	return physical.map((row, rowIndex) => row.map(({ cell, columnIndex, continuesVerticalMerge }) => ({
+		cell,
+		columnIndex,
+		colSpan: continuesVerticalMerge ? void 0 : cell.colSpan,
+		rowSpan: continuesVerticalMerge ? void 0 : verticalSpan(physical.slice(rowIndex + 1), columnIndex)
+	})));
+}
 function buildCell() {
 	return el("w:tc", {}, [buildParagraph()]);
 }
+function declaredGridColumnCount(table) {
+	const tblGrid = directChildElement(table, "w:tblGrid");
+	return tblGrid === void 0 ? 0 : tblGrid.children.filter((child) => child.type === "element" && child.tag === "w:gridCol").length;
+}
 var DocxTable = class {
 	container;
 	node;
@@ -225,11 +296,24 @@ var DocxTable = class {
 		if (this.removed) throw new Error("this DocxTable has been removed and can no longer be used");
 		return this.node;
 	}
-	rows() {
+	rowElements() {
 		const out = [];
-		for (const child of this.live().children) if (child.type === "element" && child.tag === "w:tr") out.push(new DocxTableRow(child));
+		for (const child of this.live().children) if (child.type === "element" && child.tag === "w:tr") out.push(child);
 		return out;
 	}
+	rows() {
+		return this.rowElements().map((row) => new DocxTableRow(row));
+	}
+	gridRows() {
+		return this.grid().rows;
+	}
+	gridColumnCount() {
+		return this.grid().columnCount;
+	}
+	grid() {
+		const table = this.live();
+		return resolveLiveTableGrid(placeCells(this.rows().map((row) => row.cells())), declaredGridColumnCount(table));
+	}
 	cell(rowIndex, columnIndex) {
 		const row = this.rows()[rowIndex];
 		if (row === void 0) throw new Error(`row ${rowIndex} does not exist in this table`);
@@ -247,18 +331,22 @@ var DocxTable = class {
 	}
 	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 = this.rowElements();
 		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 (startRow + rowSpan > rows.length) throw new Error(`mergeCells: rowSpan ${rowSpan} starting at row ${startRow} exceeds this table's own ${rows.length} rows`);
+		const planRow = (row, rowIndex) => {
+			const plan = planHorizontalMerge(row, startColumn, colSpan, rowSpan > 1);
+			if ("refusal" in plan) throw new Error(`mergeCells: row ${rowIndex}: ${plan.refusal}`);
+			return plan;
+		};
+		const anchorPlan = planRow(anchorRow, startRow);
+		const coveredPlans = rows.slice(startRow + 1, startRow + rowSpan).map((row, offset) => planRow(row, startRow + 1 + offset));
+		const anchor = applyHorizontalMerge(anchorPlan, colSpan);
+		const coveredCells = coveredPlans.map((plan) => applyHorizontalMerge(plan, colSpan));
 		if (rowSpan > 1) {
 			anchor.verticalMerge = "restart";
-			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`);
-				const coveredAnchor = coveredRow.mergeCellsHorizontally(startColumn, colSpan);
-				coveredAnchor.verticalMerge = "continue";
-			}
+			for (const covered of coveredCells) covered.verticalMerge = "continue";
 		}
 		return anchor;
 	}

package/dist/edit/markdown/table.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_edit_table_grid = require("../table-grid.cjs");
 const require_edit_markdown_paragraph = require("./paragraph.cjs");
 //#region src/edit/markdown/table.ts
 const DEFAULT_TABLE_WIDTH_PT = 468;
@@ -54,6 +55,15 @@ var MarkdownTable = class {
 	rows() {
 		return this.live().rows.map((row) => new MarkdownTableRow(row));
 	}
+	gridRows() {
+		return this.grid().rows;
+	}
+	gridColumnCount() {
+		return this.grid().columnCount;
+	}
+	grid() {
+		return require_edit_table_grid.resolvePivotTableGrid(this.live(), (cell) => new MarkdownTableCell(cell));
+	}
 	appendRow() {
 		const node = this.live();
 		const row = buildRow(node.columnWidthsPt.length);

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

@@ -1,3 +1,4 @@
+import { i as TableGridRows } from "../../table-grid-Xbaddzz3.cjs";
 import { MarkdownParagraph, ParagraphInit } from "./paragraph.cjs";
 import { ContentBlock, ContentTable, ContentTableCell, ContentTableRow } from "document-schema.js";
 //#region src/edit/markdown/table.d.ts
@@ -25,6 +26,9 @@ declare class MarkdownTable {
   constructor(container: ContentBlock[], node: ContentTable);
   private live;
   rows(): MarkdownTableRow[];
+  gridRows(): TableGridRows<MarkdownTableCell>;
+  gridColumnCount(): number;
+  private grid;
   appendRow(): MarkdownTableRow;
   remove(): void;
 }

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

@@ -1,3 +1,4 @@
+import { i as TableGridRows } from "../../table-grid-Xbaddzz3.js";
 import { MarkdownParagraph, ParagraphInit } from "./paragraph.js";
 import { ContentBlock, ContentTable, ContentTableCell, ContentTableRow } from "document-schema.js";
 //#region src/edit/markdown/table.d.ts
@@ -25,6 +26,9 @@ declare class MarkdownTable {
   constructor(container: ContentBlock[], node: ContentTable);
   private live;
   rows(): MarkdownTableRow[];
+  gridRows(): TableGridRows<MarkdownTableCell>;
+  gridColumnCount(): number;
+  private grid;
   appendRow(): MarkdownTableRow;
   remove(): void;
 }

package/dist/edit/markdown/table.js

@@ -1,3 +1,4 @@
+import { resolvePivotTableGrid } from "../table-grid.js";
 import { MarkdownParagraph, buildParagraph } from "./paragraph.js";
 //#region src/edit/markdown/table.ts
 const DEFAULT_TABLE_WIDTH_PT = 468;
@@ -53,6 +54,15 @@ var MarkdownTable = class {
 	rows() {
 		return this.live().rows.map((row) => new MarkdownTableRow(row));
 	}
+	gridRows() {
+		return this.grid().rows;
+	}
+	gridColumnCount() {
+		return this.grid().columnCount;
+	}
+	grid() {
+		return resolvePivotTableGrid(this.live(), (cell) => new MarkdownTableCell(cell));
+	}
 	appendRow() {
 		const node = this.live();
 		const row = buildRow(node.columnWidthsPt.length);

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-DvKlZmG0.cjs";
+import { o as TableInit, r as OdtTable } from "../../table-CCjF09Ho.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-qWkzpadC.js";
+import { o as TableInit, r as OdtTable } from "../../table-BMYJo_-F.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

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_model_metadata = require("../../model/metadata.cjs");
 const require_ports_clock = require("../../ports/clock.cjs");
+const require_edit_table_grid = require("../table-grid.cjs");
 const require_model_embedded_drawing = require("../../model/embedded-drawing.cjs");
 const require_model_formula = require("../../model/formula.cjs");
 const require_edit_odt_paragraph = require("./paragraph.cjs");
@@ -132,6 +133,7 @@ function populateCellBlocks(cell, blocks) {
 	for (const remaining of restBlocks) appendCellBlock(cell, remaining);
 }
 function populateOdtTable(table, block) {
+	require_edit_table_grid.assertTableObeysGridRule(block, "populateOdtTable");
 	const gridPositions = (0, document_schema_js.walkTableGrid)(block);
 	block.rows.forEach((row, rowIndex) => {
 		const tableRow = table.appendEmptyRow();

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-DvKlZmG0.cjs";
+import { r as OdtTable } from "../../table-CCjF09Ho.cjs";
 import { ContentDocument, ContentParagraph, ContentTable } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/content.d.ts

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-qWkzpadC.js";
+import { r as OdtTable } from "../../table-BMYJo_-F.js";
 import { ContentDocument, ContentParagraph, ContentTable } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/content.d.ts

package/dist/edit/odt/content.js

@@ -1,5 +1,6 @@
 import { resolveMetadataTimestamps } from "../../model/metadata.js";
 import { systemClock } from "../../ports/clock.js";
+import { assertTableObeysGridRule } from "../table-grid.js";
 import { FLOW_CONTAINER_ORIGIN, drawingOfBlock, embeddedDrawingVectors } from "../../model/embedded-drawing.js";
 import { formulaOfBlock, formulaPlaceholderText } from "../../model/formula.js";
 import { headingStyleName } from "./paragraph.js";
@@ -131,6 +132,7 @@ function populateCellBlocks(cell, blocks) {
 	for (const remaining of restBlocks) appendCellBlock(cell, remaining);
 }
 function populateOdtTable(table, block) {
+	assertTableObeysGridRule(block, "populateOdtTable");
 	const gridPositions = walkTableGrid(block);
 	block.rows.forEach((row, rowIndex) => {
 		const tableRow = table.appendEmptyRow();

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-DvKlZmG0.cjs";
+import { o as TableInit, r as OdtTable } from "../../table-CCjF09Ho.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-qWkzpadC.js";
+import { o as TableInit, r as OdtTable } from "../../table-BMYJo_-F.js";
 import { Box, ContentControlDescriptor, ContentFormula, ContentVector, DivisionDescriptor, LayoutMetadata } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/editor.d.ts