@stll/folio-core 0.44.0 → 0.46.0

package/dist/prosemirror/extensions/StarterKit.js

@@ -17,34 +17,10 @@ import { ParagraphChangeTrackerExtension } from "./features/ParagraphChangeTrack
 import { PasteCleanupExtension } from "./features/PasteCleanupExtension.js";
 import { PasteStyleInlinerExtension } from "./features/PasteStyleInlinerExtension.js";
 import { SelectionTrackerExtension } from "./features/SelectionTrackerExtension.js";
-import { AllCapsExtension } from "./marks/AllCapsExtension.js";
-import { BoldExtension } from "./marks/BoldExtension.js";
-import { CharacterSpacingExtension } from "./marks/CharacterSpacingExtension.js";
-import { CharacterStyleExtension } from "./marks/CharacterStyleExtension.js";
-import { CommentExtension } from "./marks/CommentExtension.js";
-import { FontFamilyExtension } from "./marks/FontFamilyExtension.js";
-import { FontSizeExtension } from "./marks/FontSizeExtension.js";
-import { FootnoteRefExtension } from "./marks/FootnoteRefExtension.js";
-import { HiddenTextExtension } from "./marks/HiddenTextExtension.js";
-import { HighlightExtension } from "./marks/HighlightExtension.js";
-import { HyperlinkExtension } from "./marks/HyperlinkExtension.js";
-import { ItalicExtension } from "./marks/ItalicExtension.js";
-import { LanguageExtension } from "./marks/LanguageExtension.js";
-import { PageBreakRunOwnerExtension } from "./marks/PageBreakRunOwnerExtension.js";
-import { RtlExtension } from "./marks/RtlExtension.js";
-import { RunFormattingOverrideExtension } from "./marks/RunFormattingOverrideExtension.js";
-import { RunShadingExtension } from "./marks/RunShadingExtension.js";
-import { SmallCapsExtension } from "./marks/SmallCapsExtension.js";
-import { StrikeExtension } from "./marks/StrikeExtension.js";
-import { SubscriptExtension } from "./marks/SubscriptExtension.js";
-import { SuperscriptExtension } from "./marks/SuperscriptExtension.js";
-import { TextColorExtension } from "./marks/TextColorExtension.js";
-import { TextEffectExtension } from "./marks/TextEffectExtension.js";
-import { EmbossExtension, EmphasisMarkExtension, ImprintExtension, TextOutlineExtension, TextShadowExtension } from "./marks/TextEffectsExtensions.js";
-import { DeletionExtension, InsertionExtension, RunPropertyChangeExtension } from "./marks/TrackedChangeExtensions.js";
-import { UnderlineExtension } from "./marks/UnderlineExtension.js";
+import { MARK_EXTENSIONS } from "./markRegistry.js";
 import { BlockSdtExtension } from "./nodes/BlockSdtExtension.js";
 import { BookmarkBoundaryExtension } from "./nodes/BookmarkBoundaryExtension.js";
+import { CommentReferenceExtension } from "./nodes/CommentReferenceExtension.js";
 import { FieldExtension, StructuredFieldExtension } from "./nodes/FieldExtension.js";
 import { HardBreakExtension } from "./nodes/HardBreakExtension.js";
 import { HorizontalRuleExtension } from "./nodes/HorizontalRuleExtension.js";
@@ -52,6 +28,8 @@ import { ImageExtension } from "./nodes/ImageExtension.js";
 import { MathExtension } from "./nodes/MathExtension.js";
 import { PageBreakExtension } from "./nodes/PageBreakExtension.js";
 import { PageBreakRunExtension } from "./nodes/PageBreakRunExtension.js";
+import { PreservedBlockExtension } from "./nodes/PreservedBlockExtension.js";
+import { PreservedXmlExtension } from "./nodes/PreservedXmlExtension.js";
 import { RenderedPageBreakExtension } from "./nodes/RenderedPageBreakExtension.js";
 import { SdtExtension } from "./nodes/SdtExtension.js";
 import { ShapeExtension } from "./nodes/ShapeExtension.js";
@@ -82,42 +60,13 @@ function createStarterKit(options = {}) {
 		...options.historyDepth !== void 0 ? { depth: options.historyDepth } : {},
 		...options.historyNewGroupDelay !== void 0 ? { newGroupDelay: options.historyNewGroupDelay } : {}
 	}));
