@stll/folio-core 0.59.0 → 0.61.0

package/dist/managers/EditorModeManager.js

@@ -18,6 +18,20 @@ const DISPLAY_MODES = [
 	"no-markup",
 	"original"
 ];
+const REVIEW_VIEW_ACCESS = {
+	"all-markup": "editable",
+	"simple-markup": "read-only",
+	"no-markup": "read-only",
+	original: "read-only"
+};
+const getReviewViewReadOnlyReason = (displayMode) => REVIEW_VIEW_ACCESS[displayMode] === "read-only" ? "review-display-mode" : null;
+const getEditorReadOnlyReason = ({ editingMode, readOnlyProp, displayMode }) => {
+	const viewReason = getReviewViewReadOnlyReason(displayMode);
+	if (viewReason) return viewReason;
+	if (readOnlyProp) return "host-read-only";
+	if (editingMode === "viewing") return "viewing-mode";
+	return null;
+};
 /** True when the host opts into read-only OR the mode is `"viewing"`. */
 const isReadOnlyMode = (editingMode, readOnlyProp) => readOnlyProp || editingMode === "viewing";
 /** True when the mode is `"suggesting"`. */
@@ -47,4 +61,4 @@ var EditorModeManager = class extends Subscribable {
 	}
 };
 //#endregion
-export { DISPLAY_MODES, EditorModeManager, isReadOnlyMode, isTrackChangesMode, toggledTrackChangesMode };
+export { DISPLAY_MODES, EditorModeManager, getEditorReadOnlyReason, getReviewViewReadOnlyReason, isReadOnlyMode, isTrackChangesMode, toggledTrackChangesMode };

package/dist/managers/TableSelectionManager.d.ts

@@ -1,6 +1,6 @@
 import { document_d_exports } from "../types/document.js";
-import { TableAction, TableContext } from "../utils/tableOperations.js";
 import { Subscribable } from "./Subscribable.js";
+import { TableAction, TableContext } from "../utils/tableOperations.js";
 import { CellCoordinates } from "./types.js";
 //#region src/managers/TableSelectionManager.d.ts
 /** Data attributes for table elements in the rendered DOM */

package/dist/managers/autoSaveCodec.js

@@ -1,5 +1,6 @@
 import { validateFolioDocumentModel } from "../docx/modelValidation.js";
 import { bytesToBase64 } from "../utils/base64.js";
+import { base64ToBytes } from "../utils/textEncoding.js";
 //#region src/managers/autoSaveCodec.ts
 /**
 * Version 3 renamed the model's `bidiWrapper` to `inlineWrapper` and gave it a
@@ -10,12 +11,7 @@ import { bytesToBase64 } from "../utils/base64.js";
 * re-taken rather than migrated.
 */
 const AUTOSAVE_FORMAT_VERSION = 3;
