@stll/folio-core 0.43.0 → 0.45.0

package/dist/prosemirror/index.js

@@ -2,7 +2,7 @@ import { PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./co
 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 { insertPageBreak } from "./commands/pageBreak.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 { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, generateTableOfContents, increaseIndent, increaseListLevel, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, toggleBidi, toggleBulletList, toggleNumberedList } from "./commands/paragraph.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 { fromProseDoc, updateDocumentContent } from "./conversion/fromProseDoc.js";
 import { createEmptyDoc, toProseDoc } from "./conversion/toProseDoc.js";
@@ -13,11 +13,11 @@ import { getHyperlinkAttrs, getSelectedText, isHyperlinkActive } from "./extensi
 import { clearFormatting, getMarkAttr, isMarkActive } from "./extensions/marks/markUtils.js";
 import { getTableContext, isInTable as isInTableCell } from "./extensions/nodes/TableExtension.js";
 import { insertPageBreakInView, insertTableInView, insertTableOfContentsInView } from "./insertOperations.js";
-import { createDocumentStylesPlugin, documentStylesKey, getDocumentStyleResolver } from "./plugins/documentStyles.js";
+import { createDocumentStylesPlugin, documentStylesKey, getDocumentBuiltInStyles, getDocumentStyleResolver } from "./plugins/documentStyles.js";
 import { createSelectionTrackerPlugin, extractSelectionContext, getSelectionContext, selectionTrackerKey } from "./plugins/selectionTracker.js";
 import { schema, singletonManager } from "./schema/index.js";
 import { extractSelectionState } from "./selectionState.js";
 import { StyleResolver, createStyleResolver } from "./styles/styleResolver.js";
 import { assertValidProseMirrorDocument, formatProseMirrorDocumentIssues, validateProseMirrorDocument } from "./validation.js";
 import { TextSelection } from "prosemirror-state";
-export { PAINTABLE_MARK_NAMES, StyleResolver, TextSelection, addColumnLeft, addColumnRight, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, assertValidProseMirrorDocument, autoFitContents, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createDocumentStylesPlugin, createEmptyDoc, createSelectionTrackerPlugin, createStyleResolver, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, documentStylesKey, ensureParaIdsInState, extractSelectionContext, extractSelectionState, formatProseMirrorDocumentIssues, fromProseDoc, generateTOC, getDocumentStyleResolver, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getSelectionContext, getStyleId, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertImageFromFile, insertPageBreak, insertPageBreakInView, insertTable, insertTableInView, insertTableOfContentsInView, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, removeHyperlink, removeList, removeTabStop, removeTableBorders, schema, selectColumn, selectRow, selectTable, selectionTrackerKey, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, singletonManager, splitCell, toProseDoc, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline, updateDocumentContent, validateProseMirrorDocument };
+export { PAINTABLE_MARK_NAMES, StyleResolver, TextSelection, addColumnLeft, addColumnRight, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, assertValidProseMirrorDocument, autoFitContents, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createDocumentStylesPlugin, createEmptyDoc, createSelectionTrackerPlugin, createStyleResolver, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, documentStylesKey, ensureParaIdsInState, extractSelectionContext, extractSelectionState, formatProseMirrorDocumentIssues, fromProseDoc, generateTableOfContents, getDocumentBuiltInStyles, getDocumentStyleResolver, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getSelectionContext, getStyleId, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertImageFromFile, insertPageBreak, insertPageBreakInView, insertTable, insertTableInView, insertTableOfContentsInView, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, removeHyperlink, removeList, removeTabStop, removeTableBorders, schema, selectColumn, selectRow, selectTable, selectionTrackerKey, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, singletonManager, splitCell, toProseDoc, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline, updateDocumentContent, validateProseMirrorDocument };

package/dist/prosemirror/insertOperations.d.ts

@@ -1,11 +1,18 @@
+import { GenerateTableOfContentsOptions } from "./extensions/core/ParagraphExtension.js";
 import { insertImageFromFile } from "./commands/image.js";
+import "./commands/index.js";
 import { EditorView } from "prosemirror-view";
 //#region src/prosemirror/insertOperations.d.ts
 /** Insert a `rows × columns` table at the current selection. */
 declare function insertTableInView(view: EditorView, rows: number, columns: number): boolean;
 /** Insert a page break at the current selection. */
 declare function insertPageBreakInView(view: EditorView): boolean;
-/** Generate (or refresh) a table of contents from the document's headings. */
-declare function insertTableOfContentsInView(view: EditorView): boolean;
+/**
+ * Generate (or refresh) a table of contents from the document's headings.
+ *
+ * `title` is the caller's because this layer has no locale — see
+ * {@link GenerateTableOfContentsOptions}.
+ */
+declare function insertTableOfContentsInView(view: EditorView, options: GenerateTableOfContentsOptions): boolean;
 //#endregion
 export { insertImageFromFile, insertPageBreakInView, insertTableInView, insertTableOfContentsInView };

package/dist/prosemirror/insertOperations.js

@@ -1,6 +1,6 @@
 import { insertImageFromFile } from "./commands/image.js";
 import { insertPageBreak } from "./commands/pageBreak.js";
-import { generateTOC } from "./commands/paragraph.js";
+import { generateTableOfContents } from "./commands/paragraph.js";
 import { insertTable } from "./commands/table.js";
 //#region src/prosemirror/insertOperations.ts
 /** Insert a `rows × columns` table at the current selection. */
@@ -11,9 +11,14 @@ function insertTableInView(view, rows, columns) {
 function insertPageBreakInView(view) {
 	return insertPageBreak(view.state, view.dispatch);
 }
-/** Generate (or refresh) a table of contents from the document's headings. */
-function insertTableOfContentsInView(view) {
-	return generateTOC(view.state, view.dispatch);
+/**
+* Generate (or refresh) a table of contents from the document's headings.
+*
+* `title` is the caller's because this layer has no locale — see
+* {@link GenerateTableOfContentsOptions}.
+*/
+function insertTableOfContentsInView(view, options) {
+	return generateTableOfContents(options)(view.state, view.dispatch);
 }
 //#endregion
 export { insertImageFromFile, insertPageBreakInView, insertTableInView, insertTableOfContentsInView };

package/dist/prosemirror/paragraphFormattingProvenance.d.ts

@@ -0,0 +1,162 @@
+import { document_d_exports } from "../types/document.js";
+import { ParagraphAttrs } from "./schema/nodes.js";
+//#region src/prosemirror/paragraphFormattingProvenance.d.ts
+/**
+ * How each `w:pPr` field reaches the saved model from paragraph attrs.
+ *
+ * - `style-resolved-attr`: the named attr holds the effective value, so the
+ *   write-back filters it against `ParagraphAttrs._resolvedFormatting`.
+ * - `direct-provenance`: the field has its own provenance channel and reader
+ *   (`alignmentFromStyle`, `spacingFromDocDefaults`, `numPrFromStyle`, …).
+ * - `derived`: not authored; recomputed from another field on load and save.
+ * - `original-only`: no editor attr writes it back; it survives through
+ *   `ParagraphAttrs._originalFormatting`.
+ */
+type ParagraphFieldWriteBack = {
+  kind: "style-resolved-attr";
+  attr: keyof ParagraphAttrs;
+} | {
+  kind: "direct-provenance";
+} | {
+  kind: "derived";
+} | {
+  kind: "original-only";
+};
+/**
+ * Total over `ParagraphFormatting`, so a new `w:pPr` field cannot land without
+ * a decision about how a save tells its authored value from its inherited one.
+ */
+declare const PARAGRAPH_FORMATTING_WRITE_BACK: {
+  readonly alignment: {
+    readonly kind: "direct-provenance";
+  };
+  readonly bidi: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "direction";
+  };
+  readonly kinsoku: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "kinsoku";
+  };
+  readonly overflowPunctuation: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "overflowPunctuation";
+  };
+  readonly spaceBefore: {
+    readonly kind: "direct-provenance";
+  };
+  readonly spaceAfter: {
+    readonly kind: "direct-provenance";
+  };
+  readonly lineSpacing: {
+    readonly kind: "direct-provenance";
+  };
+  readonly lineSpacingRule: {
+    readonly kind: "direct-provenance";
+  };
+  readonly snapToGrid: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "snapToGrid";
+  };
+  readonly beforeAutospacing: {
+    readonly kind: "direct-provenance";
+  };
+  readonly afterAutospacing: {
+    readonly kind: "direct-provenance";
+  };
+  readonly spacingExplicit: {
+    readonly kind: "derived";
+  };
+  readonly indentLeft: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "indentLeft";
+  };
+  readonly indentRight: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "indentRight";
+  };
+  readonly indentFirstLine: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "indentFirstLine";
+  };
+  readonly hangingIndent: {
+    readonly kind: "direct-provenance";
+  };
+  readonly borders: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "borders";
+  };
+  readonly shading: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "shading";
+  };
+  readonly tabs: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "tabs";
+  };
+  readonly keepNext: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "keepNext";
+  };
+  readonly keepLines: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "keepLines";
+  };
+  readonly widowControl: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "widowControl";
+  };
+  readonly pageBreakBefore: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "pageBreakBefore";
+  };
+  readonly contextualSpacing: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "contextualSpacing";
+  };
+  readonly numPr: {
+    readonly kind: "direct-provenance";
+  };
+  readonly numPrFromStyle: {
+    readonly kind: "derived";
+  };
+  readonly numberingChangeXml: {
+    readonly kind: "original-only";
+  };
+  readonly outlineLevel: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "outlineLevel";
+  };
+  readonly styleId: {
+    readonly kind: "direct-provenance";
+  };
+  readonly frame: {
+    readonly kind: "original-only";
+  };
+  readonly suppressLineNumbers: {
+    readonly kind: "original-only";
+  };
+  readonly suppressAutoHyphens: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "suppressAutoHyphens";
+  };
+  readonly runProperties: {
+    readonly kind: "original-only";
+  };
+  readonly runInWithNext: {
+    readonly kind: "style-resolved-attr";
+    readonly attr: "runInWithNext";
+  };
+};
+type StyleResolvedParagraphField = { [Field in keyof typeof PARAGRAPH_FORMATTING_WRITE_BACK]: (typeof PARAGRAPH_FORMATTING_WRITE_BACK)[Field] extends {
+  kind: "style-resolved-attr";
+} ? Field : never; }[keyof typeof PARAGRAPH_FORMATTING_WRITE_BACK];
+declare const STYLE_RESOLVED_PARAGRAPH_FIELDS: StyleResolvedParagraphField[];
+/**
+ * The part of a resolved style cascade a save needs to keep out of direct
+ * `w:pPr`. Narrowed to the governed fields so an ordinary paragraph, whose
+ * cascade supplies only spacing, stores nothing at all.
+ */
+declare const styleResolvedParagraphFormatting: (resolved: document_d_exports.ParagraphFormatting | undefined) => document_d_exports.ParagraphFormatting | undefined;
+//#endregion
+export { PARAGRAPH_FORMATTING_WRITE_BACK, ParagraphFieldWriteBack, STYLE_RESOLVED_PARAGRAPH_FIELDS, StyleResolvedParagraphField, styleResolvedParagraphFormatting };

