js.documents 12.1.0 → 13.0.0

package/dist/edit/odf-repeated-runs.cjs

@@ -0,0 +1,99 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/edit/odf-repeated-runs.ts
+const ROW_TAG = "table:table-row";
+const CELL_TAG = "table:table-cell";
+const COVERED_CELL_TAG = "table:covered-table-cell";
+const ROW_REPEAT_ATTR = "table:number-rows-repeated";
+const COLUMN_REPEAT_ATTR = "table:number-columns-repeated";
+function isElementWithTag(tag) {
+	return (node) => node.type === "element" && node.tag === tag;
+}
+function isCellOrCoveredCell(node) {
+	return node.type === "element" && (node.tag === "table:table-cell" || node.tag === "table:covered-table-cell");
+}
+function validateIndex(value, label) {
+	if (!Number.isInteger(value) || value < 0) throw new Error(`${label} must be a non-negative integer, got ${value}`);
+}
+function readRunRepeatCount(node, attrName) {
+	const raw = node.attributes.find((attribute) => attribute.name === attrName)?.value;
+	if (raw === void 0) return 1;
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
+}
+function collectRunMembers(children, isMember, headerWrapperTag) {
+	const members = [];
+	children.forEach((node, outerPosition) => {
+		if (node.type !== "element") return;
+		if (headerWrapperTag !== void 0 && node.tag === headerWrapperTag) {
+			node.children.forEach((inner, innerPosition) => {
+				if (isMember(inner)) members.push({
+					node: inner,
+					container: node.children,
+					containerPosition: innerPosition,
+					outerPosition
+				});
+			});
+			return;
+		}
+		if (isMember(node)) members.push({
+			node,
+			container: children,
+			containerPosition: outerPosition,
+			outerPosition
+		});
+	});
+	return members;
+}
+function withRepeatCount(node, attrName, count) {
+	const clone = structuredClone(node);
+	clone.attributes = clone.attributes.filter((attribute) => attribute.name !== attrName);
+	if (count > 1) clone.attributes.push({
+		name: attrName,
+		value: String(count)
+	});
+	return clone;
+}
+function replaceRun(children, isMember, targetIndex, repeatAttr, buildEmpty, headerWrapperTag) {
+	validateIndex(targetIndex, "targetIndex");
+	const members = collectRunMembers(children, isMember, headerWrapperTag);
+	let cursor = 0;
+	for (const member of members) {
+		const count = readRunRepeatCount(member.node, repeatAttr);
+		if (targetIndex < cursor + count) {
+			const offset = targetIndex - cursor;
+			if (count === 1) return member.node;
+			const before = offset > 0 ? withRepeatCount(member.node, repeatAttr, offset) : void 0;
+			const target = withRepeatCount(member.node, repeatAttr, 1);
+			const replacement = [
+				before,
+				target,
+				count - offset - 1 > 0 ? withRepeatCount(member.node, repeatAttr, count - offset - 1) : void 0
+			].filter((candidate) => candidate !== void 0);
+			member.container.splice(member.containerPosition, 1, ...replacement);
+			return target;
+		}
+		cursor += count;
+	}
+	const gap = targetIndex - cursor;
+	const lastMember = members[members.length - 1];
+	const insertAt = lastMember === void 0 ? children.length : lastMember.outerPosition + 1;
+	const toInsert = [];
+	if (gap > 0) toInsert.push(withRepeatCount(buildEmpty(), repeatAttr, gap));
+	const target = buildEmpty();
+	toInsert.push(target);
+	children.splice(insertAt, 0, ...toInsert);
+	return target;
+}
+//#endregion
+exports.CELL_TAG = CELL_TAG;
+exports.COLUMN_REPEAT_ATTR = COLUMN_REPEAT_ATTR;
+exports.COVERED_CELL_TAG = COVERED_CELL_TAG;
+exports.ROW_REPEAT_ATTR = ROW_REPEAT_ATTR;
+exports.ROW_TAG = ROW_TAG;
+exports.collectRunMembers = collectRunMembers;
+exports.isCellOrCoveredCell = isCellOrCoveredCell;
+exports.isElementWithTag = isElementWithTag;
+exports.readRunRepeatCount = readRunRepeatCount;
+exports.replaceRun = replaceRun;
+exports.validateIndex = validateIndex;
+exports.withRepeatCount = withRepeatCount;

package/dist/edit/odf-repeated-runs.d.cts

@@ -0,0 +1,22 @@
+import { XmlElement, XmlNode } from "odf.js";
+//#region src/edit/odf-repeated-runs.d.ts
+declare const ROW_TAG = "table:table-row";
+declare const CELL_TAG = "table:table-cell";
+declare const COVERED_CELL_TAG = "table:covered-table-cell";
+declare const ROW_REPEAT_ATTR = "table:number-rows-repeated";
+declare const COLUMN_REPEAT_ATTR = "table:number-columns-repeated";
+declare function isElementWithTag(tag: string): (node: XmlNode) => node is XmlElement;
+declare function isCellOrCoveredCell(node: XmlNode): node is XmlElement;
+declare function validateIndex(value: number, label: string): void;
+declare function readRunRepeatCount(node: XmlElement, attrName: string): number;
+interface RunMember {
+  readonly node: XmlElement;
+  readonly container: XmlNode[];
+  readonly containerPosition: number;
+  readonly outerPosition: number;
+}
+declare function collectRunMembers(children: XmlNode[], isMember: (node: XmlNode) => node is XmlElement, headerWrapperTag: string | undefined): RunMember[];
+declare function withRepeatCount(node: XmlElement, attrName: string, count: number): XmlElement;
+declare function replaceRun(children: XmlNode[], isMember: (node: XmlNode) => node is XmlElement, targetIndex: number, repeatAttr: string, buildEmpty: () => XmlElement, headerWrapperTag?: string): XmlElement;
+//#endregion
+export { CELL_TAG, COLUMN_REPEAT_ATTR, COVERED_CELL_TAG, ROW_REPEAT_ATTR, ROW_TAG, RunMember, collectRunMembers, isCellOrCoveredCell, isElementWithTag, readRunRepeatCount, replaceRun, validateIndex, withRepeatCount };

package/dist/edit/odf-repeated-runs.d.ts

@@ -0,0 +1,22 @@
+import { XmlElement, XmlNode } from "odf.js";
+//#region src/edit/odf-repeated-runs.d.ts
+declare const ROW_TAG = "table:table-row";
+declare const CELL_TAG = "table:table-cell";
+declare const COVERED_CELL_TAG = "table:covered-table-cell";
+declare const ROW_REPEAT_ATTR = "table:number-rows-repeated";
+declare const COLUMN_REPEAT_ATTR = "table:number-columns-repeated";
+declare function isElementWithTag(tag: string): (node: XmlNode) => node is XmlElement;
+declare function isCellOrCoveredCell(node: XmlNode): node is XmlElement;
+declare function validateIndex(value: number, label: string): void;
+declare function readRunRepeatCount(node: XmlElement, attrName: string): number;
+interface RunMember {
+  readonly node: XmlElement;
+  readonly container: XmlNode[];
+  readonly containerPosition: number;
+  readonly outerPosition: number;
+}
+declare function collectRunMembers(children: XmlNode[], isMember: (node: XmlNode) => node is XmlElement, headerWrapperTag: string | undefined): RunMember[];
+declare function withRepeatCount(node: XmlElement, attrName: string, count: number): XmlElement;
+declare function replaceRun(children: XmlNode[], isMember: (node: XmlNode) => node is XmlElement, targetIndex: number, repeatAttr: string, buildEmpty: () => XmlElement, headerWrapperTag?: string): XmlElement;
+//#endregion
+export { CELL_TAG, COLUMN_REPEAT_ATTR, COVERED_CELL_TAG, ROW_REPEAT_ATTR, ROW_TAG, RunMember, collectRunMembers, isCellOrCoveredCell, isElementWithTag, readRunRepeatCount, replaceRun, validateIndex, withRepeatCount };

