js.documents 1.72.0 → 1.73.0

package/dist/edit/docx/table.cjs

@@ -74,6 +74,21 @@ var DocxTableRow = class {
 		for (const child of this.node.children) if (child.type === "element" && child.tag === "w:tc") out.push(new DocxTableCell(child));
 		return out;
 	}
+	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;
+	}
 };
 function buildCell() {
 	return require_xml_fragment.el("w:tc", {}, [require_edit_docx_paragraph.buildParagraph()]);
@@ -110,6 +125,23 @@ var DocxTable = class {
 		node.children.push(row);
 		return new DocxTableRow(row);
 	}
+	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 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.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";
+			}
+		}
+		return anchor;
+	}
 	remove() {
 		require_xml_edit.removeChild(this.container, this.live());
 		this.removed = true;

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

@@ -23,6 +23,7 @@ declare class DocxTableRow {
   private readonly node;
   constructor(node: XmlElement);
   cells(): DocxTableCell[];
+  mergeCellsHorizontally(startColumnIndex: number, colSpan: number): DocxTableCell;
 }
 declare class DocxTable {
   private readonly container;
@@ -33,6 +34,7 @@ declare class DocxTable {
   rows(): DocxTableRow[];
   cell(rowIndex: number, columnIndex: number): DocxTableCell;
   appendRow(columnCount: number): DocxTableRow;
+  mergeCells(startRow: number, startColumn: number, rowSpan: number, colSpan: number): DocxTableCell;
   remove(): void;
 }
 declare function buildTable(init: TableInit): XmlElement;

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

@@ -23,6 +23,7 @@ declare class DocxTableRow {
   private readonly node;
   constructor(node: XmlElement);
   cells(): DocxTableCell[];
+  mergeCellsHorizontally(startColumnIndex: number, colSpan: number): DocxTableCell;
 }
 declare class DocxTable {
   private readonly container;
@@ -33,6 +34,7 @@ declare class DocxTable {
   rows(): DocxTableRow[];
   cell(rowIndex: number, columnIndex: number): DocxTableCell;
   appendRow(columnCount: number): DocxTableRow;
+  mergeCells(startRow: number, startColumn: number, rowSpan: number, colSpan: number): DocxTableCell;
   remove(): void;
 }
 declare function buildTable(init: TableInit): XmlElement;

package/dist/edit/docx/table.js

@@ -73,6 +73,21 @@ var DocxTableRow = class {
 		for (const child of this.node.children) if (child.type === "element" && child.tag === "w:tc") out.push(new DocxTableCell(child));
 		return out;
 	}
+	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;
+	}
 };
 function buildCell() {
 	return el("w:tc", {}, [buildParagraph()]);
@@ -109,6 +124,23 @@ var DocxTable = class {
 		node.children.push(row);
 		return new DocxTableRow(row);
 	}
+	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 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.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";
+			}
+		}
+		return anchor;
+	}
 	remove() {
 		removeChild(this.container, this.live());
 		this.removed = true;

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

@@ -2,7 +2,7 @@ import { t as Box$1 } from "../../geometry-DaJr8yQW.cjs";
 import { t as ImageInit } from "../../image-M5SezZVI.cjs";
 import { t as OdpShape } from "../../shape-BR8GL8XC.cjs";
 import { s as OdgVector } from "../../vector-D03KX8Ux.cjs";
-import { i as TableInit, t as OdtTable } from "../../table-sEo1Jf8c.cjs";
+import { i as TableInit, t as OdtTable } from "../../table-DSFcqJ7C.cjs";
 import { 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

@@ -2,7 +2,7 @@ import { t as Box$1 } from "../../geometry-DaJr8yQW.js";
 import { t as ImageInit } from "../../image-DHcA9kaK.js";
 import { t as OdpShape } from "../../shape-DeP-P4Nh.js";
 import { s as OdgVector } from "../../vector-D03KX8Ux.js";
-import { i as TableInit, t as OdtTable } from "../../table-kvclAXS5.js";
+import { i as TableInit, t as OdtTable } from "../../table-AT4t4VUy.js";
 import { ContentVector } from "document-schema.js";
 import { Package, XmlElement, XmlNode } from "odf.js";
 //#region src/edit/odp/slide.d.ts

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

@@ -1,6 +1,6 @@
 import { ClockPort } from "../../ports/clock.cjs";
 import { t as OdtParagraph } from "../../paragraph-Dlly6_E9.cjs";
-import { t as OdtTable } from "../../table-sEo1Jf8c.cjs";
+import { t as OdtTable } from "../../table-DSFcqJ7C.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 { ClockPort } from "../../ports/clock.js";
 import { t as OdtParagraph } from "../../paragraph-kMJVZhAi.js";
-import { t as OdtTable } from "../../table-kvclAXS5.js";
+import { t as OdtTable } from "../../table-AT4t4VUy.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/editor.d.cts

@@ -2,7 +2,7 @@ import { ClockPort } from "../../ports/clock.cjs";
 import { t as Box$1 } from "../../geometry-DaJr8yQW.cjs";
 import { n as ParagraphInit, t as OdtParagraph } from "../../paragraph-Dlly6_E9.cjs";
 import { t as OdtList } from "../../list-DXRaCcT1.cjs";
-import { i as TableInit, t as OdtTable } from "../../table-sEo1Jf8c.cjs";
+import { i as TableInit, t as OdtTable } from "../../table-DSFcqJ7C.cjs";
 import { ContentFormula, ContentVector } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/editor.d.ts

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

@@ -2,7 +2,7 @@ import { ClockPort } from "../../ports/clock.js";
 import { t as Box$1 } from "../../geometry-DaJr8yQW.js";
 import { n as ParagraphInit, t as OdtParagraph } from "../../paragraph-kMJVZhAi.js";
 import { t as OdtList } from "../../list-7hZydHAV.js";
-import { i as TableInit, t as OdtTable } from "../../table-kvclAXS5.js";
+import { i as TableInit, t as OdtTable } from "../../table-AT4t4VUy.js";
 import { ContentFormula, ContentVector } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/editor.d.ts

package/dist/edit/odt/table.cjs

@@ -89,6 +89,37 @@ var OdtTableRow = class {
 	appendCoveredCell() {
 		this.node.children.push(require_xml_fragment.el("table:covered-table-cell"));
 	}
+	gridCells() {
+		const out = [];
+		for (const child of this.node.children) if (child.type === "element" && (child.tag === "table:table-cell" || child.tag === "table:covered-table-cell")) out.push(child);
+		return out;
+	}
+	mergeCellsHorizontally(startColumnIndex, colSpan) {
+		if (!Number.isInteger(colSpan) || colSpan < 1) throw new Error(`mergeCellsHorizontally: colSpan must be a positive integer, got ${colSpan}`);
+		const gridCells = this.gridCells();
+		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) {
+				consumedElement.tag = "table:covered-table-cell";
+				consumedElement.attributes = [];
+				consumedElement.children = [];
+			}
+		}
+		const anchor = new OdtTableCell(anchorElement, this.pkg);
+		anchor.colSpan = colSpan;
+		return anchor;
+	}
+	markCellCovered(columnIndex) {
+		const element = this.gridCells()[columnIndex];
+		if (element === void 0) throw new Error(`markCellCovered: column ${columnIndex} does not exist in this row`);
+		element.tag = "table:covered-table-cell";
+		element.attributes = [];
+		element.children = [];
+	}
 };
 function buildCell(pkg) {
 	return require_xml_fragment.el("table:table-cell", {}, [require_edit_odt_paragraph.buildParagraph(pkg)]);
@@ -136,6 +167,22 @@ var OdtTable = class {
 		node.children.push(row);
 		return new OdtTableRow(row, this.pkg);
 	}
+	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 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;
+	}
 	remove() {
 		require_xml_edit.removeChild(this.container, this.live());
 		this.removed = true;

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

@@ -1,2 +1,2 @@
-import { a as buildTable, i as TableInit, n as OdtTableCell, r as OdtTableRow, t as OdtTable } from "../../table-sEo1Jf8c.cjs";
+import { a as buildTable, i as TableInit, n as OdtTableCell, r as OdtTableRow, t as OdtTable } from "../../table-DSFcqJ7C.cjs";
 export { OdtTable, OdtTableCell, OdtTableRow, TableInit, buildTable };

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

@@ -1,2 +1,2 @@
-import { a as buildTable, i as TableInit, n as OdtTableCell, r as OdtTableRow, t as OdtTable } from "../../table-kvclAXS5.js";
+import { a as buildTable, i as TableInit, n as OdtTableCell, r as OdtTableRow, t as OdtTable } from "../../table-AT4t4VUy.js";
 export { OdtTable, OdtTableCell, OdtTableRow, TableInit, buildTable };

package/dist/edit/odt/table.js

@@ -88,6 +88,37 @@ var OdtTableRow = class {
 	appendCoveredCell() {
 		this.node.children.push(el("table:covered-table-cell"));
 	}
+	gridCells() {
+		const out = [];
+		for (const child of this.node.children) if (child.type === "element" && (child.tag === "table:table-cell" || child.tag === "table:covered-table-cell")) out.push(child);
+		return out;
+	}
+	mergeCellsHorizontally(startColumnIndex, colSpan) {
+		if (!Number.isInteger(colSpan) || colSpan < 1) throw new Error(`mergeCellsHorizontally: colSpan must be a positive integer, got ${colSpan}`);
+		const gridCells = this.gridCells();
+		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) {
+				consumedElement.tag = "table:covered-table-cell";
+				consumedElement.attributes = [];
+				consumedElement.children = [];
+			}
+		}
+		const anchor = new OdtTableCell(anchorElement, this.pkg);
+		anchor.colSpan = colSpan;
+		return anchor;
+	}
+	markCellCovered(columnIndex) {
+		const element = this.gridCells()[columnIndex];
+		if (element === void 0) throw new Error(`markCellCovered: column ${columnIndex} does not exist in this row`);
+		element.tag = "table:covered-table-cell";
+		element.attributes = [];
+		element.children = [];
+	}
 };
 function buildCell(pkg) {
 	return el("table:table-cell", {}, [buildParagraph(pkg)]);
@@ -135,6 +166,22 @@ var OdtTable = class {
 		node.children.push(row);
 		return new OdtTableRow(row, this.pkg);
 	}
+	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 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;
+	}
 	remove() {
 		removeChild(this.container, this.live());
 		this.removed = true;

package/dist/index.d.cts

@@ -28,7 +28,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 { i as TableInit, n as OdtTableCell, r as OdtTableRow, t as OdtTable } from "./table-sEo1Jf8c.cjs";
+import { i as TableInit, n as OdtTableCell, r as OdtTableRow, t as OdtTable } from "./table-DSFcqJ7C.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

@@ -28,7 +28,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 { i as TableInit, n as OdtTableCell, r as OdtTableRow, t as OdtTable } from "./table-kvclAXS5.js";
+import { i as TableInit, n as OdtTableCell, r as OdtTableRow, t as OdtTable } from "./table-AT4t4VUy.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-kvclAXS5.d.ts → table-AT4t4VUy.d.ts}

@@ -25,6 +25,9 @@ declare class OdtTableRow {
   cells(): OdtTableCell[];
   appendCell(): OdtTableCell;
   appendCoveredCell(): void;
+  private gridCells;
+  mergeCellsHorizontally(startColumnIndex: number, colSpan: number): OdtTableCell;
+  markCellCovered(columnIndex: number): void;
 }
 declare class OdtTable {
   private readonly container;
@@ -37,6 +40,7 @@ declare class OdtTable {
   cell(rowIndex: number, columnIndex: number): OdtTableCell;
   appendRow(columnCount: number): OdtTableRow;
   appendEmptyRow(): OdtTableRow;
+  mergeCells(startRow: number, startColumn: number, rowSpan: number, colSpan: number): OdtTableCell;
   remove(): void;
 }
 declare function buildTable(pkg: Package, init: TableInit): XmlElement;

package/dist/{table-sEo1Jf8c.d.cts → table-DSFcqJ7C.d.cts}

@@ -25,6 +25,9 @@ declare class OdtTableRow {
   cells(): OdtTableCell[];
   appendCell(): OdtTableCell;
   appendCoveredCell(): void;
+  private gridCells;
+  mergeCellsHorizontally(startColumnIndex: number, colSpan: number): OdtTableCell;
+  markCellCovered(columnIndex: number): void;
 }
 declare class OdtTable {
   private readonly container;
@@ -37,6 +40,7 @@ declare class OdtTable {
   cell(rowIndex: number, columnIndex: number): OdtTableCell;
   appendRow(columnCount: number): OdtTableRow;
   appendEmptyRow(): OdtTableRow;
+  mergeCells(startRow: number, startColumn: number, rowSpan: number, colSpan: number): OdtTableCell;
   remove(): void;
 }
 declare function buildTable(pkg: Package, init: TableInit): XmlElement;

package/package.json

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