package/dist/prosemirror/paragraphFormattingProvenance.js

@@ -0,0 +1,115 @@
+//#region src/prosemirror/paragraphFormattingProvenance.ts
+/**
+* Total over `ParagraphFormatting`, so a new `w:pPr` field cannot land without
+* a decision about how a save tells its authored value from its inherited one.
+*/
+const PARAGRAPH_FORMATTING_WRITE_BACK = {
+	alignment: { kind: "direct-provenance" },
+	bidi: {
+		kind: "style-resolved-attr",
+		attr: "direction"
+	},
+	kinsoku: {
+		kind: "style-resolved-attr",
+		attr: "kinsoku"
+	},
+	overflowPunctuation: {
+		kind: "style-resolved-attr",
+		attr: "overflowPunctuation"
+	},
+	spaceBefore: { kind: "direct-provenance" },
+	spaceAfter: { kind: "direct-provenance" },
+	lineSpacing: { kind: "direct-provenance" },
+	lineSpacingRule: { kind: "direct-provenance" },
+	snapToGrid: {
+		kind: "style-resolved-attr",
+		attr: "snapToGrid"
+	},
+	beforeAutospacing: { kind: "direct-provenance" },
+	afterAutospacing: { kind: "direct-provenance" },
+	spacingExplicit: { kind: "derived" },
+	indentLeft: {
+		kind: "style-resolved-attr",
+		attr: "indentLeft"
+	},
+	indentRight: {
+		kind: "style-resolved-attr",
+		attr: "indentRight"
+	},
+	indentFirstLine: {
+		kind: "style-resolved-attr",
+		attr: "indentFirstLine"
+	},
+	hangingIndent: { kind: "direct-provenance" },
+	borders: {
+		kind: "style-resolved-attr",
+		attr: "borders"
+	},
+	shading: {
+		kind: "style-resolved-attr",
+		attr: "shading"
+	},
+	tabs: {
+		kind: "style-resolved-attr",
+		attr: "tabs"
+	},
+	keepNext: {
+		kind: "style-resolved-attr",
+		attr: "keepNext"
+	},
+	keepLines: {
+		kind: "style-resolved-attr",
+		attr: "keepLines"
+	},
+	widowControl: {
+		kind: "style-resolved-attr",
+		attr: "widowControl"
+	},
+	pageBreakBefore: {
+		kind: "style-resolved-attr",
+		attr: "pageBreakBefore"
+	},
+	contextualSpacing: {
+		kind: "style-resolved-attr",
+		attr: "contextualSpacing"
+	},
+	numPr: { kind: "direct-provenance" },
+	numPrFromStyle: { kind: "derived" },
+	numberingChangeXml: { kind: "original-only" },
+	outlineLevel: {
+		kind: "style-resolved-attr",
+		attr: "outlineLevel"
+	},
+	styleId: { kind: "direct-provenance" },
+	frame: { kind: "original-only" },
+	suppressLineNumbers: { kind: "original-only" },
+	suppressAutoHyphens: {
+		kind: "style-resolved-attr",
+		attr: "suppressAutoHyphens"
+	},
+	runProperties: { kind: "original-only" },
+	runInWithNext: {
+		kind: "style-resolved-attr",
+		attr: "runInWithNext"
+	}
+};
+const STYLE_RESOLVED_PARAGRAPH_FIELDS = Object.keys(PARAGRAPH_FORMATTING_WRITE_BACK).filter((field) => PARAGRAPH_FORMATTING_WRITE_BACK[field].kind === "style-resolved-attr");
+/**
+* The part of a resolved style cascade a save needs to keep out of direct
+* `w:pPr`. Narrowed to the governed fields so an ordinary paragraph, whose
+* cascade supplies only spacing, stores nothing at all.
+*/
+const styleResolvedParagraphFormatting = (resolved) => {
+	if (!resolved) return;
+	const governed = {};
+	let found = false;
+	for (const field of STYLE_RESOLVED_PARAGRAPH_FIELDS) {
+		const value = resolved[field];
+		if (value === void 0) continue;
+		Reflect.set(governed, field, value);
+		found = true;
+	}
+	return found ? governed : void 0;
+};
+//#endregion
+export { PARAGRAPH_FORMATTING_WRITE_BACK, STYLE_RESOLVED_PARAGRAPH_FIELDS, styleResolvedParagraphFormatting };

