@stll/folio-core 0.22.3 → 0.23.0

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

@@ -177,7 +177,7 @@ type ParagraphAttrs = {
    *  them in UI today, but stripping them on every edit would corrupt the
    *  `w:pPrChange` history Word relies on for "show previous formatting"
    *  and for reverting an accepted property change. */
-  _propertyChanges?: document_d_exports.ParagraphPropertyChange[];
+  _propertyChanges?: ParagraphPropertyChangeAttrs[];
   /** Paragraph-mark insertion / deletion (`<w:pPr><w:rPr><w:ins/>` /
    *  `<w:del/>`). Word emits this when the paragraph break itself was
    *  authored in track-changes mode — pressing Enter mid-paragraph
@@ -192,6 +192,17 @@ type ParagraphAttrs = {
    */
   _suggestedInsert?: SuggestedStructuralMarker | null;
 };
+/**
+ * ProseMirror property-change attrs may also carry the editor's list-marker
+ * snapshot fields alongside the canonical paragraph formatting fields.
+ * Keeping that shape typed here lets layout consume validated attrs directly.
+ */
+type ParagraphPropertyChangeAttrs = Omit<document_d_exports.ParagraphPropertyChange, "previousFormatting" | "currentFormatting"> & {
+  previousFormatting?: Omit<document_d_exports.ParagraphFormatting, "numPr"> & {
+    numPr?: document_d_exports.ParagraphFormatting["numPr"] | null;
+  } & Partial<Pick<ParagraphAttrs, "listIsBullet" | "listIsLegal" | "listNumFmt" | "listMarker" | "listMarkerHidden" | "listMarkerFontFamily" | "listMarkerFontSize" | "listMarkerBold" | "listMarkerAlignment" | "listMarkerSuffix" | "listLevelNumFmts" | "listLevelStarts" | "listAbstractNumId" | "listStartOverride" | "lineSpacingExplicit" | "direction" | "_autospacingBase">>;
+  currentFormatting?: document_d_exports.ParagraphFormatting;
+};
 /**
  * Image position for floating images (horizontal and vertical positioning)
  */
@@ -689,4 +700,4 @@ type TableCellAttrs = {
   _docxVMergeContinuationCells?: document_d_exports.TableCell[];
 };
 //#endregion
-export { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, SuggestedStructuralMarker, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAnchorAttrs, TextBoxAttrs };
+export { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, ParagraphPropertyChangeAttrs, SdtAttrs, ShapeAttrs, SuggestedStructuralMarker, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAnchorAttrs, TextBoxAttrs };

package/dist/prosemirror/selectionState.d.ts

@@ -2,9 +2,11 @@ import { document_d_exports } from "../types/document.js";
 import { EditorState } from "prosemirror-state";
 //#region src/prosemirror/selectionState.d.ts
 /**
- * Selection state for toolbar integration
+ * Canonical selection projection shared by toolbar and selection-change APIs.
+ * Adapter-specific context belongs on top of this snapshot rather than in a
+ * second formatting extractor.
  */
