@stll/folio-core 0.47.4 → 0.47.6

package/dist/prosemirror/extensions/markRegistry.d.ts

@@ -44,13 +44,10 @@ type SchemaMarkName = keyof typeof MARK_EXTENSIONS;
  * Five of these marks are containers on the save leg as well, and their
  * relative order is that leg's rather than a choice made here.
  * `extractParagraphContent` opens a comment range around everything a leaf
- * produces (it flushes the open run and hyperlink and drops the tracked wrapper
- * before pushing the marker: `fromProseDoc.ts:2359-2369`), then the revision
- * wrapper (`fromProseDoc.ts:2530`), then the wrapper stack inside that revision
- * (`nestInlineWrapperGroups`, `fromProseDoc.ts:2200`), then the hyperlink and
- * the runs it holds (`fromProseDoc.ts:2567`). So the save writes
- * `w:commentRangeStart … w:ins > w:bdo > w:hyperlink > w:r`, and the editor DOM
- * nests `span.docx-comment > span.docx-insertion > bdo > a`.
+ * produces. For an editor-created revision, the existing wrapper stack owns
+ * the change, followed by the hyperlink and the runs it holds. So the save
+ * writes `w:commentRangeStart … w:bdo > w:ins > w:hyperlink > w:r`, and the
+ * editor DOM nests `span.docx-comment > bdo > span.docx-insertion > a`.
  * `markNestingOrder.test.ts` holds the two legs to each other.
  *
  * `runIdentity` is the fifth: `w:r` is the element it names, and it is the
@@ -60,6 +57,6 @@ type SchemaMarkName = keyof typeof MARK_EXTENSIONS;
  * own in OOXML, so the save leg ranks it against nothing and its place here is
  * a presentation decision.
  */
-declare const MARK_NESTING_ORDER: readonly ["bold", "italic", "underline", "strike", "textColor", "runShading", "highlight", "fontSize", "fontFamily", "language", "superscript", "subscript", "allCaps", "smallCaps", "footnoteRef", "characterSpacing", "emboss", "imprint", "hidden", "textShadow", "emphasisMark", "textOutline", "rtl", "textEffect", "runFormattingOverride", "characterStyle", "comment", "insertion", "deletion", "inlineWrapper", "hyperlink", "runPropertyChange", "runIdentity"];
+declare const MARK_NESTING_ORDER: readonly ["bold", "italic", "underline", "strike", "textColor", "runShading", "highlight", "fontSize", "fontFamily", "language", "superscript", "subscript", "allCaps", "smallCaps", "footnoteRef", "characterSpacing", "emboss", "imprint", "hidden", "textShadow", "emphasisMark", "textOutline", "rtl", "textEffect", "runFormattingOverride", "characterStyle", "comment", "inlineWrapper", "insertion", "deletion", "hyperlink", "runPropertyChange", "runIdentity"];
 //#endregion
 export { MARK_EXTENSIONS, MARK_NESTING_ORDER, SchemaMarkName };

package/dist/prosemirror/extensions/markRegistry.js

@@ -83,13 +83,10 @@ const markNestingOrder = (names) => names;
 * Five of these marks are containers on the save leg as well, and their
 * relative order is that leg's rather than a choice made here.
 * `extractParagraphContent` opens a comment range around everything a leaf
-* produces (it flushes the open run and hyperlink and drops the tracked wrapper
-* before pushing the marker: `fromProseDoc.ts:2359-2369`), then the revision
-* wrapper (`fromProseDoc.ts:2530`), then the wrapper stack inside that revision
-* (`nestInlineWrapperGroups`, `fromProseDoc.ts:2200`), then the hyperlink and
-* the runs it holds (`fromProseDoc.ts:2567`). So the save writes
-* `w:commentRangeStart … w:ins > w:bdo > w:hyperlink > w:r`, and the editor DOM
-* nests `span.docx-comment > span.docx-insertion > bdo > a`.
+* produces. For an editor-created revision, the existing wrapper stack owns
+* the change, followed by the hyperlink and the runs it holds. So the save
+* writes `w:commentRangeStart … w:bdo > w:ins > w:hyperlink > w:r`, and the
+* editor DOM nests `span.docx-comment > bdo > span.docx-insertion > a`.
 * `markNestingOrder.test.ts` holds the two legs to each other.
 *
 * `runIdentity` is the fifth: `w:r` is the element it names, and it is the
