@stll/folio-core 0.11.0 → 0.13.0

package/dist/prosemirror/commands/contentControls.js

@@ -1,6 +1,6 @@
-import { formatDate } from "../../docx/fieldParser.js";
 import { expectBlockSdtAttrs } from "../attrs/index.js";
 import { ContentControlBoundError, ContentControlLockedError, ContentControlTypeError } from "../../content-controls/errors.js";
+import { formatDate } from "../../docx/fieldParser.js";
 import { SUGGESTION_BYPASS_META } from "../plugins/suggestionMode.js";
 //#region src/prosemirror/commands/contentControls.ts
 function nodeMatchesFilter(node, pos, filter) {

package/dist/prosemirror/commands/hyperlink.js

@@ -1,7 +1,21 @@
 import { expectHyperlinkMarkAttrs } from "../attrs/index.js";
+import { normalizeUserUrl } from "../../utils/urlSecurity.js";
 //#region src/prosemirror/commands/hyperlink.ts
 const hyperlinkHref = (mark) => expectHyperlinkMarkAttrs(mark).href;
 /**
+* Normalize/sanitize a URL typed by a user (hyperlink popup edit) before it
+* is written into a mark. Internal bookmark anchors (`#name`) bypass
+* `normalizeUserUrl` (which parses via the `URL` constructor and would
+* reject a bare fragment); protocol-less input (e.g. "example.com") is
+* accepted and normalized to https; anything resolving to a disallowed
+* scheme (javascript:, data:, file:, ...) is dropped to an empty href.
+*/
+const normalizeHyperlinkInput = (rawHref) => {
+	const trimmed = rawHref.trim();
+	if (trimmed.startsWith("#")) return trimmed;
+	return normalizeUserUrl(trimmed);
+};
+/**
 * Contiguous ranges of text nodes in `parent` (starting at `parentStart`) that
 * carry a hyperlink mark with the given `href`.
 */
@@ -44,7 +58,7 @@ const editHyperlinkAtCursor = (view, { displayText, href }) => {
 	if (!targetRange) return false;
 	const { tooltip } = expectHyperlinkMarkAttrs(linkMark);
 	const newMark = hlType.create({
-		href,
+		href: normalizeHyperlinkInput(href),
 		tooltip
 	});
 	const textNode = view.state.schema.text(displayText, [...$from.marks().filter((m) => m.type !== hlType), newMark]);

package/dist/prosemirror/commands/image.js

@@ -1,5 +1,6 @@
 import { IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES } from "../../types/documentEnumValues.js";
 import { expectImageAttrs, mergeImageAttrs } from "../attrs/index.js";
+import { sanitizeImageSrc } from "../../utils/sanitizeImageSrc.js";
 import { isSafeImageFile } from "../../utils/imageValidation.js";
 //#region src/prosemirror/commands/image.ts
 /** Map a toolbar wrap selection to the image's wrapType/displayMode/cssFloat, or null when unknown. */
@@ -203,6 +204,11 @@ function readFileAsDataUrl(file) {
 }
 function loadImageDimensions(src) {
 	return new Promise((resolve, reject) => {
+		const safeSrc = sanitizeImageSrc(src);
+		if (!safeSrc) {
+			reject(/* @__PURE__ */ new Error("Rejected unsafe image source"));
+			return;
+		}
 		const img = new Image();
 		img.addEventListener("load", () => {
 			resolve({
@@ -213,7 +219,7 @@ function loadImageDimensions(src) {
 		img.addEventListener("error", () => {
 			reject(/* @__PURE__ */ new Error("Failed to load image"));
 		});
-		img.src = src;
+		img.src = safeSrc;
 	});
 }
 //#endregion

package/dist/prosemirror/commands/index.d.ts

@@ -1,4 +1,4 @@
-import { acceptAIEditRevision, acceptAllChanges, acceptChange, addCommentMark, findAIEditRevisionRange, findNextChange, findPreviousChange, rejectAIEditRevision, rejectAllChanges, rejectChange, removeCommentMark } from "./comments.js";
+import { AcceptSuggestionOptions, FolioSuggestion, SuggestionAppliedAs, SuggestionKind, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addCommentMark, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, getSuggestions, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark } from "./comments.js";
 import { PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./formatPainter.js";
 import { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive } from "../extensions/marks/markUtils.js";
 import { getHyperlinkAttrs, getSelectedText, isHyperlinkActive } from "../extensions/marks/HyperlinkExtension.js";
@@ -10,4 +10,4 @@ import { BorderPreset, TableBorderPreset, TableContextInfo, getTableContext, isI
 import { addColumnLeft, addColumnRight, addRowAbove, addRowBelow, applyTableStyle, autoFitContents, deleteColumn, deleteRow, deleteTable, distributeColumns, insertTable, mergeCells, removeTableBorders, selectColumn, selectRow, selectTable, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setInsideTableBorders, setOutsideTableBorders, setRowHeight, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, splitCell, toggleHeaderRow, toggleNoWrap } from "./table.js";
 import { insertPageBreak } from "./pageBreak.js";
 import { CLIPBOARD_READ_ERROR_EVENT, buildPlainTextSlice, pasteWithoutFormatting } from "./pastePlainText.js";
-export { type BorderPreset, CLIPBOARD_READ_ERROR_EVENT, PAINTABLE_MARK_NAMES, type ResolvedStyleAttrs, type TableBorderPreset, type TableContextInfo, acceptAIEditRevision, acceptAllChanges, acceptChange, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, generateTOC, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectChange, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };
+export { type AcceptSuggestionOptions, type BorderPreset, CLIPBOARD_READ_ERROR_EVENT, type FolioSuggestion, PAINTABLE_MARK_NAMES, type ResolvedStyleAttrs, type SuggestionAppliedAs, type SuggestionKind, type TableBorderPreset, type TableContextInfo, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, generateTOC, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getSuggestions, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };

package/dist/prosemirror/commands/index.js

@@ -1,13 +1,13 @@
-import { acceptAIEditRevision, acceptAllChanges, acceptChange, addCommentMark, findAIEditRevisionRange, findNextChange, findPreviousChange, rejectAIEditRevision, rejectAllChanges, rejectChange, removeCommentMark } from "./comments.js";
 import { getParagraphAlignment, getParagraphBidi, getStyleId } from "../extensions/core/ParagraphExtension.js";
 import { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive } from "../extensions/marks/markUtils.js";
 import { getTableContext, isInTable as isInTableCell } from "../extensions/nodes/TableExtension.js";
 import { getListInfo, isInList } from "../extensions/features/ListExtension.js";
 import { CLIPBOARD_READ_ERROR_EVENT, buildPlainTextSlice, pasteWithoutFormatting } from "./pastePlainText.js";
 import { getHyperlinkAttrs, getSelectedText, isHyperlinkActive } from "../extensions/marks/HyperlinkExtension.js";
+import { acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addCommentMark, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, getSuggestions, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark } from "./comments.js";
 import { addColumnLeft, addColumnRight, addRowAbove, addRowBelow, applyTableStyle, autoFitContents, deleteColumn, deleteRow, deleteTable, distributeColumns, insertTable, mergeCells, removeTableBorders, selectColumn, selectRow, selectTable, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setInsideTableBorders, setOutsideTableBorders, setRowHeight, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, splitCell, toggleHeaderRow, toggleNoWrap } from "./table.js";
 import { clearFontFamily, clearFontSize, clearHighlight, clearTextColor, insertHyperlink, removeHyperlink, setFontFamily, setFontSize, setHighlight, setHyperlink, setTextColor, setUnderlineStyle, toggleBold, toggleItalic, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "./formatting.js";
 import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTOC, increaseIndent, increaseListLevel, oneAndHalfSpacing, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList } from "./paragraph.js";
 import { PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./formatPainter.js";
 import { insertPageBreak } from "./pageBreak.js";
-export { CLIPBOARD_READ_ERROR_EVENT, PAINTABLE_MARK_NAMES, acceptAIEditRevision, acceptAllChanges, acceptChange, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, generateTOC, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectChange, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };
+export { CLIPBOARD_READ_ERROR_EVENT, PAINTABLE_MARK_NAMES, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, generateTOC, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getSuggestions, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };

package/dist/prosemirror/commands/pageBreak.js

@@ -1,5 +1,5 @@
-import { TextSelection } from "prosemirror-state";
 import { Fragment } from "prosemirror-model";
+import { TextSelection } from "prosemirror-state";
 //#region src/prosemirror/commands/pageBreak.ts
 /**
 * Page Break Commands

package/dist/prosemirror/commands/propertyChangeScope.d.ts

@@ -18,9 +18,9 @@ type AttrPatch = Record<string, unknown>;
  *   `runInWithNext` (`w:specVanish` lives in that rPr)
  * - load-time style/numbering bookkeeping the command layer cannot recompute
  *   without a style resolver: `numPrFromStyle`, the `list*` rendering attrs,
- *   `spacingFromDocDefaults`
+ *   `spacingFromDocDefaults`, `spacingFromImplicitDefaultStyle`
  */
-declare const PPR_CHANGE_SCOPED_ATTR_KEYS: readonly ["styleId", "numPr", "alignment", "spaceBefore", "spaceAfter", "lineSpacing", "lineSpacingRule", "spacingExplicit", "indentLeft", "indentRight", "indentFirstLine", "hangingIndent", "borders", "shading", "tabs", "pageBreakBefore", "keepNext", "keepLines", "widowControl", "contextualSpacing", "outlineLevel", "direction", "_autospacingBase"];
+declare const PPR_CHANGE_SCOPED_ATTR_KEYS: readonly ["styleId", "numPr", "alignment", "spaceBefore", "spaceAfter", "lineSpacing", "lineSpacingRule", "snapToGrid", "spacingExplicit", "indentLeft", "indentRight", "indentFirstLine", "hangingIndent", "borders", "shading", "tabs", "pageBreakBefore", "keepNext", "keepLines", "widowControl", "contextualSpacing", "outlineLevel", "direction", "_autospacingBase"];
 /**
  * Build the attr patch that rejecting one pPrChange applies to a paragraph:
  * every in-scope key set to the stored previous value, or reset to `null`

package/dist/prosemirror/commands/propertyChangeScope.js

@@ -1,5 +1,5 @@
-import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { directionFromBidi } from "../paragraphDirection.js";
+import { setAutospacingBaseValue } from "../autospacingBase.js";
 //#region src/prosemirror/commands/propertyChangeScope.ts
 /**
 * Paragraph attrs governed by a `w:pPrChange` — the attrs
@@ -17,7 +17,7 @@ import { directionFromBidi } from "../paragraphDirection.js";
 *   `runInWithNext` (`w:specVanish` lives in that rPr)
 * - load-time style/numbering bookkeeping the command layer cannot recompute
 *   without a style resolver: `numPrFromStyle`, the `list*` rendering attrs,
-*   `spacingFromDocDefaults`
+*   `spacingFromDocDefaults`, `spacingFromImplicitDefaultStyle`
 */
 const PPR_CHANGE_SCOPED_ATTR_KEYS = [
 	"styleId",
@@ -27,6 +27,7 @@ const PPR_CHANGE_SCOPED_ATTR_KEYS = [
 	"spaceAfter",
 	"lineSpacing",
 	"lineSpacingRule",
+	"snapToGrid",
 	"spacingExplicit",
 	"indentLeft",
 	"indentRight",

package/dist/prosemirror/commands/tableCellMergeResolution.d.ts

@@ -0,0 +1,9 @@
+import { Transaction } from "prosemirror-state";
+import { Node } from "prosemirror-model";
+
+//#region src/prosemirror/commands/tableCellMergeResolution.d.ts
+declare const hasMatchingCollapsedTableCellMerge: (node: Node, revisionSet: Set<number> | null) => boolean;
+declare const resolveVisibleTableCellMerge: (tr: Transaction, cellPos: number, mode: "accept" | "reject") => boolean;
+declare const resolveCollapsedTableCellMerge: (tr: Transaction, cellPos: number, mode: "accept" | "reject", revisionSet: Set<number> | null) => boolean;
+//#endregion
+export { hasMatchingCollapsedTableCellMerge, resolveCollapsedTableCellMerge, resolveVisibleTableCellMerge };

package/dist/prosemirror/commands/tableCellMergeResolution.js

@@ -0,0 +1,181 @@
+import { standaloneTableCellToProseMirror } from "../conversion/toProseDoc.js";
+import { standaloneTableCellFromProseMirror } from "../conversion/fromProseDoc.js";
+import { getTableCellMergeChange } from "../tableCellMergeRevision.js";
+import { Result } from "better-result";
+import { TableMap } from "prosemirror-tables";
+//#region src/prosemirror/commands/tableCellMergeResolution.ts
+const hasMatchingCollapsedTableCellMerge = (node, revisionSet) => {
+	const continuationCells = node.attrs["_docxVMergeContinuationCells"];
+	if (!Array.isArray(continuationCells)) return false;
+	return continuationCells.some((cell) => {
+		const change = getTableCellMergeChange(cell);
+		return change !== null && (revisionSet === null || revisionSet.has(change.info.id));
+	});
+};
+const isTableCellMergeRevisionAttr = (value) => {
+	if (typeof value !== "object" || value === null || !("kind" in value) || value.kind !== "merge" || !("info" in value)) return false;
+	const info = value.info;
+	return typeof info === "object" && info !== null && "revisionId" in info && typeof info.revisionId === "number";
+};
+const tableCellContext = (doc, cellPos) => {
+	const resolved = doc.resolve(cellPos);
+	for (let depth = resolved.depth; depth > 0; depth -= 1) {
+		const node = resolved.node(depth);
+		if (node.type.spec["tableRole"] !== "table") continue;
+		const tablePos = resolved.before(depth);
+		return {
+			table: node,
+			tableStart: tablePos + 1,
+			relativeCellPos: cellPos - tablePos - 1
+		};
+	}
+	return null;
+};
+const resolveVisibleTableCellMerge = (tr, cellPos, mode) => {
+	const cell = tr.doc.nodeAt(cellPos);
+	const marker = cell?.attrs["cellMarker"];
+	if (!cell || !isTableCellMergeRevisionAttr(marker)) return false;
+	if (mode === "accept") {
+		tr.setNodeAttribute(cellPos, "cellMarker", null);
+		return true;
+	}
+	if ((marker.verticalMergeOriginal ?? "rest") === "continue") return mergeTableCellWithCellAbove(tr, cellPos);
+	const originalFormatting = cell.attrs["_originalFormatting"];
+	let nextOriginalFormatting = originalFormatting;
+	if (typeof originalFormatting === "object" && originalFormatting !== null) {
+		nextOriginalFormatting = { ...originalFormatting };
+		delete nextOriginalFormatting.vMerge;
+	}
+	tr.setNodeMarkup(cellPos, void 0, {
+		...cell.attrs,
+		cellMarker: null,
+		_originalFormatting: nextOriginalFormatting
+	});
+	return true;
+};
+const mergeTableCellWithCellAbove = (tr, cellPos) => {
+	const context = tableCellContext(tr.doc, cellPos);
+	const cell = tr.doc.nodeAt(cellPos);
+	if (!context || !cell) return false;
+	const map = TableMap.get(context.table);
+	const rectangle = map.findCell(context.relativeCellPos);
+	if (rectangle.top === 0) return false;
+	const aboveRelativePos = map.map[(rectangle.top - 1) * map.width + rectangle.left];
+	if (aboveRelativePos === void 0 || aboveRelativePos === context.relativeCellPos) return false;
+	const aboveRectangle = map.findCell(aboveRelativePos);
+	if (aboveRectangle.left !== rectangle.left || aboveRectangle.right !== rectangle.right || aboveRectangle.bottom !== rectangle.top) return false;
+	const abovePos = context.tableStart + aboveRelativePos;
+	const aboveCell = tr.doc.nodeAt(abovePos);
+	const aboveRowspan = aboveCell?.attrs["rowspan"];
+	const cellRowspan = cell.attrs["rowspan"];
+	if (!aboveCell || typeof aboveRowspan !== "number" || typeof cellRowspan !== "number" || aboveRowspan < 1 || cellRowspan < 1) return false;
+	const continuationCells = tableCellContinuationCells(aboveCell, aboveRowspan);
+	continuationCells.push(tableCellContinuationFromNode(cell));
+	const nestedContinuations = cell.attrs["_docxVMergeContinuationCells"];
+	if (Array.isArray(nestedContinuations)) continuationCells.push(...nestedContinuations);
+	tr.delete(cellPos, cellPos + cell.nodeSize);
+	tr.setNodeMarkup(abovePos, void 0, {
+		...aboveCell.attrs,
+		rowspan: aboveRowspan + cellRowspan,
+		_docxVMergeContinuationCells: continuationCells
+	});
+	return true;
+};
+const tableCellContinuationCells = (cell, rowspan) => {
+	const stored = cell.attrs["_docxVMergeContinuationCells"];
+	const cells = Array.isArray(stored) ? [...stored] : [];
+	while (cells.length < rowspan - 1) cells.push(emptyVerticalMergeContinuation());
+	return cells;
+};
+const tableCellContinuationFromNode = (cell) => {
+	const continuation = standaloneTableCellFromProseMirror(cell);
+	const formatting = {
+		...continuation.formatting,
+		vMerge: "continue"
+	};
+	const colspan = cell.attrs["colspan"];
+	if (typeof colspan === "number" && colspan > 1) formatting.gridSpan = colspan;
+	continuation.formatting = formatting;
+	delete continuation.structuralChange;
+	return continuation;
+};
+const emptyVerticalMergeContinuation = () => ({
+	type: "tableCell",
+	formatting: { vMerge: "continue" },
+	content: [{
+		type: "paragraph",
+		content: []
+	}]
+});
+const resolveCollapsedTableCellMerge = (tr, cellPos, mode, revisionSet) => {
+	const cell = tr.doc.nodeAt(cellPos);
+	const stored = cell?.attrs["_docxVMergeContinuationCells"];
+	if (!cell || !Array.isArray(stored)) return false;
+	const matchingIndices = [];
+	const nextCells = stored.map((continuationCell, index) => {
+		const change = getTableCellMergeChange(continuationCell);
+		if (!change || revisionSet !== null && !revisionSet.has(change.info.id)) return continuationCell;
+		matchingIndices.push(index);
+		const nextCell = { ...continuationCell };
+		delete nextCell.structuralChange;
+		return nextCell;
+	});
+	if (matchingIndices.length === 0) return false;
+	if (mode === "accept") {
+		tr.setNodeAttribute(cellPos, "_docxVMergeContinuationCells", nextCells);
+		return true;
+	}
+	const splitIndices = matchingIndices.filter((index) => {
+		const change = getTableCellMergeChange(stored[index]);
+		return change?.verticalMerge === "continue" && (change.verticalMergeOriginal ?? "rest") === "rest";
+	});
+	if (splitIndices.length === 0) {
+		tr.setNodeAttribute(cellPos, "_docxVMergeContinuationCells", nextCells);
+		return true;
+	}
+	const firstSplitIndex = splitIndices.at(0);
+	if (firstSplitIndex === void 0 || splitIndices.length !== stored.length - firstSplitIndex || splitIndices.some((index, offset) => index !== firstSplitIndex + offset)) return false;
+	const context = tableCellContext(tr.doc, cellPos);
+	if (!context) return false;
+	const map = TableMap.get(context.table);
+	const rectangle = map.findCell(context.relativeCellPos);
+	const rowspan = cell.attrs["rowspan"];
+	if (typeof rowspan !== "number" || rowspan !== stored.length + 1 || rectangle.bottom - rectangle.top !== rowspan) return false;
+	const restorations = [];
+	for (const index of splitIndices) {
+		const source = nextCells[index];
+		if (!source) return false;
+		const restoredCell = createRestoredTableCell(cell, source);
+		if (!restoredCell) return false;
+		restorations.push({
+			index,
+			cell: restoredCell
+		});
+	}
+	const mapFrom = tr.mapping.maps.length;
+	for (const restoration of restorations) {
+		const row = rectangle.top + restoration.index + 1;
+		const insertionPos = context.tableStart + map.positionAt(row, rectangle.left, context.table);
+		tr.insert(tr.mapping.slice(mapFrom).map(insertionPos, 1), restoration.cell);
+	}
+	const remainingCells = nextCells.slice(0, firstSplitIndex);
+	tr.setNodeMarkup(cellPos, void 0, {
+		...cell.attrs,
+		rowspan: firstSplitIndex + 1,
+		_docxVMergeContinuationCells: remainingCells.length > 0 ? remainingCells : null
+	});
+	return true;
+};
+const createRestoredTableCell = (origin, source) => {
+	const formatting = source.formatting ? { ...source.formatting } : void 0;
+	if (formatting) delete formatting.vMerge;
+	const restored = standaloneTableCellToProseMirror({
+		type: "tableCell",
+		...formatting ? { formatting } : {},
+		...source.propertyChanges ? { propertyChanges: source.propertyChanges } : {},
+		content: source.content
+	}, origin.type.name === "tableHeader" ? "tableHeader" : "tableCell");
+	return Result.try(() => origin.type.schema.nodeFromJSON(restored.toJSON())).unwrapOr(null);
+};
+//#endregion
+export { hasMatchingCollapsedTableCellMerge, resolveCollapsedTableCellMerge, resolveVisibleTableCellMerge };

package/dist/prosemirror/commentIdAllocator.js

@@ -1,3 +1,5 @@
+import { seedRevisionIdsAbove } from "./plugins/revisionIds.js";
+import { MAX_REVISION_ID } from "@stll/docx-core/model";
 //#region src/prosemirror/commentIdAllocator.ts
 /** Sentinel ID for a comment that hasn't been persisted yet (anchored to selection). */
 const PENDING_COMMENT_ID = -1;
@@ -9,8 +11,12 @@ const PENDING_COMMENT_ID = -1;
 function createCommentIdAllocator() {
 	let nextId = 1;
 	return {
-		next: () => nextId++,
+		next: () => {
+			if (nextId > MAX_REVISION_ID) nextId = 1;
+			return nextId++;
+		},
 		seedAbove(maxId) {
+			if (!Number.isInteger(maxId) || maxId < 0 || maxId >= MAX_REVISION_ID) return;
 			if (maxId >= nextId) nextId = maxId + 1;
 		}
 	};
@@ -25,11 +31,15 @@ function createCommentIdAllocator() {
 */
 function seedCommentAllocator(allocator, comments, view) {
 	let max = 0;
-	for (const comment of comments ?? []) max = Math.max(max, comment.id);
+	for (const comment of comments ?? []) if (Number.isInteger(comment.id) && comment.id > max && comment.id <= MAX_REVISION_ID) max = comment.id;
 	if (view) view.state.doc.descendants((node) => {
-		for (const mark of node.marks) if (mark.attrs["revisionId"] != null) max = Math.max(max, mark.attrs["revisionId"]);
+		for (const mark of node.marks) {
+			const revisionId = mark.attrs["revisionId"];
+			if (typeof revisionId === "number" && Number.isInteger(revisionId) && revisionId > max && revisionId <= MAX_REVISION_ID) max = revisionId;
+		}
 	});
 	allocator.seedAbove(max);
+	seedRevisionIdsAbove(max);
 }
 //#endregion
 export { PENDING_COMMENT_ID, createCommentIdAllocator, seedCommentAllocator };

package/dist/prosemirror/conversion/fromProseDoc.d.ts

@@ -10,6 +10,7 @@ declare function fromProseDoc(pmDoc: Node, baseDocument?: document_d_exports.Doc
  * Convert ProseMirror marks to TextFormatting
  */
 declare function marksToTextFormatting(marks: readonly Mark[]): document_d_exports.TextFormatting;
+declare const standaloneTableCellFromProseMirror: (node: Node) => document_d_exports.TableCell;
 /**
  * Update a Document with content from a ProseMirror document
  * Preserves all non-content parts of the original document
@@ -24,4 +25,4 @@ declare function updateDocumentContent(originalDocument: document_d_exports.Docu
  */
 declare function proseDocToBlocks(pmDoc: Node): document_d_exports.BlockContent[];
 //#endregion
-export { fromProseDoc, marksToTextFormatting, proseDocToBlocks, updateDocumentContent };
+export { fromProseDoc, marksToTextFormatting, proseDocToBlocks, standaloneTableCellFromProseMirror, updateDocumentContent };