-	add("bold", BoldExtension());
-	add("italic", ItalicExtension());
-	add("underline", UnderlineExtension());
-	add("strike", StrikeExtension());
-	add("textColor", TextColorExtension());
-	add("runShading", RunShadingExtension());
-	add("highlight", HighlightExtension());
-	add("fontSize", FontSizeExtension());
-	add("fontFamily", FontFamilyExtension());
-	add("language", LanguageExtension());
-	add("superscript", SuperscriptExtension());
-	add("subscript", SubscriptExtension());
-	add("hyperlink", HyperlinkExtension());
-	add("allCaps", AllCapsExtension());
-	add("smallCaps", SmallCapsExtension());
-	add("footnoteRef", FootnoteRefExtension());
-	add("characterSpacing", CharacterSpacingExtension());
-	add("emboss", EmbossExtension());
-	add("imprint", ImprintExtension());
-	add("hidden", HiddenTextExtension());
-	add("textShadow", TextShadowExtension());
-	add("emphasisMark", EmphasisMarkExtension());
-	add("textOutline", TextOutlineExtension());
-	add("rtl", RtlExtension());
-	add("textEffect", TextEffectExtension());
-	add("runFormattingOverride", RunFormattingOverrideExtension());
-	add("characterStyle", CharacterStyleExtension());
-	add("pageBreakRunOwner", PageBreakRunOwnerExtension());
-	add("comment", CommentExtension());
-	add("insertion", InsertionExtension());
-	add("deletion", DeletionExtension());
-	add("runPropertyChange", RunPropertyChangeExtension());
+	for (const [name, extension] of Object.entries(MARK_EXTENSIONS)) add(name, extension());
 	add("bookmarkBoundary", BookmarkBoundaryExtension({ getInternalClipboardToken }));
+	add("commentReference", CommentReferenceExtension({ getInternalClipboardToken }));
 	add("hardBreak", HardBreakExtension());
 	add("tab", TabExtension());
 	add("symbol", SymbolExtension());
+	add("preservedXml", PreservedXmlExtension());
 	add("image", ImageExtension());
 	add("textBox", TextBoxExtension());
 	add("textBoxAnchor", TextBoxAnchorExtension({ getInternalClipboardToken }));
@@ -134,6 +83,7 @@ function createStarterKit(options = {}) {
 	add("field", StructuredFieldExtension({ getInternalClipboardToken }));
 	add("sdt", SdtExtension());
 	add("blockSdt", BlockSdtExtension());
+	add("preservedBlock", PreservedBlockExtension());
 	add("math", MathExtension());
 	if (!disabled.has("table")) extensions.push(...createTableExtensions());
 	add("pasteCleanup", PasteCleanupExtension({ getInternalClipboardToken }));

package/dist/prosemirror/extensions/core/DocExtension.js

@@ -13,7 +13,7 @@ const DocExtension = createNodeExtension({
 			_finalSectionStart: { default: null },
 			_adjustLineHeightInTable: { default: false }
 		},
-		content: "(paragraph | horizontalRule | pageBreak | table | textBox | blockSdt)+"
+		content: "(paragraph | horizontalRule | pageBreak | table | textBox | blockSdt | preservedBlock)+"
 	}
 });
 //#endregion

package/dist/prosemirror/extensions/core/ParagraphExtension.js

@@ -254,6 +254,7 @@ const paragraphNodeSpec = {
 		_autospacingBase: { default: null },
 		_sectionProperties: { default: null },
 		_propertyChanges: { default: null },
+		_preservedAttributes: { default: null },
 		pPrMark: { default: null },
 		_suggestedInsert: { default: null }
 	},
