@stll/folio-core 0.45.0 → 0.47.0

package/dist/ai-edits/apply.js

@@ -1,3 +1,4 @@
+import { paragraphNumberingReference, paragraphNumberingReferenceId } from "../docx/numberingReference.js";
 import { formattingEquals } from "../docx/runConsolidator.js";
 import { expectParagraphAttrs, expectRunPropertyChangeMarkAttrs } from "../prosemirror/attrs/index.js";
 import { hasSerializableParagraphPropertyChange, paragraphPropertiesSnapshot } from "../prosemirror/commands/propertyChangeScope.js";
@@ -5,11 +6,13 @@ import { addedBreakCarrierBefore, finalParagraphsOf, paragraphEndsItsContainer }
 import { requestDeterministicParaIds } from "../prosemirror/extensions/features/ParaIdAllocatorExtension.js";
 import { markStructuralChange } from "../prosemirror/extensions/features/ParagraphChangeTrackerExtension.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../prosemirror/listMarker.js";
+import { paragraphNumberingAttr, readParagraphNumberingAttr } from "../prosemirror/numberingAttr.js";
 import { directParagraphAlignment } from "../prosemirror/paragraphAlignment.js";
 import { directParagraphIndentation, paragraphIndentationAttrPatch, paragraphIndentationEqual, paragraphIndentationFromFormatting, withDirectParagraphIndentation } from "../prosemirror/paragraphIndentation.js";
 import { directParagraphSpacing, paragraphSpacingAttrPatch, paragraphSpacingEqual, paragraphSpacingFromFormatting, withDirectParagraphSpacing } from "../prosemirror/paragraphSpacing.js";
 import { getDocumentNumbering } from "../prosemirror/plugins/documentNumbering.js";
 import { getDocumentStyleResolver } from "../prosemirror/plugins/documentStyles.js";
+import { addCarriedMarks, annotatedReplacement, hasReplacedAnnotations, inheritedReplacementMarks, surveyReplacedAnnotations } from "../prosemirror/replacedAnnotations.js";
 import { applyMarksToRunFormattingRepresentation, runFormattingInlineControlNodeName, selectRunFormattingCarrierRepresentations } from "../prosemirror/runFormattingInlineCarriers.js";
 import { readAuthoredRunFormatting, reconcileRunFormattingMarks } from "../prosemirror/runFormattingReconciliation.js";
 import { paragraphRunStyleContext, paragraphRunStyleContextAt } from "../prosemirror/runStyleFormatting.js";
@@ -187,26 +190,25 @@ const paragraphPropertiesPatch = ({ node, properties, resolvedFormattingFromStyl
 			ilvl: properties.numbering.level
 		}, numbering));
 		if (properties.listLevel === null) {
-			patch["numPr"] = { numId: properties.numbering.numId };
+			patch["numPr"] = paragraphNumberingAttr(paragraphNumberingReference({ numId: properties.numbering.numId }));
 			patch["numPrFromStyle"] = null;
 		}
 	}
