@stll/folio-core 0.47.4 → 0.47.6

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

@@ -1,4 +1,4 @@
-import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperLayer, LanguageAttrs, RunFormattingOverrideAttrs, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "../schema/marks.js";
+import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperLayer, LanguageAttrs, RunFormattingOverrideAttrs, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, TrackedRevisionAncestor, UnderlineAttrs } from "../schema/marks.js";
 import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, MathAttrs, PageBreakRunAttrs, ParagraphAttrs, PreservedBlockAttrs, PreservedXmlAttrs, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "../schema/nodes.js";
 import "../schema/index.js";
 import { Mark, Node } from "prosemirror-model";
@@ -76,6 +76,7 @@ declare const readFootnoteRefMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResu
 declare const expectFootnoteRefMarkAttrs: (mark: Mark) => FootnoteRefAttrs;
 declare const readCommentMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<CommentAttrs>;
 declare const expectCommentMarkAttrs: (mark: Mark) => CommentAttrs;
+declare const isTrackedRevisionAncestorArray: (value: unknown) => value is readonly TrackedRevisionAncestor[];
 declare const readTrackedChangeMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<TrackedChangeMarkAttrs>;
 declare const expectTrackedChangeMarkAttrs: (mark: Mark) => TrackedChangeMarkAttrs;
 declare const readRunPropertyChangeMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<RunPropertyChangeMarkAttrs>;