@@ -664,7 +665,7 @@ const ParagraphExtension = createNodeExtension({
 						instruction: `PAGEREF ${entry.name} \\h`,
 						displayText: "1",
 						fieldKind: "complex",
-						fldLock: false,
+						fldLock: null,
 						dirty: true
 					}));
 					tocNodes.push(s.node("paragraph", {

package/dist/prosemirror/extensions/features/BaseKeymapExtension.js

@@ -1,8 +1,11 @@
-import { mergeFontFamily } from "../../../utils/fontFamilyMerge.js";
+import { mergeTextFormatting } from "../../../utils/textFormattingMerge.js";
+import { expectCharacterStyleMarkAttrs, expectRunFormattingOverrideMarkAttrs } from "../../attrs/index.js";
 import { getDocumentStyleResolver } from "../../plugins/documentStyles.js";
+import { RUN_FORMATTING_MARK_NAMES } from "../../runFormattingMarkNames.js";
+import { authoredRunFormattingFromAttrs } from "../../runFormattingProvenance.js";
 import { paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
 import { createExtension } from "../create.js";
-import { textFormattingToMarks } from "../marks/markUtils.js";
+import { marksToTextFormatting, textFormattingToMarks } from "../marks/markUtils.js";
 import { Priority } from "../types.js";
 import { baseKeymap, deleteSelection, joinBackward, joinForward, selectAll, selectParentNode, splitBlock } from "prosemirror-commands";
 //#region src/prosemirror/extensions/features/BaseKeymapExtension.ts
@@ -44,7 +47,7 @@ const clearIndentOnBackspace = (state, dispatch) => {
 };
 /**
 * Custom Enter handler: splits the block, inherits style-related attrs,
-* clears paragraph borders, and preserves font marks on the new paragraph.
+* clears paragraph borders, and preserves run formatting on the new paragraph.
 *
 * splitBlock creates a new paragraph with default attrs (all null),
 * so we must manually copy style-related attrs from the source paragraph.
@@ -61,12 +64,31 @@ const INHERITED_PARA_ATTRS = [
 	"spaceBefore",
 	"contextualSpacing"
 ];
-/** Mark types that represent style-inherited formatting (font, size, color). */
+/** Style formatting needed when the caret has no marks of its own. */
 const STYLE_MARK_NAMES = /* @__PURE__ */ new Set([
 	"fontFamily",
 	"fontSize",
 	"textColor"
 ]);
+const directFormattingFromMarks = (marks) => {
+	const override = marks.find(({ type }) => type.name === "runFormattingOverride");
+	const directFormatting = override ? authoredRunFormattingFromAttrs(expectRunFormattingOverrideMarkAttrs(override)) : void 0;
+	const characterStyle = marks.find(({ type }) => type.name === "characterStyle");
+	if (!characterStyle) return directFormatting;
+	return {
+		...directFormatting,
+		styleId: expectCharacterStyleMarkAttrs(characterStyle).styleId
+	};
+};
+const marksForParagraphFormatting = (formatting, directFormatting, schema) => {
+	const marks = textFormattingToMarks(formatting, schema, {
+		authoredCarrier: "preserve",
+		directFormatting,
+		overrideFormatting: directFormatting
+	});
+	if (formatting.styleId) marks.push(schema.mark("characterStyle", { styleId: formatting.styleId }));
+	return marks;
+};
 /**
 * If `sourcePara`'s style defines a `w:next`, replace the empty `newPara`
 * with that style's resolved attrs and seed stored marks from its run
@@ -94,7 +116,8 @@ function applyNextParagraphStyle(tr, sourcePara, newPara, resolver) {
 const splitBlockClearBorders = (state, dispatch, view) => {
 	const { $from: preSplitFrom } = state.selection;
 	const sourcePara = preSplitFrom.parent.type.name === "paragraph" ? preSplitFrom.parent : null;
-	const styleMarks = (state.storedMarks || preSplitFrom.marks()).filter((m) => STYLE_MARK_NAMES.has(m.type.name));
+	const caretFormattingMarks = (state.storedMarks || preSplitFrom.marks()).filter((mark) => RUN_FORMATTING_MARK_NAMES.has(mark.type.name));
+	const resolver = getDocumentStyleResolver(state);
 	const splitResult = { tr: null };
 	if (!splitBlock(state, dispatch ? (tr) => {
 		splitResult.tr = tr;
@@ -104,8 +127,18 @@ const splitBlockClearBorders = (state, dispatch, view) => {
 		const { $from } = tr.selection;
 		const newPara = $from.parent;
 		if (newPara.type.name === "paragraph") {
-			const resolver = getDocumentStyleResolver(state);
 			if (resolver !== null && sourcePara !== null && newPara.content.size === 0 && applyNextParagraphStyle(tr, sourcePara, newPara, resolver)) {
+				const directFormatting = directFormattingFromMarks(caretFormattingMarks);
+				if (directFormatting && Object.keys(directFormatting).length > 0) {
+					const nextParagraph = tr.selection.$from.parent;
+					const nextStyleFormatting = nextParagraph.attrs["defaultTextFormatting"];
+					const defaultTextFormatting = mergeTextFormatting(nextStyleFormatting, directFormatting) ?? directFormatting;
+					tr.setNodeMarkup(tr.selection.$from.before(), void 0, {
+						...nextParagraph.attrs,
+						defaultTextFormatting
+					});
+					tr.setStoredMarks(marksForParagraphFormatting(defaultTextFormatting, directFormatting, state.schema));
+				}
 				dispatch(tr.scrollIntoView());
 				return true;
 			}
@@ -124,33 +157,18 @@ const splitBlockClearBorders = (state, dispatch, view) => {
 			}
 			if (attrsChanged) tr.setNodeMarkup($from.before(), void 0, newAttrs);
 			if (newPara.textContent.length === 0) {
-				let effectiveMarks = styleMarks;
+				let effectiveMarks = caretFormattingMarks;
 				if (effectiveMarks.length === 0 && sourcePara) {
 					const dtf = sourcePara.attrs["defaultTextFormatting"];
 					if (dtf) effectiveMarks = textFormattingToMarks(dtf, state.schema).filter((m) => STYLE_MARK_NAMES.has(m.type.name));
 				}
 				if (effectiveMarks.length > 0) {
-					const dtf = { ...newAttrs["defaultTextFormatting"] };
-					let dtfChanged = false;
-					for (const m of effectiveMarks) {
-						if (m.type.name === "fontSize" && m.attrs["size"] !== dtf.fontSize) {
-							dtf.fontSize = m.attrs["size"];
-							dtfChanged = true;
-						}
-						if (m.type.name === "fontFamily") {
-							const ascii = m.attrs["ascii"];
-							if (ascii && (!dtf.fontFamily || dtf.fontFamily.ascii !== ascii)) {
-								const nextFontFamily = { ascii };
-								const hAnsi = m.attrs["hAnsi"];
-								if (hAnsi !== void 0) nextFontFamily.hAnsi = hAnsi;
-								dtf.fontFamily = mergeFontFamily(dtf.fontFamily, nextFontFamily);
-								dtfChanged = true;
-							}
-						}
-					}
-					if (dtfChanged) tr.setNodeMarkup($from.before(), void 0, {
+					const previousFormatting = newAttrs["defaultTextFormatting"];
+					const markFormatting = marksToTextFormatting(effectiveMarks);
+					const defaultTextFormatting = mergeTextFormatting(previousFormatting, markFormatting) ?? markFormatting;
+					tr.setNodeMarkup($from.before(), void 0, {
 						...newAttrs,
-						defaultTextFormatting: dtf
+						defaultTextFormatting
 					});
 					tr.setStoredMarks(effectiveMarks);
 				}

package/dist/prosemirror/extensions/features/EmptyParagraphFormatExtension.js

@@ -11,8 +11,9 @@ const emptyParagraphFormatKey = new PluginKey("emptyParagraphFormat");
 * must be one `textFormattingToMarks` can turn into a mark, or the gate would
 * open for work that produces nothing.
 */
+const FONT_ONLY_DEFAULTS = /* @__PURE__ */ new Set(["fontFamily", "fontSize"]);
 function hasNonFontDefaults(dtf) {
-	return !!(dtf.bold || dtf.italic || dtf.underline || dtf.strike || dtf.doubleStrike || dtf.color || dtf.highlight || dtf.vertAlign || dtf.rtl);
+	return Object.entries(dtf).some(([property, value]) => value !== void 0 && !FONT_ONLY_DEFAULTS.has(property));
 }
 function createEmptyParagraphFormatPlugin(schema) {
 	return new Plugin({
@@ -27,6 +28,7 @@ function createEmptyParagraphFormatPlugin(schema) {
 			const dtf = para.attrs["defaultTextFormatting"];
 			if (!dtf || !hasNonFontDefaults(dtf)) return null;
 			const marks = textFormattingToMarks(dtf, schema);
+			if (dtf.styleId) marks.push(schema.mark("characterStyle", { styleId: dtf.styleId }));
 			if (marks.length === 0) return null;
 			const tr = newState.tr.setStoredMarks(marks);
 			tr.setMeta("addToHistory", false);

package/dist/prosemirror/extensions/features/ImagePasteExtension.js

@@ -1,4 +1,5 @@
-import { getClipboardImageFiles } from "../../../utils/clipboard.js";
+import { FOLIO_INSERTED_PICTURE_FRAME_LOCKS } from "../../../docx/graphicFrameLocks.js";
+import { getStandaloneClipboardImageFiles } from "../../../utils/clipboard.js";
 import { isSafeImageFile } from "../../../utils/imageValidation.js";
 import { sanitizeImageSrc } from "../../../utils/sanitizeImageSrc.js";
 import { createExtension } from "../create.js";
@@ -73,7 +74,8 @@ async function insertImageFiles(view, files) {
 			height,
 			rId: `rId_img_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
 			wrapType: "inline",
-			displayMode: "inline"
+			displayMode: "inline",
+			frameLocks: FOLIO_INSERTED_PICTURE_FRAME_LOCKS
 		});
 		const tr = view.state.tr.insert(insertPos, imageNode);
 		insertPos += imageNode.nodeSize;
@@ -86,7 +88,7 @@ const ImagePasteExtension = createExtension({
 	name: "imagePaste",
 	onSchemaReady(_ctx) {
 		return { plugins: [new Plugin({ props: { handleDOMEvents: { paste(view, event) {
-			const imageFiles = getClipboardImageFiles(event.clipboardData);
+			const imageFiles = getStandaloneClipboardImageFiles(event.clipboardData);
 			if (imageFiles.length === 0) return false;
 			if (!view.state.schema.nodes["image"]) return false;
 			event.preventDefault();

package/dist/prosemirror/extensions/features/ParaIdAllocatorExtension.js

@@ -322,6 +322,7 @@ const createParaIdAllocatorPlugin = () => new Plugin({
 		ignoreTrackedChanges(tr);
 		tr.setMeta(paraIdAllocatorKey, "allocated");
 		tr.setMeta("addToHistory", false);
+		if (newState.storedMarks !== null) tr.setStoredMarks(newState.storedMarks);
 		return tr;
 	}
 });

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

@@ -0,0 +1,41 @@
+import { MarkExtension } from "./types.js";
+//#region src/prosemirror/extensions/markRegistry.d.ts
+declare const MARK_EXTENSIONS: {
+  readonly bold: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly italic: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly underline: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly strike: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly textColor: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly runShading: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly highlight: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly fontSize: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly fontFamily: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly language: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly superscript: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly subscript: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly hyperlink: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly allCaps: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly smallCaps: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly footnoteRef: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly characterSpacing: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly emboss: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly imprint: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly hidden: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly textShadow: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly emphasisMark: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly textOutline: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly rtl: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly textEffect: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly runFormattingOverride: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly characterStyle: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly pageBreakRunOwner: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly comment: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly insertion: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly deletion: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly runPropertyChange: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly inlineWrapper: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+};
+/** A mark the editor schema declares. */
+type SchemaMarkName = keyof typeof MARK_EXTENSIONS;
+//#endregion
+export { MARK_EXTENSIONS, SchemaMarkName };

package/dist/prosemirror/extensions/markRegistry.js

@@ -0,0 +1,75 @@
+import { AllCapsExtension } from "./marks/AllCapsExtension.js";
+import { BoldExtension } from "./marks/BoldExtension.js";
+import { CharacterSpacingExtension } from "./marks/CharacterSpacingExtension.js";
+import { CharacterStyleExtension } from "./marks/CharacterStyleExtension.js";
+import { CommentExtension } from "./marks/CommentExtension.js";
+import { FontFamilyExtension } from "./marks/FontFamilyExtension.js";
+import { FontSizeExtension } from "./marks/FontSizeExtension.js";
+import { FootnoteRefExtension } from "./marks/FootnoteRefExtension.js";
+import { HiddenTextExtension } from "./marks/HiddenTextExtension.js";
+import { HighlightExtension } from "./marks/HighlightExtension.js";
+import { HyperlinkExtension } from "./marks/HyperlinkExtension.js";
+import { InlineWrapperExtension } from "./marks/InlineWrapperExtension.js";
+import { ItalicExtension } from "./marks/ItalicExtension.js";
+import { LanguageExtension } from "./marks/LanguageExtension.js";
+import { PageBreakRunOwnerExtension } from "./marks/PageBreakRunOwnerExtension.js";
+import { RtlExtension } from "./marks/RtlExtension.js";
+import { RunFormattingOverrideExtension } from "./marks/RunFormattingOverrideExtension.js";
+import { RunShadingExtension } from "./marks/RunShadingExtension.js";
+import { SmallCapsExtension } from "./marks/SmallCapsExtension.js";
+import { StrikeExtension } from "./marks/StrikeExtension.js";
+import { SubscriptExtension } from "./marks/SubscriptExtension.js";
+import { SuperscriptExtension } from "./marks/SuperscriptExtension.js";
+import { TextColorExtension } from "./marks/TextColorExtension.js";
+import { TextEffectExtension } from "./marks/TextEffectExtension.js";
+import { EmbossExtension, EmphasisMarkExtension, ImprintExtension, TextOutlineExtension, TextShadowExtension } from "./marks/TextEffectsExtensions.js";
+import { DeletionExtension, InsertionExtension, RunPropertyChangeExtension } from "./marks/TrackedChangeExtensions.js";
+import { UnderlineExtension } from "./marks/UnderlineExtension.js";
+//#region src/prosemirror/extensions/markRegistry.ts
+/**
+* Every mark the editor schema declares, in registration order.
+*
+* Registration order is DOM nesting order: a mark registered later is the
+* inner span. `StarterKit` builds the schema from this record and from nothing
+* else, so `SchemaMarkName` is the set of marks that exist rather than a list
+* beside it — a table that must decide something per mark (what the painter
+* does with it) can be checked total against this union, and a mark added
+* without that decision does not compile.
+*/
+const MARK_EXTENSIONS = {
+	bold: BoldExtension,
+	italic: ItalicExtension,
+	underline: UnderlineExtension,
+	strike: StrikeExtension,
+	textColor: TextColorExtension,
+	runShading: RunShadingExtension,
+	highlight: HighlightExtension,
+	fontSize: FontSizeExtension,
+	fontFamily: FontFamilyExtension,
+	language: LanguageExtension,
+	superscript: SuperscriptExtension,
+	subscript: SubscriptExtension,
+	hyperlink: HyperlinkExtension,
+	allCaps: AllCapsExtension,
+	smallCaps: SmallCapsExtension,
+	footnoteRef: FootnoteRefExtension,
+	characterSpacing: CharacterSpacingExtension,
+	emboss: EmbossExtension,
+	imprint: ImprintExtension,
+	hidden: HiddenTextExtension,
+	textShadow: TextShadowExtension,
+	emphasisMark: EmphasisMarkExtension,
+	textOutline: TextOutlineExtension,
+	rtl: RtlExtension,
+	textEffect: TextEffectExtension,
+	runFormattingOverride: RunFormattingOverrideExtension,
+	characterStyle: CharacterStyleExtension,
+	pageBreakRunOwner: PageBreakRunOwnerExtension,
+	comment: CommentExtension,
+	insertion: InsertionExtension,
+	deletion: DeletionExtension,
+	runPropertyChange: RunPropertyChangeExtension,
+	inlineWrapper: InlineWrapperExtension
+};
+//#endregion
+export { MARK_EXTENSIONS };

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

@@ -1,4 +1,4 @@
-import { normalizeUserUrl, sanitizeExternalUrl } from "../../../utils/urlSecurity.js";
+import { anchorTargetAttrs, normalizeUserUrl, sanitizeExternalUrl } from "../../../utils/urlSecurity.js";
 import { expectHyperlinkMarkAttrs } from "../../attrs/index.js";
 import { createMarkExtension } from "../create.js";
 import { isMarkActive } from "./markUtils.js";
@@ -96,8 +96,7 @@ const HyperlinkExtension = createMarkExtension({
 			const { href, tooltip } = expectHyperlinkMarkAttrs(mark);
 			const domAttrs = {
 				href: sanitizeStoredHref(href),
-				target: "_blank",
-				rel: "noopener noreferrer"
+				...anchorTargetAttrs(void 0)
 			};
 			if (tooltip) domAttrs["title"] = tooltip;
 			return [

package/dist/prosemirror/extensions/marks/InlineWrapperExtension.d.ts

@@ -0,0 +1,18 @@
+import { MarkExtension } from "../types.js";
+//#region src/prosemirror/extensions/marks/InlineWrapperExtension.d.ts
+/**
+ * Inline wrapper mark — the transparent wrappers a leaf sits inside.
+ *
+ * One mark for every wrapper kind rather than one mark per kind: ProseMirror's
+ * mark set is unordered across types, so two marks could not say which wrapper
+ * is inside which. The nesting lives in the `stack` attr, outermost first, and
+ * the mark excludes itself (ProseMirror's default) because a second one would
+ * be a second answer to the same question.
+ *
+ * `inclusive: false` so typing at the end of a wrapped span does not silently
+ * extend the wrapper over text the author wrote outside it.
+ */
+declare const INLINE_WRAPPER_MARK_NAME = "inlineWrapper";
+declare const InlineWrapperExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion
+export { INLINE_WRAPPER_MARK_NAME, InlineWrapperExtension };

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

@@ -0,0 +1,63 @@
+import { expectInlineWrapperMarkAttrs } from "../../attrs/index.js";
+import { INLINE_WRAPPER_STACK_ATTRIBUTE, parseInlineWrapperStack, serializeInlineWrapperStack } from "../../inlineWrapperStack.js";
+import { createMarkExtension } from "../create.js";
+import { panic } from "better-result";
+//#region src/prosemirror/extensions/marks/InlineWrapperExtension.ts
+/**
+* Inline wrapper mark — the transparent wrappers a leaf sits inside.
+*
+* One mark for every wrapper kind rather than one mark per kind: ProseMirror's
+* mark set is unordered across types, so two marks could not say which wrapper
+* is inside which. The nesting lives in the `stack` attr, outermost first, and
+* the mark excludes itself (ProseMirror's default) because a second one would
+* be a second answer to the same question.
+*
+* `inclusive: false` so typing at the end of a wrapped span does not silently
+* extend the wrapper over text the author wrote outside it.
+*/
+const INLINE_WRAPPER_MARK_NAME = "inlineWrapper";
+/**
+* How one layer is spelled in HTML.
+*
+* `w:bdo` is `unicode-bidi: bidi-override`, which HTML gives an element of its
+* own; `w:dir` is `unicode-bidi: embed`, which a `dir`-carrying span states.
+*/
+const layerElement = (layer, attributes) => {
+	switch (layer.kind) {
+		case "bidi":
+			if (layer.direction !== void 0) attributes["dir"] = layer.direction;
+			return [
+				layer.control === "override" ? "bdo" : "span",
+				attributes,
+				0
+			];
+		default:
+			layer.kind;
+			panic(`Unspelled inline wrapper layer: ${JSON.stringify(layer)}`);
+	}
+};
+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 } },
+		inclusive: false,
+		parseDOM: [{
+			tag: `[${INLINE_WRAPPER_STACK_ATTRIBUTE}]`,
+			getAttrs(dom) {
+				const stack = parseInlineWrapperStack(dom.getAttribute(INLINE_WRAPPER_STACK_ATTRIBUTE));
+				return stack === null ? false : { stack };
+			}
+		}],
+		toDOM(mark) {
+			const { stack } = 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) });
+		}
+	}
+});
+//#endregion
+export { INLINE_WRAPPER_MARK_NAME, InlineWrapperExtension };

package/dist/prosemirror/extensions/marks/markUtils.d.ts

@@ -3,6 +3,7 @@ import { Command, EditorState } from "prosemirror-state";
 import { Mark, MarkType, Schema } from "prosemirror-model";
 //#region src/prosemirror/extensions/marks/markUtils.d.ts
 type MarkAttrs = Record<string, unknown>;
+declare function marksToTextFormatting(marks: readonly Mark[]): document_d_exports.TextFormatting;
 declare function setMark(markType: MarkType, attrs: MarkAttrs): Command;
 type PairedToggleProperty = "bold" | "italic";
 /** UI toggle whose direct-formatting contract explicitly targets both script families. */
@@ -46,4 +47,4 @@ declare function createSetMarkCommand(markType: MarkType, attrs?: Record<string,
  */
 declare function createRemoveMarkCommand(markType: MarkType): Command;
 //#endregion
-export { AuthoredRunFormattingCarrier, clearFontSizeForAllScripts, clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setFontSizeForAllScripts, setMark, textFormattingToMarks, toggleMarkForAllScripts, toggleUnderlineMark };
+export { AuthoredRunFormattingCarrier, clearFontSizeForAllScripts, clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, marksToTextFormatting, removeMark, setFontSizeForAllScripts, setMark, textFormattingToMarks, toggleMarkForAllScripts, toggleUnderlineMark };

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

@@ -1,8 +1,8 @@
 import { FONT_THEME_VALUES } from "../../../types/documentEnumValues.js";
 import { mergeFontFamily } from "../../../utils/fontFamilyMerge.js";
 import { normalizeHorizontalScalePercent } from "../../../utils/horizontalScale.js";
-import { expectFontFamilyMarkAttrs, expectRunFormattingOverrideMarkAttrs } from "../../attrs/index.js";
-import { shadingToRunShadingAttrs } from "../../conversion/runShadingMark.js";
+import { expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectEmphasisMarkAttrs, expectFontFamilyMarkAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectStrikeMarkAttrs, expectTextEffectMarkAttrs } from "../../attrs/index.js";
+import { runShadingAttrsToShading, shadingToRunShadingAttrs } from "../../conversion/runShadingMark.js";
 import { selectRunFormattingCarrierRepresentations } from "../../runFormattingInlineCarriers.js";
 import { hasRunFormattingOverrideAttrs } from "../../runFormattingProvenance.js";
 import { COMPLEX_SCRIPT_RUN_PROPERTY_KEYS } from "../../schema/marks.js";
@@ -37,7 +37,8 @@ function marksToTextFormatting(marks) {
 			};
 			break;
 		case "strike":
-			formatting.strike = true;
+			if (expectStrikeMarkAttrs(mark).double) formatting.doubleStrike = true;
+			else formatting.strike = true;
 			break;
 		case "textColor": {
 			const colorRgb = mark.attrs["rgb"] !== null && mark.attrs["rgb"] !== void 0 ? String(mark.attrs["rgb"]) : void 0;
@@ -55,6 +56,9 @@ function marksToTextFormatting(marks) {
 		case "highlight":
 			formatting.highlight = String(mark.attrs["color"]);
 			break;
+		case "runShading":
+			formatting.shading = runShadingAttrsToShading(expectRunShadingMarkAttrs(mark));
+			break;
 		case "fontSize":
 			formatting.fontSize = Number(mark.attrs["size"]);
 			break;
@@ -78,12 +82,51 @@ function marksToTextFormatting(marks) {
 		case "subscript":
 			formatting.vertAlign = "subscript";
 			break;
+		case "allCaps":
+			formatting.allCaps = true;
+			break;
+		case "smallCaps":
+			formatting.smallCaps = true;
+			break;
+		case "characterSpacing": {
+			const attrs = expectCharacterSpacingMarkAttrs(mark);
+			if (attrs.spacing !== void 0) formatting.spacing = attrs.spacing;
+			if (attrs.position !== void 0) formatting.position = attrs.position;
+			const scale = normalizeHorizontalScalePercent(attrs.scale);
+			if (scale !== void 0) formatting.scale = scale;
+			if (attrs.kerning !== void 0) formatting.kerning = attrs.kerning;
+			break;
+		}
+		case "emboss":
+			formatting.emboss = true;
+			break;
+		case "imprint":
+			formatting.imprint = true;
+			break;
+		case "hidden":
+			formatting.hidden = true;
+			break;
+		case "textShadow":
+			formatting.shadow = true;
+			break;
+		case "emphasisMark":
+			formatting.emphasisMark = expectEmphasisMarkAttrs(mark).type || "dot";
+			break;
+		case "textOutline":
+			formatting.outline = true;
+			break;
 		case "rtl":
 			formatting.rtl = true;
 			break;
+		case "textEffect":
+			formatting.effect = expectTextEffectMarkAttrs(mark).effect;
+			break;
 		case "runFormattingOverride":
 			applyRunFormattingOverrideMark(formatting, mark);
 			break;
+		case "characterStyle":
+			formatting.styleId = expectCharacterStyleMarkAttrs(mark).styleId;
+			break;
 		default: break;
 	}
 	return formatting;
@@ -486,4 +529,4 @@ function createRemoveMarkCommand(markType) {
 	return removeMark(markType);
 }
 //#endregion
-export { clearFontSizeForAllScripts, clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setFontSizeForAllScripts, setMark, textFormattingToMarks, toggleMarkForAllScripts, toggleUnderlineMark };
+export { clearFontSizeForAllScripts, clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, marksToTextFormatting, removeMark, setFontSizeForAllScripts, setMark, textFormattingToMarks, toggleMarkForAllScripts, toggleUnderlineMark };

package/dist/prosemirror/extensions/nodes/CommentReferenceExtension.d.ts

@@ -0,0 +1,11 @@
+import { NodeExtension } from "../types.js";
+//#region src/prosemirror/extensions/nodes/CommentReferenceExtension.d.ts
+/** Zero-width `w:commentReference`: where a comment's visible mark is painted. */
+type CommentReferenceOptions = {
+  getInternalClipboardToken?: () => string;
+};
+/** The node name, for callers asking whether a paragraph holds any content. */
+declare const COMMENT_REFERENCE_NODE_NAME = "commentReference";
+declare const CommentReferenceExtension: (options?: Partial<CommentReferenceOptions> | undefined) => NodeExtension;
+//#endregion
+export { COMMENT_REFERENCE_NODE_NAME, CommentReferenceExtension };