@stll/folio-core 0.47.4 → 0.47.5

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -272,6 +272,7 @@ function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
 	if (tokenSources) restoreParagraphPropertySourcesByToken(blocks, tokenSources);
 	else if (baseDocument) restoreParagraphPropertySources(blocks, baseDocument.package.document.content, linkedSources.targets, linkedSources.sources);
 	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.comments) documentBody.comments = baseDocument.package.document.comments;
@@ -1137,6 +1138,17 @@ const inlineWrapperStackOf = (node) => {
 	const mark = node.marks.find((candidate) => candidate.type.name === INLINE_WRAPPER_MARK_NAME);
 	return mark ? expectInlineWrapperMarkAttrs(mark).stack : [];
 };
+/** The authored hyperlink that owns a suffix of the node's wrapper stack. */
+const inlineWrapperHyperlinkOriginOf = (node) => {
+	const mark = node.marks.find((candidate) => candidate.type.name === INLINE_WRAPPER_MARK_NAME);
+	if (!mark) return;
+	const attrs = expectInlineWrapperMarkAttrs(mark);
+	if (typeof attrs._docxHyperlinkIndex !== "number" || typeof attrs._docxInsideHyperlinkStackStart !== "number") return;
+	return {
+		hyperlinkIndex: attrs._docxHyperlinkIndex,
+		stackStart: attrs._docxInsideHyperlinkStackStart
+	};
+};
 const isRevisionWrapper = (item) => item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo";
 /** `stack` closed around `content`, outermost layer first. */
 const nestInlineWrappers = (stack, content) => {
@@ -1160,7 +1172,20 @@ const nestInlineWrappers = (stack, content) => {
 * A group with nothing in it writes no wrapper: an authored wrapper whose
 * content was deleted or rejected is gone, and an empty one says nothing.
 */
-const nestInlineWrapperGroups = (items, groups) => {
+const nestInsideHyperlink = (item, stack, hyperlinkIndex, indices) => {
+	if (item.type === "hyperlink") {
+		if (indices.get(item) !== hyperlinkIndex) return false;
+		item.children = [nestInlineWrappers(stack, item.children)];
+		return true;
+	}
+	if (isRevisionWrapper(item)) {
+		let nested = false;
+		for (const child of item.content) if (nestInsideHyperlink(child, stack, hyperlinkIndex, indices)) nested = true;
+		return nested;
+	}
+	return false;
+};
+const nestInlineWrapperGroups = (items, groups, hyperlinkIndices) => {
 	const nested = [];
 	for (const [index, group] of groups.entries()) {
 		const slice = items.slice(group.start, groups[index + 1]?.start ?? items.length);
@@ -1168,10 +1193,22 @@ const nestInlineWrapperGroups = (items, groups) => {
 			nested.push(...slice);
 			continue;
 		}
+		const origin = group.origin;
+		let outerStack = group.stack;
+		if (origin !== void 0) {
+			const innerStack = group.stack.slice(origin.stackStart);
+			let nestedInsideOrigin = false;
+			for (const item of slice) if (nestInsideHyperlink(item, innerStack, origin.hyperlinkIndex, hyperlinkIndices)) nestedInsideOrigin = true;
+			if (nestedInsideOrigin) outerStack = group.stack.slice(0, origin.stackStart);
+		}
+		if (outerStack.length === 0) {
+			nested.push(...slice);
+			continue;
+		}
 		let pending = [];
 		const closeNest = () => {
 			if (pending.length === 0) return;
-			nested.push(nestInlineWrappers(group.stack, pending));
+			nested.push(nestInlineWrappers(outerStack, pending));
 			pending = [];
 		};
 		for (const item of slice) {
@@ -1180,7 +1217,7 @@ const nestInlineWrapperGroups = (items, groups) => {
 				continue;
 			}
 			closeNest();
-			if (item.content.length > 0) item.content = [nestInlineWrappers(group.stack, item.content)];
+			if (item.content.length > 0) item.content = [nestInlineWrappers(outerStack, item.content)];
 			nested.push(item);
 		}
 		closeNest();
@@ -1214,7 +1251,14 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 	let currentHyperlinkKey = null;
 	let currentTrackedChange;
 	const sourceRunOwners = /* @__PURE__ */ new WeakMap();
+	const sourceHyperlinkIndices = /* @__PURE__ */ new WeakMap();
 	const openedComments = /* @__PURE__ */ new Set();
+	const createIndexedHyperlink = (mark) => {
+		const hyperlink = createHyperlink(mark);
+		const index = expectHyperlinkMarkAttrs(mark)._docxHyperlinkIndex;
+		if (typeof index === "number") sourceHyperlinkIndices.set(hyperlink, index);
+		return hyperlink;
+	};
 	const commentLastOffset = /* @__PURE__ */ new Map();
 	paragraph.forEach((node, offset) => {
 		for (const commentId of getCommentMarkIds(node.marks)) commentLastOffset.set(commentId, offset);
@@ -1298,14 +1342,20 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 	*/
 	const enterWrapperGroup = (node) => {
 		const stack = inlineWrapperStackOf(node);
-		const key = inlineWrapperStackKey(stack);
+		const origin = inlineWrapperHyperlinkOriginOf(node);
+		const key = [
+			inlineWrapperStackKey(stack),
+			origin?.hyperlinkIndex ?? "",
+			origin?.stackStart ?? ""
+		].join("\0");
 		if (key === wrapperGroupKey) return;
 		flushCurrentInline();
 		currentTrackedChange = void 0;
 		wrapperGroupKey = key;
 		wrapperGroups.push({
 			start: content.length,
-			stack
+			stack,
+			...origin ? { origin } : {}
 		});
 	};
 	const processInlineNode = (node, offset) => {
@@ -1332,12 +1382,6 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			content.push({ ...start }, { ...end });
 			return;
 		}
-		if (node.type.name === "moveRangeBoundary") {
-			flushCurrentInline();
-			currentTrackedChange = void 0;
-			content.push({ ...expectMoveRangeBoundaryAttrs(node) });
-			return;
-		}
 		const linkMark = node.marks.find((m) => m.type.name === "hyperlink");
 		const noteRefMark = node.marks.find((m) => m.type.name === "footnoteRef");
 		const insertionMark = node.marks.find((m) => m.type.name === "insertion");
@@ -1354,10 +1398,8 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			};
 			if (textBoxAnchorMarkers.has(anchorId)) return;
 			textBoxAnchorMarkers.set(anchorId, marker);
-			const anchoredContent = linkMark ? {
-				...createHyperlink(linkMark),
-				children: [marker]
-			} : marker;
+			const anchoredContent = linkMark ? createIndexedHyperlink(linkMark) : marker;
+			if (anchoredContent.type === "hyperlink") anchoredContent.children.push(marker);
 			const changeMark = insertionMark ?? deletionMark;
 			if (!changeMark) {
 				content.push(anchoredContent);
@@ -1409,7 +1451,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			if (linkMark) {
 				const linkKey = getLinkKey(linkMark);
 				if (!currentTrackedChange || currentTrackedChange.type !== "hyperlink" || currentTrackedChange.key !== trackedChangeKey || currentTrackedChange.hyperlinkKey !== linkKey) {
-					const hyperlink = createHyperlink(linkMark);
+					const hyperlink = createIndexedHyperlink(linkMark);
 					const wrapper = createTrackedRunWrapper(type, info, hyperlink);
 					content.push(wrapper);
 					currentTrackedChange = {
@@ -1455,6 +1497,10 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				currentTrackedChange.wrapper.content.push(bookmarkMarkerFromAttrs(expectBookmarkBoundaryAttrs(node)));
 				return;
 			}
+			if (node.type.name === "moveRangeBoundary") {
+				currentTrackedChange.wrapper.content.push({ ...expectMoveRangeBoundaryAttrs(node) });
+				return;
+			}
 			if (node.type.name === "field" || node.type.name === "structuredField") {
 				currentTrackedChange.wrapper.content.push(createFieldFromNode(node, {
 					...formattingContext,
@@ -1488,6 +1534,12 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			appendDirectRun(node, ownedRun, node.isText);
 			return;
 		}
+		if (node.type.name === "moveRangeBoundary") {
+			flushCurrentInline();
+			currentTrackedChange = void 0;
+			content.push({ ...expectMoveRangeBoundaryAttrs(node) });
+			return;
+		}
 		if (noteRefMark && !linkMark) {
 			flushCurrentInline();
 			content.push(createNoteReferenceRun(noteRefMark, node.marks, formattingContext));
@@ -1497,7 +1549,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			const linkKey = getLinkKey(linkMark);
 			if (currentHyperlink && currentHyperlinkKey === linkKey) {} else {
 				flushCurrentInline();
-				currentHyperlink = createHyperlink(linkMark);
+				currentHyperlink = createIndexedHyperlink(linkMark);
 				currentHyperlinkKey = linkKey;
 			}
 			addNodeToHyperlink({
@@ -1588,7 +1640,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 		type: "commentRangeEnd",
 		id: commentId
 	});
-	return nestInlineWrapperGroups(content, wrapperGroups);
+	return nestInlineWrapperGroups(content, wrapperGroups, sourceHyperlinkIndices);
 }
 function createTrackedChangeRun({ baseParagraphFormatting, inheritedFormatting, marks, node, paragraphMarkFormatting, paragraphMarkPrecedesStyle, styleResolver }) {
 	const formattingContext = {
@@ -1646,6 +1698,7 @@ function createEmptyHyperlink(attrs) {
 	if (attrs.target !== void 0) hyperlink.target = attrs.target;
 	if (attrs.history !== void 0) hyperlink.history = attrs.history;
 	if (attrs.docLocation !== void 0) hyperlink.docLocation = attrs.docLocation;
+	for (const stack of attrs._docxEmptyWrapperStacks ?? []) hyperlink.children.push(nestInlineWrappers(stack, []));
 	return hyperlink;
 }
 function getCommentMarkIds(marks) {
@@ -3298,6 +3351,9 @@ function convertPMTableCell(node, documentCounts, styleResolver = null) {
 		} else if (contentNode.type.name === "table") {
 			content.push(convertPMTable(contentNode, documentCounts, styleResolver));
 			previousStandaloneTextBox = null;
+		} else if (contentNode.type.name === "blockSdt") {
+			content.push(convertPMBlockSdt(contentNode, styleResolver));
+			previousStandaloneTextBox = null;
 		} else if (contentNode.type.name === "textBox") previousStandaloneTextBox = appendTextBoxBlock(content, contentNode, {
 			pendingPageBreaks: 0,
 			previousStandaloneTextBox,

package/dist/prosemirror/conversion/toProseDoc.js

@@ -486,6 +486,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 					nextRunIdentityId
 				});
 				if (linkNodes.length === 0) {
+					const emptyWrapperStacks = emptyInlineWrapperStacks(content.children);
 					emptyHyperlinks ??= [];
 					emptyHyperlinks.push({
 						offset: inlineOffset,
@@ -495,7 +496,8 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 						...content.rId !== void 0 ? { rId: content.rId } : {},
 						...content.target !== void 0 ? { target: content.target } : {},
 						...content.history !== void 0 ? { history: content.history } : {},
-						...content.docLocation !== void 0 ? { docLocation: content.docLocation } : {}
+						...content.docLocation !== void 0 ? { docLocation: content.docLocation } : {},
+						...emptyWrapperStacks.length === 0 ? {} : { _docxEmptyWrapperStacks: emptyWrapperStacks }
 					});
 					break;
 				}
@@ -667,6 +669,7 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, next
 			id: item.id,
 			displacedByCustomXml: item.displacedByCustomXml
 		}));
+		else if (item.type === "moveFromRangeStart" || item.type === "moveFromRangeEnd" || item.type === "moveToRangeStart" || item.type === "moveToRangeEnd") itemNodes.push(schema.node(MOVE_RANGE_BOUNDARY_NODE_NAME, { marker: item }));
 		else if (item.type === "preservedInline") itemNodes.push(preservedInlineNode(item));
 		else panic(`Unsupported tracked-run content: ${JSON.stringify(item)}`);
 		nodes.push(...withInlineWrapperMark(itemNodes, stack));
@@ -1035,6 +1038,7 @@ function blockHasMeaningfulContent(block) {
 	if (block.type === "preservedBlock") return true;
 	if (block.type === "bookmarkStart" || block.type === "bookmarkEnd") return true;
 	if (block.type === "table") return block.rows.some((row) => row.cells.some((cell) => tableCellHasMeaningfulContent(cell)));
+	if (block.type === "blockSdt") return true;
 	return block.content.some(paragraphContentHasMeaningfulContent);
 }
 function paragraphContentHasMeaningfulContent(content) {
@@ -1394,28 +1398,35 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 	}
 	if (preserveVMergeRestart) attrs._preserveVMergeRestart = true;
 	if (vMergeContinuationCells && vMergeContinuationCells.length > 0) attrs._docxVMergeContinuationCells = transportTableCellsWithParagraphPropertySources(vMergeContinuationCells);
-	const contentNodes = [];
-	for (const content of cell.content) switch (content.type) {
-		case "paragraph":
-			contentNodes.push(...convertParagraphWithTextBoxes(content, styleResolver, {
-				textBoxGroupId: context.nextTextBoxGroupId(),
-				context,
-				...conditionalStyle?.rPr !== void 0 ? { extraRunFormatting: conditionalStyle.rPr } : {},
-				...conditionalStyle?.pPr !== void 0 ? { tableParagraphOverlay: conditionalStyle.pPr } : {}
-			}));
-			break;
-		case "table":
-			contentNodes.push(convertTable(content, styleResolver, context));
-			break;
-		case "preservedBlock":
-			contentNodes.push(convertPreservedBlock(content));
-			break;
-		case "bookmarkStart":
-		case "bookmarkEnd":
-			contentNodes.push(convertBlockBookmarkBoundary(content));
-			break;
-		default: panic(`Unsupported table cell content: ${JSON.stringify(content)}`);
-	}
+	const convertCellBlocks = (blocks) => {
+		const nodes = [];
+		for (const block of blocks) switch (block.type) {
+			case "paragraph":
+				nodes.push(...convertParagraphWithTextBoxes(block, styleResolver, {
+					textBoxGroupId: context.nextTextBoxGroupId(),
+					context,
+					...conditionalStyle?.rPr !== void 0 ? { extraRunFormatting: conditionalStyle.rPr } : {},
+					...conditionalStyle?.pPr !== void 0 ? { tableParagraphOverlay: conditionalStyle.pPr } : {}
+				}));
+				break;
+			case "table":
+				nodes.push(convertTable(block, styleResolver, context));
+				break;
+			case "blockSdt":
+				nodes.push(convertBlockSdt(block, convertCellBlocks));
+				break;
+			case "preservedBlock":
+				nodes.push(convertPreservedBlock(block));
+				break;
+			case "bookmarkStart":
+			case "bookmarkEnd":
+				nodes.push(convertBlockBookmarkBoundary(block));
+				break;
+			default: panic(`Unsupported table cell content: ${JSON.stringify(block)}`);
+		}
+		return nodes;
+	};
+	const contentNodes = convertCellBlocks(cell.content);
 	if (contentNodes.length === 0) contentNodes.push(schema.node("paragraph", {}, []));
 	const nodeType = isHeader ? "tableHeader" : "tableCell";
 	return schema.node(nodeType, attrs, contentNodes);
@@ -1527,27 +1538,32 @@ const withInlineWrapperStacks = (content, stack = []) => content.flatMap((item)
 	content: item,
 	stack
 }]);
-/**
-* `nodes` with `stack` recorded outside whatever wrapper they already carry.
-*
-* A revision converts its own content first, so a node that arrives here
-* already marked sat inside the item this stack wraps: the two stacks
-* concatenate, outermost first. Concatenating is what the schema forces — the
-* mark excludes itself, so a second one replaces the first, and the inner
-* wrapper would be the one lost.
-*
-* A node that holds its own leaves, a content control, is marked here as the
-* one node it is; its leaves were marked with the whole enclosing stack when
-* it was built, because the painter reads the wrapper off the leaf.
-*/
-const withInlineWrapperMark = (nodes, stack) => {
+/** Wrapper nests with no leaf to carry their stack as a ProseMirror mark. */
+const emptyInlineWrapperStacks = (content, stack = []) => content.flatMap((item) => {
+	if (item.type !== "inlineWrapper") return [];
+	const nested = [...stack, inlineWrapperLayer(item)];
+	return item.content.length === 0 ? [nested] : emptyInlineWrapperStacks(item.content, nested);
+});
+const withInlineWrapperMark = (nodes, stack, origin) => {
 	const markType = schema.marks["inlineWrapper"];
 	if (stack.length === 0 || !markType) return nodes;
 	return nodes.map((node) => {
-		if (!node.isText && (!node.isInline || !node.type.allowsMarkType(markType))) return node;
+		if (!node.isInline) return node;
 		const inner = node.marks.find((mark) => mark.type === markType);
-		const layers = inner === void 0 ? stack : [...stack, ...expectInlineWrapperMarkAttrs(inner).stack];
-		return node.mark(markType.create({ stack: layers }).addToSet(node.marks));
+		const innerAttrs = inner === void 0 ? void 0 : expectInlineWrapperMarkAttrs(inner);
+		const layers = innerAttrs === void 0 ? stack : [...stack, ...innerAttrs.stack];
+		const inheritedOrigin = typeof innerAttrs?._docxHyperlinkIndex !== "number" || typeof innerAttrs._docxInsideHyperlinkStackStart !== "number" ? void 0 : {
+			hyperlinkIndex: innerAttrs._docxHyperlinkIndex,
+			stackStart: stack.length + innerAttrs._docxInsideHyperlinkStackStart
+		};
+		const provenance = origin ?? inheritedOrigin;
+		return node.mark(markType.create({
+			stack: layers,
+			...provenance === void 0 ? {} : {
+				_docxHyperlinkIndex: provenance.hyperlinkIndex,
+				_docxInsideHyperlinkStackStart: provenance.stackStart
+			}
+		}).addToSet(node.marks));
 	});
 };
 /**
@@ -1570,9 +1586,17 @@ function convertMathEquation(math) {
 function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextRunIdentityId, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, wrappedBy = []) {
 	const props = sdt.properties;
 	const inlineNodes = [];
-	for (const { content, stack } of withInlineWrapperStacks(sdt.content, wrappedBy)) {
+	const stacked = withInlineWrapperStacks(sdt.content, wrappedBy);
+	const emptyRanges = planEmptyRanges(stacked.map(({ content }) => content));
+	for (const [index, { content, stack }] of stacked.entries()) {
 		if (!isInlineSdtContent(content)) continue;
 		const itemNodes = [];
+		const anchored = emptyRanges.anchorAt.get(index);
+		if (anchored) {
+			inlineNodes.push(...withInlineWrapperMark([schema.node(RANGE_ANCHOR_NODE_NAME, anchored)], stack));
+			continue;
+		}
+		if (emptyRanges.closedAt.has(index)) continue;
 		switch (content.type) {
 			case "run":
 				itemNodes.push(...convertRun(content, getInheritedRunFormatting(content.formatting), nextRunIdentityId, styleResolver, textBoxAnchors));
@@ -1633,6 +1657,12 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextRunIdentityId, ge
 					displacedByCustomXml: content.displacedByCustomXml
 				}));
 				break;
+			case "moveFromRangeStart":
+			case "moveFromRangeEnd":
+			case "moveToRangeStart":
+			case "moveToRangeEnd":
+				itemNodes.push(schema.node(MOVE_RANGE_BOUNDARY_NODE_NAME, { marker: content }));
+				break;
 			case "preservedInline":
 				itemNodes.push(preservedInlineNode(content));
 				break;
@@ -2331,7 +2361,10 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 			}
 			default: break;
 		}
-		nodes.push(...withInlineWrapperMark(childNodes, stack));
+		nodes.push(...withInlineWrapperMark(childNodes, stack, {
+			hyperlinkIndex,
+			stackStart: 0
+		}));
 	}
 	return nodes;
 }

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/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/schema/marks.d.ts

@@ -170,6 +170,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];

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",