package/dist/prosemirror/plugins/documentStyles.d.ts

@@ -1,4 +1,5 @@
 import { document_d_exports } from "../../types/document.js";
+import { BuiltInStyleIndex } from "../../docx/builtInStyles.js";
 import { StyleResolver } from "../styles/styleResolver.js";
 import { EditorState, Plugin, PluginKey } from "prosemirror-state";
 //#region src/prosemirror/plugins/documentStyles.d.ts
@@ -13,7 +14,14 @@ declare const documentStylesKey: PluginKey<StyleResolver | null>;
 declare function createDocumentStylesPlugin(styles: document_d_exports.StyleDefinitions | StyleResolver | null | undefined): Plugin;
 /** Read the document's StyleResolver, or null when the plugin isn't installed. */
 declare function getDocumentStyleResolver(state: EditorState): StyleResolver | null;
+/**
+ * Read the document's built-in style index, for the callers that classify
+ * paragraphs (heading collection, markdown export, the AI snapshot). Without
+ * the plugin every lookup misses, which degrades classification to the
+ * paragraph's own outline level rather than to English style ids.
+ */
+declare function getDocumentBuiltInStyles(state: EditorState): BuiltInStyleIndex;
 /** Reconfigure so ProseMirror replaces the keyed plugin's resolver state. */
 declare const withDocumentStyles: (state: EditorState, styles: document_d_exports.StyleDefinitions | StyleResolver | null | undefined) => EditorState;
 //#endregion