package/dist/edit/odf-repeated-runs.js

@@ -0,0 +1,87 @@
+//#region src/edit/odf-repeated-runs.ts
+const ROW_TAG = "table:table-row";
+const CELL_TAG = "table:table-cell";
+const COVERED_CELL_TAG = "table:covered-table-cell";
+const ROW_REPEAT_ATTR = "table:number-rows-repeated";
+const COLUMN_REPEAT_ATTR = "table:number-columns-repeated";
+function isElementWithTag(tag) {
+	return (node) => node.type === "element" && node.tag === tag;
+}
+function isCellOrCoveredCell(node) {
+	return node.type === "element" && (node.tag === "table:table-cell" || node.tag === "table:covered-table-cell");
+}
+function validateIndex(value, label) {
+	if (!Number.isInteger(value) || value < 0) throw new Error(`${label} must be a non-negative integer, got ${value}`);
+}
+function readRunRepeatCount(node, attrName) {
+	const raw = node.attributes.find((attribute) => attribute.name === attrName)?.value;
+	if (raw === void 0) return 1;
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
+}
+function collectRunMembers(children, isMember, headerWrapperTag) {
+	const members = [];
+	children.forEach((node, outerPosition) => {
+		if (node.type !== "element") return;
+		if (headerWrapperTag !== void 0 && node.tag === headerWrapperTag) {
+			node.children.forEach((inner, innerPosition) => {
+				if (isMember(inner)) members.push({
+					node: inner,
+					container: node.children,
+					containerPosition: innerPosition,
+					outerPosition
+				});
+			});
+			return;
+		}
+		if (isMember(node)) members.push({
+			node,
+			container: children,
+			containerPosition: outerPosition,
+			outerPosition
+		});
+	});
+	return members;
+}
+function withRepeatCount(node, attrName, count) {
+	const clone = structuredClone(node);
+	clone.attributes = clone.attributes.filter((attribute) => attribute.name !== attrName);
+	if (count > 1) clone.attributes.push({
+		name: attrName,
+		value: String(count)
+	});
+	return clone;
+}
+function replaceRun(children, isMember, targetIndex, repeatAttr, buildEmpty, headerWrapperTag) {
+	validateIndex(targetIndex, "targetIndex");
+	const members = collectRunMembers(children, isMember, headerWrapperTag);
+	let cursor = 0;
+	for (const member of members) {
+		const count = readRunRepeatCount(member.node, repeatAttr);
+		if (targetIndex < cursor + count) {
+			const offset = targetIndex - cursor;
+			if (count === 1) return member.node;
+			const before = offset > 0 ? withRepeatCount(member.node, repeatAttr, offset) : void 0;
+			const target = withRepeatCount(member.node, repeatAttr, 1);
+			const replacement = [
+				before,
+				target,
+				count - offset - 1 > 0 ? withRepeatCount(member.node, repeatAttr, count - offset - 1) : void 0
+			].filter((candidate) => candidate !== void 0);
+			member.container.splice(member.containerPosition, 1, ...replacement);
+			return target;
+		}
+		cursor += count;
+	}
+	const gap = targetIndex - cursor;
+	const lastMember = members[members.length - 1];
+	const insertAt = lastMember === void 0 ? children.length : lastMember.outerPosition + 1;
+	const toInsert = [];
+	if (gap > 0) toInsert.push(withRepeatCount(buildEmpty(), repeatAttr, gap));
+	const target = buildEmpty();
+	toInsert.push(target);
+	children.splice(insertAt, 0, ...toInsert);
+	return target;
+}
+//#endregion
+export { CELL_TAG, COLUMN_REPEAT_ATTR, COVERED_CELL_TAG, ROW_REPEAT_ATTR, ROW_TAG, collectRunMembers, isCellOrCoveredCell, isElementWithTag, readRunRepeatCount, replaceRun, validateIndex, withRepeatCount };

package/dist/edit/ods/address.cjs

@@ -1,126 +1,34 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_fragment = require("../../xml/fragment.cjs");
+const require_edit_odf_repeated_runs = require("../odf-repeated-runs.cjs");
 //#region src/edit/ods/address.ts
-const ROW_TAG = "table:table-row";
 const COLUMN_TAG = "table:table-column";
-const CELL_TAG = "table:table-cell";
-const COVERED_CELL_TAG = "table:covered-table-cell";
-const ROW_REPEAT_ATTR = "table:number-rows-repeated";
-const COLUMN_REPEAT_ATTR = "table:number-columns-repeated";
 const HEADER_ROWS_TAG = "table:table-header-rows";
 const HEADER_COLUMNS_TAG = "table:table-header-columns";
