@stll/folio-core 0.22.3 → 0.23.1

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

@@ -1,3 +1,4 @@
+import { expectParagraphAttrs } from "../../attrs/index.js";
 import { PPR_CHANGE_SCOPED_ATTR_KEYS } from "../../commands/propertyChangeScope.js";
 import { SUGGESTION_META, makeRevisionInfo } from "../../plugins/suggestionMode.js";
 import { createExtension } from "../create.js";
@@ -10,11 +11,10 @@ function chainCommands(...commands) {
 		return false;
 	};
 }
-function appendParagraphPropertyChange(attrs, previousFormatting, rev) {
-	const existing = Array.isArray(attrs["_propertyChanges"]) ? attrs["_propertyChanges"] : [];
+function appendParagraphPropertyChange(attrs, existing, previousFormatting, rev) {
 	return {
 		...attrs,
-		_propertyChanges: [...existing, {
+		_propertyChanges: [...existing ?? [], {
 			type: "paragraphPropertyChange",
 			info: {
 				id: rev.id,
@@ -85,7 +85,7 @@ function toggleList(numId) {
 						listMarker: null
 					};
 				}
-				if (rev) nextAttrs = appendParagraphPropertyChange(nextAttrs, getPreviousListFormatting(node.attrs), rev);
+				if (rev) nextAttrs = appendParagraphPropertyChange(nextAttrs, expectParagraphAttrs(node)._propertyChanges, getPreviousListFormatting(node.attrs), rev);
 				tr = tr.setNodeMarkup(pos, void 0, nextAttrs);
 			}
 		});

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

@@ -1,10 +1,11 @@
 import { document_d_exports } from "../../../types/document.js";
+import { RunFormattingOverrideAttrs } from "../../schema/marks.js";
 import { MarkExtension } from "../types.js";
 import { Mark } from "prosemirror-model";
 //#region src/prosemirror/extensions/marks/RunFormattingOverrideExtension.d.ts
-type RunFormattingOverrideAttrs = Record<string, false | "none">;
 declare function buildRunFormattingOverrideAttrs(formatting: document_d_exports.TextFormatting | undefined): RunFormattingOverrideAttrs | undefined;
+declare function applyRunFormattingOverrideAttrs(formatting: document_d_exports.TextFormatting, attrs: RunFormattingOverrideAttrs): void;
 declare function applyRunFormattingOverrideMark(formatting: document_d_exports.TextFormatting, mark: Mark): void;
 declare const RunFormattingOverrideExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
 //#endregion
-export { RunFormattingOverrideExtension, applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs };
+export { RunFormattingOverrideExtension, applyRunFormattingOverrideAttrs, applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs };

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

@@ -4,23 +4,26 @@ import { createMarkExtension } from "../create.js";
 function buildRunFormattingOverrideAttrs(formatting) {
 	if (!formatting) return;
 	const attrs = {};
-	if (formatting.bold === false) attrs["bold"] = false;
-	if (formatting.italic === false) attrs["italic"] = false;
-	if (formatting.underline?.style === "none") attrs["underline"] = "none";
-	if (formatting.strike === false) attrs["strike"] = false;
-	if (formatting.doubleStrike === false) attrs["doubleStrike"] = false;
-	if (formatting.allCaps === false) attrs["allCaps"] = false;
-	if (formatting.smallCaps === false) attrs["smallCaps"] = false;
-	if (formatting.hidden === false) attrs["hidden"] = false;
-	if (formatting.emboss === false) attrs["emboss"] = false;
-	if (formatting.imprint === false) attrs["imprint"] = false;
-	if (formatting.shadow === false) attrs["shadow"] = false;
-	if (formatting.outline === false) attrs["outline"] = false;
-	if (formatting.rtl === false) attrs["rtl"] = false;
+	if (formatting.bold === false) attrs.bold = false;
+	if (formatting.italic === false) attrs.italic = false;
+	if (formatting.underline?.style === "none") attrs.underline = "none";
+	if (formatting.strike === false) attrs.strike = false;
+	if (formatting.doubleStrike === false) attrs.doubleStrike = false;
+	if (formatting.allCaps === false) attrs.allCaps = false;
+	if (formatting.smallCaps === false) attrs.smallCaps = false;
+	if (formatting.hidden === false) attrs.hidden = false;
+	if (formatting.emboss === false) attrs.emboss = false;
+	if (formatting.imprint === false) attrs.imprint = false;
+	if (formatting.shadow === false) attrs.shadow = false;
+	if (formatting.outline === false) attrs.outline = false;
+	if (formatting.rtl === false) attrs.rtl = false;
+	if (formatting.boldCs !== void 0 && formatting.boldCs !== formatting.bold) attrs.boldCs = formatting.boldCs;
+	if (formatting.italicCs !== void 0 && formatting.italicCs !== formatting.italic) attrs.italicCs = formatting.italicCs;
+	if (formatting.fontSizeCs !== void 0 && formatting.fontSizeCs !== formatting.fontSize) attrs.fontSizeCs = formatting.fontSizeCs;
+	if (formatting.cs !== void 0) attrs.cs = formatting.cs;
 	return Object.keys(attrs).length > 0 ? attrs : void 0;
 }
-function applyRunFormattingOverrideMark(formatting, mark) {
-	const attrs = expectRunFormattingOverrideMarkAttrs(mark);
+function applyRunFormattingOverrideAttrs(formatting, attrs) {
 	if (attrs.bold === false) formatting.bold = false;
 	if (attrs.italic === false) formatting.italic = false;
 	if (attrs.underline === "none") formatting.underline = { style: "none" };
@@ -34,6 +37,13 @@ function applyRunFormattingOverrideMark(formatting, mark) {
 	if (attrs.shadow === false) formatting.shadow = false;
 	if (attrs.outline === false) formatting.outline = false;
 	if (attrs.rtl === false) formatting.rtl = false;
+	if (attrs.boldCs !== void 0) formatting.boldCs = attrs.boldCs;
+	if (attrs.italicCs !== void 0) formatting.italicCs = attrs.italicCs;
+	if (attrs.fontSizeCs !== void 0) formatting.fontSizeCs = attrs.fontSizeCs;
+	if (attrs.cs !== void 0) formatting.cs = attrs.cs;
+}
+function applyRunFormattingOverrideMark(formatting, mark) {
+	applyRunFormattingOverrideAttrs(formatting, expectRunFormattingOverrideMarkAttrs(mark));
 }
 const RunFormattingOverrideExtension = createMarkExtension({
 	name: "runFormattingOverride",
@@ -52,7 +62,11 @@ const RunFormattingOverrideExtension = createMarkExtension({
 			imprint: { default: null },
 			shadow: { default: null },
 			outline: { default: null },
-			rtl: { default: null }
+			rtl: { default: null },
+			boldCs: { default: null },
+			italicCs: { default: null },
+			fontSizeCs: { default: null },
+			cs: { default: null }
 		},
 		toDOM(mark) {
 			const attrs = expectRunFormattingOverrideMarkAttrs(mark);
@@ -72,4 +86,4 @@ const RunFormattingOverrideExtension = createMarkExtension({
 	}
 });
 //#endregion
-export { RunFormattingOverrideExtension, applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs };
+export { RunFormattingOverrideExtension, applyRunFormattingOverrideAttrs, applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs };

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

@@ -1,5 +1,5 @@
-import { NodeExtension } from "../types.js";
 import { ShapeAttrs as ShapeAttrs$1 } from "../../schema/nodes.js";
+import { NodeExtension } from "../types.js";
 //#region src/prosemirror/extensions/nodes/ShapeExtension.d.ts
 type ShapeAttrs = ShapeAttrs$1;
 declare function sanitizeColor(value: string | null | undefined): string | null;

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

@@ -154,6 +154,7 @@ const tableSpec = {
 		look: { default: null },
 		borders: { default: null },
 		_resolvedIndent: { default: null },
+		_resolvedBidi: { default: null },
 		_originalFormatting: { default: null },
 		tblPrChange: { default: null },
 		_suggestedInsert: { default: null }

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

@@ -1,7 +1,7 @@
 import { document_d_exports } from "../../../types/document.js";
 import { OutlineStyleAttr } from "../../../types/documentEnumValues.js";
-import { NodeExtension } from "../types.js";
 import { ImagePositionAttrs, TextBoxAttrs as TextBoxAttrs$1 } from "../../schema/nodes.js";
+import { NodeExtension } from "../types.js";
 //#region src/prosemirror/extensions/nodes/TextBoxExtension.d.ts
 type TextBoxAttrs = {
   /** Width in pixels */

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

@@ -1,6 +1,50 @@
+import { document_d_exports } from "../../types/document.js";
+import { TextColorAttrs } from "../schema/marks.js";
+import "../schema/index.js";
+import { TablePropertiesCommand } from "../../utils/tableOperations.js";
+import { ResolvedStyleAttrs } from "./core/ParagraphExtension.js";
+import { BorderPreset, TableBorderPreset } from "./nodes/TableExtension.js";
 import { Command, Plugin } from "prosemirror-state";
 import { MarkSpec, NodeSpec, Schema } from "prosemirror-model";
 //#region src/prosemirror/extensions/types.d.ts
+type TableCellBorderCommandSpec = {
+  style: string;
+  size?: number;
+  color?: {
+    rgb: string;
+  };
+};
+type TableBorderCommandSpec = {
+  style: string;
+  size: number;
+  color: {
+    rgb: string;
+  };
+};
+type TableCellMarginsCommand = {
+  top?: number;
+  bottom?: number;
+  left?: number;
+  right?: number;
+};
+type TableStyleCommand = {
+  styleId: string;
+  tableBorders?: Partial<Record<"top" | "bottom" | "left" | "right" | "insideH" | "insideV", TableCellBorderCommandSpec>>;
+  conditionals?: Record<string, {
+    backgroundColor?: string;
+    borders?: Partial<Record<"top" | "bottom" | "left" | "right", TableCellBorderCommandSpec | null>>;
+    bold?: boolean;
+    color?: string;
+  }>;
+  look?: {
+    firstRow?: boolean;
+    lastRow?: boolean;
+    firstCol?: boolean;
+    lastCol?: boolean;
+    noHBand?: boolean;
+    noVBand?: boolean;
+  };
+};
 type ExtensionPriority = number;
 declare const Priority: {
   readonly Highest: 0;
@@ -12,7 +56,96 @@ declare const Priority: {
 type ExtensionContext = {
   schema: Schema;
 };
+type FolioCommandArguments = {
+  toggleBold: [];
+  toggleItalic: [];
+  toggleUnderline: [];
+  toggleStrike: [];
+  toggleSuperscript: [];
+  toggleSubscript: [];
+  setTextColor: [attrs: TextColorAttrs];
+  clearTextColor: [];
+  setHighlight: [color: string];
+  clearHighlight: [];
+  setFontSize: [size: number];
+  clearFontSize: [];
+  setFontFamily: [fontName: string];
+  clearFontFamily: [];
+  setUnderlineStyle: [style: string, color?: TextColorAttrs];
+  setHyperlink: [href: string, tooltip?: string];
+  removeHyperlink: [];
+  insertHyperlink: [text: string, href: string, tooltip?: string];
+  setAlignment: [alignment: document_d_exports.ParagraphAlignment];
+  alignLeft: [];
+  alignCenter: [];
+  alignRight: [];
+  alignJustify: [];
+  setLineSpacing: [value: number, rule?: document_d_exports.LineSpacingRule];
+  singleSpacing: [];
+  oneAndHalfSpacing: [];
+  doubleSpacing: [];
+  increaseIndent: [amount?: number];
+  decreaseIndent: [amount?: number];
+  setIndentLeft: [twips: number];
+  setIndentRight: [twips: number];
+  setIndentFirstLine: [twips: number, hanging?: boolean];
+  toggleBulletList: [];
+  toggleNumberedList: [];
+  increaseListLevel: [];
+  decreaseListLevel: [];
+  removeList: [];
+  setSpaceBefore: [twips: number];
+  setSpaceAfter: [twips: number];
+  applyStyle: [styleId: string, resolvedAttrs?: ResolvedStyleAttrs];
+  clearStyle: [];
+  insertSectionBreak: [breakType: "nextPage" | "continuous" | "oddPage" | "evenPage"];
+  removeSectionBreak: [];
+  addTabStop: [position: number, alignment?: document_d_exports.TabStopAlignment, leader?: document_d_exports.TabLeader];
+  removeTabStop: [position: number];
+  toggleBidi: [];
+  setRtl: [];
+  setLtr: [];
+  setTabs: [tabs: document_d_exports.TabStop[]];
+  generateTOC: [];
+  insertTable: [rows: number, cols: number];
+  addRowAbove: [];
+  addRowBelow: [];
+  deleteRow: [];
+  addColumnLeft: [];
+  addColumnRight: [];
+  deleteColumn: [];
+  deleteTable: [];
+  selectTable: [];
+  selectRow: [];
+  selectColumn: [];
+  mergeCells: [];
+  splitCell: [];
+  setCellBorder: [side: "top" | "bottom" | "left" | "right" | "all", spec: TableCellBorderCommandSpec | null, clearOthers?: boolean];
+  setTableBorderPreset: [preset: TableBorderPreset];
+  setTableBorders: [preset: BorderPreset, borderSpec?: TableBorderCommandSpec];
+  removeTableBorders: [];
+  setAllTableBorders: [borderSpec?: TableBorderCommandSpec];
+  setOutsideTableBorders: [borderSpec?: TableBorderCommandSpec];
+  setInsideTableBorders: [borderSpec?: TableBorderCommandSpec];
+  setCellVerticalAlign: [align: "top" | "center" | "bottom"];
+  setCellMargins: [margins: TableCellMarginsCommand];
+  setCellTextDirection: [direction: string | null];
+  toggleNoWrap: [];
+  setRowHeight: [height: number | null, rule?: "auto" | "atLeast" | "exact"];
+  toggleHeaderRow: [];
+  distributeColumns: [];
+  autoFitContents: [];
+  setTableProperties: [props: TablePropertiesCommand];
+  applyTableStyle: [styleData: TableStyleCommand];
+  setCellFillColor: [color: string | null];
+  setTableBorderColor: [color: string];
+  setTableBorderWidth: [size: number];
+};
+type FolioCommandName = keyof FolioCommandArguments;
+type CommandFactory<Args extends readonly unknown[] = readonly unknown[]> = (...args: Args) => Command;
+type FolioCommandMap = Partial<{ [Name in FolioCommandName]: CommandFactory<FolioCommandArguments[Name]>; }>;
 type CommandMap = Record<string, (...args: any[]) => Command>;
+type ExtensionCommandMap = CommandMap & FolioCommandMap;
 type KeyboardShortcutMap = Record<string, Command>;
 type ExtensionRuntime = {
   commands?: CommandMap;
@@ -97,4 +230,4 @@ type MarkExtensionDefinitionWithoutDefaults<TOptions extends ExtensionOptions =
 };
 type MarkExtensionDefinition<TOptions extends ExtensionOptions = ExtensionOptions> = MarkExtensionDefinitionWithDefaults<TOptions> | MarkExtensionDefinitionWithoutDefaults<TOptions>;
 //#endregion
-export { AnyExtension, CommandMap, Extension, ExtensionConfig, ExtensionContext, ExtensionDefinition, ExtensionPriority, ExtensionRuntime, KeyboardShortcutMap, MarkExtension, MarkExtensionConfig, MarkExtensionDefinition, NodeExtension, NodeExtensionConfig, NodeExtensionDefinition, Priority };
+export { AnyExtension, CommandFactory, CommandMap, Extension, ExtensionCommandMap, ExtensionConfig, ExtensionContext, ExtensionDefinition, ExtensionPriority, ExtensionRuntime, FolioCommandArguments, FolioCommandMap, FolioCommandName, KeyboardShortcutMap, MarkExtension, MarkExtensionConfig, MarkExtensionDefinition, NodeExtension, NodeExtensionConfig, NodeExtensionDefinition, Priority, TableBorderCommandSpec, TableCellBorderCommandSpec, TableCellMarginsCommand, type TablePropertiesCommand, TableStyleCommand };

package/dist/prosemirror/index.d.ts

@@ -1,15 +1,15 @@
 import { FontFamilyAttrs, FontSizeAttrs, HyperlinkAttrs, TextColorAttrs, UnderlineAttrs } from "./schema/marks.js";
 import { ImageAttrs, ParagraphAttrs } from "./schema/nodes.js";
 import { schema, singletonManager } from "./schema/index.js";
+import { getParagraphAlignment, getParagraphBidi, getStyleId } from "./extensions/core/ParagraphExtension.js";
+import { BorderPreset, TableBorderPreset, TableContextInfo, getTableContext, isInTable as isInTableCell } from "./extensions/nodes/TableExtension.js";
 import { PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./commands/formatPainter.js";
 import { clearFormatting, getMarkAttr, isMarkActive } from "./extensions/marks/markUtils.js";
 import { getHyperlinkAttrs, getSelectedText, isHyperlinkActive } from "./extensions/marks/HyperlinkExtension.js";
 import { clearFontFamily, clearFontSize, clearHighlight, clearTextColor, insertHyperlink, removeHyperlink, setFontFamily, setFontSize, setHighlight, setHyperlink, setTextColor, toggleBold, toggleItalic, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "./commands/formatting.js";
 import { insertImageFromFile } from "./commands/image.js";
-import { getParagraphAlignment, getParagraphBidi, getStyleId } from "./extensions/core/ParagraphExtension.js";
 import { getListInfo, isInList } from "./extensions/features/ListExtension.js";
 import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, generateTOC, increaseIndent, increaseListLevel, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, toggleBidi, toggleBulletList, toggleNumberedList } from "./commands/paragraph.js";
-import { BorderPreset, TableBorderPreset, TableContextInfo, getTableContext, isInTable as isInTableCell } from "./extensions/nodes/TableExtension.js";
 import { addColumnLeft, addColumnRight, addRowAbove, addRowBelow, applyTableStyle, autoFitContents, deleteColumn, deleteRow, deleteTable, distributeColumns, insertTable, mergeCells, removeTableBorders, selectColumn, selectRow, selectTable, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setInsideTableBorders, setOutsideTableBorders, setRowHeight, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, splitCell, toggleHeaderRow, toggleNoWrap } from "./commands/table.js";
 import { insertPageBreak } from "./commands/pageBreak.js";
 import "./commands/index.js";

package/dist/prosemirror/plugins/selectionTracker.js

@@ -1,4 +1,5 @@
-import { collectMarksInRange } from "../selectionMarks.js";
+import { expectCommentMarkAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
+import { extractSelectionSnapshot } from "../selectionState.js";
 import { Plugin, PluginKey } from "prosemirror-state";
 //#region src/prosemirror/plugins/selectionTracker.ts
 /**
@@ -18,56 +19,41 @@ const selectionTrackerKey = new PluginKey("selectionTracker");
 * Extract selection context from editor state
 */
 function extractSelectionContext(state) {
-	const { selection, doc } = state;
-	const { from, to, empty } = selection;
-	const $from = doc.resolve(from);
-	let startParagraphIndex = 0;
-	let endParagraphIndex = 0;
-	doc.forEach((_node, offset, index) => {
-		if (offset > to) return;
-		if (offset <= from) startParagraphIndex = index;
-		if (offset <= to) endParagraphIndex = index;
-	});
-	const textFormatting = extractTextFormatting(state);
-	const paragraph = $from.parent;
-	const paragraphFormatting = {};
-	if (paragraph.type.name === "paragraph") {
-		if (paragraph.attrs["alignment"]) paragraphFormatting.alignment = paragraph.attrs["alignment"];
-		if (typeof paragraph.attrs["lineSpacing"] === "number") {
-			paragraphFormatting.lineSpacing = paragraph.attrs["lineSpacing"];
-			paragraphFormatting.lineSpacingRule = paragraph.attrs["lineSpacingRule"];
-		}
-		if (typeof paragraph.attrs["snapToGrid"] === "boolean") paragraphFormatting.snapToGrid = paragraph.attrs["snapToGrid"];
-		if (paragraph.attrs["indentLeft"]) paragraphFormatting.indentLeft = paragraph.attrs["indentLeft"];
-		if (paragraph.attrs["indentRight"]) paragraphFormatting.indentRight = paragraph.attrs["indentRight"];
-		if (paragraph.attrs["indentFirstLine"]) paragraphFormatting.indentFirstLine = paragraph.attrs["indentFirstLine"];
-		if (paragraph.attrs["hangingIndent"]) paragraphFormatting.hangingIndent = paragraph.attrs["hangingIndent"];
-		if (paragraph.attrs["tabs"]) paragraphFormatting.tabs = paragraph.attrs["tabs"];
-		if (paragraph.attrs["numPr"]) paragraphFormatting.numPr = paragraph.attrs["numPr"];
-		if (paragraph.attrs["styleId"]) paragraphFormatting.styleId = paragraph.attrs["styleId"];
-	}
-	const numPr = paragraph.attrs["numPr"];
+	const { selection } = state;
+	const { empty } = selection;
+	const snapshot = extractSelectionSnapshot(state);
+	const paragraphFormatting = snapshot.styleId === null ? snapshot.paragraphFormatting : {
+		...snapshot.paragraphFormatting,
+		styleId: snapshot.styleId
+	};
+	const numPr = snapshot.paragraphFormatting.numPr;
 	const inList = !!numPr?.numId;
 	let listType;
 	if (numPr?.numId === 1) listType = "bullet";
 	else if (numPr?.numId) listType = "numbered";
 	const listLevel = numPr?.ilvl;
-	const allMarks = state.storedMarks || (empty ? $from.marks() : []);
+	const allMarks = state.storedMarks || (empty ? selection.$from.marks() : []);
 	const activeCommentIds = [];
 	let inInsertion = false;
 	let inDeletion = false;
 	for (const mark of allMarks) {
-		if (mark.type.name === "comment" && mark.attrs["commentId"]) activeCommentIds.push(mark.attrs["commentId"]);
-		if (mark.type.name === "insertion") inInsertion = true;
-		if (mark.type.name === "deletion") inDeletion = true;
+		if (mark.type.name === "comment") activeCommentIds.push(expectCommentMarkAttrs(mark).commentId);
+		if (mark.type.name === "insertion") {
+			expectTrackedChangeMarkAttrs(mark);
+			inInsertion = true;
+		}
+		if (mark.type.name === "deletion") {
+			expectTrackedChangeMarkAttrs(mark);
+			inDeletion = true;
+		}
 	}
 	return {
-		hasSelection: !empty,
-		isMultiParagraph: startParagraphIndex !== endParagraphIndex,
-		textFormatting,
+		hasSelection: snapshot.hasSelection,
+		isMultiParagraph: snapshot.isMultiParagraph,
+		textFormatting: snapshot.textFormatting,
 		paragraphFormatting,
-		startParagraphIndex,
-		endParagraphIndex,
+		startParagraphIndex: snapshot.startParagraphIndex,
+		endParagraphIndex: snapshot.endParagraphIndex,
 		inList,
 		...listType !== void 0 ? { listType } : {},
 		...listLevel !== void 0 ? { listLevel } : {},
@@ -77,66 +63,6 @@ function extractSelectionContext(state) {
 	};
 }
 /**
-* Extract text formatting from current selection/cursor marks
-*/
-function extractTextFormatting(state) {
-	const { selection, doc } = state;
-	const { from, to, empty, $from } = selection;
-	const marks = empty ? state.storedMarks || $from.marks() : collectMarksInRange({
-		doc,
-		from,
-		to
-	});
-	const formatting = {};
-	for (const mark of marks) switch (mark.type.name) {
-		case "bold":
-			formatting.bold = true;
-			break;
-		case "italic":
-			formatting.italic = true;
-			break;
-		case "underline":
-			if (mark.attrs["style"] !== "none") formatting.underline = {
-				style: mark.attrs["style"] || "single",
-				color: mark.attrs["color"]
-			};
-			break;
-		case "strike":
-			if (mark.attrs["double"]) formatting.doubleStrike = true;
-			else formatting.strike = true;
-			break;
-		case "textColor":
-			formatting.color = {
-				rgb: mark.attrs["rgb"],
-				themeColor: mark.attrs["themeColor"],
-				themeTint: mark.attrs["themeTint"],
-				themeShade: mark.attrs["themeShade"]
-			};
-			break;
-		case "highlight":
-			formatting.highlight = mark.attrs["color"];
-			break;
-		case "fontSize":
-			formatting.fontSize = mark.attrs["size"];
-			break;
-		case "fontFamily":
-			formatting.fontFamily = {
-				ascii: mark.attrs["ascii"],
-				hAnsi: mark.attrs["hAnsi"],
-				asciiTheme: mark.attrs["asciiTheme"]
-			};
-			break;
-		case "superscript":
-			formatting.vertAlign = "superscript";
-			break;
-		case "subscript":
-			formatting.vertAlign = "subscript";
-			break;
-		default: break;
-	}
-	return formatting;
-}
-/**
 * Create selection tracker plugin
 */
 function createSelectionTrackerPlugin(onSelectionChange) {

package/dist/prosemirror/revisionCarriers.js

@@ -1,3 +1,4 @@
+import { expectParagraphAttrs } from "./attrs/index.js";
 //#region src/prosemirror/revisionCarriers.ts
 const isObjectRecord = (value) => typeof value === "object" && value !== null;
 const revisionMetadata = (value) => {
@@ -34,6 +35,7 @@ const getFolioNodeRevisionCarriers = (node, nodePos) => {
 	if (node.type.name === "paragraph") {
 		const from = nodePos + node.nodeSize - 1;
 		const to = nodePos + node.nodeSize;
+		const paragraphAttrs = expectParagraphAttrs(node);
 		const paragraphMark = node.attrs["pPrMark"];
 		if (isObjectRecord(paragraphMark) && (paragraphMark["kind"] === "ins" || paragraphMark["kind"] === "del")) {
 			const metadata = revisionMetadata(paragraphMark["info"]);
@@ -47,7 +49,7 @@ const getFolioNodeRevisionCarriers = (node, nodePos) => {
 		}
 		appendPropertyCarriers({
 			carriers,
-			changes: node.attrs["_propertyChanges"],
+			changes: paragraphAttrs._propertyChanges,
 			type: "paragraphPropertiesChanged",
 			node,
 			from,

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

@@ -1,6 +1,6 @@
 import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "./marks.js";
+import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, ParagraphPropertyChangeAttrs, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
 import { ExtensionManager } from "../extensions/ExtensionManager.js";
-import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
 //#region src/prosemirror/schema/index.d.ts
 declare const singletonManager: ExtensionManager;
 declare const schema: import("prosemirror-model").Schema<any, any>;
@@ -11,4 +11,4 @@ type DocxSchema = typeof schema;
 type DocxNode = ReturnType<typeof schema.node>;
 type DocxMark = ReturnType<typeof schema.mark>;
 //#endregion
-export { type BlockSdtAttrs, type 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 LanguageAttrs, type MathAttrs, type ParagraphAttrs, type RunFormattingOverrideAttrs, type RunPropertyChangeMarkAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type SymbolAttrs, type TabAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };
+export { type BlockSdtAttrs, type 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 LanguageAttrs, type MathAttrs, type ParagraphAttrs, type ParagraphPropertyChangeAttrs, type RunFormattingOverrideAttrs, type RunPropertyChangeMarkAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type SymbolAttrs, type TabAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };

package/dist/prosemirror/schema/index.js

@@ -14,6 +14,93 @@ import { createStarterKit } from "../extensions/StarterKit.js";
 const mgr = new ExtensionManager(createStarterKit());
 mgr.buildSchema();
 mgr.initializeRuntime();
+const completeCommandNames = (names) => names;
+const requiredCommands = completeCommandNames([
+	"toggleBold",
+	"toggleItalic",
+	"toggleUnderline",
+	"toggleStrike",
+	"toggleSuperscript",
+	"toggleSubscript",
+	"setTextColor",
+	"clearTextColor",
+	"setHighlight",
+	"clearHighlight",
+	"setFontSize",
+	"clearFontSize",
+	"setFontFamily",
+	"clearFontFamily",
+	"setUnderlineStyle",
+	"setHyperlink",
+	"removeHyperlink",
+	"insertHyperlink",
+	"setAlignment",
+	"alignLeft",
+	"alignCenter",
+	"alignRight",
+	"alignJustify",
+	"setLineSpacing",
+	"singleSpacing",
+	"oneAndHalfSpacing",
+	"doubleSpacing",
+	"increaseIndent",
+	"decreaseIndent",
+	"setIndentLeft",
+	"setIndentRight",
+	"setIndentFirstLine",
+	"toggleBulletList",
+	"toggleNumberedList",
+	"increaseListLevel",
+	"decreaseListLevel",
+	"removeList",
+	"setSpaceBefore",
+	"setSpaceAfter",
+	"applyStyle",
+	"clearStyle",
+	"insertSectionBreak",
+	"removeSectionBreak",
+	"addTabStop",
+	"removeTabStop",
+	"toggleBidi",
+	"setRtl",
+	"setLtr",
+	"setTabs",
+	"generateTOC",
+	"insertTable",
+	"addRowAbove",
+	"addRowBelow",
+	"deleteRow",
+	"addColumnLeft",
+	"addColumnRight",
+	"deleteColumn",
+	"deleteTable",
+	"selectTable",
+	"selectRow",
+	"selectColumn",
+	"mergeCells",
+	"splitCell",
+	"setCellBorder",
+	"setTableBorderPreset",
+	"setTableBorders",
+	"removeTableBorders",
+	"setAllTableBorders",
+	"setOutsideTableBorders",
+	"setInsideTableBorders",
+	"setCellVerticalAlign",
+	"setCellMargins",
+	"setCellTextDirection",
+	"toggleNoWrap",
+	"setRowHeight",
+	"toggleHeaderRow",
+	"distributeColumns",
+	"autoFitContents",
+	"setTableProperties",
+	"applyTableStyle",
+	"setCellFillColor",
+	"setTableBorderColor",
+	"setTableBorderWidth"
+]);
+for (const commandName of requiredCommands) mgr.requireCommand(commandName);
 const singletonManager = mgr;
 const schema = mgr.getSchema();
 //#endregion

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

@@ -122,6 +122,14 @@ type RunPropertyChangeMarkAttrs = {
   suggestionId?: string;
 };
 type RunFormattingOverrideAttrs = { [K in keyof Pick<document_d_exports.TextFormatting, "bold" | "italic" | "strike" | "doubleStrike" | "allCaps" | "smallCaps" | "hidden" | "emboss" | "imprint" | "shadow" | "outline" | "rtl">]?: false; } & {
+  /** Independent complex-script weight (`w:bCs`). */
+  boldCs?: boolean;
+  /** Force complex-script formatting for the full run (`w:cs`). */
+  cs?: boolean;
+  /** Independent complex-script size in half-points (`w:szCs`). */
+  fontSizeCs?: number;
+  /** Independent complex-script slant (`w:iCs`). */
+  italicCs?: boolean;
   underline?: "none";
 };
 /**