-	else if (properties.listLevel !== void 0) {
-		const numPr = node.attrs["numPr"];
-		if (properties.listLevel === null) {
-			patch["numPr"] = null;
-			Object.assign(patch, CLEARED_LIST_RENDERING_ATTRS);
-		} else {
-			const numId = typeof numPr === "object" && numPr !== null && "numId" in numPr ? numPr.numId : void 0;
-			if (typeof numId === "number") Object.assign(patch, listLevelAttrPatch(attrs, {
-				numId,
+	else if (properties.listLevel !== void 0) if (properties.listLevel === null) {
+		patch["numPr"] = null;
+		Object.assign(patch, CLEARED_LIST_RENDERING_ATTRS);
+	} else {
+		const numId = paragraphNumberingReferenceId(readParagraphNumberingAttr(node.attrs["numPr"]) ?? void 0);
+		if (numId === void 0) {
+			patch["numPr"] = paragraphNumberingAttr({
+				kind: "levelOnly",
 				ilvl: properties.listLevel
-			}, numbering));
-			else {
-				patch["numPr"] = { ilvl: properties.listLevel };
-				Object.assign(patch, CLEARED_LIST_RENDERING_ATTRS);
-			}
-		}
+			});
+			Object.assign(patch, CLEARED_LIST_RENDERING_ATTRS);
+		} else Object.assign(patch, listLevelAttrPatch(attrs, {
+			numId,
+			ilvl: properties.listLevel
+		}, numbering));
 	}
 	if (properties.alignment !== void 0 && (styleChanged || (currentDirectAlignment ?? null) !== properties.alignment)) {
 		originalFormatting ??= {};
@@ -949,6 +951,14 @@ const buildEmphasisInlineContent = (schema, text, baseMarks) => {
 	}
 	return nodes.length > 0 ? nodes : [schema.text(text, [...baseMarks])];
 };
+/**
+* Inline content for a block the applier rebuilds whole, carrying over the
+* annotations the block's old content held (see `replacedAnnotations`).
+*/
+const rebuiltBlockContent = ({ doc, blockFrom, blockTo, content }) => annotatedReplacement({
+	annotations: surveyReplacedAnnotations(doc, blockFrom + 1, blockTo - 1),
+	content: Fragment.fromArray([...content])
+}).fragment;
 const isBatchableParagraphInsertion = (item, mode) => {
 	if (item.operation.type !== "insertAfterBlock" && item.operation.type !== "insertBeforeBlock") return false;
 	if (item.commentText !== void 0) return false;
@@ -1143,23 +1153,24 @@ const buildInsertedParagraphs = ({ item, schema, formattingFromStyle, mode, auth
 					ilvl: explicitNumbering.level
 				}, numbering));
 				if (listLevel === null) {
-					attrs["numPr"] = { numId: explicitNumbering.numId };
+					attrs["numPr"] = paragraphNumberingAttr(paragraphNumberingReference({ numId: explicitNumbering.numId }));
 					attrs["numPrFromStyle"] = null;
 				}
 			} else if (listLevel === null) {
 				attrs["numPr"] = null;
 				Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
 			} else if (typeof listLevel === "number") {
-				const anchorNumPr = Reflect.get(baseAttrs, "numPr");
-				const numId = typeof anchorNumPr === "object" && anchorNumPr !== null && "numId" in anchorNumPr ? anchorNumPr.numId : void 0;
-				if (typeof numId === "number") Object.assign(attrs, listLevelAttrPatch(operation.inheritFormatting === false ? {} : expectParagraphAttrs(item.blockNode), {
+				const numId = paragraphNumberingReferenceId(readParagraphNumberingAttr(Reflect.get(baseAttrs, "numPr")) ?? void 0);
+				if (numId === void 0) {
+					attrs["numPr"] = paragraphNumberingAttr({
+						kind: "levelOnly",
+						ilvl: listLevel
+					});
+					Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
+				} else Object.assign(attrs, listLevelAttrPatch(operation.inheritFormatting === false ? {} : expectParagraphAttrs(item.blockNode), {
 					numId,
 					ilvl: listLevel
 				}, numbering));
-				else {
-					attrs["numPr"] = { ilvl: listLevel };
-					Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
-				}
 			}
 		}
 		if (formatsParagraph && operation.styleId !== void 0) {
@@ -1608,7 +1619,12 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations, mode =
 					const replacement = item.operation.text;
 					const paragraphType = view.state.schema.nodes["paragraph"];
 					if (paragraphType) {
-						const node = paragraphType.create(null, replacement.length === 0 ? null : buildEmphasisInlineContent(view.state.schema, replacement, commentMark ? [commentMark] : []));
+						const node = paragraphType.create(null, rebuiltBlockContent({
+							doc: tr.doc,
+							blockFrom: item.blockFrom,
+							blockTo: item.blockTo,
+							content: replacement.length === 0 ? [] : buildEmphasisInlineContent(view.state.schema, replacement, commentMark ? [commentMark] : [])
+						}));
 						tr = tr.replaceWith(item.blockFrom, item.blockTo, node);
 						tr = applyReplaceBlockStyleId({
 							item,
@@ -1619,7 +1635,12 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations, mode =
 					}
 				}
 				if (mode === "direct" && hasInlineEmphasis(item.operation.text)) {
-					const node = item.blockNode.type.create({ ...item.blockNode.attrs }, buildEmphasisInlineContent(view.state.schema, item.operation.text, commentMark ? [commentMark] : []));
+					const node = item.blockNode.type.create({ ...item.blockNode.attrs }, rebuiltBlockContent({
+						doc: tr.doc,
+						blockFrom: item.blockFrom,
+						blockTo: item.blockTo,
+						content: buildEmphasisInlineContent(view.state.schema, item.operation.text, commentMark ? [commentMark] : [])
+					}));
 					tr = tr.replaceWith(item.blockFrom, item.blockTo, node);
 					tr = applyReplaceBlockStyleId({
 						item,
@@ -2342,18 +2363,28 @@ const cleanTextInlineNodes = ({ schema, text, marks = [] }) => {
 	if (trailing.length > 0) nodes.push(schema.text(trailing, marks));
 	return nodes;
 };
-const insertCleanText = ({ tr, from, to, text }) => {
-	if (!hasCleanTextControls(text)) return {
+const insertCleanText = ({ tr, from, to, text, standsInFor }) => {
+	const annotations = surveyReplacedAnnotations(tr.doc, from, to);
+	const replaced = standsInFor ? surveyReplacedAnnotations(tr.doc, standsInFor.from, standsInFor.to).carried : [];
+	if (!hasReplacedAnnotations(annotations) && replaced.length === 0 && !hasCleanTextControls(text)) return {
 		transaction: tr.insertText(text, from, to),
+		start: from,
 		end: from + text.length
 	};
-	const content = Fragment.fromArray(cleanTextInlineNodes({
-		schema: tr.doc.type.schema,
-		text
-	}));
+	const schema = tr.doc.type.schema;
+	const { fragment, leadingSize, contentSize } = annotatedReplacement({
+		annotations,
+		content: Fragment.fromArray(cleanTextInlineNodes({
+			schema,
+			text,
+			marks: addCarriedMarks(inheritedReplacementMarks(tr.doc, from, to), replaced)
+		}))
+	});
+	const start = from + leadingSize;
 	return {
-		transaction: tr.replaceWith(from, to, content),
-		end: from + content.size
+		transaction: tr.replaceWith(from, to, fragment),
+		start,
+		end: start + contentSize
 	};
 };
 const applyTextReplacement = ({ tr, item, mode, author, date, revisionIdDelete, revisionIdInsert, commentMark, suggestionId = null, initials, diffText }) => {
@@ -2365,8 +2396,11 @@ const applyTextReplacement = ({ tr, item, mode, author, date, revisionIdDelete,
 	})());
 	if (mode === "direct") {
 		if ((item.operation.type === "replaceInBlock" || item.operation.type === "replaceRange") && hasInlineEmphasis(item.operation.replace)) {
-			const content = buildEmphasisInlineContent(nextTr.doc.type.schema, item.operation.replace, commentMark ? [commentMark] : []);
-			return nextTr.replaceWith(item.from, item.to, content);
+			const { fragment } = annotatedReplacement({
+				annotations: surveyReplacedAnnotations(nextTr.doc, item.from, item.to),
+				content: Fragment.fromArray(buildEmphasisInlineContent(nextTr.doc.type.schema, item.operation.replace, commentMark ? [commentMark] : []))
+			});
+			return nextTr.replaceWith(item.from, item.to, fragment);
 		}
 		const inserted = insertCleanText({
 			tr: nextTr,
@@ -2375,7 +2409,7 @@ const applyTextReplacement = ({ tr, item, mode, author, date, revisionIdDelete,
 			text: replacement
 		});
 		nextTr = inserted.transaction;
-		if (commentMark && replacement.length > 0) nextTr = nextTr.addMark(item.from, inserted.end, commentMark);
+		if (commentMark && replacement.length > 0) nextTr = nextTr.addMark(inserted.start, inserted.end, commentMark);
 		return nextTr;
 	}
 	const insertionType = nextTr.doc.type.schema.marks["insertion"];
@@ -2465,11 +2499,15 @@ const applyTextReplacement = ({ tr, item, mode, author, date, revisionIdDelete,
 						tr: nextTr,
 						from: step.at,
 						to: step.at,
-						text: step.text
+						text: step.text,
+						standsInFor: {
+							from: item.from,
+							to: item.to
+						}
 					});
 					nextTr = inserted.transaction;
-					nextTr = nextTr.addMark(step.at, inserted.end, insertionType.create(insAttrs));
-					if (commentMark) nextTr = nextTr.addMark(step.at, inserted.end, commentMark);
+					nextTr = nextTr.addMark(inserted.start, inserted.end, insertionType.create(insAttrs));
+					if (commentMark) nextTr = nextTr.addMark(inserted.start, inserted.end, commentMark);
 				}
 			}
 			return nextTr;
@@ -2480,11 +2518,15 @@ const applyTextReplacement = ({ tr, item, mode, author, date, revisionIdDelete,
 			tr: nextTr,
 			from: item.to,
 			to: item.to,
-			text: replacement
+			text: replacement,
+			standsInFor: {
+				from: item.from,
+				to: item.to
+			}
 		});
 		nextTr = inserted.transaction;
-		nextTr = nextTr.addMark(item.to, inserted.end, insertionType.create(insAttrs));
-		if (commentMark) nextTr = nextTr.addMark(item.to, inserted.end, commentMark);
+		nextTr = nextTr.addMark(inserted.start, inserted.end, insertionType.create(insAttrs));
+		if (commentMark) nextTr = nextTr.addMark(inserted.start, inserted.end, commentMark);
 	}
 	if (item.to > item.from && deletionType) {
 		nextTr = nextTr.addMark(item.from, item.to, deletionType.create(delAttrs));

package/dist/ai-edits/headless.js

@@ -35,9 +35,9 @@ import { createFolioAIEditSnapshotWithStyleResolver, detachFolioAIEditSnapshotEx
 import { matchTableGeometry } from "./table-geometry.js";
 import { tableTemplateCanCrossPackageLosslessly } from "./table-template.js";
 import { TaggedError, panic } from "better-result";
+import { REVIEW_CARRIERS } from "@stll/docx-core/model";
 import { Fragment } from "prosemirror-model";
 import { EditorState } from "prosemirror-state";
-import { REVIEW_CARRIERS } from "@stll/docx-core/model";
 import JSZip from "jszip";
 //#region src/ai-edits/headless.ts
 /**
@@ -1544,7 +1544,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* same states, so the text now describes exactly what a save would write.
 	*/
 	storyBlocks(state, source) {
-		return state ? proseDocToBlocks(state.doc, source.content, this.baseDocument.package.styles, { emptyFieldResult: "authored" }) : source.content;
+		return state ? proseDocToBlocks(state.doc, source.content, this.baseDocument.package.styles) : source.content;
 	}
 	getHeaderFooterStoryText(story, source) {
 		const state = this.secondaryStoryStates.get(headerFooterStoryKey(story))?.state;

package/dist/ai-edits/read.d.ts

@@ -25,6 +25,7 @@ declare const FOLIO_REVIEW_CHANGE_KINDS: Readonly<{
   readonly paragraphPropertiesChanged: "paragraphPropertiesChanged";
   readonly sectionPropertiesChanged: "sectionPropertiesChanged";
   readonly tablePropertiesChanged: "tablePropertiesChanged";
+  readonly tablePropertyExceptionsChanged: "tablePropertyExceptionsChanged";
   readonly rowPropertiesChanged: "rowPropertiesChanged";
   readonly cellPropertiesChanged: "cellPropertiesChanged";
 }>;

package/dist/ai-edits/read.js

@@ -26,6 +26,7 @@ const FOLIO_REVIEW_CHANGE_KINDS = Object.freeze({
 	paragraphPropertiesChanged: "paragraphPropertiesChanged",
 	sectionPropertiesChanged: "sectionPropertiesChanged",
 	tablePropertiesChanged: "tablePropertiesChanged",
+	tablePropertyExceptionsChanged: "tablePropertyExceptionsChanged",
 	rowPropertiesChanged: "rowPropertiesChanged",
 	cellPropertiesChanged: "cellPropertiesChanged"
 });

package/dist/ai-edits/snapshot.js

@@ -1,7 +1,10 @@
 import { EMPTY_BUILT_IN_STYLE_INDEX, resolveHeadingLevel } from "../docx/builtInStyles.js";
+import { resolveParagraphNumbering } from "../docx/numberingReference.js";
 import { recreateProseNodeWithParagraphPropertySource } from "../docx/paragraphPropertySource.js";
 import { expectCharacterStyleMarkAttrs, expectHyperlinkMarkAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs } from "../prosemirror/attrs/index.js";
 import { marksToTextFormatting } from "../prosemirror/conversion/fromProseDoc.js";
+import { paragraphNumberingAttr, readParagraphNumberingAttr } from "../prosemirror/numberingAttr.js";
+import { readOutlineLevelAttr } from "../prosemirror/outlineLevelAttr.js";
 import { directParagraphAlignment } from "../prosemirror/paragraphAlignment.js";
 import { directParagraphIndentation } from "../prosemirror/paragraphIndentation.js";
 import { directParagraphSpacing } from "../prosemirror/paragraphSpacing.js";
@@ -34,18 +37,16 @@ const remapFolioAIEditSnapshotNumberingReferences = (snapshot, numIdMap) => {
 	if (numIdMap.size === 0) return snapshot;
 	const metadata = metadataOf(snapshot);
 	const remapNode = (node) => {
-		const numPr = node.attrs["numPr"];
-		if (typeof numPr !== "object" || numPr === null || !("numId" in numPr)) return node;
-		const numId = numPr.numId;
-		if (typeof numId !== "number") return node;
-		const remappedNumId = numIdMap.get(numId);
+		const numPr = readParagraphNumberingAttr(node.attrs["numPr"]);
+		if (numPr?.kind !== "reference") return node;
+		const remappedNumId = numIdMap.get(numPr.numId);
 		if (remappedNumId === void 0) return node;
 		return recreateProseNodeWithParagraphPropertySource(node, { attrs: {
 			...node.attrs,
-			numPr: {
+			numPr: paragraphNumberingAttr({
 				...numPr,
 				numId: remappedNumId
-			}
+			})
 		} });
 	};
 	const remapped = remapDocument(metadata.sourceDocument, remapNode);
@@ -481,10 +482,9 @@ const getBlockKind = (node, headingLevel) => {
 };
 /** The block's 1-based heading level, as {@link resolveHeadingLevel} classifies it. */
 const getHeadingLevel = (node, styles) => {
-	const outlineLevel = node.attrs["outlineLevel"];
 	const styleId = node.attrs["styleId"];
 	const level = resolveHeadingLevel({
-		outlineLevel: typeof outlineLevel === "number" ? outlineLevel : null,
+		outlineLevel: readOutlineLevelAttr(node.attrs["outlineLevel"]),
 		styleId: typeof styleId === "string" ? styleId : null
 	}, styles);
 	return level === void 0 ? void 0 : level + 1;
@@ -495,30 +495,35 @@ const getDisplayLabel = (node, isHeading) => {
 	const styleId = node.attrs["styleId"];
 	if (isHeading && typeof styleId === "string") return styleId;
 };
+/**
+* The level the paragraph's `<w:numPr>` states, and only that. An absent
+* `w:ilvl` renders as level zero but is not a stated zero, and a caller that
+* writes it back would turn an untouched paragraph into one stating a level
+* its source never did.
+*/
 const getListLevel = (node) => {
-	const numPr = node.attrs["numPr"];
-	if (typeof numPr !== "object" || numPr === null || !("ilvl" in numPr)) return;
-	const { ilvl } = numPr;
-	return typeof ilvl === "number" && Number.isInteger(ilvl) && ilvl >= 0 ? ilvl : void 0;
+	const numPr = readParagraphNumberingAttr(node.attrs["numPr"]);
+	return numPr === null || numPr.kind === "none" ? void 0 : numPr.ilvl;
 };
+/**
+* The numbering a paragraph attr states, read through the model's own reader.
+*
+* The two functions below used to test the reserved id relationally
+* (`numId > 0`, `numId <= 0`), which is the one spelling that disagreed with
+* the other four: a malformed package's negative id is a dangling reference
+* everywhere else and "not numbered" here.
+*/
+const statedNumbering = (node) => resolveParagraphNumbering(readParagraphNumberingAttr(node.attrs["numPr"]) ?? void 0);
 const getListReference = (node) => {
-	const numPr = node.attrs["numPr"];
-	if (typeof numPr !== "object" || numPr === null || !("numId" in numPr)) return void 0;
-	const { numId } = numPr;
-	const level = "ilvl" in numPr ? numPr.ilvl : 0;
-	return typeof numId === "number" && Number.isInteger(numId) && numId > 0 && typeof level === "number" && Number.isInteger(level) && level >= 0 ? {
-		numId,
-		level
+	const numbering = statedNumbering(node);
+	return numbering.kind === "reference" ? {
+		numId: numbering.numId,
+		level: numbering.ilvl
 	} : void 0;
 };
 const getNumberingReferenceKey = (node) => {
-	const numPr = node.attrs["numPr"];
-	if (typeof numPr !== "object" || numPr === null || !("numId" in numPr)) return null;
-	const { numId } = numPr;
-	if (typeof numId !== "number" || !Number.isInteger(numId) || numId <= 0) return null;
-	const level = "ilvl" in numPr ? numPr.ilvl : void 0;
-	if (level !== void 0 && (typeof level !== "number" || !Number.isInteger(level) || level < 0)) return null;
-	return `${String(numId)}:${String(level ?? 0)}`;
+	const numbering = statedNumbering(node);
+	return numbering.kind === "reference" ? `${String(numbering.numId)}:${String(numbering.ilvl)}` : null;
 };
 const getStyleId = (node) => {
 	const styleId = node.attrs["styleId"];

package/dist/ai-edits/table-cell-mutations.js

@@ -51,7 +51,11 @@ const mergeTableRectangle = ({ tr, tablePosition, table, rectangle }) => {
 		rowspan: rectangle.bottom - rectangle.top,
 		colwidth: nextColwidth,
 		width: preferredWidth.type === "value" ? preferredWidth.width : null,
-		widthType: preferredWidth.type === "value" ? preferredWidth.widthType : null
+		widthType: preferredWidth.type === "value" ? preferredWidth.widthType : null,
+		_authoredWidth: preferredWidth.type === "value" ? {
+			value: preferredWidth.width,
+			type: preferredWidth.widthType
+		} : null
 	});
 	if (appendedContent.size > 0) {
 		const contentEnd = absoluteMergedPosition + 1 + merged.cell.content.size;
@@ -74,16 +78,20 @@ const mergeTopRowColwidths = (cells, mergedColspan) => {
 * preferred widths; retaining only the first cell's width makes a 50%+50%
 * bilingual row serialize as a 50%-wide spanning cell. Mixed/implicit units
 * cannot be composed safely, so clear the preference and let the table grid
-* define the merged width. */
+* define the merged width.
+*
+* The summands are `_authoredWidth`, not the rendered `width`: a cell that
+* states no preferred width still renders at the width the table grid
+* resolved, and summing those would give the merged cell a `w:tcW` no source
+* cell wrote. */
 const mergeTopRowPreferredWidths = (cells) => {
 	let width = 0;
 	let widthType;
 	for (const cell of cells) {
-		const candidateWidth = cell.attrs["width"];
-		const candidateType = cell.attrs["widthType"];
-		if (typeof candidateWidth !== "number" || !Number.isFinite(candidateWidth) || candidateType !== "dxa" && candidateType !== "pct" || widthType !== void 0 && candidateType !== widthType) return { type: "absent" };
-		width += candidateWidth;
-		widthType = candidateType;
+		const stated = expectTableCellAttrs(cell)._authoredWidth;
+		if (stated === void 0 || !Number.isFinite(stated.value) || stated.type !== "dxa" && stated.type !== "pct" || widthType !== void 0 && stated.type !== widthType) return { type: "absent" };
+		width += stated.value;
+		widthType = stated.type;
 	}
 	return widthType === void 0 ? { type: "absent" } : {
 		type: "value",

package/dist/ai-edits/table-geometry.js

@@ -80,21 +80,24 @@ const TABLE_SCOPE = {
 	changeAttr: "tblPrChange",
 	changeType: "tablePropertyChange"
 };
-const ROW_SCOPE = {
-	keys: ROW_SCOPED_ATTRS,
-	signatureOf: (node) => scopedValues(node.attrs, ROW_SCOPED_ATTRS),
-	formattingOf: (node) => tableRowAttrsToFormatting(node.attrs),
-	rejectPatch: (previousFormatting) => tableRowRejectAttrPatch(previousFormatting),
-	changeAttr: "trPrChange",
-	changeType: "tableRowPropertyChange"
-};
-const CELL_SCOPE = {
-	keys: CELL_SCOPED_ATTRS,
-	signatureOf: (node) => scopedValues(node.attrs, CELL_SCOPED_ATTRS),
-	formattingOf: (node) => tableCellAttrsToFormatting(cellAttrsOf(node)),
-	rejectPatch: (previousFormatting, liveFormatting) => tableCellRejectAttrPatch(previousFormatting, liveFormatting),
-	changeAttr: "tcPrChange",
-	changeType: "tableCellPropertyChange"
+const GEOMETRY_SCOPES = {
+	tablePropertyChange: TABLE_SCOPE,
+	tableRowPropertyChange: {
+		keys: ROW_SCOPED_ATTRS,
+		signatureOf: (node) => scopedValues(node.attrs, ROW_SCOPED_ATTRS),
+		formattingOf: (node) => tableRowAttrsToFormatting(node.attrs),
+		rejectPatch: (previousFormatting) => tableRowRejectAttrPatch(previousFormatting),
+		changeAttr: "trPrChange",
+		changeType: "tableRowPropertyChange"
+	},
+	tableCellPropertyChange: {
+		keys: CELL_SCOPED_ATTRS,
+		signatureOf: (node) => scopedValues(node.attrs, CELL_SCOPED_ATTRS),
+		formattingOf: (node) => tableCellAttrsToFormatting(cellAttrsOf(node)),
+		rejectPatch: (previousFormatting, liveFormatting) => tableCellRejectAttrPatch(previousFormatting, liveFormatting),
+		changeAttr: "tcPrChange",
+		changeType: "tableCellPropertyChange"
+	}
 };
 const scopedValues = (attrs, keys) => canonicalJson(scopedAttrs(attrs, keys));
 /**
@@ -200,9 +203,9 @@ const matchTableGeometry = ({ tr, baseTables, targetTables, pairings, revision }
 		const targetCell = targetRow.maybeChild(target.cellIndex);
 		const cellPosition = childPositions(baseRow, rowPosition)[base.cellIndex];
 		if (!baseCell || !targetCell || cellPosition === void 0) continue;
-		consider(baseTable.node, targetTable, baseTable.start, TABLE_SCOPE);
-		consider(baseRow, targetRow, rowPosition, ROW_SCOPE);
-		consider(baseCell, targetCell, cellPosition, CELL_SCOPE);
+		consider(baseTable.node, targetTable, baseTable.start, GEOMETRY_SCOPES.tablePropertyChange);
+		consider(baseRow, targetRow, rowPosition, GEOMETRY_SCOPES.tableRowPropertyChange);
+		consider(baseCell, targetCell, cellPosition, GEOMETRY_SCOPES.tableCellPropertyChange);
 	}
 	let revisionId = revision.idSeed;
 	for (const target of targets) {

package/dist/ai-edits/table-template.js

@@ -70,7 +70,6 @@ const CLEARED_PARAGRAPH_ATTRS = [
 	"pPrMark",
 	"_suggestedInsert",
 	"_sectionProperties",
-	"sectionBreakType",
 	"renderedPageBreakBefore"
 ];
 /** Table, row and cell attrs that record the other document's revisions. */
@@ -78,7 +77,8 @@ const CLEARED_TABLE_ATTRS = ["tblPrChange", "_suggestedInsert"];
 const CLEARED_ROW_ATTRS = [
 	"trIns",
 	"trDel",
-	"trPrChange"
+	"trPrChange",
+	"tblPrExChange"
 ];
 const CLEARED_CELL_ATTRS = ["cellMarker", "tcPrChange"];
 const hasAuthoredValue = (value) => {

package/dist/compare/compare.js

@@ -15,7 +15,7 @@ import { sameAuthoredInlineProvenance } from "./inline-provenance.js";
 import { planStoryCompare } from "./plan.js";
 import { withFixedPackageDates } from "./reproducible-package.js";
 import { compareSectionBoundaryProperties } from "./section-boundary-properties.js";
-import { CompareDocxApplyError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, InvalidCompareDocxOptionsError } from "./types.js";
+import { CompareDocxApplyError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, CompareDocxParseError, CompareDocxRoundTripError, InvalidCompareDocxOptionsError, compareDocxSerializeError } from "./types.js";
 import { classifyGeometryMismatch, classifyProjectionMismatch, revisedFinalParagraphMarks } from "./verification.js";
 import { Result, panic } from "better-result";
 //#region src/compare/compare.ts
@@ -903,10 +903,7 @@ const serializeComparison = async ({ baseBuffer, baseCarriedRevisions, reviewer,
 	}));
 	return await Result.tryPromise({
 		try: async () => await withFixedPackageDates(await reviewer.toBuffer(), packageDate),
-		catch: (cause) => new CompareDocxSerializeError({
-			message: "The compared document could not be serialized.",
-			cause
-		})
+		catch: (cause) => compareDocxSerializeError("The compared document could not be serialized", cause)
 	});
 };
 /**