-function isElementWithTag(tag) {
-	return (node) => node.type === "element" && node.tag === tag;
-}
-function isCellOrCoveredCell(node) {
-	return node.type === "element" && (node.tag === "table:table-cell" || node.tag === "table:covered-table-cell");
-}
-function validateIndex(value, label) {
-	if (!Number.isInteger(value) || value < 0) throw new Error(`${label} must be a non-negative integer, got ${value}`);
-}
-function readRunRepeatCount(node, attrName) {
-	const raw = node.attributes.find((attribute) => attribute.name === attrName)?.value;
-	if (raw === void 0) return 1;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
-}
-function collectRunMembers(children, isMember, headerWrapperTag) {
-	const members = [];
-	children.forEach((node, outerPosition) => {
-		if (node.type !== "element") return;
-		if (headerWrapperTag !== void 0 && node.tag === headerWrapperTag) {
-			node.children.forEach((inner, innerPosition) => {
-				if (isMember(inner)) members.push({
-					node: inner,
-					container: node.children,
-					containerPosition: innerPosition,
-					outerPosition
-				});
-			});
-			return;
-		}
-		if (isMember(node)) members.push({
-			node,
-			container: children,
-			containerPosition: outerPosition,
-			outerPosition
-		});
-	});
-	return members;
-}
-function withRepeatCount(node, attrName, count) {
-	const clone = structuredClone(node);
-	clone.attributes = clone.attributes.filter((attribute) => attribute.name !== attrName);
-	if (count > 1) clone.attributes.push({
-		name: attrName,
-		value: String(count)
-	});
-	return clone;
-}
-function replaceRun(children, isMember, targetIndex, repeatAttr, buildEmpty, headerWrapperTag) {
-	validateIndex(targetIndex, "targetIndex");
-	const members = collectRunMembers(children, isMember, headerWrapperTag);
-	let cursor = 0;
-	for (const member of members) {
-		const count = readRunRepeatCount(member.node, repeatAttr);
-		if (targetIndex < cursor + count) {
-			const offset = targetIndex - cursor;
-			if (count === 1) return member.node;
-			const before = offset > 0 ? withRepeatCount(member.node, repeatAttr, offset) : void 0;
-			const target = withRepeatCount(member.node, repeatAttr, 1);
-			const replacement = [
-				before,
-				target,
-				count - offset - 1 > 0 ? withRepeatCount(member.node, repeatAttr, count - offset - 1) : void 0
-			].filter((candidate) => candidate !== void 0);
-			member.container.splice(member.containerPosition, 1, ...replacement);
-			return target;
-		}
-		cursor += count;
-	}
-	const gap = targetIndex - cursor;
-	const lastMember = members[members.length - 1];
-	const insertAt = lastMember === void 0 ? children.length : lastMember.outerPosition + 1;
-	const toInsert = [];
-	if (gap > 0) toInsert.push(withRepeatCount(buildEmpty(), repeatAttr, gap));
-	const target = buildEmpty();
-	toInsert.push(target);
-	children.splice(insertAt, 0, ...toInsert);
-	return target;
-}
 function ensureColumnCoverage(tableElement, minCount) {
 	if (minCount <= 0) return;
-	const columnMembers = collectRunMembers(tableElement.children, isElementWithTag(COLUMN_TAG), HEADER_COLUMNS_TAG);
-	const covered = columnMembers.reduce((sum, member) => sum + readRunRepeatCount(member.node, COLUMN_REPEAT_ATTR), 0);
+	const columnMembers = require_edit_odf_repeated_runs.collectRunMembers(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag(COLUMN_TAG), HEADER_COLUMNS_TAG);
+	const covered = columnMembers.reduce((sum, member) => sum + require_edit_odf_repeated_runs.readRunRepeatCount(member.node, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR), 0);
 	if (covered >= minCount) return;
 	const additional = minCount - covered;
-	const newColumn = withRepeatCount(require_xml_fragment.el(COLUMN_TAG), COLUMN_REPEAT_ATTR, additional);
+	const newColumn = require_edit_odf_repeated_runs.withRepeatCount(require_xml_fragment.el(COLUMN_TAG), require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR, additional);
 	const lastColumn = columnMembers[columnMembers.length - 1];
 	if (lastColumn === void 0) {
-		const firstRowOrHeaderPosition = tableElement.children.findIndex((node) => isElementWithTag("table:table-row")(node) || isElementWithTag("table:table-header-rows")(node));
+		const firstRowOrHeaderPosition = tableElement.children.findIndex((node) => require_edit_odf_repeated_runs.isElementWithTag("table:table-row")(node) || require_edit_odf_repeated_runs.isElementWithTag("table:table-header-rows")(node));
 		const insertAt = firstRowOrHeaderPosition === -1 ? tableElement.children.length : firstRowOrHeaderPosition;
 		tableElement.children.splice(insertAt, 0, newColumn);
 	} else tableElement.children.splice(lastColumn.outerPosition + 1, 0, newColumn);
 }
 function resolveCellNode(tableElement, row, column) {
-	validateIndex(row, "row");
-	validateIndex(column, "column");
+	require_edit_odf_repeated_runs.validateIndex(row, "row");
+	require_edit_odf_repeated_runs.validateIndex(column, "column");
 	ensureColumnCoverage(tableElement, column + 1);
-	return replaceRun(replaceRun(tableElement.children, isElementWithTag(ROW_TAG), row, ROW_REPEAT_ATTR, () => require_xml_fragment.el(ROW_TAG), HEADER_ROWS_TAG).children, isCellOrCoveredCell, column, COLUMN_REPEAT_ATTR, () => require_xml_fragment.el(CELL_TAG));
+	const rowElement = require_edit_odf_repeated_runs.replaceRun(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag(require_edit_odf_repeated_runs.ROW_TAG), row, require_edit_odf_repeated_runs.ROW_REPEAT_ATTR, () => require_xml_fragment.el(require_edit_odf_repeated_runs.ROW_TAG), HEADER_ROWS_TAG);
+	return require_edit_odf_repeated_runs.replaceRun(rowElement.children, require_edit_odf_repeated_runs.isCellOrCoveredCell, column, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR, () => require_xml_fragment.el(require_edit_odf_repeated_runs.CELL_TAG));
 }
 //#endregion
-exports.CELL_TAG = CELL_TAG;
-exports.COLUMN_REPEAT_ATTR = COLUMN_REPEAT_ATTR;
 exports.COLUMN_TAG = COLUMN_TAG;
-exports.COVERED_CELL_TAG = COVERED_CELL_TAG;
 exports.HEADER_COLUMNS_TAG = HEADER_COLUMNS_TAG;
 exports.HEADER_ROWS_TAG = HEADER_ROWS_TAG;
-exports.ROW_REPEAT_ATTR = ROW_REPEAT_ATTR;
-exports.ROW_TAG = ROW_TAG;
-exports.collectRunMembers = collectRunMembers;
 exports.ensureColumnCoverage = ensureColumnCoverage;
-exports.isCellOrCoveredCell = isCellOrCoveredCell;
-exports.isElementWithTag = isElementWithTag;
-exports.readRunRepeatCount = readRunRepeatCount;
-exports.replaceRun = replaceRun;
 exports.resolveCellNode = resolveCellNode;

package/dist/edit/ods/address.d.cts

@@ -1,25 +1,9 @@
-import { XmlElement, XmlNode } from "odf.js";
+import { XmlElement } from "odf.js";
 //#region src/edit/ods/address.d.ts
-declare const ROW_TAG = "table:table-row";
 declare const COLUMN_TAG = "table:table-column";
-declare const CELL_TAG = "table:table-cell";
-declare const COVERED_CELL_TAG = "table:covered-table-cell";
-declare const ROW_REPEAT_ATTR = "table:number-rows-repeated";
-declare const COLUMN_REPEAT_ATTR = "table:number-columns-repeated";
 declare const HEADER_ROWS_TAG = "table:table-header-rows";
 declare const HEADER_COLUMNS_TAG = "table:table-header-columns";
-declare function isElementWithTag(tag: string): (node: XmlNode) => node is XmlElement;
-declare function isCellOrCoveredCell(node: XmlNode): node is XmlElement;
-declare function readRunRepeatCount(node: XmlElement, attrName: string): number;
-interface RunMember {
-  readonly node: XmlElement;
-  readonly container: XmlNode[];
-  readonly containerPosition: number;
-  readonly outerPosition: number;
-}
-declare function collectRunMembers(children: XmlNode[], isMember: (node: XmlNode) => node is XmlElement, headerWrapperTag: string | undefined): RunMember[];
-declare function replaceRun(children: XmlNode[], isMember: (node: XmlNode) => node is XmlElement, targetIndex: number, repeatAttr: string, buildEmpty: () => XmlElement, headerWrapperTag?: string): XmlElement;
 declare function ensureColumnCoverage(tableElement: XmlElement, minCount: number): void;
 declare function resolveCellNode(tableElement: XmlElement, row: number, column: number): XmlElement;
 //#endregion
-export { CELL_TAG, COLUMN_REPEAT_ATTR, COLUMN_TAG, COVERED_CELL_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG, ROW_REPEAT_ATTR, ROW_TAG, RunMember, collectRunMembers, ensureColumnCoverage, isCellOrCoveredCell, isElementWithTag, readRunRepeatCount, replaceRun, resolveCellNode };
+export { COLUMN_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG, ensureColumnCoverage, resolveCellNode };

package/dist/edit/ods/address.d.ts

@@ -1,25 +1,9 @@
-import { XmlElement, XmlNode } from "odf.js";
+import { XmlElement } from "odf.js";
 //#region src/edit/ods/address.d.ts
-declare const ROW_TAG = "table:table-row";
 declare const COLUMN_TAG = "table:table-column";
-declare const CELL_TAG = "table:table-cell";
-declare const COVERED_CELL_TAG = "table:covered-table-cell";
-declare const ROW_REPEAT_ATTR = "table:number-rows-repeated";
-declare const COLUMN_REPEAT_ATTR = "table:number-columns-repeated";
 declare const HEADER_ROWS_TAG = "table:table-header-rows";
 declare const HEADER_COLUMNS_TAG = "table:table-header-columns";
