@stll/folio-core 0.12.0 → 0.14.0

package/dist/prosemirror/commands/comments.js

@@ -1,4 +1,5 @@
 import { expectRunPropertyChangeMarkAttrs } from "../attrs/index.js";
+import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { markStructuralChange } from "../extensions/features/ParagraphChangeTrackerExtension.js";
 import { paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, sectionRejectProperties, tableCellRejectAttrPatch, tableRejectAttrPatch, tableRowRejectAttrPatch } from "./propertyChangeScope.js";
 import { textFormattingToMarks } from "../conversion/toProseDoc.js";
@@ -200,33 +201,6 @@ function resolveChange(from, to, mode, revisionIds) {
 		return true;
 	};
 }
-const RUN_FORMATTING_MARK_NAMES = /* @__PURE__ */ new Set([
-	"bold",
-	"italic",
-	"underline",
-	"strike",
-	"textColor",
-	"highlight",
-	"runShading",
-	"fontSize",
-	"fontFamily",
-	"language",
-	"superscript",
-	"subscript",
-	"allCaps",
-	"smallCaps",
-	"characterSpacing",
-	"emboss",
-	"imprint",
-	"hidden",
-	"textShadow",
-	"emphasisMark",
-	"textOutline",
-	"rtl",
-	"textEffect",
-	"runFormattingOverride",
-	"characterStyle"
-]);
 const resolveRunPropertyChange = ({ tr, node, from, to, mark, mode, revisionSet }) => {
 	const { changes } = expectRunPropertyChangeMarkAttrs(mark);
 	const matches = changes.filter((change) => revisionSet === null || revisionSet.has(change.info.id));
@@ -574,6 +548,405 @@ function rejectAIEditRevision(revisionIds) {
 	};
 }
 /**
+* Suggestion (AI-proposed tracked change) commands.
+*
+* A suggestion is a set of `insertion` / `deletion` / `runPropertyChange` marks
+* sharing one `suggestionId` and carrying `provenance: "suggested"`. Accepting
+* rewrites those marks to normal (`"user"`) tracked changes authored by the
+* accepting user; rejecting inverse-applies them like `rejectChange`, reusing
+* the same {@link resolveChange} machinery scoped to the suggestion's revision
+* ids. All three operate as ordinary PM transactions, so they sync via collab
+* and are undoable.
+*/
+const SUGGESTION_MARK_NAMES = /* @__PURE__ */ new Set([
+	"insertion",
+	"deletion",
+	"runPropertyChange"
+]);
+const isSuggestionMark = (mark) => mark.attrs["provenance"] === "suggested" && SUGGESTION_MARK_NAMES.has(mark.type.name);
+const suggestionKindOf = (mark) => {
+	if (mark.type.name === "insertion") return "insertion";
+	if (mark.type.name === "deletion") return "deletion";
+	return "formatting";
+};
+const readSuggestedMarker = (marker) => {
+	if (typeof marker !== "object" || marker === null || marker.provenance !== "suggested") return null;
+	const suggestionId = marker.suggestionId;
+	const revisionId = marker.revisionId;
+	if (typeof suggestionId !== "string" || typeof revisionId !== "number") return null;
+	return {
+		suggestionId,
+		revisionId
+	};
+};
+const readStructuralSuggestion = (node) => {
+	const attrs = node.attrs;
+	const name = node.type.name;
+	const insertMarker = attrs["_suggestedInsert"];
+	if ((name === "paragraph" || name === "table") && typeof insertMarker === "object" && insertMarker !== null) {
+		const suggestionId = insertMarker.suggestionId;
+		const revisionId = insertMarker.revisionId;
+		if (typeof suggestionId === "string" && typeof revisionId === "number") return {
+			suggestionId,
+			revisionId,
+			kind: name === "table" ? "insertTable" : "insertBlock",
+			isNodeInsert: true
+		};
+	}
+	if (node.type.name === "tableRow") {
+		const ins = readSuggestedMarker(attrs["trIns"]);
+		if (ins) return {
+			...ins,
+			kind: "insertRow",
+			isNodeInsert: false
+		};
+		const del = readSuggestedMarker(attrs["trDel"]);
+		if (del) return {
+			...del,
+			kind: "deleteRow",
+			isNodeInsert: false
+		};
+	}
+	if (node.type.name === "tableCell" || node.type.name === "tableHeader") {
+		const cellMarker = attrs["cellMarker"];
+		if (typeof cellMarker === "object" && cellMarker !== null) {
+			const markerKind = cellMarker.kind;
+			if (markerKind === "ins" || markerKind === "del") {
+				const marker = readSuggestedMarker(cellMarker.info);
+				if (marker) {
+					const kind = markerKind === "del" ? "deleteColumn" : "insertColumn";
+					return {
+						...marker,
+						kind,
+						isNodeInsert: false
+					};
+				}
+			}
+		}
+	}
+	return null;
+};
+const collectSuggestions = (state) => {
+	const runPropertyChangeType = state.schema.marks["runPropertyChange"];
+	const bySuggestion = /* @__PURE__ */ new Map();
+	const entryFor = (suggestionId) => {
+		const existing = bySuggestion.get(suggestionId);
+		if (existing) return existing;
+		const created = {
+			segments: [],
+			kinds: /* @__PURE__ */ new Set(),
+			revisionIds: /* @__PURE__ */ new Set()
+		};
+		bySuggestion.set(suggestionId, created);
+		return created;
+	};
+	state.doc.descendants((node, pos) => {
+		const structural = readStructuralSuggestion(node);
+		if (structural) {
+			const entry = entryFor(structural.suggestionId);
+			entry.segments.push({
+				from: pos,
+				to: pos + node.nodeSize
+			});
+			entry.kinds.add(structural.kind);
+			entry.revisionIds.add(structural.revisionId);
+		}
+		if (!node.isInline) return;
+		for (const mark of node.marks) {
+			if (!isSuggestionMark(mark)) continue;
+			const suggestionId = mark.attrs["suggestionId"];
+			if (typeof suggestionId !== "string" || suggestionId.length === 0) continue;
+			const entry = entryFor(suggestionId);
+			entry.segments.push({
+				from: pos,
+				to: pos + node.nodeSize
+			});
+			entry.kinds.add(suggestionKindOf(mark));
+			if (mark.type === runPropertyChangeType) for (const change of expectRunPropertyChangeMarkAttrs(mark).changes) entry.revisionIds.add(change.info.id);
+			else if (typeof mark.attrs["revisionId"] === "number") entry.revisionIds.add(mark.attrs["revisionId"]);
+		}
+	});
+	return bySuggestion;
+};
+/**
+* A whole inserted table (`insertTable`) has no OOXML tracked representation and
+* accepts directly; every other kind accepts as a tracked change. A group that
+* mixes a table insert with any other kind (a caller stamping heterogeneous
+* operations with one `suggestionId`) is `"mixed"`.
+*/
+const suggestionAppliedAs = (kinds) => {
+	if (!kinds.has("insertTable")) return "tracked";
+	return [...kinds].some((kind) => kind !== "insertTable") ? "mixed" : "direct";
+};
+/** Merge sorted, possibly adjacent/overlapping segments into contiguous ranges. */
+const mergeSegments = (segments) => {
+	const sorted = [...segments].toSorted((a, b) => a.from - b.from || a.to - b.to);
+	const merged = [];
+	for (const segment of sorted) {
+		const last = merged.at(-1);
+		if (last && segment.from <= last.to) {
+			last.to = Math.max(last.to, segment.to);
+			continue;
+		}
+		merged.push({ ...segment });
+	}
+	return merged;
+};
+const SUGGESTION_KIND_ORDER = [
+	"insertion",
+	"deletion",
+	"formatting",
+	"insertBlock",
+	"insertTable",
+	"insertRow",
+	"deleteRow",
+	"insertColumn",
+	"deleteColumn"
+];
+/**
+* List every suggestion in the document for host consumption: its id, the
+* contiguous ranges it covers, which kinds of change it contains, and how
+* accepting it applies (tracked vs direct).
+*/
+function getSuggestions(state) {
+	const bySuggestion = collectSuggestions(state);
+	const suggestions = [];
+	for (const [suggestionId, entry] of bySuggestion) suggestions.push({
+		suggestionId,
+		ranges: mergeSegments(entry.segments),
+		kinds: SUGGESTION_KIND_ORDER.filter((kind) => entry.kinds.has(kind)),
+		appliedAs: suggestionAppliedAs(entry.kinds)
+	});
+	return suggestions.toSorted((a, b) => (a.ranges[0]?.from ?? 0) - (b.ranges[0]?.from ?? 0));
+}
+/**
+* The document range covering every mark belonging to `suggestionId`, plus the
+* revision ids those marks carry. Returns null when the suggestion is absent
+* (already accepted/rejected, or never existed).
+*/
+function findSuggestionRange(state, suggestionId) {
+	const entry = collectSuggestions(state).get(suggestionId);
+	if (!entry || entry.segments.length === 0) return null;
+	const ranges = mergeSegments(entry.segments);
+	const from = ranges[0]?.from ?? 0;
+	return {
+		from,
+		to: ranges.at(-1)?.to ?? from,
+		revisionIds: [...entry.revisionIds]
+	};
+}
+/**
+* Normalize an optional acceptance date to a canonical ISO 8601 string. Absent
+* or unparseable input falls back to the current time — a malformed `w:date`
+* must never reach the serialized document (fail-safe boundary validation).
+*/
+const normalizeAcceptDate = (date) => {
+	if (date === void 0) return (/* @__PURE__ */ new Date()).toISOString();
+	const parsed = new Date(date);
+	return Number.isNaN(parsed.getTime()) ? (/* @__PURE__ */ new Date()).toISOString() : parsed.toISOString();
+};
+/**
+* The node-attr patch that converts a suggested block/table revision into a
+* normal (`"user"`) one authored by the accepting user. Returns `null` when the
+* node carries no matching suggested revision. Position-stable (attr writes
+* only), so callers can apply it during a single descendants walk.
+*/
+const convertStructuralSuggestionAttrs = (node, author, date) => {
+	const attrs = node.attrs;
+	const userInfo = (marker) => {
+		const source = marker.info ?? marker;
+		return {
+			revisionId: source.revisionId,
+			author,
+			date,
+			...typeof source.initials === "string" ? { initials: source.initials } : {}
+		};
+	};
+	const name = node.type.name;
+	const insertMarker = attrs["_suggestedInsert"];
+	if ((name === "paragraph" || name === "table") && typeof insertMarker === "object" && insertMarker !== null) {
+		const marker = insertMarker;
+		if (name === "table") return {
+			...attrs,
+			_suggestedInsert: null
+		};
+		if (typeof marker.revisionId === "number") return {
+			...attrs,
+			_suggestedInsert: null,
+			pPrMark: {
+				kind: "ins",
+				info: {
+					id: marker.revisionId,
+					author,
+					date,
+					...typeof marker.initials === "string" ? { initials: marker.initials } : {}
+				}
+			}
+		};
+	}
+	if (node.type.name === "tableRow") {
+		if (readSuggestedMarker(attrs["trIns"])) return {
+			...attrs,
+			trIns: userInfo(attrs["trIns"])
+		};
+		if (readSuggestedMarker(attrs["trDel"])) return {
+			...attrs,
+			trDel: userInfo(attrs["trDel"])
+		};
+	}
+	if (node.type.name === "tableCell" || node.type.name === "tableHeader") {
+		const cellMarker = attrs["cellMarker"];
+		if (cellMarker && (cellMarker.kind === "ins" || cellMarker.kind === "del") && readSuggestedMarker(cellMarker.info)) return {
+			...attrs,
+			cellMarker: {
+				kind: cellMarker.kind,
+				info: userInfo(cellMarker)
+			}
+		};
+	}
+	return null;
+};
+/**
+* Convert suggested marks AND block/table node revisions to normal (`"user"`)
+* tracked changes. `matchesSuggestion(id)` selects which suggestion to convert
+* (one id, or all).
+*/
+const acceptSuggestions = (matchesSuggestion, options) => {
+	return (state, dispatch) => {
+		const insertionType = state.schema.marks["insertion"];
+		const deletionType = state.schema.marks["deletion"];
+		const runPropertyChangeType = state.schema.marks["runPropertyChange"];
+		const date = normalizeAcceptDate(options.date);
+		const tr = state.tr;
+		let changed = false;
+		state.doc.descendants((node, pos) => {
+			const structural = readStructuralSuggestion(node);
+			if (structural && matchesSuggestion(structural.suggestionId)) {
+				const nextAttrs = convertStructuralSuggestionAttrs(node, options.author, date);
+				if (nextAttrs) {
+					tr.setNodeMarkup(pos, void 0, nextAttrs);
+					changed = true;
+				}
+			}
+			if (!node.isInline) return;
+			const from = pos;
+			const to = pos + node.nodeSize;
+			for (const mark of node.marks) {
+				if (!isSuggestionMark(mark) || typeof mark.attrs["suggestionId"] !== "string" || !matchesSuggestion(mark.attrs["suggestionId"])) continue;
+				changed = true;
+				tr.removeMark(from, to, mark);
+				if (mark.type === runPropertyChangeType) {
+					const nextChanges = [];
+					for (const change of expectRunPropertyChangeMarkAttrs(mark).changes) nextChanges.push({
+						...change,
+						info: {
+							...change.info,
+							author: options.author,
+							date
+						}
+					});
+					tr.addMark(from, to, mark.type.create({
+						changes: nextChanges,
+						provenance: "user",
+						suggestionId: null
+					}));
+					continue;
+				}
+				if (mark.type === insertionType || mark.type === deletionType) tr.addMark(from, to, mark.type.create({
+					...mark.attrs,
+					author: options.author,
+					date,
+					provenance: "user",
+					suggestionId: null
+				}));
+			}
+		});
+		if (!changed) return false;
+		if (dispatch) dispatch(tr);
+		return true;
+	};
+};
+/**
+* Accept one suggestion: convert its inline marks and block/table node
+* revisions into normal tracked changes authored by `author`, keeping revision
+* ids. A whole inserted table (which OOXML cannot track) is applied directly;
+* everything else becomes a tracked change. See {@link getSuggestions} for the
+* per-suggestion `appliedAs`.
+*/
+function acceptSuggestion(suggestionId, options) {
+	return acceptSuggestions((id) => id === suggestionId, options);
+}
+/** Accept every suggestion in the document. */
+function acceptAllSuggestions(options) {
+	return acceptSuggestions(() => true, options);
+}
+/**
+* Reject one suggestion: inverse-apply it in a single transaction. Runs BOTH
+* phases so a heterogeneous group (one `suggestionId` spanning whole-node
+* inserts AND other edits) is fully resolved:
+*  1. inline marks and suggested `trIns`/`trDel`/`cellMarker` revisions are
+*     inverse-applied through {@link resolveChange} (delete suggested-inserted
+*     text/rows/cells, drop suggested deletions/formatting);
+*  2. any remaining whole-node inserts (paragraph/table) are then deleted,
+*     mapped through the accumulated transaction so positions stay valid.
+*
+* A paragraph whole-node insert carries inline marks with the same revision id,
+* so phase 1 empties its text and phase 2 removes the now-empty node; a whole
+* inserted table has no matching revision, so only phase 2 removes it.
+*/
+function rejectSuggestion(suggestionId) {
+	return (state, dispatch) => {
+		const entry = collectSuggestions(state).get(suggestionId);
+		if (!entry) return false;
+		let tr = null;
+		if (entry.revisionIds.size > 0) {
+			const ranges = mergeSegments(entry.segments);
+			const from = ranges[0]?.from ?? 0;
+			resolveChange(from, ranges.at(-1)?.to ?? from, "reject", [...entry.revisionIds])(state, (resolved) => {
+				tr = resolved;
+			});
+		}
+		const workingTr = tr ?? state.tr;
+		const positions = [];
+		workingTr.doc.descendants((node, pos) => {
+			const structural = readStructuralSuggestion(node);
+			if (structural?.isNodeInsert && structural.suggestionId === suggestionId) positions.push(pos);
+		});
+		for (const pos of positions.toSorted((a, b) => b - a)) {
+			const node = workingTr.doc.nodeAt(pos);
+			if (node) workingTr.delete(pos, pos + node.nodeSize);
+		}
+		if (workingTr.steps.length === 0) return false;
+		if (dispatch) dispatch(workingTr);
+		return true;
+	};
+}
+/** Reject every suggestion in the document. */
+function rejectAllSuggestions() {
+	return (state, dispatch) => {
+		const bySuggestion = collectSuggestions(state);
+		if (bySuggestion.size === 0) return false;
+		const revisionIds = /* @__PURE__ */ new Set();
+		for (const entry of bySuggestion.values()) for (const id of entry.revisionIds) revisionIds.add(id);
+		let tr = null;
+		if (revisionIds.size > 0) resolveChange(0, state.doc.content.size, "reject", [...revisionIds])(state, (resolved) => {
+			tr = resolved;
+		});
+		const workingTr = tr ?? state.tr;
+		const positions = [];
+		workingTr.doc.descendants((node, pos) => {
+			if (readStructuralSuggestion(node)?.isNodeInsert) positions.push(pos);
+		});
+		for (const pos of positions.toSorted((a, b) => b - a)) {
+			const node = workingTr.doc.nodeAt(pos);
+			if (node) workingTr.delete(pos, pos + node.nodeSize);
+		}
+		if (workingTr.steps.length === 0) return false;
+		if (dispatch) dispatch(workingTr);
+		return true;
+	};
+}
+/**
 * Find the tracked change mark range at a given cursor position.
 * If the cursor is inside a tracked change, returns the full extent
 * of that mark (expanding to cover all adjacent nodes with the same
@@ -738,4 +1111,4 @@ function findPreviousChange(state, startPos) {
 	return result.value;
 }
 //#endregion
-export { acceptAIEditRevision, acceptAllChanges, acceptChange, addCommentMark, findAIEditRevisionRange, findChangeAtPosition, findNextChange, findParagraphBoundaryChangeAtPosition, findPreviousChange, rejectAIEditRevision, rejectAllChanges, rejectChange, removeCommentMark };
+export { acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addCommentMark, findAIEditRevisionRange, findChangeAtPosition, findNextChange, findParagraphBoundaryChangeAtPosition, findPreviousChange, findSuggestionRange, getSuggestions, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark };

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

@@ -4,10 +4,10 @@ import { getTableContext, isInTable as isInTableCell } from "../extensions/nodes
 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, acceptChange, addCommentMark, findAIEditRevisionRange, findNextChange, findPreviousChange, rejectAIEditRevision, rejectAllChanges, rejectChange, removeCommentMark } from "./comments.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/tableCellMergeResolution.js

@@ -1,5 +1,5 @@
-import { standaloneTableCellFromProseMirror } from "../conversion/fromProseDoc.js";
 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";

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 };