-export { createDocumentStylesPlugin, documentStylesKey, getDocumentStyleResolver, withDocumentStyles };
+export { createDocumentStylesPlugin, documentStylesKey, getDocumentBuiltInStyles, getDocumentStyleResolver, withDocumentStyles };

package/dist/prosemirror/plugins/documentStyles.js

@@ -1,3 +1,4 @@
+import { EMPTY_BUILT_IN_STYLE_INDEX } from "../../docx/builtInStyles.js";
 import { StyleResolver, createStyleResolver } from "../styles/styleResolver.js";
 import { Plugin, PluginKey } from "prosemirror-state";
 //#region src/prosemirror/plugins/documentStyles.ts
@@ -42,6 +43,15 @@ function createDocumentStylesPlugin(styles) {
 function getDocumentStyleResolver(state) {
 	return documentStylesKey.getState(state) ?? null;
 }
+/**
+* Read the document's built-in style index, for the callers that classify
+* paragraphs (heading collection, markdown export, the AI snapshot). Without
+* the plugin every lookup misses, which degrades classification to the
+* paragraph's own outline level rather than to English style ids.
+*/
+function getDocumentBuiltInStyles(state) {
+	return getDocumentStyleResolver(state)?.builtInStyles ?? EMPTY_BUILT_IN_STYLE_INDEX;
+}
 /** Reconfigure so ProseMirror replaces the keyed plugin's resolver state. */
 const withDocumentStyles = (state, styles) => {
 	const previous = documentStylesKey.get(state);
@@ -49,4 +59,4 @@ const withDocumentStyles = (state, styles) => {
 	return state.reconfigure({ plugins: retained }).reconfigure({ plugins: [...retained, createDocumentStylesPlugin(styles)] });
 };
 //#endregion
-export { createDocumentStylesPlugin, documentStylesKey, getDocumentStyleResolver, withDocumentStyles };
+export { createDocumentStylesPlugin, documentStylesKey, getDocumentBuiltInStyles, getDocumentStyleResolver, withDocumentStyles };

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

@@ -1,3 +1,3 @@
 import { SelectionChangeCallback, SelectionContext, createSelectionTrackerPlugin, extractSelectionContext, getSelectionContext, selectionTrackerKey } from "./selectionTracker.js";
-import { createDocumentStylesPlugin, documentStylesKey, getDocumentStyleResolver } from "./documentStyles.js";
-export { type SelectionChangeCallback, type SelectionContext, createDocumentStylesPlugin, createSelectionTrackerPlugin, documentStylesKey, extractSelectionContext, getDocumentStyleResolver, getSelectionContext, selectionTrackerKey };
+import { createDocumentStylesPlugin, documentStylesKey, getDocumentBuiltInStyles, getDocumentStyleResolver } from "./documentStyles.js";
+export { type SelectionChangeCallback, type SelectionContext, createDocumentStylesPlugin, createSelectionTrackerPlugin, documentStylesKey, extractSelectionContext, getDocumentBuiltInStyles, getDocumentStyleResolver, getSelectionContext, selectionTrackerKey };

package/dist/prosemirror/plugins/index.js

@@ -1,3 +1,3 @@
-import { createDocumentStylesPlugin, documentStylesKey, getDocumentStyleResolver } from "./documentStyles.js";
+import { createDocumentStylesPlugin, documentStylesKey, getDocumentBuiltInStyles, getDocumentStyleResolver } from "./documentStyles.js";
 import { createSelectionTrackerPlugin, extractSelectionContext, getSelectionContext, selectionTrackerKey } from "./selectionTracker.js";
-export { createDocumentStylesPlugin, createSelectionTrackerPlugin, documentStylesKey, extractSelectionContext, getDocumentStyleResolver, getSelectionContext, selectionTrackerKey };
+export { createDocumentStylesPlugin, createSelectionTrackerPlugin, documentStylesKey, extractSelectionContext, getDocumentBuiltInStyles, getDocumentStyleResolver, getSelectionContext, selectionTrackerKey };

package/dist/prosemirror/plugins/revisionIds.d.ts

@@ -14,9 +14,18 @@ declare function mintRevisionId(): number;
  */
 declare function seedRevisionIdsAbove(maxId: number): void;
 /**
- * Raise the counter above every revision id already present in `doc`.
+ * The highest id in `doc` from any part of the annotation space.
+ *
+ * A revision, a comment and a bookmark draw their `w:id` from one space, so a
+ * counter seeded above its own kind alone still mints over another kind's id.
+ * Both allocators seed from this, and the save-time normalization avoids the
+ * same space, so the three agree on what is taken.
+ */
+declare function maxAnnotationIdInDoc(doc: Node): number;
+/**
+ * Raise the counter above every annotation id already present in `doc`.
  * Called from the suggestion-mode plugin's `state.init`.
  */
 declare function seedRevisionIdsFromDoc(doc: Node): void;
 //#endregion
-export { mintRevisionId, seedRevisionIdsAbove, seedRevisionIdsFromDoc };
+export { maxAnnotationIdInDoc, mintRevisionId, seedRevisionIdsAbove, seedRevisionIdsFromDoc };

package/dist/prosemirror/plugins/revisionIds.js

@@ -31,16 +31,24 @@ function seedRevisionIdsAbove(maxId) {
 /** Node attrs that carry a revision id directly (`revisionId` field). */
 const DIRECT_REVISION_ATTR_KEYS = ["trIns", "trDel"];
 /**
-* Raise the counter above every revision id already present in `doc`.
-* Called from the suggestion-mode plugin's `state.init`.
+* The highest id in `doc` from any part of the annotation space.
+*
+* A revision, a comment and a bookmark draw their `w:id` from one space, so a
+* counter seeded above its own kind alone still mints over another kind's id.
+* Both allocators seed from this, and the save-time normalization avoids the
+* same space, so the three agree on what is taken.
 */
-function seedRevisionIdsFromDoc(doc) {
+function maxAnnotationIdInDoc(doc) {
 	let max = 0;
 	const consider = (id) => {
 		if (typeof id === "number" && Number.isInteger(id) && id > max && id <= MAX_REVISION_ID) max = id;
 	};
 	doc.descendants((node) => {
-		for (const mark of node.marks) consider(mark.attrs["revisionId"]);
+		for (const mark of node.marks) {
+			consider(mark.attrs["revisionId"]);
+			consider(mark.attrs["commentId"]);
+		}
+		if (node.type.name === "bookmarkBoundary") consider(node.attrs["id"]);
 		const attrs = node.attrs;
 		const pPrMark = attrs["pPrMark"];
 		if (pPrMark?.info) consider(pPrMark.info.id);
@@ -51,7 +59,14 @@ function seedRevisionIdsFromDoc(doc) {
 		const cellMarker = attrs["cellMarker"];
 		if (cellMarker?.info) consider(cellMarker.info.revisionId);
 	});
-	seedRevisionIdsAbove(max);
+	return max;
+}
+/**
+* Raise the counter above every annotation id already present in `doc`.
+* Called from the suggestion-mode plugin's `state.init`.
+*/
+function seedRevisionIdsFromDoc(doc) {
+	seedRevisionIdsAbove(maxAnnotationIdInDoc(doc));
 }
 //#endregion
-export { mintRevisionId, seedRevisionIdsAbove, seedRevisionIdsFromDoc };
+export { maxAnnotationIdInDoc, mintRevisionId, seedRevisionIdsAbove, seedRevisionIdsFromDoc };

package/dist/prosemirror/runFormattingReconciliation.js

@@ -1,9 +1,10 @@
 import { mergeTextFormatting } from "../utils/textFormattingMerge.js";
 import { expectCharacterStyleMarkAttrs } from "./attrs/index.js";
 import { marksToTextFormatting } from "./conversion/fromProseDoc.js";
-import { textFormattingToMarks } from "./conversion/toProseDoc.js";
+import { textFormattingToMarks } from "./extensions/marks/markUtils.js";
 import { RUN_FORMATTING_MARK_NAMES } from "./runFormattingMarkNames.js";
 import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, paragraphFormattingForRun, resolveEffectiveRunStyleFormatting } from "./runStyleFormatting.js";
+import { schema } from "./schema/index.js";
 import { Mark } from "prosemirror-model";
 //#region src/prosemirror/runFormattingReconciliation.ts
 /** Read authored run properties without confusing inherited visuals for direct formatting. */
@@ -36,7 +37,7 @@ const reconcileRunFormattingMarks = ({ authoredFormatting, context, node, styleR
 		marks: styleResolutionMarks,
 		paragraphFormatting,
 		...styleResolver !== void 0 ? { styleResolver } : {}
-	}), authoredFormatting), {
+	}), authoredFormatting), schema, {
 		overrideFormatting: mergeTextFormatting(getParagraphMarkSuppressionOverrides({
 			directFormatting: authoredFormatting,
 			paragraphMarkFormatting: context.paragraphMarkFormatting,

package/dist/prosemirror/runStyleFormatting.d.ts

@@ -26,7 +26,7 @@ type ParagraphRunStyleContext = {
   paragraphMarkFormatting: document_d_exports.TextFormatting | undefined;
   paragraphMarkPrecedesStyle: boolean;
 };
-type RunStyleResolver = Pick<StyleEngine, "getDefaultCharacterStyle" | "getDefaultParagraphStyle" | "getDocDefaults" | "getRunStyleOwnProperties" | "getStyle" | "resolveParagraphStyle">;
+type RunStyleResolver = Pick<StyleEngine, "builtInStyles" | "getDefaultCharacterStyle" | "getDefaultParagraphStyle" | "getDocDefaults" | "getRunStyleOwnProperties" | "getStyle" | "resolveParagraphStyle">;
 type ResolveParagraphBodyRunFormattingOptions = {
   styleId: string | undefined;
   styleResolver?: RunStyleResolver | null | undefined;