-declare function isElementWithTag(tag: string): (node: XmlNode) => node is XmlElement;
-declare function isCellOrCoveredCell(node: XmlNode): node is XmlElement;
-declare function readRunRepeatCount(node: XmlElement, attrName: string): number;
-interface RunMember {
-  readonly node: XmlElement;
-  readonly container: XmlNode[];
-  readonly containerPosition: number;
-  readonly outerPosition: number;
-}
-declare function collectRunMembers(children: XmlNode[], isMember: (node: XmlNode) => node is XmlElement, headerWrapperTag: string | undefined): RunMember[];
-declare function replaceRun(children: XmlNode[], isMember: (node: XmlNode) => node is XmlElement, targetIndex: number, repeatAttr: string, buildEmpty: () => XmlElement, headerWrapperTag?: string): XmlElement;
 declare function ensureColumnCoverage(tableElement: XmlElement, minCount: number): void;
 declare function resolveCellNode(tableElement: XmlElement, row: number, column: number): XmlElement;
 //#endregion
-export { CELL_TAG, COLUMN_REPEAT_ATTR, COLUMN_TAG, COVERED_CELL_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG, ROW_REPEAT_ATTR, ROW_TAG, RunMember, collectRunMembers, ensureColumnCoverage, isCellOrCoveredCell, isElementWithTag, readRunRepeatCount, replaceRun, resolveCellNode };
+export { COLUMN_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG, ensureColumnCoverage, resolveCellNode };

package/dist/edit/ods/address.js

@@ -1,92 +1,9 @@
 import { el } from "../../xml/fragment.js";
+import { CELL_TAG, COLUMN_REPEAT_ATTR, ROW_REPEAT_ATTR, ROW_TAG, collectRunMembers, isCellOrCoveredCell, isElementWithTag, readRunRepeatCount, replaceRun, validateIndex, withRepeatCount } from "../odf-repeated-runs.js";
 //#region src/edit/ods/address.ts
-const ROW_TAG = "table:table-row";
 const COLUMN_TAG = "table:table-column";
-const CELL_TAG = "table:table-cell";
-const COVERED_CELL_TAG = "table:covered-table-cell";
-const ROW_REPEAT_ATTR = "table:number-rows-repeated";
-const COLUMN_REPEAT_ATTR = "table:number-columns-repeated";
 const HEADER_ROWS_TAG = "table:table-header-rows";
 const HEADER_COLUMNS_TAG = "table:table-header-columns";