-type SelectionState = {
+type SelectionSnapshot = {
   /** Whether there's an active selection (not just cursor) */
   hasSelection: boolean;
   /** Whether selection spans multiple paragraphs */
@@ -20,10 +22,14 @@ type SelectionState = {
   /** End paragraph index */
   endParagraphIndex: number;
 };
+/** Compatibility name for the public toolbar selection contract. */
+type SelectionState = SelectionSnapshot;
 /**
- * Extract selection state from editor state.
- * Used by PagedEditor integration in DocxEditor for toolbar state.
+ * Extract the canonical selection snapshot from editor state.
+ * Used by both the toolbar callback and the selection tracker plugin.
  */
+declare function extractSelectionSnapshot(state: EditorState): SelectionSnapshot;
+/** Compatibility entry point used by existing React and Vue integrations. */
 declare function extractSelectionState(state: EditorState): SelectionState | null;
 //#endregion
-export { SelectionState, extractSelectionState };
+export { SelectionSnapshot, SelectionState, extractSelectionSnapshot, extractSelectionState };

package/dist/prosemirror/selectionState.js

@@ -1,100 +1,137 @@
+import { FONT_THEME_VALUES } from "../types/documentEnumValues.js";
+import { expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectHighlightMarkAttrs, expectParagraphAttrs, expectStrikeMarkAttrs, expectTextColorMarkAttrs, expectUnderlineMarkAttrs } from "./attrs/index.js";
 import { directionIsRtl } from "./paragraphDirection.js";
 import { collectMarksInRange } from "./selectionMarks.js";
 //#region src/prosemirror/selectionState.ts
+const isFontTheme = (value) => value !== void 0 && FONT_THEME_VALUES.some((theme) => theme === value);
 /**
-* Extract selection state from editor state.
-* Used by PagedEditor integration in DocxEditor for toolbar state.
+* Extract the canonical selection snapshot from editor state.
+* Used by both the toolbar callback and the selection tracker plugin.
 */
-function extractSelectionState(state) {
+function extractSelectionSnapshot(state) {
 	const { selection, doc } = state;
 	const { from, to, empty } = selection;
 	const $from = doc.resolve(from);
+	const { startParagraphIndex, endParagraphIndex } = paragraphIndexes(doc, from, to);
+	const paragraph = $from.parent;
+	const paragraphAttrs = paragraph.type.name === "paragraph" ? expectParagraphAttrs(paragraph) : null;
+	const marks = selectionMarks(state);
+	let textFormatting = extractTextFormatting(marks);
+	if (paragraph.type.name === "paragraph" && paragraph.textContent.length === 0 && marks.length === 0 && paragraphAttrs?.defaultTextFormatting) textFormatting = { ...paragraphAttrs.defaultTextFormatting };
+	const paragraphFormatting = {};
+	let styleId = null;
+	if (paragraphAttrs) {
+		if (paragraphAttrs.alignment !== void 0) paragraphFormatting.alignment = paragraphAttrs.alignment;
+		if (paragraphAttrs.lineSpacing !== void 0) {
+			paragraphFormatting.lineSpacing = paragraphAttrs.lineSpacing;
+			if (paragraphAttrs.lineSpacingRule !== void 0) paragraphFormatting.lineSpacingRule = paragraphAttrs.lineSpacingRule;
+		}
+		if (paragraphAttrs.snapToGrid !== void 0) paragraphFormatting.snapToGrid = paragraphAttrs.snapToGrid;
+		if (paragraphAttrs.numPr !== void 0) paragraphFormatting.numPr = paragraphAttrs.numPr;
+		if (paragraphAttrs.indentLeft !== void 0) paragraphFormatting.indentLeft = paragraphAttrs.indentLeft;
+		if (paragraphAttrs.indentRight !== void 0) paragraphFormatting.indentRight = paragraphAttrs.indentRight;
+		if (paragraphAttrs.indentFirstLine !== void 0) paragraphFormatting.indentFirstLine = paragraphAttrs.indentFirstLine;
+		if (paragraphAttrs.hangingIndent !== void 0) paragraphFormatting.hangingIndent = paragraphAttrs.hangingIndent;
+		if (paragraphAttrs.tabs !== void 0) paragraphFormatting.tabs = paragraphAttrs.tabs;
+		if (directionIsRtl(paragraphAttrs.direction)) paragraphFormatting.bidi = true;
+		if (paragraphAttrs.styleId !== void 0) styleId = paragraphAttrs.styleId;
+	}
+	return {
+		hasSelection: !empty,
+		isMultiParagraph: startParagraphIndex !== endParagraphIndex,
+		textFormatting,
+		paragraphFormatting,
+		styleId,
+		startParagraphIndex,
+		endParagraphIndex
+	};
+}
+/** Compatibility entry point used by existing React and Vue integrations. */
+function extractSelectionState(state) {
+	return extractSelectionSnapshot(state);
+}
+function paragraphIndexes(doc, from, to) {
 	let startParagraphIndex = 0;
 	let endParagraphIndex = 0;
 	doc.forEach((_node, offset, index) => {
 		if (offset <= from) startParagraphIndex = index;
 		if (offset <= to) endParagraphIndex = index;
 	});
-	let textFormatting = {};
-	const paragraph = $from.parent;
-	const isEmptyParagraph = paragraph.type.name === "paragraph" && paragraph.textContent.length === 0;
-	const paragraphDefaultFormatting = paragraph.attrs["defaultTextFormatting"];
-	const marks = empty ? state.storedMarks || selection.$from.marks() : collectMarksInRange({
+	return {
+		startParagraphIndex,
+		endParagraphIndex
+	};
+}
+function selectionMarks(state) {
+	const { selection, doc } = state;
+	const { from, to, empty } = selection;
+	return empty ? state.storedMarks || selection.$from.marks() : collectMarksInRange({
 		doc,
 		from,
 		to
 	});
-	if (isEmptyParagraph && marks.length === 0 && paragraphDefaultFormatting) textFormatting = { ...paragraphDefaultFormatting };
+}
+function extractTextFormatting(marks) {
+	const formatting = {};
 	for (const mark of marks) switch (mark.type.name) {
 		case "bold":
-			textFormatting.bold = true;
+			formatting.bold = true;
 			break;
 		case "italic":
-			textFormatting.italic = true;
+			formatting.italic = true;
 			break;
-		case "underline":
-			if (mark.attrs["style"] !== "none") textFormatting.underline = {
-				style: mark.attrs["style"] || "single",
-				color: mark.attrs["color"]
+		case "underline": {
+			const attrs = expectUnderlineMarkAttrs(mark);
+			if (attrs.style !== "none") formatting.underline = {
+				style: attrs.style ?? "single",
+				...attrs.color !== void 0 ? { color: attrs.color } : {}
 			};
 			break;
+		}
 		case "strike":
-			if (mark.attrs["double"]) textFormatting.doubleStrike = true;
-			else textFormatting.strike = true;
+			if (expectStrikeMarkAttrs(mark).double) formatting.doubleStrike = true;
+			else formatting.strike = true;
 			break;
-		case "textColor":
-			textFormatting.color = {
-				rgb: mark.attrs["rgb"],
-				themeColor: mark.attrs["themeColor"]
+		case "textColor": {
+			const attrs = expectTextColorMarkAttrs(mark);
+			formatting.color = {
+				...attrs.rgb !== void 0 ? { rgb: attrs.rgb } : {},
+				...attrs.themeColor !== void 0 ? { themeColor: attrs.themeColor } : {},
+				...attrs.themeTint !== void 0 ? { themeTint: attrs.themeTint } : {},
+				...attrs.themeShade !== void 0 ? { themeShade: attrs.themeShade } : {}
 			};
 			break;
+		}
 		case "highlight":
-			textFormatting.highlight = mark.attrs["color"];
+			formatting.highlight = expectHighlightMarkAttrs(mark).color;
 			break;
 		case "fontSize":
-			textFormatting.fontSize = mark.attrs["size"];
+			formatting.fontSize = expectFontSizeMarkAttrs(mark).size;
 			break;
-		case "fontFamily":
-			textFormatting.fontFamily = {
-				ascii: mark.attrs["ascii"],
-				hAnsi: mark.attrs["hAnsi"]
+		case "fontFamily": {
+			const attrs = expectFontFamilyMarkAttrs(mark);
+			formatting.fontFamily = {
+				...attrs.ascii !== void 0 ? { ascii: attrs.ascii } : {},
+				...attrs.hAnsi !== void 0 ? { hAnsi: attrs.hAnsi } : {},
+				...attrs.eastAsia !== void 0 ? { eastAsia: attrs.eastAsia } : {},
+				...attrs.cs !== void 0 ? { cs: attrs.cs } : {},
+				...attrs.hint !== void 0 ? { hint: attrs.hint } : {},
+				...isFontTheme(attrs.asciiTheme) ? { asciiTheme: attrs.asciiTheme } : {},
+				...attrs.hAnsiTheme !== void 0 ? { hAnsiTheme: attrs.hAnsiTheme } : {},
+				...attrs.eastAsiaTheme !== void 0 ? { eastAsiaTheme: attrs.eastAsiaTheme } : {},
+				...attrs.csTheme !== void 0 ? { csTheme: attrs.csTheme } : {}
 			};
 			break;
+		}
 		case "superscript":
-			textFormatting.vertAlign = "superscript";
+			formatting.vertAlign = "superscript";
 			break;
 		case "subscript":
-			textFormatting.vertAlign = "subscript";
+			formatting.vertAlign = "subscript";
 			break;
 		default: break;
 	}
-	const paragraphFormatting = {};
-	let styleId = null;
-	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["numPr"]) paragraphFormatting.numPr = paragraph.attrs["numPr"];
-		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 (directionIsRtl(paragraph.attrs["direction"])) paragraphFormatting.bidi = true;
-		if (paragraph.attrs["styleId"]) styleId = paragraph.attrs["styleId"];
-	}
-	return {
-		hasSelection: !empty,
-		isMultiParagraph: startParagraphIndex !== endParagraphIndex,
-		textFormatting,
-		paragraphFormatting,
-		styleId,
-		startParagraphIndex,
-		endParagraphIndex
-	};
+	return formatting;
 }
 //#endregion
-export { extractSelectionState };
+export { extractSelectionSnapshot, extractSelectionState };

package/dist/utils/tableOperations.d.ts

@@ -1,5 +1,10 @@
 import { document_d_exports } from "../types/document.js";
 //#region src/utils/tableOperations.d.ts
+type TablePropertiesCommand = {
+  width?: number | null;
+  widthType?: document_d_exports.TableWidthType | null;
+  justification?: "left" | "center" | "right" | null;
+};
 type TableAction = "addRowAbove" | "addRowBelow" | "addColumnLeft" | "addColumnRight" | "deleteRow" | "deleteColumn" | "mergeCells" | "splitCell" | "deleteTable" | "selectTable" | "selectRow" | "selectColumn" | "borderAll" | "borderOutside" | "borderInside" | "borderNone" | "borderTop" | "borderBottom" | "borderLeft" | "borderRight" | {
   type: "cellFillColor";
   color: string | null;
@@ -43,11 +48,7 @@ type TableAction = "addRowAbove" | "addRowBelow" | "addColumnLeft" | "addColumnR
   type: "autoFitContents";
 } | {
   type: "tableProperties";
-  props: {
-    width?: number | null;
-    widthType?: string | null;
-    justification?: "left" | "center" | "right" | null;
-  };
+  props: TablePropertiesCommand;
 } | {
   type: "openTableProperties";
 } | {
@@ -83,4 +84,4 @@ declare const deleteColumn: (table: document_d_exports.Table, columnIndex: numbe
 declare const mergeCells: (table: document_d_exports.Table, selection: TableSelection) => document_d_exports.Table;
 declare const splitCell: (table: document_d_exports.Table, rowIndex: number, columnIndex: number) => document_d_exports.Table;
 //#endregion
-export { TableAction, TableContext, TableSelection, addColumn, addRow, createTableContext, deleteColumn, deleteRow, getCellAt, getColumnCount, mergeCells, splitCell };
+export { TableAction, TableContext, TablePropertiesCommand, TableSelection, addColumn, addRow, createTableContext, deleteColumn, deleteRow, getCellAt, getColumnCount, mergeCells, splitCell };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.22.3",
+  "version": "0.23.0",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -113,13 +113,13 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.15.1",
+    "@stll/docx-core": "^0.15.2",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.1.0",
     "better-result": "3.0.1",
     "csstype": "^3.1.3",
     "dompurify": "^3.4.13",
-    "fast-xml-parser": "^5.9.3",
+    "fast-xml-parser": "^5.10.1",
     "hyphen": "1.14.1",
     "jszip": "3.10.1",
     "marked": "^18.0.5",