@@ -127,9 +124,9 @@ const MARK_NESTING_ORDER = markNestingOrder([
 	"runFormattingOverride",
 	"characterStyle",
 	"comment",
+	"inlineWrapper",
 	"insertion",
 	"deletion",
-	"inlineWrapper",
 	"hyperlink",
 	"runPropertyChange",
 	"runIdentity"

package/dist/prosemirror/extensions/marks/HyperlinkExtension.js

@@ -7,6 +7,7 @@ import { panic } from "better-result";
 /**
 * Hyperlink Mark Extension
 */
+const DOCX_HYPERLINK_INDEX_ATTRIBUTE = "data-docx-hyperlink-index";
 /**
 * Sanitize an href arriving from (or being emitted to) the DOM: pasted HTML,
 * clipboard content, or a mark attr already stored on the document. Only
@@ -90,19 +91,25 @@ const HyperlinkExtension = createMarkExtension({
 		inclusive: false,
 		parseDOM: [{
 			tag: "a[href]",
-			getAttrs: (dom) => ({
-				href: sanitizeStoredHref(dom.getAttribute("href") ?? void 0),
-				tooltip: dom.getAttribute("title") ?? void 0,
-				target: dom.getAttribute("target") ?? void 0
-			})
+			getAttrs: (dom) => {
+				const index = dom.getAttribute(DOCX_HYPERLINK_INDEX_ATTRIBUTE);
+				const docxHyperlinkIndex = index !== null && /^\d+$/u.test(index) && Number.isSafeInteger(Number(index)) ? Number(index) : void 0;
+				return {
+					href: sanitizeStoredHref(dom.getAttribute("href") ?? void 0),
+					tooltip: dom.getAttribute("title") ?? void 0,
+					target: dom.getAttribute("target") ?? void 0,
+					...docxHyperlinkIndex === void 0 ? {} : { _docxHyperlinkIndex: docxHyperlinkIndex }
+				};
+			}
 		}],
 		toDOM(mark) {
-			const { href, target, tooltip } = expectHyperlinkMarkAttrs(mark);
+			const { href, target, tooltip, _docxHyperlinkIndex } = expectHyperlinkMarkAttrs(mark);
 			const domAttrs = {
 				href: sanitizeStoredHref(href),
 				...anchorTargetAttrs(target)
 			};
 			if (tooltip) domAttrs["title"] = tooltip;
+			if (typeof _docxHyperlinkIndex === "number") domAttrs[DOCX_HYPERLINK_INDEX_ATTRIBUTE] = String(_docxHyperlinkIndex);
 			return [
 				"a",
 				domAttrs,

package/dist/prosemirror/extensions/marks/InlineWrapperExtension.js

@@ -16,6 +16,7 @@ import { panic } from "better-result";
 * extend the wrapper over text the author wrote outside it.
 */
 const INLINE_WRAPPER_MARK_NAME = "inlineWrapper";
+const INLINE_WRAPPER_HYPERLINK_ORIGIN_ATTRIBUTE = "data-inline-wrapper-hyperlink-origin";
 /** What a tagged layer's element name is spelled as on the rendered span. */
 const TAGGED_ELEMENT_ATTRIBUTES = {
 	smartTag: "data-smart-tag-element",
@@ -54,22 +55,39 @@ const InlineWrapperExtension = createMarkExtension({
 	name: INLINE_WRAPPER_MARK_NAME,
 	schemaMarkName: INLINE_WRAPPER_MARK_NAME,
 	markSpec: {
-		attrs: { 
-		/** Outermost first. `null` is no wrapper, which is the absence of the mark. */
-stack: { default: null } },
+		attrs: {
+			/** Outermost first. `null` is no wrapper, which is the absence of the mark. */
+			stack: { default: null },
+			_docxHyperlinkIndex: { default: null },
+			_docxInsideHyperlinkStackStart: { default: null }
+		},
 		inclusive: false,
 		parseDOM: [{
 			tag: `[${INLINE_WRAPPER_STACK_ATTRIBUTE}]`,
 			getAttrs(dom) {
 				const stack = parseInlineWrapperStack(dom.getAttribute(INLINE_WRAPPER_STACK_ATTRIBUTE));
-				return stack === null ? false : { stack };
+				if (stack === null) return false;
+				const origin = dom.getAttribute(INLINE_WRAPPER_HYPERLINK_ORIGIN_ATTRIBUTE);
+				if (origin === null) return { stack };
+				const match = /^(\d+):(\d+)$/u.exec(origin);
+				if (match === null) return false;
+				const hyperlinkIndex = Number(match[1]);
+				const stackStart = Number(match[2]);
+				if (!Number.isSafeInteger(hyperlinkIndex) || !Number.isSafeInteger(stackStart) || stackStart >= stack.length) return false;
+				return {
+					stack,
+					_docxHyperlinkIndex: hyperlinkIndex,
+					_docxInsideHyperlinkStackStart: stackStart
+				};
 			}
 		}],
 		toDOM(mark) {
-			const { stack } = expectInlineWrapperMarkAttrs(mark);
+			const { stack, _docxHyperlinkIndex, _docxInsideHyperlinkStackStart } = expectInlineWrapperMarkAttrs(mark);
 			const innermost = stack.at(-1);
 			if (innermost === void 0) panic("An inline wrapper mark carries at least one layer");
-			return layerElement(innermost, { [INLINE_WRAPPER_STACK_ATTRIBUTE]: serializeInlineWrapperStack(stack) });
+			const attributes = { [INLINE_WRAPPER_STACK_ATTRIBUTE]: serializeInlineWrapperStack(stack) };
+			if (typeof _docxHyperlinkIndex === "number" && typeof _docxInsideHyperlinkStackStart === "number") attributes[INLINE_WRAPPER_HYPERLINK_ORIGIN_ATTRIBUTE] = `${_docxHyperlinkIndex}:${_docxInsideHyperlinkStackStart}`;
+			return layerElement(innermost, attributes);
 		}
 	}
 });

package/dist/prosemirror/extensions/marks/RunIdentityExtension.js

@@ -105,7 +105,8 @@ const RunIdentityExtension = createMarkExtension({
 		attrs: {
 			id: {},
 			preservedAttributes: { default: null },
-			preserved: { default: null }
+			preserved: { default: null },
+			emptyFormatting: { default: null }
 		},
 		inclusive: false,
 		parseDOM: [{

package/dist/prosemirror/extensions/marks/TrackedChangeExtensions.js

@@ -1,5 +1,5 @@
 import { AUTHOR_COLORS, getAuthorColorIdx } from "../../../utils/authorColors.js";
-import { expectTrackedChangeMarkAttrs } from "../../attrs/index.js";
+import { expectTrackedChangeMarkAttrs, isTrackedRevisionAncestorArray } from "../../attrs/index.js";
 import { createMarkExtension } from "../create.js";
 //#region src/prosemirror/extensions/marks/TrackedChangeExtensions.ts
 /**
@@ -31,6 +31,15 @@ const SUGGESTION_TINT = "var(--suggestion-bg, color-mix(in oklch, #6d3bd6 12%, t
 const SUGGESTION_TINT_LAYER = `linear-gradient(${SUGGESTION_TINT}, ${SUGGESTION_TINT})`;
 const suggestedInsertionStyle = () => `color: ${SUGGESTION_COLOR}; text-decoration: underline; text-decoration-style: dotted; text-decoration-color: ${SUGGESTION_COLOR}; background-image: ${SUGGESTION_TINT_LAYER};`;
 const suggestedDeletionStyle = () => `color: ${SUGGESTION_COLOR}; text-decoration: line-through; text-decoration-style: dotted; text-decoration-color: ${SUGGESTION_COLOR}; background-image: ${SUGGESTION_TINT_LAYER};`;
+const revisionAncestorsFromDom = (serialized) => {
+	if (serialized === void 0) return null;
+	try {
+		const value = JSON.parse(serialized);
+		return isTrackedRevisionAncestorArray(value) ? value : false;
+	} catch {
+		return false;
+	}
+};
 /**
 * Insertion mark — text added in tracked changes
 * Renders with per-author colored underline.
@@ -47,21 +56,27 @@ const InsertionExtension = createMarkExtension({
 			moveKind: { default: null },
 			initials: { default: null },
 			provenance: { default: "user" },
-			suggestionId: { default: null }
+			suggestionId: { default: null },
+			_docxOuterWrapperCount: { default: null },
+			_docxRevisionAncestors: { default: null }
 		},
 		inclusive: false,
 		parseDOM: [{
 			tag: "span.docx-insertion",
 			getAttrs(dom) {
+				const ancestors = revisionAncestorsFromDom(dom.dataset["revisionAncestors"]);
+				if (ancestors === false) return false;
 				return {
 					revisionId: Number.parseInt(dom.dataset["revisionId"] ?? "0", 10),
 					author: dom.dataset["author"] ?? "",
-					date: dom.dataset["date"] ?? null
+					date: dom.dataset["date"] ?? null,
+					_docxOuterWrapperCount: dom.dataset["outerWrapperCount"] ? Number(dom.dataset["outerWrapperCount"]) : null,
+					_docxRevisionAncestors: ancestors
 				};
 			}
 		}],
 		toDOM(mark) {
-			const { revisionId, author, date, provenance, suggestionId } = expectTrackedChangeMarkAttrs(mark);
+			const { revisionId, author, date, provenance, suggestionId, _docxOuterWrapperCount, _docxRevisionAncestors } = expectTrackedChangeMarkAttrs(mark);
 			const idx = getAuthorColorIdx(author);
 			const color = AUTHOR_COLORS[idx] ?? "#000000";
 			const titleParts = [author, date ? new Date(date).toLocaleDateString() : ""].filter(Boolean);
@@ -76,6 +91,8 @@ const InsertionExtension = createMarkExtension({
 					...suggested ? { "data-provenance": "suggested" } : {},
 					...suggested && suggestionId ? { "data-suggestion-id": suggestionId } : {},
 					...date ? { "data-date": date } : {},
+					..._docxOuterWrapperCount != null ? { "data-outer-wrapper-count": String(_docxOuterWrapperCount) } : {},
+					..._docxRevisionAncestors ? { "data-revision-ancestors": JSON.stringify(_docxRevisionAncestors) } : {},
 					...titleParts.length > 0 ? { title: `${suggested ? "Suggested" : "Inserted"}: ${titleParts.join(", ")}` } : {},
 					style: suggested ? suggestedInsertionStyle() : insertionStyle(color)
 				},
@@ -101,21 +118,27 @@ const DeletionExtension = createMarkExtension({
 			initials: { default: null },
 			provenance: { default: "user" },
 			suggestionId: { default: null },
-			_historicalFormatting: { default: null }
+			_historicalFormatting: { default: null },
+			_docxOuterWrapperCount: { default: null },
+			_docxRevisionAncestors: { default: null }
 		},
 		inclusive: false,
 		parseDOM: [{
 			tag: "span.docx-deletion",
 			getAttrs(dom) {
+				const ancestors = revisionAncestorsFromDom(dom.dataset["revisionAncestors"]);
+				if (ancestors === false) return false;
 				return {
 					revisionId: Number.parseInt(dom.dataset["revisionId"] ?? "0", 10),
 					author: dom.dataset["author"] ?? "",
-					date: dom.dataset["date"] ?? null
+					date: dom.dataset["date"] ?? null,
+					_docxOuterWrapperCount: dom.dataset["outerWrapperCount"] ? Number(dom.dataset["outerWrapperCount"]) : null,
+					_docxRevisionAncestors: ancestors
 				};
 			}
 		}],
 		toDOM(mark) {
-			const { revisionId, author, date, provenance, suggestionId } = expectTrackedChangeMarkAttrs(mark);
+			const { revisionId, author, date, provenance, suggestionId, _docxOuterWrapperCount, _docxRevisionAncestors } = expectTrackedChangeMarkAttrs(mark);
 			const idx = getAuthorColorIdx(author);
 			const color = AUTHOR_COLORS[idx] ?? "#000000";
 			const titleParts = [author, date ? new Date(date).toLocaleDateString() : ""].filter(Boolean);
@@ -130,6 +153,8 @@ const DeletionExtension = createMarkExtension({
 					...suggested ? { "data-provenance": "suggested" } : {},
 					...suggested && suggestionId ? { "data-suggestion-id": suggestionId } : {},
 					...date ? { "data-date": date } : {},
+					..._docxOuterWrapperCount != null ? { "data-outer-wrapper-count": String(_docxOuterWrapperCount) } : {},
+					..._docxRevisionAncestors ? { "data-revision-ancestors": JSON.stringify(_docxRevisionAncestors) } : {},
 					...titleParts.length > 0 ? { title: `${suggested ? "Suggested deletion" : "Deleted"}: ${titleParts.join(", ")}` } : {},
 					style: suggested ? suggestedDeletionStyle() : deletionStyle(color)
 				},

package/dist/prosemirror/extensions/nodes/CommentReferenceExtension.js

@@ -13,11 +13,15 @@ const surveyCommentReferences = (doc) => {
 	doc.descendants((node, position) => {
 		if (node.type.name === "commentReference") {
 			const attrs = readCommentReferenceAttrs(node);
-			references.push({
-				commentId: attrs.ok ? attrs.value.commentId : -1,
+			references.push(attrs.ok ? {
+				status: "valid",
+				commentId: attrs.value.commentId,
 				position,
-				size: node.nodeSize,
-				malformed: !attrs.ok
+				size: node.nodeSize
+			} : {
+				status: "malformed",
+				position,
+				size: node.nodeSize
 			});
 			return false;
 		}
@@ -60,7 +64,7 @@ const CommentReferenceExtension = createNodeExtension({
 			tag: "span[data-docx-comment-reference]",
 			getAttrs(dom) {
 				const raw = dom.getAttribute("data-docx-comment-reference");
-				if (raw === null || !/^(?:0|[1-9]\d*)$/.test(raw)) return false;
+				if (raw === null || !/^-?(?:0|[1-9]\d*)$/.test(raw)) return false;
 				const commentId = Number(raw);
 				return Number.isSafeInteger(commentId) ? { commentId } : false;
 			}

package/dist/prosemirror/extensions/nodes/TableExtension.js

@@ -367,7 +367,7 @@ const statedCellWidth = (value, type) => ({
 	}
 });
 const tableCellSpec = {
-	content: "(paragraph | table | textBox | preservedBlock | blockBookmarkBoundary)+",
+	content: "(paragraph | table | textBox | blockSdt | preservedBlock | blockBookmarkBoundary)+",
 	tableRole: "cell",
 	isolating: true,
 	attrs: {
@@ -436,7 +436,7 @@ const tableCellSpec = {
 	}
 };
 const tableHeaderSpec = {
-	content: "(paragraph | table | textBox | preservedBlock | blockBookmarkBoundary)+",
+	content: "(paragraph | table | textBox | blockSdt | preservedBlock | blockBookmarkBoundary)+",
 	tableRole: "header_cell",
 	isolating: true,
 	attrs: {

package/dist/prosemirror/runIdentity.d.ts

@@ -13,16 +13,16 @@ declare const RUN_IDENTITY_MARK_NAME = "runIdentity";
 type RunIdentityPayload = {
   preservedAttributes?: readonly document_d_exports.PreservedAttribute[] | undefined;
   preserved?: document_d_exports.PreservedMarkup | undefined;
+  emptyFormatting?: boolean | undefined;
 };
 /** A run identity's attrs in canonical form. */
-declare const runIdentityAttrs: (id: number, { preservedAttributes, preserved }?: RunIdentityPayload) => RunIdentityMarkAttrs;
+declare const runIdentityAttrs: (id: number, { preservedAttributes, preserved, emptyFormatting }?: RunIdentityPayload) => RunIdentityMarkAttrs;
 /**
  * Whether a run holds markup the mark exists to carry.
  *
- * The mint condition, minus the page break: a run with neither remainder nor
- * sink and no break to rejoin its leaves across needs no identity, and 57.5%
- * of corpus files hold none.
+ * The payload condition. The conversion also mints an identity for runs whose
+ * page break or mixed inline atoms split one authored run into several leaves.
  */
-declare const hasRunIdentityPayload: ({ preservedAttributes, preserved }: RunIdentityPayload) => boolean;
+declare const hasRunIdentityPayload: ({ preservedAttributes, preserved, emptyFormatting }: RunIdentityPayload) => boolean;
 //#endregion
 export { RUN_IDENTITY_ATTRIBUTE, RUN_IDENTITY_MARK_NAME, RunIdentityPayload, hasRunIdentityPayload, runIdentityAttrs };

package/dist/prosemirror/runIdentity.js

@@ -18,19 +18,19 @@ const preservedMarkup = ({ children }) => ({ children: (children ?? []).map(({ i
 	xml
 })) });
 /** A run identity's attrs in canonical form. */
-const runIdentityAttrs = (id, { preservedAttributes, preserved } = {}) => {
+const runIdentityAttrs = (id, { preservedAttributes, preserved, emptyFormatting } = {}) => {
 	const attrs = { id };
 	if (preservedAttributes && preservedAttributes.length > 0) attrs.preservedAttributes = preservedAttributes.map(preservedAttribute);
 	if (preserved && (preserved.children?.length ?? 0) > 0) attrs.preserved = preservedMarkup(preserved);
+	if (emptyFormatting) attrs.emptyFormatting = true;
 	return attrs;
 };
 /**
 * Whether a run holds markup the mark exists to carry.
 *
-* The mint condition, minus the page break: a run with neither remainder nor
-* sink and no break to rejoin its leaves across needs no identity, and 57.5%
-* of corpus files hold none.
+* The payload condition. The conversion also mints an identity for runs whose
+* page break or mixed inline atoms split one authored run into several leaves.
 */
-const hasRunIdentityPayload = ({ preservedAttributes, preserved }) => (preservedAttributes?.length ?? 0) > 0 || (preserved?.children?.length ?? 0) > 0;
+const hasRunIdentityPayload = ({ preservedAttributes, preserved, emptyFormatting }) => (preservedAttributes?.length ?? 0) > 0 || (preserved?.children?.length ?? 0) > 0 || emptyFormatting === true;
 //#endregion
 export { RUN_IDENTITY_ATTRIBUTE, RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs };

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

@@ -1,4 +1,4 @@
-import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperKind, InlineWrapperLayer, LanguageAttrs, RunFormattingOverrideAttrs, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "./marks.js";
+import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperKind, InlineWrapperLayer, LanguageAttrs, RunFormattingOverrideAttrs, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, TrackedRevisionAncestor, UnderlineAttrs } from "./marks.js";
 import { BlockSdtAttrs, BookmarkBoundaryAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, PageBreakRunAttrs, ParagraphAttrs, ParagraphPropertyChangeAttrs, PreservedBlockAttrs, PreservedXmlAttrs, PreservedXmlLevel, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
 import { ExtensionManager } from "../extensions/ExtensionManager.js";
 //#region src/prosemirror/schema/index.d.ts
@@ -11,4 +11,4 @@ type DocxSchema = typeof schema;
 type DocxNode = ReturnType<typeof schema.node>;
 type DocxMark = ReturnType<typeof schema.mark>;
 //#endregion
-export { type BlockSdtAttrs, type BookmarkBoundaryAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type InlineWrapperAttrs, type InlineWrapperKind, type InlineWrapperLayer, type LanguageAttrs, type MathAttrs, type PageBreakRunAttrs, type ParagraphAttrs, type ParagraphPropertyChangeAttrs, type PreservedBlockAttrs, type PreservedXmlAttrs, type PreservedXmlLevel, type RunFormattingOverrideAttrs, type RunIdentityMarkAttrs, type RunPropertyChangeMarkAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type SymbolAttrs, type TabAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };
+export { type BlockSdtAttrs, type BookmarkBoundaryAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type InlineWrapperAttrs, type InlineWrapperKind, type InlineWrapperLayer, type LanguageAttrs, type MathAttrs, type PageBreakRunAttrs, type ParagraphAttrs, type ParagraphPropertyChangeAttrs, type PreservedBlockAttrs, type PreservedXmlAttrs, type PreservedXmlLevel, type RunFormattingOverrideAttrs, type RunIdentityMarkAttrs, type RunPropertyChangeMarkAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type SymbolAttrs, type TabAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type TrackedRevisionAncestor, type UnderlineAttrs, schema, singletonManager };

package/dist/prosemirror/schema/marks.d.ts

@@ -99,6 +99,15 @@ type CommentAttrs = {
  */
 declare const TRACKED_CHANGE_PROVENANCE_VALUES: readonly ["user", "suggested"];
 type TrackedChangeProvenance = (typeof TRACKED_CHANGE_PROVENANCE_VALUES)[number];
+type TrackedRevisionAncestor = {
+  type: "insertion" | "deletion" | "moveFrom" | "moveTo";
+  revisionId: number;
+  author: string;
+  date?: string;
+  utcDate?: string;
+  initials?: string;
+  outerWrapperCount: number;
+};
 type TrackedChangeMarkAttrs = {
   revisionId: number;
   author: string;
@@ -108,6 +117,10 @@ type TrackedChangeMarkAttrs = {
   /** Optional author initials (w:initials) carried through the round-trip. */
   initials?: string;
   moveKind?: "moveTo" | "moveFrom";
+  /** Number of inline-wrapper layers authored outside this revision. */
+  _docxOuterWrapperCount?: number;
+  /** Outer revisions, in authored order, that ProseMirror cannot hold as nested marks. */
+  _docxRevisionAncestors?: readonly TrackedRevisionAncestor[];
   /** Defaults to `"user"`; `"suggested"` for AI-proposed, non-serialized edits. */
   provenance: TrackedChangeProvenance;
   /**
@@ -136,7 +149,7 @@ type RunPropertyChangeMarkAttrs = {
  * in the schema would force a resolution.
  *
  * Minted only when the run has something to carry — a page break, an
- * attribute remainder, or a property-set remainder — so a document that
+ * attribute remainder, or authored run properties — so a document that
  * carries none pays nothing.
  */
 type RunIdentityMarkAttrs = {
@@ -146,6 +159,8 @@ type RunIdentityMarkAttrs = {
   preservedAttributes?: readonly document_d_exports.PreservedAttribute[];
   /** The `w:rPr` children no reader took a value from, with their ordinals. */
   preserved?: document_d_exports.PreservedMarkup;
+  /** Preserve an authored empty `w:rPr`, distinct from no run properties. */
+  emptyFormatting?: true;
 };
 /**
  * One transparent wrapper a leaf sits inside, minus the content ProseMirror
@@ -170,6 +185,17 @@ type InlineWrapperKind = InlineWrapperLayer["kind"];
  */
 type InlineWrapperAttrs = {
   stack: readonly InlineWrapperLayer[];
+  /**
+   * The imported hyperlink whose children the suffix of `stack` came from.
+   *
+   * ProseMirror stores marks as an unordered set, so a link mark and a wrapper
+   * mark otherwise cannot say whether `<w:bdo>` surrounded `<w:hyperlink>` or
+   * was one of its children. This is parser provenance, not editable wrapper
+   * data: it is meaningful only alongside the matching hyperlink mark.
+   */
+  _docxHyperlinkIndex?: number;
+  /** The first stack layer authored inside `_docxHyperlinkIndex`. */
+  _docxInsideHyperlinkStackStart?: number;
 };
 declare const COMPLEX_SCRIPT_RUN_PROPERTY_KEYS: readonly ["boldCs", "italicCs", "fontSizeCs"];
 type ComplexScriptRunPropertyKey = (typeof COMPLEX_SCRIPT_RUN_PROPERTY_KEYS)[number];
@@ -278,4 +304,4 @@ type HyperlinkAttrs = {
   _docxHyperlinkIndex?: number;
 };
 //#endregion
-export { AuthoredRunFormattingValues, COMPLEX_SCRIPT_RUN_PROPERTY_KEYS, CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, ComplexScriptRunPropertyKey, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperKind, InlineWrapperLayer, LanguageAttrs, RUN_FORMATTING_BOOLEAN_PROPERTIES, RUN_FORMATTING_PROPERTY_SPECS, RUN_FORMATTING_VALUE_PROPERTIES, RunFormattingBooleanProperty, RunFormattingOverrideAttrs, RunFormattingValueProperty, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TRACKED_CHANGE_PROVENANCE_VALUES, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, TrackedChangeProvenance, UnderlineAttrs };
+export { AuthoredRunFormattingValues, COMPLEX_SCRIPT_RUN_PROPERTY_KEYS, CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, ComplexScriptRunPropertyKey, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperKind, InlineWrapperLayer, LanguageAttrs, RUN_FORMATTING_BOOLEAN_PROPERTIES, RUN_FORMATTING_PROPERTY_SPECS, RUN_FORMATTING_VALUE_PROPERTIES, RunFormattingBooleanProperty, RunFormattingOverrideAttrs, RunFormattingValueProperty, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TRACKED_CHANGE_PROVENANCE_VALUES, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, TrackedChangeProvenance, TrackedRevisionAncestor, UnderlineAttrs };

package/dist/prosemirror/schema/nodes.d.ts

@@ -1,5 +1,5 @@
 import { document_d_exports } from "../../types/document.js";
-import { TrackedChangeProvenance } from "./marks.js";
+import { InlineWrapperLayer, TrackedChangeProvenance } from "./marks.js";
 import "../../types/index.js";
 import { OutlineStyleAttr } from "../../types/documentEnumValues.js";
 import { SpacingExplicit } from "../../types/formatting.js";
@@ -212,9 +212,9 @@ type ParagraphAttrs = {
     id: number;
     name: string;
   }[];
-  /** Empty `w:hyperlink` elements cannot be represented as text marks.
-   *  Preserve their relationship metadata at the paragraph boundary so a
-   *  no-edit DOCX round-trip does not silently drop hyperlink elements. */
+  /** A `w:hyperlink` with no projectable leaf cannot be represented as a text mark.
+   *  Preserve its metadata and any empty transparent-wrapper children at the
+   *  paragraph boundary so an editor round trip does not drop either element. */
   _emptyHyperlinks?: {
     /** ProseMirror inline offset where the zero-width hyperlink appeared. */
     offset: number;
@@ -225,6 +225,8 @@ type ParagraphAttrs = {
     target?: document_d_exports.Hyperlink["target"];
     history?: document_d_exports.Hyperlink["history"];
     docLocation?: document_d_exports.Hyperlink["docLocation"];
+    /** Empty transparent-wrapper nests authored as children of this link. */
+    _docxEmptyWrapperStacks?: readonly (readonly InlineWrapperLayer[])[];
   }[];
   /**
    * Run-in heading flag: this paragraph's mark carries

package/dist/prosemirror/trackedRunInlineAtoms.d.ts

@@ -16,7 +16,7 @@ declare const TRACKED_RUN_INLINE_ATOM_DISPOSITIONS: Readonly<{
   readonly hardBreak: "carry";
   readonly image: "carry";
   readonly math: "carry";
-  readonly moveRangeBoundary: "transparent";
+  readonly moveRangeBoundary: "carry";
   readonly pageBreakRun: "page-break-carrier";
   readonly preservedXml: "carry";
   readonly rangeAnchor: "transparent";

package/dist/prosemirror/trackedRunInlineAtoms.js

@@ -15,7 +15,7 @@ const TRACKED_RUN_INLINE_ATOM_DISPOSITIONS = Object.freeze({
 	hardBreak: "carry",
 	image: "carry",
 	math: "carry",
-	moveRangeBoundary: "transparent",
+	moveRangeBoundary: "carry",
 	pageBreakRun: "page-break-carrier",
 	preservedXml: "carry",
 	rangeAnchor: "transparent",

package/dist/prosemirror/utils/extractTrackedChanges.js

@@ -1,4 +1,4 @@
-import { expectRunPropertyChangeMarkAttrs } from "../attrs/index.js";
+import { expectRunPropertyChangeMarkAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
 import { nodePropertyRevisionSites, propertyRevisionMetadata, propertyRevisionRecords } from "../revisionCarriers.js";
 import { getTableCellMergeChange } from "../tableCellMergeRevision.js";
 //#region src/prosemirror/utils/extractTrackedChanges.ts
@@ -46,6 +46,7 @@ function extractTrackedChanges(state) {
 	const runPropertyChangeType = schema.marks["runPropertyChange"];
 	if (!insertionType && !deletionType && !runPropertyChangeType) return EMPTY_RESULT;
 	const raw = [];
+	const nestedRevisionIds = /* @__PURE__ */ new Set();
 	const commentToRevision = /* @__PURE__ */ new Map();
 	const commentMetadata = /* @__PURE__ */ new Map();
 	const rowRevisionScopes = [];
@@ -223,14 +224,28 @@ function extractTrackedChanges(state) {
 			if (mark.type === insertionType || mark.type === deletionType) {
 				tcMark = mark;
 				if (foldIntoRowRevision(rowRevisionScopes.at(-1), mark)) continue;
+				const attrs = expectTrackedChangeMarkAttrs(mark);
+				if (attrs._docxRevisionAncestors?.length) nestedRevisionIds.add(attrs.revisionId);
+				for (const ancestor of attrs._docxRevisionAncestors ?? []) {
+					nestedRevisionIds.add(ancestor.revisionId);
+					raw.push({
+						type: ancestor.type === "insertion" || ancestor.type === "moveTo" ? "insertion" : "deletion",
+						text: inlineText,
+						author: ancestor.author,
+						date: ancestor.date,
+						from: pos,
+						to: pos + node.nodeSize,
+						revisionId: ancestor.revisionId
+					});
+				}
 				raw.push({
 					type: mark.type === insertionType ? "insertion" : "deletion",
 					text: inlineText,
-					author: mark.attrs["author"] || "",
-					date: mark.attrs["date"],
+					author: attrs.author,
+					date: attrs.date,
 					from: pos,
 					to: pos + node.nodeSize,
-					revisionId: mark.attrs["revisionId"]
+					revisionId: attrs.revisionId
 				});
 			}
 		}
@@ -380,7 +395,7 @@ function extractTrackedChanges(state) {
 			merged.push({ ...entry });
 			continue;
 		}
-		const key = `${entry.type}|${entry.author}|${entry.date ?? ""}`;
+		const key = `${entry.type}|${entry.author}|${entry.date ?? ""}|${nestedRevisionIds.has(entry.revisionId) ? entry.revisionId : ""}`;
 		const group = inlineGroups.get(key);
 		if (group) {
 			const sep = group.to === entry.from ? "" : " ";
@@ -403,7 +418,7 @@ function extractTrackedChanges(state) {
 	for (let i = 0; i < merged.length; i++) {
 		const curr = merged[i];
 		const next = merged[i + 1];
-		if (curr.type === "deletion" && next && next.type === "insertion" && curr.author === next.author && curr.to === next.from) {
+		if (curr.type === "deletion" && next && next.type === "insertion" && !nestedRevisionIds.has(curr.revisionId) && !nestedRevisionIds.has(next.revisionId) && curr.author === next.author && curr.to === next.from) {
 			final.push({
 				type: "replacement",
 				text: next.text,