-function isElementWithTag(tag) {
-	return (node) => node.type === "element" && node.tag === tag;
-}
-function isCellOrCoveredCell(node) {
-	return node.type === "element" && (node.tag === "table:table-cell" || node.tag === "table:covered-table-cell");
-}
-function validateIndex(value, label) {
-	if (!Number.isInteger(value) || value < 0) throw new Error(`${label} must be a non-negative integer, got ${value}`);
-}
-function readRunRepeatCount(node, attrName) {
-	const raw = node.attributes.find((attribute) => attribute.name === attrName)?.value;
-	if (raw === void 0) return 1;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
-}
-function collectRunMembers(children, isMember, headerWrapperTag) {
-	const members = [];
-	children.forEach((node, outerPosition) => {
-		if (node.type !== "element") return;
-		if (headerWrapperTag !== void 0 && node.tag === headerWrapperTag) {
-			node.children.forEach((inner, innerPosition) => {
-				if (isMember(inner)) members.push({
-					node: inner,
-					container: node.children,
-					containerPosition: innerPosition,
-					outerPosition
-				});
-			});
-			return;
-		}
-		if (isMember(node)) members.push({
-			node,
-			container: children,
-			containerPosition: outerPosition,
-			outerPosition
-		});
-	});
-	return members;
-}
-function withRepeatCount(node, attrName, count) {
-	const clone = structuredClone(node);
-	clone.attributes = clone.attributes.filter((attribute) => attribute.name !== attrName);
-	if (count > 1) clone.attributes.push({
-		name: attrName,
-		value: String(count)
-	});
-	return clone;
-}
-function replaceRun(children, isMember, targetIndex, repeatAttr, buildEmpty, headerWrapperTag) {
-	validateIndex(targetIndex, "targetIndex");
-	const members = collectRunMembers(children, isMember, headerWrapperTag);
-	let cursor = 0;
-	for (const member of members) {
-		const count = readRunRepeatCount(member.node, repeatAttr);
-		if (targetIndex < cursor + count) {
-			const offset = targetIndex - cursor;
-			if (count === 1) return member.node;
-			const before = offset > 0 ? withRepeatCount(member.node, repeatAttr, offset) : void 0;
-			const target = withRepeatCount(member.node, repeatAttr, 1);
-			const replacement = [
-				before,
-				target,
-				count - offset - 1 > 0 ? withRepeatCount(member.node, repeatAttr, count - offset - 1) : void 0
-			].filter((candidate) => candidate !== void 0);
-			member.container.splice(member.containerPosition, 1, ...replacement);
-			return target;
-		}
-		cursor += count;
-	}
-	const gap = targetIndex - cursor;
-	const lastMember = members[members.length - 1];
-	const insertAt = lastMember === void 0 ? children.length : lastMember.outerPosition + 1;
-	const toInsert = [];
-	if (gap > 0) toInsert.push(withRepeatCount(buildEmpty(), repeatAttr, gap));
-	const target = buildEmpty();
-	toInsert.push(target);
-	children.splice(insertAt, 0, ...toInsert);
-	return target;
-}
 function ensureColumnCoverage(tableElement, minCount) {
 	if (minCount <= 0) return;
 	const columnMembers = collectRunMembers(tableElement.children, isElementWithTag(COLUMN_TAG), HEADER_COLUMNS_TAG);
@@ -105,7 +22,8 @@ function resolveCellNode(tableElement, row, column) {
 	validateIndex(row, "row");
 	validateIndex(column, "column");
 	ensureColumnCoverage(tableElement, column + 1);
-	return replaceRun(replaceRun(tableElement.children, isElementWithTag(ROW_TAG), row, ROW_REPEAT_ATTR, () => el(ROW_TAG), HEADER_ROWS_TAG).children, isCellOrCoveredCell, column, COLUMN_REPEAT_ATTR, () => el(CELL_TAG));
+	const rowElement = replaceRun(tableElement.children, isElementWithTag(ROW_TAG), row, ROW_REPEAT_ATTR, () => el(ROW_TAG), HEADER_ROWS_TAG);
+	return replaceRun(rowElement.children, isCellOrCoveredCell, column, COLUMN_REPEAT_ATTR, () => el(CELL_TAG));
 }
 //#endregion
-export { CELL_TAG, COLUMN_REPEAT_ATTR, COLUMN_TAG, COVERED_CELL_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG, ROW_REPEAT_ATTR, ROW_TAG, collectRunMembers, ensureColumnCoverage, isCellOrCoveredCell, isElementWithTag, readRunRepeatCount, replaceRun, resolveCellNode };
+export { COLUMN_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG, ensureColumnCoverage, resolveCellNode };

package/dist/edit/ods/column-row.cjs

@@ -2,6 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_fragment = require("../../xml/fragment.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
 const require_edit_odt_automatic_styles = require("../odt/automatic-styles.cjs");
+const require_edit_odf_repeated_runs = require("../odf-repeated-runs.cjs");
 const require_edit_ods_address = require("./address.cjs");
 let ooxml_js = require("ooxml.js");
 let odf_js = require("odf.js");
@@ -32,7 +33,7 @@ function currentRowStyleProperties(pkg, rowElement) {
 }
 function applyColumnStyleProperties(pkg, tableElement, index, changes) {
 	require_edit_ods_address.ensureColumnCoverage(tableElement, index + 1);
-	const columnElement = require_edit_ods_address.replaceRun(tableElement.children, require_edit_ods_address.isElementWithTag(require_edit_ods_address.COLUMN_TAG), index, require_edit_ods_address.COLUMN_REPEAT_ATTR, () => require_xml_fragment.el(require_edit_ods_address.COLUMN_TAG), require_edit_ods_address.HEADER_COLUMNS_TAG);
+	const columnElement = require_edit_odf_repeated_runs.replaceRun(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag(require_edit_ods_address.COLUMN_TAG), index, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR, () => require_xml_fragment.el(require_edit_ods_address.COLUMN_TAG), require_edit_ods_address.HEADER_COLUMNS_TAG);
 	const current = currentColumnStyleProperties(pkg, columnElement);
 	const widthPt = changes.widthPt ?? current.widthPt;
 	const manualBreak = changes.manualBreak ?? current.manualBreak;
@@ -48,7 +49,7 @@ function applyColumnStyleProperties(pkg, tableElement, index, changes) {
 	require_xml_edit.setAttr(columnElement, "table:style-name", styleName);
 }
 function applyRowStyleProperties(pkg, tableElement, index, changes) {
-	const rowElement = require_edit_ods_address.replaceRun(tableElement.children, require_edit_ods_address.isElementWithTag(require_edit_ods_address.ROW_TAG), index, require_edit_ods_address.ROW_REPEAT_ATTR, () => require_xml_fragment.el(require_edit_ods_address.ROW_TAG), require_edit_ods_address.HEADER_ROWS_TAG);
+	const rowElement = require_edit_odf_repeated_runs.replaceRun(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag(require_edit_odf_repeated_runs.ROW_TAG), index, require_edit_odf_repeated_runs.ROW_REPEAT_ATTR, () => require_xml_fragment.el(require_edit_odf_repeated_runs.ROW_TAG), require_edit_ods_address.HEADER_ROWS_TAG);
 	const current = currentRowStyleProperties(pkg, rowElement);
 	const heightPt = changes.heightPt ?? current.heightPt;
 	const manualBreak = changes.manualBreak ?? current.manualBreak;
@@ -71,10 +72,10 @@ function writeRowHeight(pkg, tableElement, index, heightPt) {
 }
 function ensureColumnDefaultWidth(pkg, tableElement, index) {
 	require_edit_ods_address.ensureColumnCoverage(tableElement, index + 1);
-	if (currentColumnStyleProperties(pkg, require_edit_ods_address.replaceRun(tableElement.children, require_edit_ods_address.isElementWithTag("table:table-column"), index, "table:number-columns-repeated", () => require_xml_fragment.el("table:table-column"), "table:table-header-columns")).widthPt === void 0) writeColumnWidth(pkg, tableElement, index, DEFAULT_COLUMN_WIDTH_PT);
+	if (currentColumnStyleProperties(pkg, require_edit_odf_repeated_runs.replaceRun(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag("table:table-column"), index, "table:number-columns-repeated", () => require_xml_fragment.el("table:table-column"), "table:table-header-columns")).widthPt === void 0) writeColumnWidth(pkg, tableElement, index, DEFAULT_COLUMN_WIDTH_PT);
 }
 function ensureRowDefaultHeight(pkg, tableElement, index) {
-	if (currentRowStyleProperties(pkg, require_edit_ods_address.replaceRun(tableElement.children, require_edit_ods_address.isElementWithTag("table:table-row"), index, "table:number-rows-repeated", () => require_xml_fragment.el("table:table-row"), "table:table-header-rows")).heightPt === void 0) writeRowHeight(pkg, tableElement, index, DEFAULT_ROW_HEIGHT_PT);
+	if (currentRowStyleProperties(pkg, require_edit_odf_repeated_runs.replaceRun(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag("table:table-row"), index, "table:number-rows-repeated", () => require_xml_fragment.el("table:table-row"), "table:table-header-rows")).heightPt === void 0) writeRowHeight(pkg, tableElement, index, DEFAULT_ROW_HEIGHT_PT);
 }
 function ensureColumnElementDefaultWidth(pkg, columnElement) {
 	if (currentColumnStyleProperties(pkg, columnElement).widthPt !== void 0) return;
@@ -104,13 +105,13 @@ function writeRowManualBreak(pkg, tableElement, index) {
 }
 function writeColumnHidden(pkg, tableElement, index, hidden) {
 	ensureColumnDefaultWidth(pkg, tableElement, index);
-	const columnElement = require_edit_ods_address.replaceRun(tableElement.children, require_edit_ods_address.isElementWithTag(require_edit_ods_address.COLUMN_TAG), index, require_edit_ods_address.COLUMN_REPEAT_ATTR, () => require_xml_fragment.el(require_edit_ods_address.COLUMN_TAG), require_edit_ods_address.HEADER_COLUMNS_TAG);
+	const columnElement = require_edit_odf_repeated_runs.replaceRun(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag(require_edit_ods_address.COLUMN_TAG), index, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR, () => require_xml_fragment.el(require_edit_ods_address.COLUMN_TAG), require_edit_ods_address.HEADER_COLUMNS_TAG);
 	if (hidden) require_xml_edit.setAttr(columnElement, VISIBILITY_ATTR, VISIBILITY_COLLAPSE);
 	else require_xml_edit.removeAttr(columnElement, VISIBILITY_ATTR);
 }
 function writeRowHidden(pkg, tableElement, index, hidden) {
 	ensureRowDefaultHeight(pkg, tableElement, index);
-	const rowElement = require_edit_ods_address.replaceRun(tableElement.children, require_edit_ods_address.isElementWithTag(require_edit_ods_address.ROW_TAG), index, require_edit_ods_address.ROW_REPEAT_ATTR, () => require_xml_fragment.el(require_edit_ods_address.ROW_TAG), require_edit_ods_address.HEADER_ROWS_TAG);
+	const rowElement = require_edit_odf_repeated_runs.replaceRun(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag(require_edit_odf_repeated_runs.ROW_TAG), index, require_edit_odf_repeated_runs.ROW_REPEAT_ATTR, () => require_xml_fragment.el(require_edit_odf_repeated_runs.ROW_TAG), require_edit_ods_address.HEADER_ROWS_TAG);
 	if (hidden) require_xml_edit.setAttr(rowElement, VISIBILITY_ATTR, VISIBILITY_COLLAPSE);
 	else require_xml_edit.removeAttr(rowElement, VISIBILITY_ATTR);
 }

package/dist/edit/ods/column-row.js

@@ -1,7 +1,8 @@
 import { el } from "../../xml/fragment.js";
 import { directChildElement, removeAttr, setAttr } from "../../xml/edit.js";
 import { ensureAutomaticStyles, nextStyleName } from "../odt/automatic-styles.js";
-import { COLUMN_REPEAT_ATTR, COLUMN_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG, ROW_REPEAT_ATTR, ROW_TAG, ensureColumnCoverage, isElementWithTag, replaceRun } from "./address.js";
+import { COLUMN_REPEAT_ATTR, ROW_REPEAT_ATTR, ROW_TAG, isElementWithTag, replaceRun } from "../odf-repeated-runs.js";
+import { COLUMN_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG, ensureColumnCoverage } from "./address.js";
 import { attr } from "ooxml.js";
 import { findStyleElement, formatOdfLength, parseOdfLength } from "odf.js";
 //#region src/edit/ods/column-row.ts

package/dist/edit/ods/floating.cjs

@@ -3,6 +3,7 @@ const require_xml_fragment = require("../../xml/fragment.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
 const require_odf_package_formula = require("../../odf-package/formula.cjs");
 const require_odf_package_media = require("../../odf-package/media.cjs");
+const require_edit_odf_repeated_runs = require("../odf-repeated-runs.cjs");
 const require_edit_ods_address = require("./address.cjs");
 let ooxml_js = require("ooxml.js");
 let odf_js = require("odf.js");
@@ -39,9 +40,9 @@ function resolvedRowHeightPt(pkg, rowElement) {
 function cumulativeColumnOffsetPt(pkg, tableElement, anchorColumn) {
 	let cursor = 0;
 	let offsetPt = 0;
-	for (const member of require_edit_ods_address.collectRunMembers(tableElement.children, require_edit_ods_address.isElementWithTag(require_edit_ods_address.COLUMN_TAG), require_edit_ods_address.HEADER_COLUMNS_TAG)) {
+	for (const member of require_edit_odf_repeated_runs.collectRunMembers(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag(require_edit_ods_address.COLUMN_TAG), require_edit_ods_address.HEADER_COLUMNS_TAG)) {
 		if (cursor >= anchorColumn) break;
-		const count = require_edit_ods_address.readRunRepeatCount(member.node, require_edit_ods_address.COLUMN_REPEAT_ATTR);
+		const count = require_edit_odf_repeated_runs.readRunRepeatCount(member.node, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR);
 		const overlap = Math.min(count, anchorColumn - cursor);
 		offsetPt += overlap * resolvedColumnWidthPt(pkg, member.node);
 		cursor += count;
@@ -52,9 +53,9 @@ function cumulativeColumnOffsetPt(pkg, tableElement, anchorColumn) {
 function cumulativeRowOffsetPt(pkg, tableElement, anchorRow) {
 	let cursor = 0;
 	let offsetPt = 0;
-	for (const member of require_edit_ods_address.collectRunMembers(tableElement.children, require_edit_ods_address.isElementWithTag(require_edit_ods_address.ROW_TAG), require_edit_ods_address.HEADER_ROWS_TAG)) {
+	for (const member of require_edit_odf_repeated_runs.collectRunMembers(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag(require_edit_odf_repeated_runs.ROW_TAG), require_edit_ods_address.HEADER_ROWS_TAG)) {
 		if (cursor >= anchorRow) break;
-		const count = require_edit_ods_address.readRunRepeatCount(member.node, require_edit_ods_address.ROW_REPEAT_ATTR);
+		const count = require_edit_odf_repeated_runs.readRunRepeatCount(member.node, require_edit_odf_repeated_runs.ROW_REPEAT_ATTR);
 		const overlap = Math.min(count, anchorRow - cursor);
 		offsetPt += overlap * resolvedRowHeightPt(pkg, member.node);
 		cursor += count;

package/dist/edit/ods/floating.js

@@ -2,7 +2,8 @@ import { el } from "../../xml/fragment.js";
 import { directChildElement } from "../../xml/edit.js";
 import { addFormulaObject } from "../../odf-package/formula.js";
 import { addImageMedia } from "../../odf-package/media.js";
-import { COLUMN_REPEAT_ATTR, COLUMN_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG, ROW_REPEAT_ATTR, ROW_TAG, collectRunMembers, isElementWithTag, readRunRepeatCount } from "./address.js";
+import { COLUMN_REPEAT_ATTR, ROW_REPEAT_ATTR, ROW_TAG, collectRunMembers, isElementWithTag, readRunRepeatCount } from "../odf-repeated-runs.js";
+import { COLUMN_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG } from "./address.js";
 import { attr } from "ooxml.js";
 import { base64ToBytes as base64ToBytes$1, findStyleElement, formatOdfLength, parseOdfLength, writeEmbeddedObject } from "odf.js";
 //#region src/edit/ods/floating.ts

package/dist/edit/ods/print-settings.cjs

@@ -2,6 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_fragment = require("../../xml/fragment.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
 const require_edit_odt_automatic_styles = require("../odt/automatic-styles.cjs");
+const require_edit_odf_repeated_runs = require("../odf-repeated-runs.cjs");
 const require_edit_ods_address = require("./address.cjs");
 const require_edit_ods_column_row = require("./column-row.cjs");
 let ooxml_js = require("ooxml.js");
@@ -56,12 +57,12 @@ function scanTableStructure(pkg, tableElement) {
 	const manualBreakRows = [];
 	function processColumn(columnElement) {
 		if (hasManualBreak(pkg, columnElement, "table-column", "style:table-column-properties")) manualBreakColumns.push(columnCursor);
-		columnCursor += require_edit_ods_address.readRunRepeatCount(columnElement, require_edit_ods_address.COLUMN_REPEAT_ATTR);
+		columnCursor += require_edit_odf_repeated_runs.readRunRepeatCount(columnElement, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR);
 	}
 	function processRow(rowElement) {
 		const startIndex = rowCursor;
 		if (hasManualBreak(pkg, rowElement, "table-row", "style:table-row-properties")) manualBreakRows.push(startIndex);
-		rowCursor += require_edit_ods_address.readRunRepeatCount(rowElement, require_edit_ods_address.ROW_REPEAT_ATTR);
+		rowCursor += require_edit_odf_repeated_runs.readRunRepeatCount(rowElement, require_edit_odf_repeated_runs.ROW_REPEAT_ATTR);
 	}
 	for (const child of tableElement.children) {
 		if (child.type !== "element") continue;
@@ -174,7 +175,7 @@ function collectRangeElements(children, tag, repeatAttr, start, end) {
 	const found = [];
 	children.forEach((node, position) => {
 		if (node.type !== "element" || node.tag !== tag) return;
-		const count = require_edit_ods_address.readRunRepeatCount(node, repeatAttr);
+		const count = require_edit_odf_repeated_runs.readRunRepeatCount(node, repeatAttr);
 		if (cursor >= start && cursor + count - 1 <= end) found.push({
 			position,
 			element: node
@@ -184,8 +185,8 @@ function collectRangeElements(children, tag, repeatAttr, start, end) {
 	return found;
 }
 function wrapRepeatRange(tableElement, memberTag, repeatAttr, wrapperTag, range, buildEmpty, pkg) {
-	require_edit_ods_address.replaceRun(tableElement.children, require_edit_ods_address.isElementWithTag(memberTag), range.start, repeatAttr, buildEmpty);
-	require_edit_ods_address.replaceRun(tableElement.children, require_edit_ods_address.isElementWithTag(memberTag), range.end, repeatAttr, buildEmpty);
+	require_edit_odf_repeated_runs.replaceRun(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag(memberTag), range.start, repeatAttr, buildEmpty);
+	require_edit_odf_repeated_runs.replaceRun(tableElement.children, require_edit_odf_repeated_runs.isElementWithTag(memberTag), range.end, repeatAttr, buildEmpty);
 	for (const entry of collectRangeElements(tableElement.children, memberTag, repeatAttr, 0, range.end)) if (memberTag === "table:table-column") require_edit_ods_column_row.ensureColumnElementDefaultWidth(pkg, entry.element);
 	else require_edit_ods_column_row.ensureRowElementDefaultHeight(pkg, entry.element);
 	const found = collectRangeElements(tableElement.children, memberTag, repeatAttr, range.start, range.end);
@@ -235,9 +236,9 @@ function writeSheetPrintSettings(pkg, tableElement, settings) {
 		require_xml_edit.setAttr(tableElement, "table:print-ranges", formatPrintRange(sheetName, settings.printRange));
 	}
 	unwrapHeaderGroup(tableElement, require_edit_ods_address.HEADER_COLUMNS_TAG);
-	if (settings.repeatColumns !== void 0) wrapRepeatRange(tableElement, require_edit_ods_address.COLUMN_TAG, require_edit_ods_address.COLUMN_REPEAT_ATTR, require_edit_ods_address.HEADER_COLUMNS_TAG, settings.repeatColumns, () => require_xml_fragment.el(require_edit_ods_address.COLUMN_TAG), pkg);
+	if (settings.repeatColumns !== void 0) wrapRepeatRange(tableElement, require_edit_ods_address.COLUMN_TAG, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR, require_edit_ods_address.HEADER_COLUMNS_TAG, settings.repeatColumns, () => require_xml_fragment.el(require_edit_ods_address.COLUMN_TAG), pkg);
 	unwrapHeaderGroup(tableElement, require_edit_ods_address.HEADER_ROWS_TAG);
-	if (settings.repeatRows !== void 0) wrapRepeatRange(tableElement, require_edit_ods_address.ROW_TAG, require_edit_ods_address.ROW_REPEAT_ATTR, require_edit_ods_address.HEADER_ROWS_TAG, settings.repeatRows, () => require_xml_fragment.el(require_edit_ods_address.ROW_TAG), pkg);
+	if (settings.repeatRows !== void 0) wrapRepeatRange(tableElement, require_edit_odf_repeated_runs.ROW_TAG, require_edit_odf_repeated_runs.ROW_REPEAT_ATTR, require_edit_ods_address.HEADER_ROWS_TAG, settings.repeatRows, () => require_xml_fragment.el(require_edit_odf_repeated_runs.ROW_TAG), pkg);
 	if (settings.manualBreaks !== void 0) {
 		for (const columnIndex of settings.manualBreaks.columns) require_edit_ods_column_row.writeColumnManualBreak(pkg, tableElement, columnIndex);
 		for (const rowIndex of settings.manualBreaks.rows) require_edit_ods_column_row.writeRowManualBreak(pkg, tableElement, rowIndex);

package/dist/edit/ods/print-settings.js

@@ -1,7 +1,8 @@
 import { el } from "../../xml/fragment.js";
 import { setAttr } from "../../xml/edit.js";
 import { nextStyleName } from "../odt/automatic-styles.js";
-import { COLUMN_REPEAT_ATTR, COLUMN_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG, ROW_REPEAT_ATTR, ROW_TAG, isElementWithTag, readRunRepeatCount, replaceRun } from "./address.js";
+import { COLUMN_REPEAT_ATTR, ROW_REPEAT_ATTR, ROW_TAG, isElementWithTag, readRunRepeatCount, replaceRun } from "../odf-repeated-runs.js";
+import { COLUMN_TAG, HEADER_COLUMNS_TAG, HEADER_ROWS_TAG } from "./address.js";
 import { ensureColumnElementDefaultWidth, ensureRowElementDefaultHeight, writeColumnManualBreak, writeRowManualBreak } from "./column-row.js";
 import { attr } from "ooxml.js";
 import { PAGE_SIZE_A4, cellReference, parseCellReference } from "document-schema.js";

package/dist/edit/ods/sheet.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_edit = require("../../xml/edit.cjs");
+const require_edit_odf_repeated_runs = require("../odf-repeated-runs.cjs");
 const require_edit_ods_address = require("./address.cjs");
 const require_edit_ods_cell = require("./cell.cjs");
 const require_edit_ods_column_row = require("./column-row.cjs");
@@ -86,7 +87,7 @@ var OdsSheet = class {
 		for (let rowOffset = 0; rowOffset < rowSpan; rowOffset++) for (let columnOffset = 0; columnOffset < colSpan; columnOffset++) {
 			if (rowOffset === 0 && columnOffset === 0) continue;
 			const coveredNode = require_edit_ods_address.resolveCellNode(tableElement, startRow + rowOffset, startColumn + columnOffset);
-			coveredNode.tag = require_edit_ods_address.COVERED_CELL_TAG;
+			coveredNode.tag = require_edit_odf_repeated_runs.COVERED_CELL_TAG;
 			coveredNode.attributes = [];
 			coveredNode.children = [];
 		}

package/dist/edit/ods/sheet.js

@@ -1,5 +1,6 @@
 import { removeChild, setAttr } from "../../xml/edit.js";
-import { COVERED_CELL_TAG, resolveCellNode } from "./address.js";
+import { COVERED_CELL_TAG } from "../odf-repeated-runs.js";
+import { resolveCellNode } from "./address.js";
 import { OdsCell } from "./cell.js";
 import { ensureColumnDefaultWidth, ensureRowDefaultHeight, writeColumnHidden, writeColumnWidth, writeRowHeight, writeRowHidden } from "./column-row.js";
 import { insertSheetEmbeddedObject, insertSheetImage } from "./floating.js";

package/dist/edit/odt/table.cjs

@@ -4,6 +4,7 @@ const require_xml_edit = require("../../xml/edit.cjs");
 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");
+const require_edit_odf_repeated_runs = require("../odf-repeated-runs.cjs");
 let ooxml_js = require("ooxml.js");
 let document_schema_js = require("document-schema.js");
 let odf_js = require("odf.js");
@@ -250,16 +251,41 @@ function retagAsCovered(element) {
 	element.attributes = element.attributes.filter((attribute) => attribute.name === COVERED_CELL_KEPT_ATTRIBUTE);
 	element.children = [];
 }
-function gridCellElements(row) {
+function gridColumnElements(row) {
 	const out = [];
-	for (const child of row.children) if (child.type === "element" && (child.tag === "table:table-cell" || child.tag === "table:covered-table-cell")) out.push(child);
+	let columnIndex = 0;
+	for (const member of require_edit_odf_repeated_runs.collectRunMembers(row.children, require_edit_odf_repeated_runs.isCellOrCoveredCell, void 0)) {
+		const repeat = require_edit_odf_repeated_runs.readRunRepeatCount(member.node, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR);
+		for (let offset = 0; offset < repeat; offset++) out.push({
+			columnIndex: columnIndex + offset,
+			element: member.node
+		});
+		columnIndex += repeat;
+	}
 	return out;
 }
+function rowGridColumnCount(row) {
+	return require_edit_odf_repeated_runs.collectRunMembers(row.children, require_edit_odf_repeated_runs.isCellOrCoveredCell, void 0).reduce((sum, member) => sum + require_edit_odf_repeated_runs.readRunRepeatCount(member.node, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR), 0);
+}
+function locateGridColumnElement(row, columnIndex) {
+	if (columnIndex < 0) return;
+	let cursor = 0;
+	for (const member of require_edit_odf_repeated_runs.collectRunMembers(row.children, require_edit_odf_repeated_runs.isCellOrCoveredCell, void 0)) {
+		const count = require_edit_odf_repeated_runs.readRunRepeatCount(member.node, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR);
+		if (columnIndex < cursor + count) return member.node;
+		cursor += count;
+	}
+}
+function individuateGridColumn(row, columnIndex) {
+	return require_edit_odf_repeated_runs.replaceRun(row.children, require_edit_odf_repeated_runs.isCellOrCoveredCell, columnIndex, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR, () => {
+		throw new Error(`individuateGridColumn: column ${columnIndex} has no existing element to individuate in this row -- callers must bounds-check against rowGridColumnCount first`);
+	});
+}
 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) => {
+	return gridColumnElements(row).flatMap(({ columnIndex, element }) => {
 		if (element.tag !== "table:table-cell") return [];
 		const cell = new OdtTableCell(element, pkg);
 		return [{
@@ -275,7 +301,7 @@ function resolveOdtGrid(table, pkg) {
 	let declaredColumns = 0;
 	for (const child of table.children) {
 		if (child.type !== "element") continue;
-		if (child.tag === "table:table-column") declaredColumns++;
+		if (child.tag === "table:table-column") declaredColumns += require_edit_odf_repeated_runs.readRunRepeatCount(child, require_edit_odf_repeated_runs.COLUMN_REPEAT_ATTR);
 		else if (child.tag === "table:table-row") placedRows.push(placedCells(child, pkg));
 	}
 	return require_edit_table_grid.resolveLiveTableGrid(placedRows, declaredColumns);
@@ -319,14 +345,15 @@ function refuseMerge(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 anchorElement = locateGridColumnElement(anchorRow, target.column);
+	if (anchorElement === 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`);
+	for (const [offset, row] of rows.entries()) {
+		const totalColumns = rowGridColumnCount(row);
+		if (endColumn > totalColumns) return refuseMerge(target.row + offset, `colSpan ${target.columnSpan} starting at column ${target.column} exceeds this row's own ${totalColumns} grid columns`);
+	}
 	const regions = anchorRegions(resolveOdtGrid(table, pkg));
-	if (anchor.tag === "table:covered-table-cell") {
+	if (anchorElement.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)}`);
 	}
@@ -335,14 +362,26 @@ function planMerge(table, pkg, target, rows) {
 		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`);
 	}
+	const consumed = [];
+	for (let column = target.column + 1; column < endColumn; column++) consumed.push({
+		row: anchorRow,
+		column
+	});
+	for (const row of coveredRows) for (let column = target.column; column < endColumn; column++) consumed.push({
+		row,
+		column
+	});
 	return {
-		anchor,
-		consumed: [...anchorCells.slice(target.column + 1, endColumn), ...coveredCells.flatMap((cells) => cells.slice(target.column, endColumn))]
+		anchor: {
+			row: anchorRow,
+			column: target.column
+		},
+		consumed
 	};
 }
 function applyMerge(plan, target, pkg) {
-	for (const element of plan.consumed) retagAsCovered(element);
-	const anchor = new OdtTableCell(plan.anchor, pkg);
+	for (const position of plan.consumed) retagAsCovered(individuateGridColumn(position.row, position.column));
+	const anchor = new OdtTableCell(individuateGridColumn(plan.anchor.row, plan.anchor.column), pkg);
 	anchor.colSpan = target.columnSpan;
 	if (target.rowSpan > 1) anchor.rowSpan = target.rowSpan;
 	return anchor;
@@ -402,12 +441,12 @@ var OdtTableRow = class {
 		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 totalColumns = rowGridColumnCount(this.node);
+		if (columnIndex < 0 || columnIndex >= totalColumns) 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);
+		retagAsCovered(individuateGridColumn(this.node, columnIndex));
 	}
 };
 function buildCell(pkg) {

package/dist/edit/odt/table.js

@@ -3,6 +3,7 @@ import { removeAttr, removeChild, setAttr } from "../../xml/edit.js";
 import { resolveLiveTableGrid } from "../table-grid.js";
 import { ensureAutomaticStyles, nextStyleName } from "./automatic-styles.js";
 import { OdtParagraph, buildParagraph } from "./paragraph.js";
+import { COLUMN_REPEAT_ATTR, collectRunMembers, isCellOrCoveredCell, readRunRepeatCount, replaceRun } from "../odf-repeated-runs.js";
 import { attr } from "ooxml.js";
 import { tableCellColumnSpan, tableCellRowSpan } from "document-schema.js";
 import { findStyleElement, formatOdfColor, formatOdfLength, parseOdfColor, parseOdfLength } from "odf.js";
@@ -249,16 +250,41 @@ function retagAsCovered(element) {
 	element.attributes = element.attributes.filter((attribute) => attribute.name === COVERED_CELL_KEPT_ATTRIBUTE);
 	element.children = [];
 }
-function gridCellElements(row) {
+function gridColumnElements(row) {
 	const out = [];
-	for (const child of row.children) if (child.type === "element" && (child.tag === "table:table-cell" || child.tag === "table:covered-table-cell")) out.push(child);
+	let columnIndex = 0;
+	for (const member of collectRunMembers(row.children, isCellOrCoveredCell, void 0)) {
+		const repeat = readRunRepeatCount(member.node, COLUMN_REPEAT_ATTR);
+		for (let offset = 0; offset < repeat; offset++) out.push({
+			columnIndex: columnIndex + offset,
+			element: member.node
+		});
+		columnIndex += repeat;
+	}
 	return out;
 }
+function rowGridColumnCount(row) {
+	return collectRunMembers(row.children, isCellOrCoveredCell, void 0).reduce((sum, member) => sum + readRunRepeatCount(member.node, COLUMN_REPEAT_ATTR), 0);
+}
+function locateGridColumnElement(row, columnIndex) {
+	if (columnIndex < 0) return;
+	let cursor = 0;
+	for (const member of collectRunMembers(row.children, isCellOrCoveredCell, void 0)) {
+		const count = readRunRepeatCount(member.node, COLUMN_REPEAT_ATTR);
+		if (columnIndex < cursor + count) return member.node;
+		cursor += count;
+	}
+}
+function individuateGridColumn(row, columnIndex) {
+	return replaceRun(row.children, isCellOrCoveredCell, columnIndex, COLUMN_REPEAT_ATTR, () => {
+		throw new Error(`individuateGridColumn: column ${columnIndex} has no existing element to individuate in this row -- callers must bounds-check against rowGridColumnCount first`);
+	});
+}
 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) => {
+	return gridColumnElements(row).flatMap(({ columnIndex, element }) => {
 		if (element.tag !== "table:table-cell") return [];
 		const cell = new OdtTableCell(element, pkg);
 		return [{
@@ -274,7 +300,7 @@ function resolveOdtGrid(table, pkg) {
 	let declaredColumns = 0;
 	for (const child of table.children) {
 		if (child.type !== "element") continue;
-		if (child.tag === "table:table-column") declaredColumns++;
+		if (child.tag === "table:table-column") declaredColumns += readRunRepeatCount(child, COLUMN_REPEAT_ATTR);
 		else if (child.tag === "table:table-row") placedRows.push(placedCells(child, pkg));
 	}
 	return resolveLiveTableGrid(placedRows, declaredColumns);
@@ -318,14 +344,15 @@ function refuseMerge(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 anchorElement = locateGridColumnElement(anchorRow, target.column);
+	if (anchorElement === 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`);
+	for (const [offset, row] of rows.entries()) {
+		const totalColumns = rowGridColumnCount(row);
+		if (endColumn > totalColumns) return refuseMerge(target.row + offset, `colSpan ${target.columnSpan} starting at column ${target.column} exceeds this row's own ${totalColumns} grid columns`);
+	}
 	const regions = anchorRegions(resolveOdtGrid(table, pkg));
-	if (anchor.tag === "table:covered-table-cell") {
+	if (anchorElement.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)}`);
 	}
@@ -334,14 +361,26 @@ function planMerge(table, pkg, target, rows) {
 		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`);
 	}
+	const consumed = [];
+	for (let column = target.column + 1; column < endColumn; column++) consumed.push({
+		row: anchorRow,
+		column
+	});
+	for (const row of coveredRows) for (let column = target.column; column < endColumn; column++) consumed.push({
+		row,
+		column
+	});
 	return {
-		anchor,
-		consumed: [...anchorCells.slice(target.column + 1, endColumn), ...coveredCells.flatMap((cells) => cells.slice(target.column, endColumn))]
+		anchor: {
+			row: anchorRow,
+			column: target.column
+		},
+		consumed
 	};
 }
 function applyMerge(plan, target, pkg) {
-	for (const element of plan.consumed) retagAsCovered(element);
-	const anchor = new OdtTableCell(plan.anchor, pkg);
+	for (const position of plan.consumed) retagAsCovered(individuateGridColumn(position.row, position.column));
+	const anchor = new OdtTableCell(individuateGridColumn(plan.anchor.row, plan.anchor.column), pkg);
 	anchor.colSpan = target.columnSpan;
 	if (target.rowSpan > 1) anchor.rowSpan = target.rowSpan;
 	return anchor;
@@ -401,12 +440,12 @@ var OdtTableRow = class {
 		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 totalColumns = rowGridColumnCount(this.node);
+		if (columnIndex < 0 || columnIndex >= totalColumns) 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);
+		retagAsCovered(individuateGridColumn(this.node, columnIndex));
 	}
 };
 function buildCell(pkg) {

package/package.json

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