@stll/folio-core 0.61.0 → 0.63.0

package/dist/prosemirror/runFormattingReconciliation.js

@@ -40,16 +40,18 @@ const reconcileRunFormattingMarks = ({ authoredFormatting, context, node, styleR
 		context,
 		directFormatting: authoredFormatting
 	});
-	const effectiveFormatting = mergeTextFormatting(resolveEffectiveRunStyleFormatting({
+	const inheritedFormatting = resolveEffectiveRunStyleFormatting({
 		marks: styleResolutionMarks,
 		paragraphFormatting,
 		...styleResolver !== void 0 ? { styleResolver } : {}
-	}), authoredFormatting);
-	const overrideFormatting = mergeTextFormatting(isParagraphMarkSuppressionEligible(authoredFormatting) ? getParagraphMarkSuppressionOverrides({
+	});
+	const effectiveFormatting = mergeTextFormatting(inheritedFormatting, authoredFormatting);
+	const paragraphMarkOverrides = isParagraphMarkSuppressionEligible(authoredFormatting) ? getParagraphMarkSuppressionOverrides({
 		directFormatting: authoredFormatting,
 		paragraphMarkFormatting: context.paragraphMarkFormatting,
 		suppressedFormatting: paragraphFormatting
-	}) : void 0, authoredFormatting);
+	}) : void 0;
+	const overrideFormatting = mergeTextFormatting(paragraphMarkOverrides, authoredFormatting);
 	const formattingMarks = textFormattingToMarks(effectiveFormatting, node.type.schema, {
 		overrideFormatting,
 		directFormatting: authoredFormatting,

package/dist/prosemirror/runIdentity.d.ts

@@ -2,27 +2,26 @@ import { document_d_exports } from "../types/document.js";
 import { RunIdentityMarkAttrs } from "./schema/marks.js";
 //#region src/prosemirror/runIdentity.d.ts
 /** The DOM attribute that carries a run's identity through copy and paste. */
-declare const RUN_IDENTITY_ATTRIBUTE = "data-docx-run-identity";
+export declare const RUN_IDENTITY_ATTRIBUTE = "data-docx-run-identity";
 /** The schema name of the mark these attrs belong to. */
-declare const RUN_IDENTITY_MARK_NAME = "runIdentity";
+export declare const RUN_IDENTITY_MARK_NAME = "runIdentity";
 /**
  * What a run carries beside its id: absent fields left absent, empty
  * collections normalised to absent so a run with nothing to carry keys the
  * same however it was built.
  */
-type RunIdentityPayload = {
+export 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, emptyFormatting }?: RunIdentityPayload) => RunIdentityMarkAttrs;
+export declare const runIdentityAttrs: (id: number, { preservedAttributes, preserved, emptyFormatting }?: RunIdentityPayload) => RunIdentityMarkAttrs;
 /**
  * Whether a run holds markup the mark exists to carry.
  *
  * 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, emptyFormatting }: RunIdentityPayload) => boolean;
-//#endregion
-export { RUN_IDENTITY_ATTRIBUTE, RUN_IDENTITY_MARK_NAME, RunIdentityPayload, hasRunIdentityPayload, runIdentityAttrs };
+export declare const hasRunIdentityPayload: ({ preservedAttributes, preserved, emptyFormatting }: RunIdentityPayload) => boolean;
+//#endregion

package/dist/prosemirror/runIdentityAcrossRevisions.d.ts

@@ -1,8 +1,19 @@
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/runIdentityAcrossRevisions.d.ts
-/** The continuation policy covers every declared source-carrier mark. */
-declare const SOURCE_CARRIER_MARK_NAMES: ("hyperlink" | "runIdentity")[];
+/** Ordered source of truth for source-carrier identities and continuation. */
+export type SourceCarrierMarkName = "runIdentity" | "hyperlink";
+export declare const SOURCE_CARRIER_MARK_NAMES: readonly ["runIdentity", "hyperlink"];
 /** Every source-carrier family uses the same revision-boundary continuation policy. */
-declare const continueSourceCarrierIdentitiesAcrossRevisions: (nodes: readonly Node[]) => readonly Node[];
-//#endregion
-export { SOURCE_CARRIER_MARK_NAMES, continueSourceCarrierIdentitiesAcrossRevisions };
+export declare const continueSourceCarrierIdentitiesAcrossRevisions: (nodes: readonly Node[]) => readonly Node[];
+/**
+ * `blocks`, sibling blocks of one container and everything inside them, with
+ * the source carriers a tracked paragraph split cut apart given one identity.
+ *
+ * A split inside a run or link saves the two halves in two paragraphs, which
+ * reopen as two carriers. Rejecting the inserted paragraph mark rejoins the
+ * halves, and the editor that made the split still holds one carrier there.
+ * A deleted paragraph mark joined two source paragraphs, whose carriers were
+ * always separate, so it is not crossed.
+ */
+export declare const continueSourceCarrierIdentitiesAcrossInsertedParagraphMarks: (blocks: readonly Node[]) => readonly Node[];
+//#endregion

package/dist/prosemirror/runIdentityAcrossRevisions.js

@@ -15,34 +15,37 @@ const REVISION_MARK_NAMES = /* @__PURE__ */ new Set([
 	"deletion",
 	"runPropertyChange"
 ]);
-const CARRIER_OWNERS = [{
-	markName: RUN_IDENTITY_MARK_NAME,
-	read: (mark) => {
-		const attrs = expectRunIdentityMarkAttrs(mark);
-		return {
-			id: attrs.id,
-			payloadKey: JSON.stringify({
-				...attrs,
-				id: 0
-			})
-		};
-	}
-}, {
-	markName: "hyperlink",
-	read: (mark) => {
-		const attrs = expectHyperlinkMarkAttrs(mark);
-		if (typeof attrs._docxHyperlinkIndex !== "number") return void 0;
-		return {
-			id: attrs._docxHyperlinkIndex,
-			payloadKey: JSON.stringify({
-				...attrs,
-				_docxHyperlinkIndex: 0
-			})
-		};
+const SOURCE_CARRIER_MARK_NAMES = [RUN_IDENTITY_MARK_NAME, "hyperlink"];
+/** Every declared carrier has one owner; iteration follows the canonical tuple. */
+const CARRIER_OWNERS = {
+	[SOURCE_CARRIER_MARK_NAMES[0]]: {
+		markName: SOURCE_CARRIER_MARK_NAMES[0],
+		read: (mark) => {
+			const attrs = expectRunIdentityMarkAttrs(mark);
+			return {
+				id: attrs.id,
+				payloadKey: JSON.stringify({
+					...attrs,
+					id: 0
+				})
+			};
+		}
+	},
+	[SOURCE_CARRIER_MARK_NAMES[1]]: {
+		markName: SOURCE_CARRIER_MARK_NAMES[1],
+		read: (mark) => {
+			const attrs = expectHyperlinkMarkAttrs(mark);
+			if (typeof attrs._docxHyperlinkIndex !== "number") return void 0;
+			return {
+				id: attrs._docxHyperlinkIndex,
+				payloadKey: JSON.stringify({
+					...attrs,
+					_docxHyperlinkIndex: 0
+				})
+			};
+		}
 	}
-}];
-/** The continuation policy covers every declared source-carrier mark. */
-const SOURCE_CARRIER_MARK_NAMES = CARRIER_OWNERS.map(({ markName }) => markName);
+};
 const identityOf = (node, owner) => {
 	const mark = node.marks.find((candidate) => candidate.type.name === owner.markName);
 	if (!mark) return void 0;
@@ -65,11 +68,11 @@ const continuesCarrier = ({ left, right, bridged, owner }) => {
 * the identity of its matching source carrier. A control is a container of its
 * own. `nodes` itself comes back when nothing changes.
 */
-const continueIdentities = (nodes, owner) => {
+const continueIdentities = (nodes, owner, before) => {
 	const renamed = /* @__PURE__ */ new Map();
 	/** The last carrier with an identity, while only revised content follows it. */
-	let anchor;
-	let bridged = false;
+	let anchor = before?.anchor;
+	let bridged = before?.bridged ?? false;
 	let changed = false;
 	const result = nodes.map((node) => {
 		if (node.type.name === "sdt") {
@@ -111,8 +114,65 @@ const continueIdentities = (nodes, owner) => {
 /** Every source-carrier family uses the same revision-boundary continuation policy. */
 const continueSourceCarrierIdentitiesAcrossRevisions = (nodes) => {
 	let continued = nodes;
-	for (const owner of CARRIER_OWNERS) continued = continueIdentities(continued, owner);
+	for (const markName of SOURCE_CARRIER_MARK_NAMES) continued = continueIdentities(continued, CARRIER_OWNERS[markName]);
 	return continued;
 };
+/** Paragraph-mark kinds whose rejection joins the paragraph to the next. */
+const INSERTED_PARAGRAPH_MARK_KINDS = /* @__PURE__ */ new Set(["ins", "moveTo"]);
+const endsWithInsertedMark = (node) => {
+	if (node.type.name !== "paragraph") return false;
+	const mark = node.attrs["pPrMark"];
+	return typeof mark === "object" && mark !== null && "kind" in mark && INSERTED_PARAGRAPH_MARK_KINDS.has(mark.kind);
+};
+const childrenOf = (node) => {
+	const children = [];
+	node.forEach((child) => {
+		children.push(child);
+	});
+	return children;
+};
+/**
+* `paragraph`, after `previous` whose inserted mark split one source paragraph
+* in two, with the carriers that continue `previous`'s last one across that
+* mark given its identity, as fragments across a revision boundary are.
+*/
+const continueAcrossInsertedMark = (previous, paragraph) => {
+	const anchor = previous.lastChild;
+	if (anchor === null) return paragraph;
+	const original = childrenOf(paragraph);
+	let continued = original;
+	for (const markName of SOURCE_CARRIER_MARK_NAMES) continued = continueIdentities(continued, CARRIER_OWNERS[markName], {
+		anchor,
+		bridged: true
+	});
+	return continued === original ? paragraph : paragraph.copy(Fragment.fromArray([...continued]));
+};
+/**
+* `blocks`, sibling blocks of one container and everything inside them, with
+* the source carriers a tracked paragraph split cut apart given one identity.
+*
+* A split inside a run or link saves the two halves in two paragraphs, which
+* reopen as two carriers. Rejecting the inserted paragraph mark rejoins the
+* halves, and the editor that made the split still holds one carrier there.
+* A deleted paragraph mark joined two source paragraphs, whose carriers were
+* always separate, so it is not crossed.
+*/
+const continueSourceCarrierIdentitiesAcrossInsertedParagraphMarks = (blocks) => {
+	let changed = false;
+	const result = [];
+	for (const block of blocks) {
+		let next = block;
+		if (!block.isTextblock && !block.isLeaf && !block.inlineContent) {
+			const children = childrenOf(block);
+			const continued = continueSourceCarrierIdentitiesAcrossInsertedParagraphMarks(children);
+			if (continued !== children) next = block.copy(Fragment.fromArray([...continued]));
+		}
+		const previous = result.at(-1);
+		if (previous !== void 0 && next.type.name === "paragraph" && endsWithInsertedMark(previous)) next = continueAcrossInsertedMark(previous, next);
+		changed ||= next !== block;
+		result.push(next);
+	}
+	return changed ? result : blocks;
+};
 //#endregion
-export { SOURCE_CARRIER_MARK_NAMES, continueSourceCarrierIdentitiesAcrossRevisions };
+export { SOURCE_CARRIER_MARK_NAMES, continueSourceCarrierIdentitiesAcrossInsertedParagraphMarks, continueSourceCarrierIdentitiesAcrossRevisions };

package/dist/prosemirror/runPropertyChangeResolution.d.ts

@@ -13,13 +13,13 @@ type ReconstructRejectedRunFormattingMarksOptions = {
  * Both granular editor commands and the headless linear rewriter use this
  * owner so their reject semantics cannot diverge at the bulk threshold.
  */
-declare const reconstructRejectedRunFormattingMarks: ({ node, paragraphContext, previousFormatting, styleResolver }: ReconstructRejectedRunFormattingMarksOptions) => readonly Mark[];
+export declare const reconstructRejectedRunFormattingMarks: ({ node, paragraphContext, previousFormatting, styleResolver }: ReconstructRejectedRunFormattingMarksOptions) => readonly Mark[];
 type RestoreHistoricalRunFormattingOptions = {
   node: Node;
   paragraphContext: ParagraphRunStyleContext;
   styleResolver?: RunStyleResolver | null;
 };
 /** Restored deletions inherit the live paragraph cascade without authoring their historical visuals. */
-declare const restoreHistoricalRunFormatting: ({ node, paragraphContext, styleResolver }: RestoreHistoricalRunFormattingOptions) => readonly Mark[];
+export declare const restoreHistoricalRunFormatting: ({ node, paragraphContext, styleResolver }: RestoreHistoricalRunFormattingOptions) => readonly Mark[];
 //#endregion
-export { reconstructRejectedRunFormattingMarks, restoreHistoricalRunFormatting };
+export {};

package/dist/prosemirror/runPropertyChangeResolution.js

@@ -32,17 +32,18 @@ const restoreHistoricalRunFormatting = ({ node, paragraphContext, styleResolver
 	const disposition = runFormattingInlineAtomDisposition(node);
 	if (disposition === null || disposition === "not-a-run") return node.marks;
 	if (paragraphContext.paragraphMarkFormatting === void 0) return node.marks;
+	const authoredFormatting = readAuthoredRunFormatting({
+		context: {
+			baseParagraphFormatting: paragraphContext.baseParagraphFormatting,
+			paragraphFormatting: paragraphContext.baseParagraphFormatting,
+			paragraphMarkFormatting: void 0,
+			paragraphMarkPrecedesStyle: false
+		},
+		marks: node.marks,
+		...styleResolver !== void 0 ? { styleResolver } : {}
+	});
 	return reconcileRunFormattingMarks({
-		authoredFormatting: readAuthoredRunFormatting({
-			context: {
-				baseParagraphFormatting: paragraphContext.baseParagraphFormatting,
-				paragraphFormatting: paragraphContext.baseParagraphFormatting,
-				paragraphMarkFormatting: void 0,
-				paragraphMarkPrecedesStyle: false
-			},
-			marks: node.marks,
-			...styleResolver !== void 0 ? { styleResolver } : {}
-		}),
+		authoredFormatting,
 		context: paragraphContext,
 		node,
 		...styleResolver !== void 0 ? { styleResolver } : {}

package/dist/prosemirror/runStyleFormatting.d.ts

@@ -4,38 +4,38 @@ import "../style-engine/index.js";
 import { StyleToggleKey, cascadeStyleTextFormatting } from "./styles/styleToggleCascade.js";
 import { Mark, Node } from "prosemirror-model";
 //#region src/prosemirror/runStyleFormatting.d.ts
-declare const hasDirectRunFormatting: (formatting: document_d_exports.TextFormatting | undefined) => boolean;
+export declare const hasDirectRunFormatting: (formatting: document_d_exports.TextFormatting | undefined) => boolean;
 /** A stated run property or character style establishes paragraph-mark suppression. */
-declare const isParagraphMarkSuppressionEligible: (formatting: document_d_exports.TextFormatting | undefined) => boolean;
-declare const stripParagraphMarkOnlyFormatting: (formatting: document_d_exports.TextFormatting) => document_d_exports.TextFormatting | undefined;
-declare const stripParagraphMarkFormattingForBodyRuns: (formatting: document_d_exports.TextFormatting) => document_d_exports.TextFormatting | undefined;
+export declare const isParagraphMarkSuppressionEligible: (formatting: document_d_exports.TextFormatting | undefined) => boolean;
+export declare const stripParagraphMarkOnlyFormatting: (formatting: document_d_exports.TextFormatting) => document_d_exports.TextFormatting | undefined;
+export declare const stripParagraphMarkFormattingForBodyRuns: (formatting: document_d_exports.TextFormatting) => document_d_exports.TextFormatting | undefined;
 type SuppressParagraphMarkFormattingOptions = {
   baseFormatting: document_d_exports.TextFormatting | undefined;
   directFormatting: document_d_exports.TextFormatting | undefined;
   paragraphMarkFormatting: document_d_exports.TextFormatting | undefined;
   paragraphMarkPrecedesStyle?: boolean;
 };
-declare const suppressParagraphMarkFormatting: ({ baseFormatting, directFormatting, paragraphMarkFormatting, paragraphMarkPrecedesStyle }: SuppressParagraphMarkFormattingOptions) => document_d_exports.TextFormatting | undefined;
+export declare const suppressParagraphMarkFormatting: ({ baseFormatting, directFormatting, paragraphMarkFormatting, paragraphMarkPrecedesStyle }: SuppressParagraphMarkFormattingOptions) => document_d_exports.TextFormatting | undefined;
 type GetParagraphMarkSuppressionOverridesOptions = {
   directFormatting: document_d_exports.TextFormatting | undefined;
   paragraphMarkFormatting: document_d_exports.TextFormatting | undefined;
   suppressedFormatting: document_d_exports.TextFormatting | undefined;
 };
-declare const getParagraphMarkSuppressionOverrides: ({ directFormatting, paragraphMarkFormatting, suppressedFormatting }: GetParagraphMarkSuppressionOverridesOptions) => document_d_exports.TextFormatting | undefined;
-type ParagraphRunStyleContext = {
+export declare const getParagraphMarkSuppressionOverrides: ({ directFormatting, paragraphMarkFormatting, suppressedFormatting }: GetParagraphMarkSuppressionOverridesOptions) => document_d_exports.TextFormatting | undefined;
+export type ParagraphRunStyleContext = {
   baseParagraphFormatting: document_d_exports.TextFormatting | undefined;
   paragraphFormatting: document_d_exports.TextFormatting | undefined;
   paragraphMarkFormatting: document_d_exports.TextFormatting | undefined;
   paragraphMarkPrecedesStyle: boolean;
 };
-type RunStyleResolver = Pick<StyleEngine, "builtInStyles" | "getDefaultCharacterStyle" | "getDefaultParagraphStyle" | "getDocDefaults" | "getRunStyleOwnProperties" | "getStyle" | "resolveParagraphStyle">;
+export type RunStyleResolver = Pick<StyleEngine, "builtInStyles" | "getDefaultCharacterStyle" | "getDefaultParagraphStyle" | "getDocDefaults" | "getRunStyleOwnProperties" | "getStyle" | "resolveParagraphStyle">;
 type ResolveParagraphBodyRunFormattingOptions = {
   styleId: string | undefined;
   styleResolver?: RunStyleResolver | null | undefined;
   tableRunFormatting?: document_d_exports.TextFormatting | undefined;
 };
 /** Resolve the table, paragraph, and character style cascade before paragraph-mark properties. */
-declare const resolveParagraphBodyRunFormatting: ({ styleId, styleResolver, tableRunFormatting }: ResolveParagraphBodyRunFormattingOptions) => {
+export declare const resolveParagraphBodyRunFormatting: ({ styleId, styleResolver, tableRunFormatting }: ResolveParagraphBodyRunFormattingOptions) => {
   baseFormatting: document_d_exports.TextFormatting | undefined;
   baseToggleCascade: ReturnType<typeof cascadeStyleTextFormatting>;
   defaultFormatting: document_d_exports.TextFormatting | undefined;
@@ -45,7 +45,7 @@ type ResolveParagraphInheritedRunFormattingOptions = ResolveParagraphBodyRunForm
   paragraphMarkFormatting: document_d_exports.TextFormatting | undefined;
 };
 /** One source cascade for imported body runs and the saver inheritance baseline. */
-declare const resolveParagraphInheritedRunFormatting: (options: ResolveParagraphInheritedRunFormattingOptions) => {
+export declare const resolveParagraphInheritedRunFormatting: (options: ResolveParagraphInheritedRunFormattingOptions) => {
   inheritedFormatting: {
     bold?: boolean | undefined;
     boldCs?: boolean | undefined;
@@ -111,31 +111,31 @@ declare const resolveParagraphInheritedRunFormatting: (options: ResolveParagraph
   defaultFormatting: document_d_exports.TextFormatting | undefined;
   defaultToggleCascade: ReturnType<typeof cascadeStyleTextFormatting>;
 };
-declare const paragraphRunStyleContext: (paragraph: Node, styleResolver?: RunStyleResolver | null) => ParagraphRunStyleContext;
+export declare const paragraphRunStyleContext: (paragraph: Node, styleResolver?: RunStyleResolver | null) => ParagraphRunStyleContext;
 type ParagraphFormattingForRunOptions = {
   context: ParagraphRunStyleContext;
   directFormatting?: document_d_exports.TextFormatting;
   marks: readonly Mark[];
 };
-declare const paragraphFormattingForRun: ({ context, directFormatting, marks }: ParagraphFormattingForRunOptions) => document_d_exports.TextFormatting | undefined;
+export declare const paragraphFormattingForRun: ({ context, directFormatting, marks }: ParagraphFormattingForRunOptions) => document_d_exports.TextFormatting | undefined;
 type ParagraphRunStyleContextAtOptions = {
   doc: Node;
   pos: number;
   styleResolver?: RunStyleResolver | null;
 };
-declare const paragraphRunStyleContextAt: ({ doc, pos, styleResolver }: ParagraphRunStyleContextAtOptions) => ParagraphRunStyleContext;
+export declare const paragraphRunStyleContextAt: ({ doc, pos, styleResolver }: ParagraphRunStyleContextAtOptions) => ParagraphRunStyleContext;
 /**
  * {@link paragraphRunStyleContextAt} for a caller that already knows the
  * nearest paragraph, or that there is none. A document walk knows it for free,
  * where `doc.resolve` re-descends from the root once per run.
  */
-declare const nearestParagraphRunStyleContext: (paragraph: Node | null, styleResolver?: RunStyleResolver | null) => ParagraphRunStyleContext;
+export declare const nearestParagraphRunStyleContext: (paragraph: Node | null, styleResolver?: RunStyleResolver | null) => ParagraphRunStyleContext;
 type ResolveEffectiveRunStyleFormattingOptions = {
   marks: readonly Mark[];
   paragraphFormatting: document_d_exports.TextFormatting | undefined;
   styleResolver?: RunStyleResolver | null;
 };
 /** Resolve the non-direct run cascade from shared document styles and the current paragraph. */
-declare const resolveEffectiveRunStyleFormatting: ({ marks, paragraphFormatting, styleResolver }: ResolveEffectiveRunStyleFormattingOptions) => document_d_exports.TextFormatting | undefined;
+export declare const resolveEffectiveRunStyleFormatting: ({ marks, paragraphFormatting, styleResolver }: ResolveEffectiveRunStyleFormattingOptions) => document_d_exports.TextFormatting | undefined;
 //#endregion
-export { ParagraphRunStyleContext, RunStyleResolver, getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, nearestParagraphRunStyleContext, paragraphFormattingForRun, paragraphRunStyleContext, paragraphRunStyleContextAt, resolveEffectiveRunStyleFormatting, resolveParagraphBodyRunFormatting, resolveParagraphInheritedRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting };
+export {};

package/dist/prosemirror/runStyleFormatting.js

@@ -138,8 +138,9 @@ const resolveParagraphInheritedRunFormatting = (options) => {
 const paragraphRunStyleContext = (paragraph, styleResolver) => {
 	const attrs = expectParagraphAttrs(paragraph);
 	const paragraphMarkFormatting = attrs._originalFormatting?.runProperties;
+	const characterStyleFormatting = paragraphMarkFormatting?.styleId ? styleResolver?.getRunStyleOwnProperties(paragraphMarkFormatting.styleId) : void 0;
 	const resolvedParagraphMarkFormatting = cascadeStyleTextFormatting([{
-		formatting: paragraphMarkFormatting?.styleId ? styleResolver?.getRunStyleOwnProperties(paragraphMarkFormatting.styleId) : void 0,
+		formatting: characterStyleFormatting,
 		type: "style"
 	}, {
 		formatting: paragraphMarkFormatting,
@@ -194,9 +195,10 @@ const resolveEffectiveRunStyleFormatting = ({ marks, paragraphFormatting, styleR
 	else if (hasDirectFormattingCarrier) styleFormatting = styleResolver?.getDefaultCharacterStyle()?.rPr;
 	if (!styleFormatting) return paragraphFormatting;
 	const docDefaults = styleResolver?.getDocDefaults()?.rPr;
+	const defaultsActiveProperties = STYLE_TOGGLE_KEYS.filter((property) => docDefaults?.[property] === true);
 	return cascadeStyleFromResolvedBase({
 		baseFormatting: paragraphFormatting,
-		defaultsActiveProperties: STYLE_TOGGLE_KEYS.filter((property) => docDefaults?.[property] === true),
+		defaultsActiveProperties,
 		styleFormatting
 	});
 };

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

@@ -2,13 +2,13 @@ import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkA
 import { BlockCustomXmlAttrs, 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
-declare const singletonManager: ExtensionManager;
-declare const schema: import("prosemirror-model").Schema<any, any>;
+export declare const singletonManager: ExtensionManager;
+export declare const schema: import("prosemirror-model").Schema<any, any>;
 /**
  * Export types for convenience
  */
-type DocxSchema = typeof schema;
-type DocxNode = ReturnType<typeof schema.node>;
-type DocxMark = ReturnType<typeof schema.mark>;
+export type DocxSchema = typeof schema;
+export type DocxNode = ReturnType<typeof schema.node>;
+export type DocxMark = ReturnType<typeof schema.mark>;
 //#endregion
-export { type BlockCustomXmlAttrs, 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 };
+export type { BlockCustomXmlAttrs, BlockSdtAttrs, BookmarkBoundaryAttrs, CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FieldAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HardBreakAttrs, HighlightAttrs, HyperlinkAttrs, ImageAttrs, ImagePositionAttrs, InlineWrapperAttrs, InlineWrapperKind, InlineWrapperLayer, LanguageAttrs, MathAttrs, PageBreakRunAttrs, ParagraphAttrs, ParagraphPropertyChangeAttrs, PreservedBlockAttrs, PreservedXmlAttrs, PreservedXmlLevel, RunFormattingOverrideAttrs, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, SdtAttrs, ShapeAttrs, StrikeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, TrackedRevisionAncestor, UnderlineAttrs };

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

@@ -1,10 +1,11 @@
 import { ShadingProperties } from "../../types/colors.js";
 import { document_d_exports } from "../../types/document.js";
+import { TrackedCommentBoundary } from "../commentBoundaryOwnership.js";
 //#region src/prosemirror/schema/marks.d.ts
 /**
  * Text color mark attributes
  */
-type TextColorAttrs = {
+export type TextColorAttrs = {
   rgb?: string;
   themeColor?: document_d_exports.ThemeColor;
   themeTint?: string;
@@ -13,23 +14,23 @@ type TextColorAttrs = {
 /**
  * Underline mark attributes
  */
-type UnderlineAttrs = {
+export type UnderlineAttrs = {
   style?: document_d_exports.UnderlineStyle;
   color?: TextColorAttrs;
 };
-type StrikeAttrs = {
+export type StrikeAttrs = {
   double?: boolean;
 };
 /**
  * Font size mark attributes
  */
-type FontSizeAttrs = {
+export type FontSizeAttrs = {
   size: number;
 };
 /**
  * Font family mark attributes
  */
-type FontFamilyAttrs = {
+export type FontFamilyAttrs = {
   ascii?: string;
   hAnsi?: string;
   eastAsia?: string;
@@ -40,12 +41,12 @@ type FontFamilyAttrs = {
   eastAsiaTheme?: string;
   csTheme?: string;
 };
-type LanguageAttrs = {
+export type LanguageAttrs = {
   val?: string;
   eastAsia?: string;
   bidi?: string;
 };
-type HighlightAttrs = {
+export type HighlightAttrs = {
   color: NonNullable<document_d_exports.TextFormatting["highlight"]>;
 };
 /**
@@ -57,34 +58,34 @@ type HighlightAttrs = {
  * the fill). `patternColor` is the pattern foreground rgb (`w:shd w:color`),
  * carried so a non-clear pattern's color survives export.
  */
-type RunShadingAttrs = TextColorAttrs & {
+export type RunShadingAttrs = TextColorAttrs & {
   pattern?: NonNullable<ShadingProperties["pattern"]>;
   patternColor?: string;
 };
-type CharacterSpacingAttrs = {
+export type CharacterSpacingAttrs = {
   spacing?: number;
   position?: number;
   scale?: number;
   kerning?: number;
 };
-type EmphasisMarkAttrs = {
+export type EmphasisMarkAttrs = {
   type?: Exclude<document_d_exports.EmphasisMark, "none">;
 };
 /**
  * Text effect mark attributes (w:effect). The "none" sentinel is never marked;
  * absence of the mark is the no-effect state.
  */
-type TextEffectAttrs = {
+export type TextEffectAttrs = {
   effect: Exclude<document_d_exports.TextEffect, "none">;
 };
-type FootnoteRefAttrs = {
+export type FootnoteRefAttrs = {
   occurrenceId: string;
   id: string | number;
   noteType?: "footnote" | "endnote";
   vertAlign?: "baseline" | "superscript";
   customMarkFollows?: document_d_exports.NoteReferenceContent["customMarkFollows"];
 };
-type CommentAttrs = {
+export type CommentAttrs = {
   commentId: number;
 };
 /**
@@ -98,9 +99,9 @@ type CommentAttrs = {
  *   accepted. Suggested marks never round-trip through OOXML; parsing a
  *   DOCX can only ever produce `"user"` marks.
  */
-declare const TRACKED_CHANGE_PROVENANCE_VALUES: readonly ["user", "suggested"];
-type TrackedChangeProvenance = (typeof TRACKED_CHANGE_PROVENANCE_VALUES)[number];
-type TrackedRevisionAncestor = {
+export declare const TRACKED_CHANGE_PROVENANCE_VALUES: readonly ["user", "suggested"];
+export type TrackedChangeProvenance = (typeof TRACKED_CHANGE_PROVENANCE_VALUES)[number];
+export type TrackedRevisionAncestor = {
   type: "insertion" | "deletion" | "moveFrom" | "moveTo";
   revisionId: number;
   author: string;
@@ -110,7 +111,7 @@ type TrackedRevisionAncestor = {
   outerWrapperCount: number;
   resolutionJoins?: document_d_exports.Insertion["resolutionJoins"];
 };
-type TrackedChangeMarkAttrs = {
+export type TrackedChangeMarkAttrs = {
   revisionId: number;
   author: string;
   date?: string;
@@ -122,6 +123,7 @@ type TrackedChangeMarkAttrs = {
   /** Number of inline-wrapper layers authored outside this revision. */
   _docxOuterWrapperCount?: number;
   _docxResolutionJoins?: document_d_exports.Insertion["resolutionJoins"];
+  _docxCommentRangeBoundaries?: readonly TrackedCommentBoundary[] | null;
   /** 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. */
@@ -136,7 +138,7 @@ type TrackedChangeMarkAttrs = {
   _historicalFormatting?: true;
 };
 /** Run-property revisions carried through the editable model. */
-type RunPropertyChangeMarkAttrs = {
+export type RunPropertyChangeMarkAttrs = {
   changes: document_d_exports.RunPropertyChange[];
   /** See {@link TrackedChangeProvenance}. Defaults to `"user"`. */
   provenance: TrackedChangeProvenance;
@@ -155,7 +157,7 @@ type RunPropertyChangeMarkAttrs = {
  * attribute remainder, or authored run properties — so a document that
  * carries none pays nothing.
  */
-type RunIdentityMarkAttrs = {
+export type RunIdentityMarkAttrs = {
   /** The authored run this leaf came from. Monotonic within one parse. */
   id: number;
   /** `w:r`'s attribute remainder: resolved names, source order. */
@@ -176,8 +178,8 @@ type RunIdentityMarkAttrs = {
  * site that decides per kind.
  */
 type WrapperLayer<Wrapper> = Wrapper extends unknown ? Omit<Wrapper, "type" | "content"> : never;
-type InlineWrapperLayer = WrapperLayer<document_d_exports.InlineWrapper>;
-type InlineWrapperKind = InlineWrapperLayer["kind"];
+export type InlineWrapperLayer = WrapperLayer<document_d_exports.InlineWrapper>;
+export type InlineWrapperKind = InlineWrapperLayer["kind"];
 /**
  * The wrappers a leaf sits inside, outermost first.
  *
@@ -186,7 +188,7 @@ type InlineWrapperKind = InlineWrapperLayer["kind"];
  * wrapper inside another cannot be spelled as two marks. `null` is no
  * wrapper; an empty stack is never stored.
  */
-type InlineWrapperAttrs = {
+export type InlineWrapperAttrs = {
   stack: readonly InlineWrapperLayer[];
   /**
    * The imported hyperlink whose children the suffix of `stack` came from.
@@ -200,13 +202,13 @@ type InlineWrapperAttrs = {
   /** 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];
-declare const RUN_FORMATTING_BOOLEAN_PROPERTIES: readonly ["bold", "boldCs", "italic", "italicCs", "strike", "doubleStrike", "smallCaps", "allCaps", "hidden", "noProof", "emboss", "imprint", "outline", "shadow", "rtl", "cs"];
-declare const RUN_FORMATTING_VALUE_PROPERTIES: readonly ["underline", "vertAlign", "color", "highlight", "shading", "fontSize", "fontSizeCs", "fontFamily", "language", "spacing", "position", "scale", "kerning", "effect", "emphasisMark"];
-type RunFormattingBooleanProperty = (typeof RUN_FORMATTING_BOOLEAN_PROPERTIES)[number];
-type RunFormattingValueProperty = (typeof RUN_FORMATTING_VALUE_PROPERTIES)[number];
-declare const RUN_FORMATTING_PROPERTY_SPECS: {
+export declare const COMPLEX_SCRIPT_RUN_PROPERTY_KEYS: readonly ["boldCs", "italicCs", "fontSizeCs"];
+export type ComplexScriptRunPropertyKey = (typeof COMPLEX_SCRIPT_RUN_PROPERTY_KEYS)[number];
+export declare const RUN_FORMATTING_BOOLEAN_PROPERTIES: readonly ["bold", "boldCs", "italic", "italicCs", "strike", "doubleStrike", "smallCaps", "allCaps", "hidden", "noProof", "emboss", "imprint", "outline", "shadow", "rtl", "cs"];
+export declare const RUN_FORMATTING_VALUE_PROPERTIES: readonly ["underline", "vertAlign", "color", "highlight", "shading", "fontSize", "fontSizeCs", "fontFamily", "language", "spacing", "position", "scale", "kerning", "effect", "emphasisMark"];
+export type RunFormattingBooleanProperty = (typeof RUN_FORMATTING_BOOLEAN_PROPERTIES)[number];
+export type RunFormattingValueProperty = (typeof RUN_FORMATTING_VALUE_PROPERTIES)[number];
+export declare const RUN_FORMATTING_PROPERTY_SPECS: {
   readonly bold: "boolean";
   readonly boldCs: "boolean";
   readonly italic: "boolean";
@@ -240,8 +242,8 @@ declare const RUN_FORMATTING_PROPERTY_SPECS: {
   readonly cs: "boolean";
   readonly styleId: "style";
 };
-type AuthoredRunFormattingValues = Partial<Pick<document_d_exports.TextFormatting, RunFormattingValueProperty>>;
-type RunFormattingOverrideAttrs = {
+export type AuthoredRunFormattingValues = Partial<Pick<document_d_exports.TextFormatting, RunFormattingValueProperty>>;
+export type RunFormattingOverrideAttrs = {
   allCaps?: boolean;
   bold?: boolean;
   boldCs?: boolean;
@@ -291,20 +293,15 @@ type RunFormattingOverrideAttrs = {
  * duplicating it on every styled run bloats collaborative state and becomes
  * stale when a run moves between paragraph contexts.
  */
-type CharacterStyleAttrs = {
+export type CharacterStyleAttrs = {
   styleId: string;
 };
 /**
  * Hyperlink mark attributes
  */
-type HyperlinkAttrs = {
+export type HyperlinkAttrs = Omit<document_d_exports.Hyperlink, "type" | "children" | "href"> & {
   href: string;
-  tooltip?: string;
-  rId?: string;
-  target?: document_d_exports.Hyperlink["target"];
-  history?: document_d_exports.Hyperlink["history"];
-  docLocation?: document_d_exports.Hyperlink["docLocation"];
   _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, TrackedRevisionAncestor, UnderlineAttrs };
+export {};