-const decodeBase64 = (value) => {
-	const binary = atob(value);
-	const bytes = new Uint8Array(binary.length);
-	for (let index = 0; index < binary.length; index += 1) bytes[index] = binary.charCodeAt(index);
-	return bytes.buffer;
-};
+const decodeBase64 = (value) => base64ToBytes(value).buffer;
 const encodeValue = (value) => {
 	if (value === void 0) return { type: "undefined" };
 	if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;

package/dist/managers/editorShortcuts.d.ts

@@ -1,6 +1,7 @@
 import { HistoryShortcutOwner } from "../prosemirror/extensions/core/HistoryExtension.js";
 import { EditorState, Transaction } from "prosemirror-state";
 //#region src/managers/editorShortcuts.d.ts
+declare const DEFAULT_KEYBOARD_SHORTCUT_SCOPE = "editor";
 declare function isMacPlatform(): boolean;
 /**
  * `target` is an input-like element that the user is typing into. We must
@@ -82,4 +83,4 @@ declare function isKeydownInShortcutScope(event: {
  */
 declare function deleteSelectedTable(state: EditorState, dispatch: (tr: Transaction) => void): boolean;
 //#endregion
-export { ClassifyEditorKeydownOptions, EditorKeydownIntent, HostShortcut, IsKeydownInShortcutScopeOptions, KeyboardShortcutScope, ShortcutScopeRoot, classifyEditorKeydown, deleteSelectedTable, historyShortcutOwner, isFocusInInputLike, isKeydownInShortcutScope, isMacPlatform };
+export { ClassifyEditorKeydownOptions, DEFAULT_KEYBOARD_SHORTCUT_SCOPE, EditorKeydownIntent, HostShortcut, IsKeydownInShortcutScopeOptions, KeyboardShortcutScope, ShortcutScopeRoot, classifyEditorKeydown, deleteSelectedTable, historyShortcutOwner, isFocusInInputLike, isKeydownInShortcutScope, isMacPlatform };

package/dist/managers/editorShortcuts.js

@@ -1,6 +1,7 @@
 import { deleteTable } from "../prosemirror/commands/table.js";
 import { getTableContext } from "../prosemirror/extensions/nodes/TableExtension.js";
 //#region src/managers/editorShortcuts.ts
+const DEFAULT_KEYBOARD_SHORTCUT_SCOPE = "editor";
 function isMacPlatform() {
 	if (typeof navigator === "undefined") return false;
 	return /Mac|iPod|iPhone|iPad/u.test(navigator.platform);
@@ -78,4 +79,4 @@ function deleteSelectedTable(state, dispatch) {
 	return false;
 }
 //#endregion
-export { classifyEditorKeydown, deleteSelectedTable, historyShortcutOwner, isFocusInInputLike, isKeydownInShortcutScope, isMacPlatform };
+export { DEFAULT_KEYBOARD_SHORTCUT_SCOPE, classifyEditorKeydown, deleteSelectedTable, historyShortcutOwner, isFocusInInputLike, isKeydownInShortcutScope, isMacPlatform };

package/dist/managers/reviewDisplayMode.d.ts

@@ -0,0 +1,8 @@
+import { DisplayMode } from "./EditorModeManager.js";
+//#region src/managers/reviewDisplayMode.d.ts
+/** The host's reading of pending revisions; it never changes the saved document. */
+declare const REVIEW_DISPLAY_MODES: readonly ["all-markup", "final", "original"];
+type ReviewDisplayMode = (typeof REVIEW_DISPLAY_MODES)[number];
+declare const reviewDisplayModeToDisplayMode: (mode: ReviewDisplayMode) => DisplayMode;
+//#endregion
+export { REVIEW_DISPLAY_MODES, ReviewDisplayMode, reviewDisplayModeToDisplayMode };

package/dist/managers/reviewDisplayMode.js

@@ -0,0 +1,15 @@
+//#region src/managers/reviewDisplayMode.ts
+/** The host's reading of pending revisions; it never changes the saved document. */
+const REVIEW_DISPLAY_MODES = [
+	"all-markup",
+	"final",
+	"original"
+];
+const REVIEW_DISPLAY_MODE_VIEWS = {
+	"all-markup": "all-markup",
+	final: "no-markup",
+	original: "original"
+};
+const reviewDisplayModeToDisplayMode = (mode) => REVIEW_DISPLAY_MODE_VIEWS[mode];
+//#endregion
+export { REVIEW_DISPLAY_MODES, reviewDisplayModeToDisplayMode };

package/dist/paged-layout/pageText.d.ts

@@ -1,14 +1,23 @@
 import { Layout } from "../layout-engine/types.js";
 import "../layout-engine/index.js";
+import { MarkupViewProjection } from "../prosemirror/markupViewProjection.js";
 import { Node } from "prosemirror-model";
 //#region src/paged-layout/pageText.d.ts
+type PageTextOptions = {
+  layout: Layout | null;
+  doc: Node;
+  page: number;
+  projection?: MarkupViewProjection;
+};
 /**
  * The plain text of a single rendered page (1-based), read by joining each of
  * the page's layout fragments' `[pmStart, pmEnd)` document text with a
- * newline. Fragments with no `pmStart`/`pmEnd` (e.g. a page-shell placeholder)
+ * newline. A review projection maps those authored ranges to the displayed
+ * document, excluding text the view hides. Fragments with no `pmStart`/`pmEnd`
+ * (e.g. a page-shell placeholder)
  * are skipped. Returns `null` when the layout hasn't been computed yet or the
  * page number is out of range.
  */
-declare const getPageTextFromLayout: (layout: Layout | null, doc: Node, page: number) => string | null;
+declare const getPageTextFromLayout: ({ layout, doc, page, projection }: PageTextOptions) => string | null;
 //#endregion
 export { getPageTextFromLayout };

package/dist/paged-layout/pageText.js

@@ -2,18 +2,23 @@
 /**
 * The plain text of a single rendered page (1-based), read by joining each of
 * the page's layout fragments' `[pmStart, pmEnd)` document text with a
-* newline. Fragments with no `pmStart`/`pmEnd` (e.g. a page-shell placeholder)
+* newline. A review projection maps those authored ranges to the displayed
+* document, excluding text the view hides. Fragments with no `pmStart`/`pmEnd`
+* (e.g. a page-shell placeholder)
 * are skipped. Returns `null` when the layout hasn't been computed yet or the
 * page number is out of range.
 */
-const getPageTextFromLayout = (layout, doc, page) => {
+const getPageTextFromLayout = ({ layout, doc, page, projection }) => {
 	if (!layout || !Number.isInteger(page) || page < 1) return null;
 	const layoutPage = layout.pages[page - 1];
 	if (!layoutPage) return null;
+	const viewDoc = projection?.type === "resolved" ? projection.doc : doc;
 	const fragmentTexts = [];
 	for (const fragment of layoutPage.fragments) {
 		if (typeof fragment.pmStart !== "number" || typeof fragment.pmEnd !== "number") continue;
-		fragmentTexts.push(doc.textBetween(fragment.pmStart, fragment.pmEnd, "\n"));
+		const from = projection?.type === "resolved" ? projection.toView(fragment.pmStart, 1) : fragment.pmStart;
+		const to = projection?.type === "resolved" ? projection.toView(fragment.pmEnd, -1) : fragment.pmEnd;
+		fragmentTexts.push(viewDoc.textBetween(from, to, "\n"));
 	}
 	return fragmentTexts.join("\n");
 };

package/dist/pdf/fonts.js

@@ -2,6 +2,7 @@ import { parseSfnt } from "../fonts/sfnt/parse.js";
 import { subsetTrueType } from "../fonts/sfnt/subset.js";
 import { toSfntBytes } from "../fonts/sfnt/woff.js";
 import { needsShaping, placeRun } from "../shaping/placeRun.js";
+import { bytesToHex, decodeText, encodeUtf16BE, encodeUtf8 } from "../utils/textEncoding.js";
 import { pdfArray, pdfAsciiString, pdfDict, pdfFlateStream, pdfName, pdfNumber, pdfNumberArray } from "./objects.js";
 import { Result, TaggedError, panic } from "better-result";
 //#region src/pdf/fonts.ts
@@ -46,7 +47,7 @@ const SUBSET_TAG_LENGTH = 6;
 const ALPHABET_LENGTH = 26;
 const UPPERCASE_A = 65;
 const WOFF_SIGNATURES = ["wOFF", "wOF2"];
-const readTag = (bytes) => String.fromCharCode(bytes[0] ?? 0, bytes[1] ?? 0, bytes[2] ?? 0, bytes[3] ?? 0);
+const readTag = (bytes) => decodeText(Uint8Array.of(bytes[0] ?? 0, bytes[1] ?? 0, bytes[2] ?? 0, bytes[3] ?? 0), { encoding: "binary" });
 /**
 * Six uppercase letters derived from the face and the exact glyph set, so the
 * tag is stable across runs and two different subsets of one family do not
@@ -148,18 +149,8 @@ const buildWinAnsiTable = () => {
 	return table;
 };
 const WIN_ANSI_BY_CODE_POINT = buildWinAnsiTable();
-const utf16BeHexOf = (text) => [...text].map((character) => utf16BeHex(character.codePointAt(0) ?? 0)).join("");
-const utf16BeHex = (codePoint) => {
-	const SUPPLEMENTARY_START = 65536;
-	const SURROGATE_HALF_BITS = 10;
-	const LOW_SURROGATE_MASK = 1023;
-	const HIGH_SURROGATE_BASE = 55296;
-	const LOW_SURROGATE_BASE = 56320;
-	const hex = (unit) => unit.toString(16).padStart(4, "0").toUpperCase();
-	if (codePoint < SUPPLEMENTARY_START) return hex(codePoint);
-	const offset = codePoint - SUPPLEMENTARY_START;
-	return hex(HIGH_SURROGATE_BASE + (offset >> SURROGATE_HALF_BITS)) + hex(LOW_SURROGATE_BASE + (offset & LOW_SURROGATE_MASK));
-};
+const utf16BeHexOf = (text) => bytesToHex(encodeUtf16BE(text)).toUpperCase();
+const utf16BeHex = (codePoint) => utf16BeHexOf(String.fromCodePoint(codePoint));
 /** Entries per `beginbfchar` block; the CMap syntax caps this at 100. */
 const BFCHAR_BLOCK_SIZE = 100;
 const toUnicodeCMap = (glyphToText) => {
@@ -290,7 +281,7 @@ const emitFont = (document, plan) => {
 		fontFileKey: font.isCff ? "FontFile3" : "FontFile2",
 		fontFileRef
 	}));
-	const toUnicodeRef = document.add(pdfFlateStream([], new TextEncoder().encode(toUnicodeCMap(plan.glyphToText))));
+	const toUnicodeRef = document.add(pdfFlateStream([], encodeUtf8(toUnicodeCMap(plan.glyphToText))));
 	const descendantRef = document.add(pdfDict([
 		["Type", pdfName("Font")],
 		["Subtype", pdfName(font.isCff ? "CIDFontType0" : "CIDFontType2")],

package/dist/pdf/images.js

@@ -1,3 +1,4 @@
+import { decodeText } from "../utils/textEncoding.js";
 import { pdfArray, pdfHexString, pdfName, pdfNumber } from "./objects.js";
 import { Result, TaggedError } from "better-result";
 import { inflateSync } from "node:zlib";
@@ -63,7 +64,7 @@ const readPngChunks = (bytes) => {
 	const CHUNK_CRC_BYTES = 4;
 	while (cursor + CHUNK_HEADER_BYTES <= bytes.length) {
 		const length = view.getUint32(cursor);
-		const type = String.fromCharCode(bytes[cursor + 4] ?? 0, bytes[cursor + 5] ?? 0, bytes[cursor + 6] ?? 0, bytes[cursor + 7] ?? 0);
+		const type = decodeText(bytes.subarray(cursor + 4, cursor + 8), { encoding: "binary" });
 		const dataStart = cursor + CHUNK_HEADER_BYTES;
 		const dataEnd = dataStart + length;
 		if (dataEnd > bytes.length) return Result.err(new PdfImageError({ message: `PNG chunk ${type} runs past the end` }));
@@ -538,7 +539,7 @@ const decodeJpeg = (bytes) => {
 		const length = view.getUint16(cursor + 2);
 		const segment = cursor + 4;
 		const frame = JPEG_FRAME_MODES[marker];
-		if (marker === APP14 && length >= 12) adobe = String.fromCharCode(...bytes.subarray(segment, segment + 5)) === "Adobe";
+		if (marker === APP14 && length >= 12) adobe = decodeText(bytes.subarray(segment, segment + 5), { encoding: "binary" }) === "Adobe";
 		if (frame !== void 0) {
 			if (!frame.dctDecodable) return Result.err(new PdfImageError({ message: `JPEG ${frame.name} frame (marker 0xff${marker.toString(16)}) has no /DCTDecode equivalent` }));
 			const height = view.getUint16(segment + 1);

package/dist/pdf/objects.d.ts

@@ -1,15 +1,4 @@
 //#region src/pdf/objects.d.ts
-/**
- * The PDF object model: values, serialization, the cross-reference table and
- * the trailer.
- *
- * Everything a backend writes into a PDF file passes through here, which is
- * what makes byte-for-byte determinism enforceable rather than aspirational:
- * numbers go through one formatter, dictionaries carry their entries as an
- * ordered list (never an object or a `Map` whose iteration order depends on
- * how it was built), and object numbers come from one allocator in call
- * order.
- */
 /** The one number formatter. Every number in the file is emitted through it. */
 declare const formatNumber: (value: number) => string;
 type PdfRef = {

package/dist/pdf/objects.js

@@ -1,3 +1,4 @@
+import { bytesToHex, encodeBinaryString, encodeUtf16BE, encodeUtf8 } from "../utils/textEncoding.js";
 import { panic } from "better-result";
 import { deflateSync } from "node:zlib";
 //#region src/pdf/objects.ts
@@ -94,7 +95,10 @@ const pdfFlateStream = (entries, data) => pdfStream(pdfDict([...entries, ["Filte
 const NAME_REGULAR = /^[A-Za-z0-9._\-+]$/u;
 const encodeName = (value) => {
 	let out = "/";
-	for (const char of value) out += NAME_REGULAR.test(char) ? char : `#${char.charCodeAt(0).toString(16).padStart(2, "0").toUpperCase()}`;
+	for (const byte of encodeUtf8(value)) {
+		const char = String.fromCharCode(byte);
+		out += NAME_REGULAR.test(char) ? char : `#${byte.toString(16).padStart(2, "0").toUpperCase()}`;
+	}
 	return out;
 };
 const encodeAsciiString = (value) => {
@@ -108,11 +112,7 @@ const encodeAsciiString = (value) => {
 	}
 	return `${out})`;
 };
-const encodeTextString = (value) => {
-	let hex = "FEFF";
-	for (let index = 0; index < value.length; index += 1) hex += value.charCodeAt(index).toString(16).padStart(4, "0").toUpperCase();
-	return `<${hex}>`;
-};
+const encodeTextString = (value) => `<FEFF${bytesToHex(encodeUtf16BE(value)).toUpperCase()}>`;
 const createByteSink = () => {
 	const chunks = [];
 	let length = 0;
@@ -122,9 +122,7 @@ const createByteSink = () => {
 	};
 	return {
 		writeAscii: (text) => {
-			const bytes = new Uint8Array(text.length);
-			for (let index = 0; index < text.length; index += 1) bytes[index] = text.charCodeAt(index) & 255;
-			writeBytes(bytes);
+			writeBytes(encodeBinaryString(text));
 		},
 		writeBytes,
 		offset: () => length,

package/dist/pdf/writePdf.js

@@ -1,4 +1,5 @@
 import { getShaper } from "../shaping/shaper.js";
+import { encodeUtf8 } from "../utils/textEncoding.js";
 import { collectResources, renderContentStream } from "./contentStream.js";
 import { prepareFonts } from "./fonts.js";
 import { decodeImage } from "./images.js";
@@ -288,7 +289,7 @@ const writePdf = async (list, options) => {
 			fonts: byFontIndex
 		});
 		const resources = collectResources(parts);
-		const contentRef = document.add(pdfFlateStream([], new TextEncoder().encode(renderContentStream(parts, resources))));
+		const contentRef = document.add(pdfFlateStream([], encodeUtf8(renderContentStream(parts, resources))));
 		const annotationRefs = [];
 		for (const link of page.links) {
 			const annotation = buildLinkAnnotation({

package/dist/prosemirror/canonicalSelectionRange.d.ts

@@ -1,9 +1,12 @@
+import { Node } from "prosemirror-model";
 import { EditorState } from "prosemirror-state";
 //#region src/prosemirror/canonicalSelectionRange.d.ts
+/** Document edges denote the first and last editable content gaps. */
+declare const canonicalContentPosition: (doc: Node, position: number) => number;
 /** Whole-document selection addresses paragraph content rather than document edges. */
 declare const canonicalSelectionRange: ({ doc, selection }: EditorState) => {
   from: number;
   to: number;
 };
 //#endregion
-export { canonicalSelectionRange };
+export { canonicalContentPosition, canonicalSelectionRange };

package/dist/prosemirror/canonicalSelectionRange.js

@@ -1,10 +1,16 @@
 import { AllSelection, Selection } from "prosemirror-state";
 //#region src/prosemirror/canonicalSelectionRange.ts
+/** Document edges denote the first and last editable content gaps. */
+const canonicalContentPosition = (doc, position) => {
+	if (position === 0) return Selection.atStart(doc).from;
+	if (position === doc.content.size) return Selection.atEnd(doc).to;
+	return position;
+};
 /** Whole-document selection addresses paragraph content rather than document edges. */
 const canonicalSelectionRange = ({ doc, selection }) => {
 	if (selection instanceof AllSelection) return {
-		from: Selection.atStart(doc).from,
-		to: Selection.atEnd(doc).to
+		from: canonicalContentPosition(doc, selection.from),
+		to: canonicalContentPosition(doc, selection.to)
 	};
 	return {
 		from: selection.from,
@@ -12,4 +18,4 @@ const canonicalSelectionRange = ({ doc, selection }) => {
 	};
 };
 //#endregion
-export { canonicalSelectionRange };
+export { canonicalContentPosition, canonicalSelectionRange };

package/dist/prosemirror/commands/comments.js

@@ -13,11 +13,13 @@ import "../extensions/nodes/SdtExtension.js";
 import { canonicalFieldNode } from "../fieldRepresentation.js";
 import { resolveStateStory } from "../markupViewProjection.js";
 import { joinAtParagraphMark } from "../paragraphMarkJoin.js";
+import { carryParagraphProperties, paragraphLeftAfter } from "../paragraphPropertyCarry.js";
 import { getDocumentNumbering } from "../plugins/documentNumbering.js";
 import { getDocumentStyleResolver } from "../plugins/documentStyleState.js";
 import { resolvedPreservedXmlAttrs } from "../preservedXmlReview.js";
 import { setParagraphAttrsWithRebasedRunFormatting } from "../rebaseParagraphRunFormatting.js";
 import { rejoinRunsAt } from "../rejoinRunCarriers.js";
+import { commentPoint, resolvedCommentPoints } from "../replacedAnnotations.js";
 import { getFolioNodeRevisionCarriers, nodePropertyRevisionSites } from "../revisionCarriers.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { reconstructRejectedRunFormattingMarks, restoreHistoricalRunFormatting } from "../runPropertyChangeResolution.js";
@@ -100,6 +102,16 @@ function resolveChange(from, to, mode, revisionIds) {
 		const removeKeptMarksInBulk = revisionSet === null && keepType !== void 0;
 		const matchesRevision = (mark) => revisionSet === null || typeof mark.attrs["revisionId"] === "number" && revisionSet.has(mark.attrs["revisionId"]);
 		if (dispatch) {
+			const points = mode === "accept" ? resolvedCommentPoints({
+				doc: state.doc,
+				retiresStructure: (node, position) => {
+					if (node.type.name === "paragraph") return collectPPrMarkOp(node, position, from, to, mode, revisionSet)?.action === "join";
+					if (!rangeCoversNode(from, to, position, node)) return false;
+					if (node.type.name === "tableRow") return collectTableRowStructuralOp(node, position, mode, revisionSet)?.action === "remove";
+					return collectTableCellStructuralOps(node, position, mode, revisionSet).some((op) => op.type === "membership" && op.action === "remove");
+				},
+				removes: (node, position) => position >= from && position + node.nodeSize <= to && node.marks.some((mark) => mark.type === removeType && matchesRevision(mark))
+			}) : /* @__PURE__ */ new Map();
 			const tr = state.tr;
 			tr.setMeta(JOINED_RUNS_RESTYLED_META, true);
 			const deleteRanges = [];
@@ -110,6 +122,25 @@ function resolveChange(from, to, mode, revisionIds) {
 			const tableCellStructuralOps = [];
 			let removedSectionEndpointCount = 0;
 			const removedSectionReferences = [];
+			const carryRestoredProperties = (position) => {
+				if (mode !== "reject" || revisionSet === null) return;
+				const source = tr.doc.nodeAt(position);
+				const mark = source ? expectParagraphAttrs(source).pPrMark : null;
+				if (!source || mark?.kind !== "del" && mark?.kind !== "moveFrom" || revisionSet.has(mark.info.id)) return;
+				const survivor = paragraphLeftAfter({
+					doc: tr.doc,
+					paragraphPos: position
+				});
+				if (survivor === null) return;
+				carryParagraphProperties({
+					tr,
+					position: survivor,
+					source,
+					styleResolver,
+					numbering,
+					revision: mark.info
+				});
+			};
 			state.doc.nodesBetween(from, to, (node, pos) => {
 				if (node.type.name === "paragraph") {
 					const op = collectPPrMarkOp(node, pos, from, to, mode, revisionSet);
@@ -122,18 +153,21 @@ function resolveChange(from, to, mode, revisionIds) {
 						styleResolver,
 						numbering
 					});
-					if (nextAttrs) if (nextAttrs["styleId"] !== node.attrs["styleId"] && styleResolver) setParagraphAttrsWithRebasedRunFormatting({
-						nextAttrs,
-						paragraphPosition: pos,
-						styleResolver,
-						tr,
-						...mode === "reject" && { shouldRebase: (inline) => {
-							const deleted = inline.marks.some(({ type }) => type.name === "deletion");
-							const direct = inline.marks.some(({ type }) => type.name === "runFormattingOverride");
-							return !deleted || !direct;
-						} }
-					});
-					else tr.setNodeMarkup(pos, void 0, nextAttrs);
+					if (nextAttrs) {
+						if (nextAttrs["styleId"] !== node.attrs["styleId"] && styleResolver) setParagraphAttrsWithRebasedRunFormatting({
+							nextAttrs,
+							paragraphPosition: pos,
+							styleResolver,
+							tr,
+							...mode === "reject" && { shouldRebase: (inline) => {
+								const deleted = inline.marks.some(({ type }) => type.name === "deletion");
+								const direct = inline.marks.some(({ type }) => type.name === "runFormattingOverride");
+								return !deleted || !direct;
+							} }
+						});
+						else tr.setNodeMarkup(pos, void 0, nextAttrs);
+						carryRestoredProperties(pos);
+					}
 					return true;
 				}
 				if (node.type.name === "tableRow" && rangeCoversNode(from, to, pos, node)) {
@@ -388,7 +422,10 @@ function resolveChange(from, to, mode, revisionIds) {
 						removedSectionEndpointCount++;
 						removedSectionReferences.push(...sectionReferencesOf(paragraph));
 					}
-				} catch {}
+				} catch {
+					continue;
+				}
+				if (op.markWasAdded) carryRestoredProperties(mappedPos);
 			}
 			if (removedSectionEndpointCount > 0) markTrackedSectionEndpointRemoval(tr, {
 				sourceDoc: state.doc,
@@ -416,6 +453,7 @@ function resolveChange(from, to, mode, revisionIds) {
 				if (field.type === node.type) tr.setNodeMarkup(position, void 0, node.attrs, node.marks);
 				else tr.replaceWith(position, position + field.nodeSize, node);
 			}
+			for (const [id, position] of [...points].toReversed()) tr.insert(tr.mapping.map(position, -1), commentPoint(tr.doc.type.schema, id));
 			if (tr.steps.length > 0) dispatch(tr);
 		}
 		return true;

package/dist/prosemirror/containerFinalParagraph.d.ts

@@ -2,15 +2,15 @@ import { Node, ResolvedPos } from "prosemirror-model";
 //#region src/prosemirror/containerFinalParagraph.d.ts
 /**
  * Whether the paragraph starting at `at` is the one its container ENDS with,
- * which is the one place a paragraph mark cannot carry a revision.
+ * where a paragraph break cannot join into a following paragraph.
  *
- * A deleted mark asks a reader to join the paragraph it ends with the one
- * after it, and an inserted mark says that break was added, so rejecting it
- * closes the paragraph back over the next one. A body, a table cell, a header
- * or footer, a note and a text box each end with a paragraph that nothing
- * follows, so neither direction can be resolved there: a consumer is left with
- * a revision it can only ignore, and the redline no longer resolves to the two
- * documents it was written from.
+ * Added boundaries normally rotate onto a preceding paragraph, so rejecting
+ * them joins back into this one. If an occupied boundary or a table prevents
+ * rotation, the final inserted paragraph must retain its own revision: the
+ * resolver removes the whole paragraph after rejecting its inserted content.
+ * A terminal deletion, by contrast, clears without removing the container's
+ * required ending. Bodies, table cells, headers, footers, notes and text boxes
+ * share these rules.
  *
  * A paragraph before a TABLE is not one of those: the table is a following
  * sibling, so the paragraph does not end anything and carries its own mark

package/dist/prosemirror/containerFinalParagraph.js

@@ -14,15 +14,15 @@ const nothingFollowsIn = (parent, fromIndex, paragraphTypeName) => {
 };
 /**
 * Whether the paragraph starting at `at` is the one its container ENDS with,
-* which is the one place a paragraph mark cannot carry a revision.
+* where a paragraph break cannot join into a following paragraph.
 *
-* A deleted mark asks a reader to join the paragraph it ends with the one
-* after it, and an inserted mark says that break was added, so rejecting it
-* closes the paragraph back over the next one. A body, a table cell, a header
-* or footer, a note and a text box each end with a paragraph that nothing
-* follows, so neither direction can be resolved there: a consumer is left with
-* a revision it can only ignore, and the redline no longer resolves to the two
-* documents it was written from.
+* Added boundaries normally rotate onto a preceding paragraph, so rejecting
+* them joins back into this one. If an occupied boundary or a table prevents
+* rotation, the final inserted paragraph must retain its own revision: the
+* resolver removes the whole paragraph after rejecting its inserted content.
+* A terminal deletion, by contrast, clears without removing the container's
+* required ending. Bodies, table cells, headers, footers, notes and text boxes
+* share these rules.
 *
 * A paragraph before a TABLE is not one of those: the table is a following
 * sibling, so the paragraph does not end anything and carries its own mark

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,5 +1,6 @@
 import { joinCommentRangesAcrossParagraphs } from "../../docx/commentRangeJoin.js";
 import { completeCommentReferences } from "../../docx/commentReferenceCompletion.js";
+import { buildSections } from "../../docx/documentParser.js";
 import { normalizeFoldedListNumbers } from "../../docx/foldedListNumberFields.js";
 import { getDocumentSourceStyles } from "../../docx/headerFooterVerbatim.js";
 import { EDITED_PREVIEW_FINGERPRINT, imageRawXmlFingerprint } from "../../docx/imageRawXml.js";
@@ -397,7 +398,7 @@ function fromProseDoc(pmDoc, baseDocument, { stylesheetSource, reuse = "none" })
 	const documentBody = { content: blocks };
 	if (baseDocument?.package.document.background) documentBody.background = baseDocument.package.document.background;
 	if (baseDocument?.package.document.finalSectionProperties) documentBody.finalSectionProperties = baseDocument.package.document.finalSectionProperties;
-	if (baseDocument?.package.document.sections) documentBody.sections = baseDocument.package.document.sections;
+	if (baseDocument?.package.document.sections) documentBody.sections = buildSections(blocks, documentBody.finalSectionProperties);
 	if (baseDocument?.package.document.comments) documentBody.comments = baseDocument.package.document.comments;
 	const numbering = completeNumberingForDoc(baseDocument?.package.numbering, pmDoc);
 	if (baseDocument) {
@@ -1582,12 +1583,16 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 	};
 	const appendDirectRun = (node, run, coalescePlainText = false) => {
 		if (currentHyperlink) flushCurrentInline();
-		const marksKey = getMarksKey(node.marks);
+		const marksKey = getMarksKey(node.marks.filter((mark) => {
+			if (mark.type.name !== "runIdentity") return true;
+			const { emptyFormatting, preservedAttributes, preserved } = expectRunIdentityMarkAttrs(mark);
+			return emptyFormatting !== true || (preservedAttributes?.length ?? 0) > 0 || (preserved?.children?.length ?? 0) > 0;
+		}));
 		const ownerId = runIdentityId(node);
 		const currentOwnerId = currentRun ? sourceRunOwners.get(currentRun) : void 0;
 		const currentRunIsPlainText = currentRun?.content.every((runContent) => runContent.type === "text");
 		const joinsOwnedSourceRun = ownerId !== void 0 && ownerId === currentOwnerId && currentRun !== null && runsShareProperties(currentRun, run);
-		const joinsOrdinaryText = coalescePlainText && ownerId === void 0 && currentOwnerId === void 0 && currentRunIsPlainText === true && currentMarksKey === marksKey;
+		const joinsOrdinaryText = coalescePlainText && currentRun !== null && runsShareProperties(currentRun, run) && currentRunIsPlainText === true && currentMarksKey === marksKey;
 		if (currentRun && (joinsOwnedSourceRun || joinsOrdinaryText)) {
 			if (joinsOrdinaryText) {
 				for (const runContent of run.content) if (runContent.type === "text") appendTextToRun(currentRun, runContent.text);
@@ -3319,7 +3324,7 @@ function tableCellAttrsToFormatting(attrs) {
 		if (attrs.margins && !sameResolvedValue(attrs.margins, attrs._resolvedMargins)) result.margins = buildCellMarginsFromAttrs(attrs.margins);
 		if (attrs.textDirection !== (orig.textDirection ?? void 0)) if (attrs.textDirection) result.textDirection = attrs.textDirection;
 		else delete result.textDirection;
-		return result;
+		return Object.keys(result).length > 0 ? result : void 0;
 	}
 	const authoredWidth = attrs._authoredWidth;
 	if (!(attrs.colspan > 1 || attrs.rowspan > 1 || authoredWidth !== void 0 || attrs.verticalAlign || backgroundChanged || attrs.borders || attrs.margins || attrs.textDirection)) return;

package/dist/prosemirror/conversion/toProseDoc.js

@@ -42,7 +42,7 @@ import { directionFromBidi } from "../paragraphDirection.js";
 import { paragraphIndentationFromFormatting } from "../paragraphIndentation.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
 import { RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs } from "../runIdentity.js";
-import { continueRunIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.js";
+import { continueSourceCarrierIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.js";
 import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, resolveParagraphInheritedRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
 import { schema } from "../schema/index.js";
 import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
@@ -112,7 +112,7 @@ const runIdentityMark = (run, nextRunIdentityId) => {
 	const payload = {
 		preservedAttributes: run.preservedAttributes,
 		preserved: run.formatting?.preserved,
-		emptyFormatting: run.formatting !== void 0 && Object.keys(run.formatting).length === 0 && (run.propertyChanges?.length ?? 0) === 0 ? true : void 0
+		emptyFormatting: run.formatting !== void 0 && Object.keys(run.formatting).length === 0 ? true : void 0
 	};
 	if (!runHasPageBreakContent(run) && !runHasMixedContent(run) && !hasRunIdentityPayload(payload)) return null;
 	return schema.mark(RUN_IDENTITY_MARK_NAME, runIdentityAttrs(nextRunIdentityId(), payload));
@@ -676,7 +676,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 	if (emptyHyperlinks) attrs._emptyHyperlinks = emptyHyperlinks;
 	return createProseParagraphWithPropertySource(schema.nodes["paragraph"], paragraph, {
 		attrs,
-		content: continueRunIdentitiesAcrossRevisions(inlineNodes)
+		content: continueSourceCarrierIdentitiesAcrossRevisions(inlineNodes)
 	});
 }
 /**
@@ -1256,7 +1256,7 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 		attrs.margins = effectiveFormatting.margins;
 		attrs._resolvedMargins = effectiveFormatting.margins;
 	}
-	if (formatting) attrs._originalFormatting = formatting;
+	attrs._originalFormatting = formatting ?? {};
 	if (cell.propertyChanges && cell.propertyChanges.length > 0) attrs.tcPrChange = [...cell.propertyChanges];
 	if (cell.contentControls && cell.contentControls.length > 0) attrs.contentControls = cell.contentControls;
 	if (cell.carrierStack?.length) attrs.carrierStack = cell.carrierStack;

package/dist/prosemirror/extensions/features/AutoBidiDetectionExtension.d.ts

@@ -1,7 +1,13 @@
 import { Extension } from "../types.js";
-import { EditorState, PluginKey } from "prosemirror-state";
+import { EditorState, Plugin } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/AutoBidiDetectionExtension.d.ts
-declare const autoBidiDetectionKey: PluginKey<any>;
+declare const autoBidiDetectionKey: Readonly<{
+  key: string;
+  createKey: () => import("prosemirror-state").PluginKey<unknown>;
+  owns: (plugin: Plugin<unknown>) => boolean;
+  get: (state: EditorState) => Plugin<unknown> | undefined;
+  getState: (state: EditorState) => unknown;
+}>;
 /**
  * Imperatively apply auto-bidi detection to a freshly built state (initial
  * load: Markdown import, DOCX import, template). `appendTransaction` does not