@@ -118,4 +119,4 @@ declare const mergeTableRowAttrs: (node: Node, patch: NodeAttrPatch<TableRowAttr
  */
 declare const mergeTableCellAttrs: (node: Node, patch: NodeAttrPatch<TableCellAttrs>) => TableCellAttrs;
 //#endregion
-export { ProseMirrorAttrIssue, ReadProseMirrorAttrsResult, expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectInlineWrapperMarkAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectParagraphAttrs, expectPreservedBlockAttrs, expectPreservedXmlAttrs, expectRunFormattingOverrideMarkAttrs, expectRunIdentityMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readInlineWrapperMarkAttrs, readInlineWrapperStack, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readParagraphAttrs, readPreservedBlockAttrs, readPreservedXmlAttrs, readRunFormattingOverrideMarkAttrs, readRunIdentityMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };
+export { ProseMirrorAttrIssue, ReadProseMirrorAttrsResult, expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectInlineWrapperMarkAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectParagraphAttrs, expectPreservedBlockAttrs, expectPreservedXmlAttrs, expectRunFormattingOverrideMarkAttrs, expectRunIdentityMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs, isTrackedRevisionAncestorArray, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readInlineWrapperMarkAttrs, readInlineWrapperStack, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readParagraphAttrs, readPreservedBlockAttrs, readPreservedXmlAttrs, readRunFormattingOverrideMarkAttrs, readRunIdentityMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };

package/dist/prosemirror/attrs/index.js

@@ -82,6 +82,12 @@ const NOTE_TYPES = ["footnote", "endnote"];
 const NOTE_REF_VERT_ALIGNS = ["baseline", "superscript"];
 const TEXT_BOX_DOCX_PLACEMENTS = ["standalone", "inlineWithPrevious"];
 const TRACKED_CHANGE_MOVE_KINDS = ["moveTo", "moveFrom"];
+const TRACKED_REVISION_ANCESTOR_TYPES = [
+	"insertion",
+	"deletion",
+	"moveFrom",
+	"moveTo"
+];
 const TEXT_BOX_TRACKED_CHANGE_TYPES = [
 	"insertion",
 	"deletion",
@@ -792,6 +798,7 @@ const readCommentMarkAttrs = (mark) => {
 	return attrsResult(attrs, issues);
 };
 const expectCommentMarkAttrs = (mark) => expectCachedMarkAttrs(mark, commentAttrsCache, readCommentMarkAttrs, "comment attrs");
+const isTrackedRevisionAncestorArray = (value) => Array.isArray(value) && value.length > 0 && value.every((ancestor) => isRecord(ancestor) && TRACKED_REVISION_ANCESTOR_TYPES.some((type) => type === ancestor["type"]) && typeof ancestor["revisionId"] === "number" && Number.isSafeInteger(ancestor["revisionId"]) && ancestor["revisionId"] >= 0 && typeof ancestor["author"] === "string" && (ancestor["date"] === void 0 || typeof ancestor["date"] === "string") && (ancestor["utcDate"] === void 0 || typeof ancestor["utcDate"] === "string") && (ancestor["initials"] === void 0 || typeof ancestor["initials"] === "string") && typeof ancestor["outerWrapperCount"] === "number" && Number.isSafeInteger(ancestor["outerWrapperCount"]) && ancestor["outerWrapperCount"] >= 0);
 const readTrackedChangeMarkAttrs = (mark) => {
 	const attrs = attrsRecord(mark.attrs);
 	const issues = [];
@@ -801,6 +808,16 @@ const readTrackedChangeMarkAttrs = (mark) => {
 	optionalString(attrs, "date", `${mark.type.name}.attrs.date`, issues);
 	optionalString(attrs, "utcDate", `${mark.type.name}.attrs.utcDate`, issues);
 	optionalString(attrs, "initials", `${mark.type.name}.attrs.initials`, issues);
+	const outerWrapperCount = attrs["_docxOuterWrapperCount"];
+	if (outerWrapperCount !== void 0 && outerWrapperCount !== null && (typeof outerWrapperCount !== "number" || !Number.isSafeInteger(outerWrapperCount) || outerWrapperCount < 0)) issues.push({
+		path: `${mark.type.name}.attrs._docxOuterWrapperCount`,
+		message: "Expected a non-negative safe integer."
+	});
+	const ancestors = attrs["_docxRevisionAncestors"];
+	if (ancestors !== void 0 && ancestors !== null && !isTrackedRevisionAncestorArray(ancestors)) issues.push({
+		path: `${mark.type.name}.attrs._docxRevisionAncestors`,
+		message: "Expected a non-empty array of valid revision ancestors."
+	});
 	optionalOneOf(attrs, "moveKind", `${mark.type.name}.attrs.moveKind`, issues, TRACKED_CHANGE_MOVE_KINDS);
 	optionalOneOf(attrs, "provenance", `${mark.type.name}.attrs.provenance`, issues, TRACKED_CHANGE_PROVENANCE_VALUES);
 	optionalString(attrs, "suggestionId", `${mark.type.name}.attrs.suggestionId`, issues);
@@ -868,6 +885,11 @@ const taggedLayerValidator = (label) => (layer, path, issues) => {
 		path: `${path}.${key}`,
 		message: "Expected a string."
 	});
+	const propertiesXml = layer["propertiesXml"];
+	if (typeof propertiesXml === "string" && !isSafePreservedChildXml(propertiesXml)) issues.push({
+		path: `${path}.propertiesXml`,
+		message: "Expected one bounded, well-formed XML element."
+	});
 	for (const key of Object.keys(layer)) if (!TAGGED_LAYER_KEYS.has(key)) issues.push({
 		path: `${path}.${key}`,
 		message: `Unexpected ${label} wrapper property.`
@@ -894,6 +916,19 @@ const INLINE_WRAPPER_LAYER_VALIDATORS = {
 const inlineWrapperLayerValidator = (kind) => {
 	return typeof kind === "string" ? INLINE_WRAPPER_LAYER_VALIDATORS[kind] : void 0;
 };
+const inlineWrapperProperties = function* (layers) {
+	for (let index = 0; index < layers.length; index += 1) {
+		const layer = layers[index];
+		yield { xml: isRecord(layer) && typeof layer["propertiesXml"] === "string" ? layer["propertiesXml"] : "" };
+	}
+};
+const emptyHyperlinkWrapperProperties = function* (stacks) {
+	for (let stackIndex = 0; stackIndex < stacks.length; stackIndex += 1) {
+		const stack = stacks[stackIndex];
+		yield {};
+		if (Array.isArray(stack)) yield* inlineWrapperProperties(stack);
+	}
+};
 const validateInlineWrapperStack = (value, path, issues) => {
 	if (!Array.isArray(value)) {
 		issues.push({
@@ -909,6 +944,13 @@ const validateInlineWrapperStack = (value, path, issues) => {
 		});
 		return;
 	}
+	if (!isWithinPreservedMarkupBudget(inlineWrapperProperties(value))) {
+		issues.push({
+			path,
+			message: "Inline wrapper stack exceeds its resource budget."
+		});
+		return;
+	}
 	for (const [index, layer] of value.entries()) {
 		const layerPath = `${path}[${index}]`;
 		if (!isRecord(layer)) {
@@ -950,6 +992,22 @@ const readInlineWrapperMarkAttrs = (mark) => {
 	const issues = [];
 	expectMarkType(mark, "inlineWrapper", issues);
 	validateInlineWrapperStack(attrs["stack"], "inlineWrapper.attrs.stack", issues);
+	const hyperlinkIndex = attrs["_docxHyperlinkIndex"];
+	const stackStart = attrs["_docxInsideHyperlinkStackStart"];
+	const hasHyperlinkIndex = hyperlinkIndex !== void 0 && hyperlinkIndex !== null;
+	const hasStackStart = stackStart !== void 0 && stackStart !== null;
+	if (hasHyperlinkIndex !== hasStackStart) issues.push({
+		path: "inlineWrapper.attrs",
+		message: "Hyperlink wrapper provenance requires both an index and stack start."
+	});
+	else if (hasHyperlinkIndex && hasStackStart) {
+		validateNonNegativeInteger(hyperlinkIndex, "inlineWrapper.attrs._docxHyperlinkIndex", issues);
+		validateNonNegativeInteger(stackStart, "inlineWrapper.attrs._docxInsideHyperlinkStackStart", issues);
+		if (typeof stackStart === "number" && Array.isArray(attrs["stack"]) && stackStart >= attrs["stack"].length) issues.push({
+			path: "inlineWrapper.attrs._docxInsideHyperlinkStackStart",
+			message: "Expected a stack position inside the wrapper stack."
+		});
+	}
 	return attrsResult(attrs, issues);
 };
 const expectInlineWrapperMarkAttrs = (mark) => expectCachedMarkAttrs(mark, inlineWrapperAttrsCache, readInlineWrapperMarkAttrs, "inline wrapper attrs");
@@ -1745,7 +1803,7 @@ const optionalPositionedBookmarks = (attrs, path, issues) => {
 			});
 			continue;
 		}
-		requiredNumber(entry, "index", `${entryPath}.index`, issues);
+		validateNonNegativeSafeInteger(entry["index"], `${entryPath}.index`, issues);
 		const marker = entry["marker"];
 		if (!isRecord(marker)) {
 			issues.push({
@@ -1762,7 +1820,7 @@ const optionalPositionedBookmarks = (attrs, path, issues) => {
 			});
 			continue;
 		}
-		requiredNumber(marker, "id", `${entryPath}.marker.id`, issues);
+		validateNonNegativeSafeInteger(marker["id"], `${entryPath}.marker.id`, issues);
 		if (type === "bookmarkStart") requiredString(marker, "name", `${entryPath}.marker.name`, issues);
 		optionalContentControls(entry, `${entryPath}.contentControls`, issues);
 	}
@@ -2574,11 +2632,17 @@ const validateNonNegativeInteger = (value, path, issues) => {
 		});
 		return;
 	}
-	if (!Number.isInteger(value) || value < 0) issues.push({
+	if (!Number.isSafeInteger(value) || value < 0) issues.push({
 		path,
 		message: "Expected a non-negative integer."
 	});
 };
+const validateNonNegativeSafeInteger = (value, path, issues) => {
+	if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0) issues.push({
+		path,
+		message: "Expected a non-negative safe integer."
+	});
+};
 const optionalBookmarkArray = (value, issues) => {
 	if (value === void 0 || value === null) return;
 	if (!Array.isArray(value)) {
@@ -2633,7 +2697,24 @@ const optionalEmptyHyperlinkArray = (value, issues) => {
 		optionalString(item, "target", `${itemPath}.target`, issues);
 		optionalBoolean(item, "history", `${itemPath}.history`, issues);
 		optionalString(item, "docLocation", `${itemPath}.docLocation`, issues);
+		const wrapperStacks = item["_docxEmptyWrapperStacks"];
+		if (wrapperStacks === void 0 || wrapperStacks === null) continue;
+		if (!Array.isArray(wrapperStacks)) {
+			issues.push({
+				path: `${itemPath}._docxEmptyWrapperStacks`,
+				message: "Expected an array of inline wrapper stacks."
+			});
+			continue;
+		}
+		if (!isWithinPreservedMarkupBudget(emptyHyperlinkWrapperProperties(wrapperStacks))) {
+			issues.push({
+				path: `${itemPath}._docxEmptyWrapperStacks`,
+				message: "Empty inline wrapper stacks exceed their aggregate resource budget."
+			});
+			continue;
+		}
+		for (const [stackIndex, stack] of wrapperStacks.entries()) validateInlineWrapperStack(stack, `${itemPath}._docxEmptyWrapperStacks[${stackIndex}]`, issues);
 	}
 };
 //#endregion
-export { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectInlineWrapperMarkAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectParagraphAttrs, expectPreservedBlockAttrs, expectPreservedXmlAttrs, expectRunFormattingOverrideMarkAttrs, expectRunIdentityMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readInlineWrapperMarkAttrs, readInlineWrapperStack, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readParagraphAttrs, readPreservedBlockAttrs, readPreservedXmlAttrs, readRunFormattingOverrideMarkAttrs, readRunIdentityMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };
+export { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectInlineWrapperMarkAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectParagraphAttrs, expectPreservedBlockAttrs, expectPreservedXmlAttrs, expectRunFormattingOverrideMarkAttrs, expectRunIdentityMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs, isTrackedRevisionAncestorArray, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readInlineWrapperMarkAttrs, readInlineWrapperStack, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readParagraphAttrs, readPreservedBlockAttrs, readPreservedXmlAttrs, readRunFormattingOverrideMarkAttrs, readRunIdentityMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };

package/dist/prosemirror/commands/comments.js

@@ -2,7 +2,7 @@ import { sameStatedParagraphNumbering as sameStatedParagraphNumbering$1 } from "
 import { joinProseParagraphsWithRightPropertySource } from "../../docx/paragraphPropertySource.js";
 import { appendHeadlessInlineResolution } from "../../internal/headlessRevisionResolution.js";
 import { stateAllowsHeadlessRevisionResolution } from "../../internal/headlessRevisionResolutionGuard.js";
-import { expectParagraphAttrs, expectRunPropertyChangeMarkAttrs } from "../attrs/index.js";
+import { expectParagraphAttrs, expectRunPropertyChangeMarkAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
 import { addedBreakCarrierBefore, finalParagraphsOf, paragraphEndsItsContainer } from "../containerFinalParagraph.js";
 import { resolveParagraphDefaultTextFormatting } from "../conversion/toProseDoc.js";
 import { markChangedParagraphRanges, markStructuralChange, markTrackedSectionEndpointRemoval } from "../extensions/features/ParagraphChangeTrackerExtension.js";
@@ -19,6 +19,7 @@ import { reconcileTableGridAfterColumnRemoval } from "../tableGridMutation.js";
 import { holdsNoContent } from "../zeroWidthAnchors.js";
 import { hasSerializableParagraphPropertyChange, paragraphPropertiesSnapshot, paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges, sectionRejectProperties, tableCellRejectAttrPatch, tablePropertyExceptionsRejectAttrPatch, tableRejectAttrPatch, tableRowRejectAttrPatch } from "./propertyChangeScope.js";
 import { hasMatchingCollapsedTableCellMerge, resolveCollapsedTableCellMerge, resolveVisibleTableCellMerge } from "./tableCellMergeResolution.js";
+import { panic } from "better-result";
 import { PARAGRAPH_MARK_CHANGE_KINDS, REVIEW_CARRIERS } from "@stll/docx-core/model";
 import { TableMap, removeRow } from "prosemirror-tables";
 import { Mapping } from "prosemirror-transform";
@@ -55,6 +56,33 @@ function removeCommentMark(commentId) {
 		return true;
 	};
 }
+const revisionLayerOf = (mark) => {
+	const attrs = expectTrackedChangeMarkAttrs(mark);
+	let type;
+	if (mark.type.name === "insertion") type = attrs.moveKind === "moveTo" ? "moveTo" : "insertion";
+	else type = attrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
+	return {
+		type,
+		revisionId: attrs.revisionId,
+		author: attrs.author,
+		...attrs.date ? { date: attrs.date } : {},
+		...attrs.utcDate ? { utcDate: attrs.utcDate } : {},
+		...attrs.initials ? { initials: attrs.initials } : {},
+		outerWrapperCount: attrs._docxOuterWrapperCount ?? 0
+	};
+};
+const revisionLayerRemovesContent = (layer, mode) => mode === "accept" ? layer.type === "deletion" || layer.type === "moveFrom" : layer.type === "insertion" || layer.type === "moveTo";
+const containsNestedRevision = (doc) => {
+	let found = false;
+	doc.descendants((node) => {
+		if (found) return false;
+		for (const mark of node.marks) if ((mark.type.name === "insertion" || mark.type.name === "deletion") && (expectTrackedChangeMarkAttrs(mark)._docxRevisionAncestors?.length ?? 0) > 0) {
+			found = true;
+			return false;
+		}
+	});
+	return found;
+};
 /**
 * Resolve a tracked change: accept or reject.
 * - Accept: keep insertions (remove mark), delete deletions (remove text)
@@ -76,7 +104,7 @@ function resolveChange(from, to, mode, revisionIds, execution = "legacy") {
 		const removeType = mode === "accept" ? deletionType : insertionType;
 		const revisionSet = revisionIds === void 0 ? null : new Set(revisionIds);
 		const removeKeptMarksInBulk = revisionSet === null && keepType !== void 0;
-		const canBulkInlineResolution = execution === "headless-bulk-inline" && revisionSet === null && from === 0 && to === state.doc.content.size && stateAllowsHeadlessRevisionResolution(state);
+		const canBulkInlineResolution = execution === "headless-bulk-inline" && revisionSet === null && from === 0 && to === state.doc.content.size && stateAllowsHeadlessRevisionResolution(state) && !containsNestedRevision(state.doc);
 		const matchesRevision = (mark) => revisionSet === null || typeof mark.attrs["revisionId"] === "number" && revisionSet.has(mark.attrs["revisionId"]);
 		if (dispatch) {
 			const tr = state.tr;
@@ -189,6 +217,36 @@ function resolveChange(from, to, mode, revisionIds, execution = "legacy") {
 					revisionSet,
 					styleResolver
 				});
+				const nestedMark = node.marks.find((mark) => (mark.type === insertionType || mark.type === deletionType) && (expectTrackedChangeMarkAttrs(mark)._docxRevisionAncestors?.length ?? 0) > 0);
+				if (nestedMark) {
+					const path = [...expectTrackedChangeMarkAttrs(nestedMark)._docxRevisionAncestors ?? [], revisionLayerOf(nestedMark)];
+					const selected = (layer) => revisionSet === null || revisionSet.has(layer.revisionId);
+					if (path.some(selected)) if (path.some((layer) => selected(layer) && revisionLayerRemovesContent(layer, mode))) deleteRanges.push({
+						from: rangeFrom,
+						to: rangeTo
+					});
+					else {
+						tr.removeMark(rangeFrom, rangeTo, nestedMark);
+						const remaining = path.filter((layer) => !selected(layer));
+						const active = remaining.at(-1);
+						if (active) {
+							const type = active.type === "insertion" || active.type === "moveTo" ? insertionType : deletionType;
+							if (!type) panic("A nested tracked revision has no editor mark type");
+							tr.addMark(rangeFrom, rangeTo, type.create({
+								revisionId: active.revisionId,
+								author: active.author,
+								date: active.date ?? null,
+								utcDate: active.utcDate ?? null,
+								initials: active.initials ?? null,
+								moveKind: active.type === "moveTo" || active.type === "moveFrom" ? active.type : null,
+								_historicalFormatting: active.type === "deletion" || active.type === "moveFrom" ? true : null,
+								_docxOuterWrapperCount: active.outerWrapperCount,
+								_docxRevisionAncestors: remaining.length > 1 ? remaining.slice(0, -1) : null
+							}));
+						}
+					}
+					return true;
+				}
 				if (removesNode) deleteRanges.push({
 					from: rangeFrom,
 					to: rangeTo
@@ -794,7 +852,7 @@ function findAIEditRevisionRange(state, revisionIds) {
 				includeRange(pos, pos + node.nodeSize);
 				break;
 			}
-			if ((mark.type === insertionType || mark.type === deletionType) && typeof mark.attrs["revisionId"] === "number" && idSet.has(mark.attrs["revisionId"])) {
+			if ((mark.type === insertionType || mark.type === deletionType) && (idSet.has(expectTrackedChangeMarkAttrs(mark).revisionId) || (expectTrackedChangeMarkAttrs(mark)._docxRevisionAncestors ?? []).some((ancestor) => idSet.has(ancestor.revisionId)))) {
 				includeRange(pos, pos + node.nodeSize);
 				break;
 			}

package/dist/prosemirror/commentReferenceAttrs.js

@@ -8,9 +8,9 @@ const readCommentReferenceAttrs = (node) => {
 		message: `Expected commentReference, got ${node.type.name}.`
 	});
 	const commentId = node.attrs["commentId"];
-	if (typeof commentId !== "number" || !Number.isInteger(commentId) || commentId < 0) issues.push({
+	if (typeof commentId !== "number" || !Number.isSafeInteger(commentId)) issues.push({
 		path: "commentReference.attrs.commentId",
-		message: "Expected a non-negative integer."
+		message: "Expected a safe integer."
 	});
 	if (issues.length > 0 || typeof commentId !== "number") return {
 		ok: false,

package/dist/prosemirror/commentReferenceIntegrity.d.ts

@@ -10,13 +10,17 @@
  * a comment mark creates none — so the repair is computed here and applied by
  * the extension's `appendTransaction`, rather than left to each call site.
  */
-type CommentReferenceOccurrence = {
-  commentId: number;
+type PositionedReference = {
   position: number;
   /** Node size, so a caller can delete the node without re-reading it. */
   size: number;
-  malformed: boolean;
 };
+type CommentReferenceOccurrence = (PositionedReference & {
+  status: "valid";
+  commentId: number;
+}) | (PositionedReference & {
+  status: "malformed";
+});
 /** Where a comment's mark last covers content, and how far that content runs. */
 type CommentMarkExtent = {
   commentId: number;

package/dist/prosemirror/commentReferenceIntegrity.js

@@ -10,7 +10,15 @@ const planCommentReferenceRepairs = ({ references, markExtents }) => {
 	const deletions = [];
 	const keptIds = /* @__PURE__ */ new Set();
 	for (const reference of references) {
-		if (reference.malformed || !markedIds.has(reference.commentId)) {
+		if (reference.status === "malformed") {
+			deletions.push({
+				type: "delete",
+				position: reference.position,
+				size: reference.size
+			});
+			continue;
+		}
+		if (!markedIds.has(reference.commentId)) {
 			deletions.push({
 				type: "delete",
 				position: reference.position,