@stll/folio-core 0.43.0 → 0.44.0

package/dist/markdown/trailers.js

@@ -1,7 +1,15 @@
 import { escapeLinkUrl } from "./escape.js";
 import { renderBlocks } from "./renderBlock.js";
+import { panic } from "better-result";
 //#region src/markdown/trailers.ts
 /**
+* Trailer sections appended after the document body: footnote definitions, the
+* hyperlink reference list (`hyperlinks: "reference"`), and the comments
+* sidecar (`comments: "sidecar"`). Split out of `internals` so the renderers
+* can import `pushWarning` without pulling in `renderBlock` (which would form an
+* import cycle). Ported from eigenpal/docx-editor PR #595.
+*/
+/**
 * Append footnote definitions, the hyperlink reference list (for
 * `hyperlinks: "reference"`), and the comments sidecar block (for
 * `comments: "sidecar"`). Each section is emitted only when its corresponding
@@ -41,13 +49,39 @@ function runText(run) {
 /** Flatten paragraph inline content to plain text, recursing through wrappers. */
 function inlineText(content) {
 	let out = "";
-	for (const item of content) if (item.type === "run") out += runText(item);
-	else if (item.type === "hyperlink") {
-		for (const child of item.children) if (child.type === "run") out += runText(child);
-	} else if (item.type === "simpleField") out += inlineText(item.content);
-	else if (item.type === "complexField") out += inlineText(item.fieldResult);
-	else if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") out += inlineText(item.content);
-	else if (item.type === "inlineSdt") out += inlineText(item.content);
+	for (const item of content) switch (item.type) {
+		case "run":
+			out += runText(item);
+			break;
+		case "hyperlink":
+			for (const child of item.children) if (child.type === "run") out += runText(child);
+			break;
+		case "complexField":
+			out += inlineText(item.fieldResult);
+			break;
+		case "simpleField":
+		case "insertion":
+		case "deletion":
+		case "moveFrom":
+		case "moveTo":
+		case "inlineSdt":
+		case "bidiWrapper":
+			out += inlineText(item.content);
+			break;
+		case "mathEquation":
+			out += item.plainText ?? "";
+			break;
+		case "bookmarkStart":
+		case "bookmarkEnd":
+		case "commentRangeStart":
+		case "commentRangeEnd":
+		case "commentReference":
+		case "moveFromRangeStart":
+		case "moveFromRangeEnd":
+		case "moveToRangeStart":
+		case "moveToRangeEnd": break;
+		default: panic(`Unsupported paragraph content in trailer text: ${JSON.stringify(item)}`);
+	}
 	return out;
 }
 //#endregion

package/dist/markdown/types.d.ts

@@ -1,11 +1,5 @@
+import { BuiltInStyleIndex } from "../docx/builtInStyles.js";
 //#region src/markdown/types.d.ts
-/**
- * Types for the DOCX-document → Markdown converter (ported from eigenpal
- * /docx-editor PR #595). This is folio's v1 surface: the synchronous,
- * continuous (non-paged) `toMarkdown(Document)` path. The paged + async +
- * image-handler variants from upstream are not ported (skills bodies have no
- * images today); they can be added later if needed.
- */
 /**
  * Metadata describing a single image registration. Owned by the markdown
  * module so its public surface is independent of the docx model's drawing
@@ -134,6 +128,8 @@ type RenderContext = {
   listCounters: Map<number, number[]>;
   /** `numId:level` pairs already seen, so a start override applies once. */
   listSeenLevels: Set<string>;
+  /** The document's styles indexed by the built-in they are; classifies headings and quotes. */
+  builtInStyles: BuiltInStyleIndex;
 };
 //#endregion
 export { ImageMeta, ImageRef, MarkdownOptions, MarkdownResult, RenderContext, ResolvedOptions };

package/dist/prosemirror/attrs/index.js

@@ -292,11 +292,7 @@ const readSymbolAttrs = (node) => {
 	expectNodeType(node, "symbol", issues);
 	requiredString(attrs, "font", "symbol.attrs.font", issues);
 	requiredString(attrs, "char", "symbol.attrs.char", issues);
-	if (typeof attrs["font"] === "string" && attrs["font"].trim() === "") issues.push({
-		path: "symbol.attrs.font",
-		message: "Expected a non-empty font name."
-	});
-	if (typeof attrs["char"] === "string" && !isOoxmlSymbolCharacter(attrs["char"])) issues.push({
+	if (typeof attrs["char"] === "string" && attrs["char"] !== "" && !isOoxmlSymbolCharacter(attrs["char"])) issues.push({
 		path: "symbol.attrs.char",
 		message: "Expected exactly four hexadecimal digits."
 	});
@@ -1645,6 +1641,7 @@ const validateParagraphFormatting = (value, path, issues) => {
 	]) optionalNumber(value, key, `${path}.${key}`, issues);
 	optionalOneOf(value, "lineSpacingRule", `${path}.lineSpacingRule`, issues, LINE_SPACING_RULE_VALUES);
 	optionalString(value, "styleId", `${path}.styleId`, issues);
+	optionalString(value, "numberingChangeXml", `${path}.numberingChangeXml`, issues);
 	optionalOneOf(value, "listNumFmt", `${path}.listNumFmt`, issues, NUMBER_FORMAT_VALUES);
 	optionalString(value, "listMarker", `${path}.listMarker`, issues);
 	optionalString(value, "listMarkerTemplate", `${path}.listMarkerTemplate`, issues);

package/dist/prosemirror/bookmarkBoundaryAttrs.d.ts

@@ -1,8 +1,18 @@
+import { document_d_exports } from "../types/document.js";
 import { BookmarkBoundaryAttrs } from "./schema/nodes.js";
 import { ReadProseMirrorAttrsResult } from "./attrs/index.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/bookmarkBoundaryAttrs.d.ts
+declare const isDisplacedByCustomXml: (value: unknown) => value is document_d_exports.DisplacedByCustomXml;
+/**
+ * A boundary's `w:displacedByCustomXml`, as a fragment to spread into the model
+ * content it rebuilds. Both a start and an end may carry it, so the callers
+ * that build either one share this rather than each remembering the attribute.
+ */
+declare const bookmarkBoundaryDisplacement: (attrs: BookmarkBoundaryAttrs) => {
+  displacedByCustomXml?: document_d_exports.DisplacedByCustomXml;
+};
 declare const readBookmarkBoundaryAttrs: (node: Node) => ReadProseMirrorAttrsResult<BookmarkBoundaryAttrs>;
 declare const expectBookmarkBoundaryAttrs: (node: Node) => BookmarkBoundaryAttrs;
 //#endregion
-export { expectBookmarkBoundaryAttrs, readBookmarkBoundaryAttrs };
+export { bookmarkBoundaryDisplacement, expectBookmarkBoundaryAttrs, isDisplacedByCustomXml, readBookmarkBoundaryAttrs };

package/dist/prosemirror/bookmarkBoundaryAttrs.js

@@ -1,6 +1,13 @@
 import { panic } from "better-result";
 //#region src/prosemirror/bookmarkBoundaryAttrs.ts
+const isDisplacedByCustomXml = (value) => value === "next" || value === "prev";
 const attrsCache = /* @__PURE__ */ new WeakMap();
+/**
+* A boundary's `w:displacedByCustomXml`, as a fragment to spread into the model
+* content it rebuilds. Both a start and an end may carry it, so the callers
+* that build either one share this rather than each remembering the attribute.
+*/
+const bookmarkBoundaryDisplacement = (attrs) => attrs.displacedByCustomXml === void 0 ? {} : { displacedByCustomXml: attrs.displacedByCustomXml };
 const readBookmarkBoundaryAttrs = (node) => {
 	const issues = [];
 	if (node.type.name !== "bookmarkBoundary") issues.push({
@@ -32,10 +39,16 @@ const readBookmarkBoundaryAttrs = (node) => {
 		path: "bookmarkBoundary.attrs.colLast",
 		message: "Expected a non-negative integer."
 	});
+	const displaced = node.attrs["displacedByCustomXml"];
+	if (displaced !== void 0 && displaced !== null && !isDisplacedByCustomXml(displaced)) issues.push({
+		path: "bookmarkBoundary.attrs.displacedByCustomXml",
+		message: "Expected \"next\" or \"prev\"."
+	});
 	if (issues.length > 0 || typeof id !== "number") return {
 		ok: false,
 		issues
 	};
+	const displacement = isDisplacedByCustomXml(displaced) ? { displacedByCustomXml: displaced } : {};
 	if (type === "start" && typeof name === "string") return {
 		ok: true,
 		value: {
@@ -43,14 +56,16 @@ const readBookmarkBoundaryAttrs = (node) => {
 			id,
 			name,
 			...typeof colFirst === "number" ? { colFirst } : {},
-			...typeof colLast === "number" ? { colLast } : {}
+			...typeof colLast === "number" ? { colLast } : {},
+			...displacement
 		}
 	};
 	return {
 		ok: true,
 		value: {
 			type: "end",
-			id
+			id,
+			...displacement
 		}
 	};
 };
@@ -63,4 +78,4 @@ const expectBookmarkBoundaryAttrs = (node) => {
 	return result.value;
 };
 //#endregion
-export { expectBookmarkBoundaryAttrs, readBookmarkBoundaryAttrs };
+export { bookmarkBoundaryDisplacement, expectBookmarkBoundaryAttrs, isDisplacedByCustomXml, readBookmarkBoundaryAttrs };

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

@@ -1,4 +1,4 @@
-import { ResolvedStyleAttrs, getParagraphAlignment, getParagraphBidi, getStyleId } from "../extensions/core/ParagraphExtension.js";
+import { GenerateTableOfContentsOptions, ResolvedStyleAttrs, getParagraphAlignment, getParagraphBidi, getStyleId } from "../extensions/core/ParagraphExtension.js";
 import { BorderPreset, TableBorderPreset, TableContextInfo, getTableContext, isInTable as isInTableCell } from "../extensions/nodes/TableExtension.js";
 import { AcceptSuggestionOptions, FolioSuggestion, SuggestionAppliedAs, SuggestionKind, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addCommentMark, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, getSuggestions, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark } from "./comments.js";
 import { CapturedTextFormatting, PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./formatPainter.js";
@@ -6,8 +6,8 @@ import { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMark
 import { getHyperlinkAttrs, getSelectedText, isHyperlinkActive } from "../extensions/marks/HyperlinkExtension.js";
 import { clearFontFamily, clearFontSize, clearHighlight, clearTextColor, insertHyperlink, removeHyperlink, setFontFamily, setFontSize, setHighlight, setHyperlink, setTextColor, setUnderlineStyle, toggleBold, toggleItalic, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "./formatting.js";
 import { getListInfo, isInList } from "../extensions/features/ListExtension.js";
-import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTOC, increaseIndent, increaseListLevel, oneAndHalfSpacing, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList } from "./paragraph.js";
+import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTableOfContents, increaseIndent, increaseListLevel, oneAndHalfSpacing, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList } from "./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 "./table.js";
 import { insertPageBreak } from "./pageBreak.js";
 import { CLIPBOARD_READ_ERROR_EVENT, buildPlainTextSlice, pasteWithoutFormatting } from "./pastePlainText.js";
-export { type AcceptSuggestionOptions, type BorderPreset, CLIPBOARD_READ_ERROR_EVENT, type CapturedTextFormatting, type FolioSuggestion, PAINTABLE_MARK_NAMES, type ResolvedStyleAttrs, type SuggestionAppliedAs, type SuggestionKind, type TableBorderPreset, type TableContextInfo, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, generateTOC, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getSuggestions, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };
+export { type AcceptSuggestionOptions, type BorderPreset, CLIPBOARD_READ_ERROR_EVENT, type CapturedTextFormatting, type FolioSuggestion, type GenerateTableOfContentsOptions, PAINTABLE_MARK_NAMES, type ResolvedStyleAttrs, type SuggestionAppliedAs, type SuggestionKind, type TableBorderPreset, type TableContextInfo, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, generateTableOfContents, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getSuggestions, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };

package/dist/prosemirror/commands/index.js

@@ -7,7 +7,7 @@ import { acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptCha
 import { PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./formatPainter.js";
 import { clearFontFamily, clearFontSize, clearHighlight, clearTextColor, insertHyperlink, removeHyperlink, setFontFamily, setFontSize, setHighlight, setHyperlink, setTextColor, setUnderlineStyle, toggleBold, toggleItalic, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "./formatting.js";
 import { insertPageBreak } from "./pageBreak.js";
-import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTOC, increaseIndent, increaseListLevel, oneAndHalfSpacing, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList } from "./paragraph.js";
+import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTableOfContents, increaseIndent, increaseListLevel, oneAndHalfSpacing, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList } from "./paragraph.js";
 import { CLIPBOARD_READ_ERROR_EVENT, buildPlainTextSlice, pasteWithoutFormatting } from "./pastePlainText.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 "./table.js";
-export { CLIPBOARD_READ_ERROR_EVENT, PAINTABLE_MARK_NAMES, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, generateTOC, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getSuggestions, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };
+export { CLIPBOARD_READ_ERROR_EVENT, PAINTABLE_MARK_NAMES, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, generateTableOfContents, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getSuggestions, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };

package/dist/prosemirror/commands/paragraph.d.ts

@@ -1,5 +1,5 @@
 import { document_d_exports } from "../../types/document.js";
-import { ResolvedStyleAttrs, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId } from "../extensions/core/ParagraphExtension.js";
+import { GenerateTableOfContentsOptions, ResolvedStyleAttrs, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId } from "../extensions/core/ParagraphExtension.js";
 import { getListInfo, isInList } from "../extensions/features/ListExtension.js";
 import { Command } from "prosemirror-state";
 //#region src/prosemirror/commands/paragraph.d.ts
@@ -33,6 +33,6 @@ declare function removeTabStop(position: number): Command;
 declare const toggleBidi: Command;
 declare const setRtl: Command;
 declare const setLtr: Command;
-declare const generateTOC: Command;
+declare const generateTableOfContents: (options: GenerateTableOfContentsOptions) => Command;
 //#endregion
-export { type ResolvedStyleAttrs, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTOC, getListInfo, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId, increaseIndent, increaseListLevel, insertSectionBreak, isInList, oneAndHalfSpacing, removeList, removeSectionBreak, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList };
+export { type GenerateTableOfContentsOptions, type ResolvedStyleAttrs, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTableOfContents, getListInfo, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId, increaseIndent, increaseListLevel, insertSectionBreak, isInList, oneAndHalfSpacing, removeList, removeSectionBreak, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList };

package/dist/prosemirror/commands/paragraph.js

@@ -59,6 +59,6 @@ function removeTabStop(position) {
 const toggleBidi = cmds.requireCommand("toggleBidi")();
 const setRtl = cmds.requireCommand("setRtl")();
 const setLtr = cmds.requireCommand("setLtr")();
-const generateTOC = cmds.requireCommand("generateTOC")();
+const generateTableOfContents = (options) => cmds.requireCommand("generateTOC")(options);
 //#endregion
-export { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTOC, getListInfo, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId, increaseIndent, increaseListLevel, insertSectionBreak, isInList, oneAndHalfSpacing, removeList, removeSectionBreak, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList };
+export { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTableOfContents, getListInfo, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId, increaseIndent, increaseListLevel, insertSectionBreak, isInList, oneAndHalfSpacing, removeList, removeSectionBreak, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList };

package/dist/prosemirror/commentIdAllocator.js

@@ -1,4 +1,4 @@
-import { seedRevisionIdsAbove } from "./plugins/revisionIds.js";
+import { maxAnnotationIdInDoc, seedRevisionIdsAbove } from "./plugins/revisionIds.js";
 import { MAX_REVISION_ID } from "@stll/docx-core/model";
 //#region src/prosemirror/commentIdAllocator.ts
 /** Sentinel ID for a comment that hasn't been persisted yet (anchored to selection). */
@@ -32,12 +32,7 @@ function createCommentIdAllocator() {
 function seedCommentAllocator(allocator, comments, view) {
 	let max = 0;
 	for (const comment of comments ?? []) if (Number.isInteger(comment.id) && comment.id > max && comment.id <= MAX_REVISION_ID) max = comment.id;
-	if (view) view.state.doc.descendants((node) => {
-		for (const mark of node.marks) {
-			const revisionId = mark.attrs["revisionId"];
-			if (typeof revisionId === "number" && Number.isInteger(revisionId) && revisionId > max && revisionId <= MAX_REVISION_ID) max = revisionId;
-		}
-	});
+	if (view) max = Math.max(max, maxAnnotationIdInDoc(view.state.doc));
 	allocator.seedAbove(max);
 	seedRevisionIdsAbove(max);
 }

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -13,9 +13,10 @@ import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { pixelsToEmu } from "../../utils/units.js";
 import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectPageBreakRunOwnerMarkAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
-import { expectBookmarkBoundaryAttrs } from "../bookmarkBoundaryAttrs.js";
+import { bookmarkBoundaryDisplacement, expectBookmarkBoundaryAttrs } from "../bookmarkBoundaryAttrs.js";
 import { paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges } from "../commands/propertyChangeScope.js";
 import { applyRunFormattingOverrideAttrs, buildRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
+import { textFormattingToMarks } from "../extensions/marks/markUtils.js";
 import { listRenderingFromAttrs as listRenderingFromAttrs$1 } from "../listRenderingAttrs.js";
 import { resolveNumberedRefFields } from "../numberedRefFields.js";
 import { directParagraphAlignment } from "../paragraphAlignment.js";
@@ -24,12 +25,12 @@ import { directParagraphSpacing } from "../paragraphSpacing.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { authoredRunFormattingFromAttrs, hasAuthoredRunFormattingProvenance } from "../runFormattingProvenance.js";
 import { paragraphFormattingForRun, paragraphRunStyleContext, resolveEffectiveRunStyleFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
+import { schema } from "../schema/index.js";
 import { parseShapeGeometryAdjustments } from "../shapeGeometryAdjustments.js";
 import { expectTextBoxAnchorAttrs } from "../textBoxAnchorAttrs.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { runShadingAttrsToShading, shadingToRunShadingAttrs } from "./runShadingMark.js";
 import { decodeSdtListItems, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs } from "./sdtAttrs.js";
-import { textFormattingToMarks } from "./toProseDoc.js";
 import { panic } from "better-result";
 import { Fragment } from "prosemirror-model";
 import { DRAWING_RAW_XML_MODES } from "@stll/docx-core/model";
@@ -271,7 +272,7 @@ function stripSuggestedInlineMarks(marks, { baseParagraphFormatting, inheritedFo
 			styleResolver
 		}) : paragraphFormatting, previousFormatting);
 		next = next.filter((mark) => !RUN_FORMATTING_MARK_NAMES.has(mark.type.name));
-		for (const restored of textFormattingToMarks(effectivePreviousFormatting, {
+		for (const restored of textFormattingToMarks(effectivePreviousFormatting, schema, {
 			overrideFormatting: previousFormatting,
 			directFormatting: previousFormatting
 		})) next = restored.addToSet(next);
@@ -645,17 +646,47 @@ function replaceTextBoxAnchorInBlocks(blocks, marker, textBoxRun) {
 	}
 	return false;
 }
+/**
+* The inline list a text-box anchor run can be spliced out of, or nothing when
+* the item holds no such list.
+*
+* A complex field keeps its runs in `fieldCode`/`fieldResult`, two arrays
+* rather than one, and an anchor has never been placed in either; splicing one
+* would have to pick a side. The marker stays where it is and
+* `removeUnresolvedTextBoxAnchors` leaves it, as before.
+*/
+const textBoxAnchorHost = (item) => {
+	switch (item.type) {
+		case "hyperlink": return item.children;
+		case "simpleField": return item.content;
+		case "inlineSdt":
+		case "insertion":
+		case "deletion":
+		case "moveFrom":
+		case "moveTo":
+		case "bidiWrapper": return item.content;
+		case "run":
+		case "complexField":
+		case "bookmarkStart":
+		case "bookmarkEnd":
+		case "commentRangeStart":
+		case "commentRangeEnd":
+		case "commentReference":
+		case "moveFromRangeStart":
+		case "moveFromRangeEnd":
+		case "moveToRangeStart":
+		case "moveToRangeEnd":
+		case "mathEquation": return;
+		default: panic(`Unsupported paragraph content: ${JSON.stringify(item)}`);
+	}
+};
 function editTextBoxAnchorInContent(content, marker, replacement) {
-	for (let index = 0; index < content.length; index += 1) {
-		const item = content[index];
+	for (const [index, item] of content.entries()) {
 		if (item === marker) {
 			content.splice(index, 1, ...replacement ? [replacement] : []);
 			return true;
 		}
-		let nestedContent;
-		if (item?.type === "hyperlink") nestedContent = item.children;
-		else if (item?.type === "simpleField") nestedContent = item.content;
-		else if (item?.type === "inlineSdt" || item?.type === "insertion" || item?.type === "deletion" || item?.type === "moveFrom" || item?.type === "moveTo") nestedContent = item.content;
+		const nestedContent = textBoxAnchorHost(item);
 		if (!nestedContent) continue;
 		const hadContent = nestedContent.length > 0;
 		if (editTextBoxAnchorInContent(nestedContent, marker, replacement)) {
@@ -800,8 +831,23 @@ const propertyChangeFromAttrs = (change) => {
 		...currentFormatting !== void 0 && { currentFormatting }
 	};
 };
+/**
+* What the paragraph states itself for one `w:pPr` field, as opposed to what
+* the style cascade resolved into the same attr.
+*
+* `undefined` means the paragraph states nothing and the field must stay
+* absent: a materialised value is a direct override that outranks the style it
+* was read from, and a later edit to that style no longer reaches the
+* paragraph. A value the source stated directly is always authored, even when
+* it happens to equal the style's.
+*/
+const authoredParagraphValue = (field, value, orig, resolved) => {
+	if (value === void 0) return;
+	if (orig?.[field] !== void 0) return value;
+	return sameResolvedValue(value, resolved?.[field]) ? void 0 : value;
+};
 function assignBooleanToggle(result, attrs, orig, key) {
-	const value = attrs[key] ?? void 0;
+	const value = authoredParagraphValue(key, attrs[key] ?? void 0, orig, attrs._resolvedFormatting);
 	if (value === (orig[key] ?? void 0)) return;
 	if (value === void 0) Reflect.deleteProperty(result, key);
 	else result[key] = value;
@@ -866,14 +912,29 @@ function paragraphAttrsToFormatting(attrs) {
 		assignBooleanToggle(result, attrs, orig, "suppressAutoHyphens");
 		if (attrs.spacingExplicit !== orig.spacingExplicit) if (attrs.spacingExplicit) result.spacingExplicit = attrs.spacingExplicit;
 		else delete result.spacingExplicit;
-		const bidi = directionToBidi(attrs.direction);
+		const bidi = authoredParagraphValue("bidi", directionToBidi(attrs.direction), orig, attrs._resolvedFormatting);
 		if (bidi !== (orig.bidi ?? void 0)) if (bidi === void 0) delete result.bidi;
 		else result.bidi = bidi;
 		return result;
 	}
-	const outlineLevel = Reflect.get(attrs, "outlineLevel");
-	const bidi = directionToBidi(attrs.direction);
-	if (!(directAlignment !== void 0 || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || hasDirectLineSpacing || hasDirectLineSpacingRule || attrs.snapToGrid != null || attrs.indentLeft || attrs.indentRight || attrs.indentFirstLine || attrs.numPr || attrs.styleId || attrs.borders || attrs.shading || attrs.tabs || typeof outlineLevel === "number" || attrs.contextualSpacing || attrs.spacingExplicit || bidi != null || attrs.pageBreakBefore != null || attrs.widowControl != null || attrs.kinsoku != null || attrs.overflowPunctuation != null || attrs.suppressAutoHyphens != null)) return;
+	const resolved = attrs._resolvedFormatting;
+	const authored = (field, value) => authoredParagraphValue(field, value ?? void 0, void 0, resolved);
+	const outlineLevel = authored("outlineLevel", Reflect.get(attrs, "outlineLevel"));
+	const bidi = authored("bidi", directionToBidi(attrs.direction));
+	const snapToGrid = authored("snapToGrid", attrs.snapToGrid);
+	const indentLeft = authored("indentLeft", attrs.indentLeft);
+	const indentRight = authored("indentRight", attrs.indentRight);
+	const indentFirstLine = authored("indentFirstLine", attrs.indentFirstLine);
+	const borders = authored("borders", attrs.borders);
+	const shading = authored("shading", attrs.shading);
+	const tabs = authored("tabs", attrs.tabs);
+	const contextualSpacing = authored("contextualSpacing", attrs.contextualSpacing);
+	const pageBreakBefore = authored("pageBreakBefore", attrs.pageBreakBefore);
+	const widowControl = authored("widowControl", attrs.widowControl);
+	const kinsoku = authored("kinsoku", attrs.kinsoku);
+	const overflowPunctuation = authored("overflowPunctuation", attrs.overflowPunctuation);
+	const suppressAutoHyphens = authored("suppressAutoHyphens", attrs.suppressAutoHyphens);
+	if (!(directAlignment !== void 0 || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || hasDirectLineSpacing || hasDirectLineSpacingRule || snapToGrid != null || indentLeft || indentRight || indentFirstLine || attrs.numPr || attrs.styleId || borders || shading || tabs || typeof outlineLevel === "number" || contextualSpacing || attrs.spacingExplicit || bidi != null || pageBreakBefore != null || widowControl != null || kinsoku != null || overflowPunctuation != null || suppressAutoHyphens != null)) return;
 	const f = {};
 	if (directAlignment !== void 0) f.alignment = directAlignment;
 	if (shouldSerializeSpaceBefore) f.spaceBefore = spaceBefore;
@@ -882,25 +943,25 @@ function paragraphAttrsToFormatting(attrs) {
 	if (afterAutospacingEdited) f.afterAutospacing = false;
 	if (hasDirectLineSpacing && typeof attrs.lineSpacing === "number") f.lineSpacing = attrs.lineSpacing;
 	if (hasDirectLineSpacingRule && attrs.lineSpacingRule) f.lineSpacingRule = attrs.lineSpacingRule;
-	if (attrs.snapToGrid != null) f.snapToGrid = attrs.snapToGrid;
+	if (snapToGrid != null) f.snapToGrid = snapToGrid;
 	if (attrs.spacingExplicit) f.spacingExplicit = attrs.spacingExplicit;
-	if (attrs.indentLeft) f.indentLeft = attrs.indentLeft;
-	if (attrs.indentRight) f.indentRight = attrs.indentRight;
-	if (attrs.indentFirstLine) f.indentFirstLine = attrs.indentFirstLine;
-	if (attrs.hangingIndent) f.hangingIndent = attrs.hangingIndent;
+	if (indentLeft) f.indentLeft = indentLeft;
+	if (indentRight) f.indentRight = indentRight;
+	if (indentFirstLine) f.indentFirstLine = indentFirstLine;
+	if (attrs.hangingIndent && indentFirstLine) f.hangingIndent = attrs.hangingIndent;
 	if (attrs.numPr && !isStyleSourcedParagraphNumbering(attrs.numPr, attrs.numPrFromStyle)) f.numPr = attrs.numPr;
 	if (attrs.styleId) f.styleId = attrs.styleId;
-	if (attrs.borders) f.borders = attrs.borders;
-	if (attrs.shading) f.shading = attrs.shading;
-	if (attrs.tabs) f.tabs = attrs.tabs;
+	if (borders) f.borders = borders;
+	if (shading) f.shading = shading;
+	if (tabs) f.tabs = tabs;
 	if (typeof outlineLevel === "number") f.outlineLevel = outlineLevel;
-	if (attrs.contextualSpacing) f.contextualSpacing = attrs.contextualSpacing;
+	if (contextualSpacing) f.contextualSpacing = contextualSpacing;
 	if (bidi != null) f.bidi = bidi;
-	if (attrs.pageBreakBefore != null) f.pageBreakBefore = attrs.pageBreakBefore;
-	if (attrs.widowControl != null) f.widowControl = attrs.widowControl;
-	if (attrs.kinsoku != null) f.kinsoku = attrs.kinsoku;
-	if (attrs.overflowPunctuation != null) f.overflowPunctuation = attrs.overflowPunctuation;
-	if (attrs.suppressAutoHyphens != null) f.suppressAutoHyphens = attrs.suppressAutoHyphens;
+	if (pageBreakBefore != null) f.pageBreakBefore = pageBreakBefore;
+	if (widowControl != null) f.widowControl = widowControl;
+	if (kinsoku != null) f.kinsoku = kinsoku;
+	if (overflowPunctuation != null) f.overflowPunctuation = overflowPunctuation;
+	if (suppressAutoHyphens != null) f.suppressAutoHyphens = suppressAutoHyphens;
 	return f;
 }
 function createTrackedRunWrapper(type, info, child) {
@@ -1143,10 +1204,12 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 					id: attrs.id,
 					name: attrs.name,
 					...attrs.colFirst !== void 0 ? { colFirst: attrs.colFirst } : {},
-					...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {}
+					...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {},
+					...bookmarkBoundaryDisplacement(attrs)
 				} : {
 					type: "bookmarkEnd",
-					id: attrs.id
+					id: attrs.id,
+					...bookmarkBoundaryDisplacement(attrs)
 				};
 				currentTrackedChange.wrapper.content.push(boundary);
 				return;
@@ -1209,11 +1272,13 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				id: attrs.id,
 				name: attrs.name,
 				...attrs.colFirst !== void 0 ? { colFirst: attrs.colFirst } : {},
-				...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {}
+				...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {},
+				...bookmarkBoundaryDisplacement(attrs)
 			});
 			else content.push({
 				type: "bookmarkEnd",
-				id: attrs.id
+				id: attrs.id,
+				...bookmarkBoundaryDisplacement(attrs)
 			});
 		} else if (node.isText) appendDirectRun(node, createRunFromText({
 			...formattingContext,
@@ -1426,11 +1491,13 @@ function addNodeToHyperlink({ baseParagraphFormatting, hyperlink, inheritedForma
 			id: attrs.id,
 			name: attrs.name,
 			...attrs.colFirst !== void 0 ? { colFirst: attrs.colFirst } : {},
-			...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {}
+			...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {},
+			...bookmarkBoundaryDisplacement(attrs)
 		});
 		else hyperlink.children.push({
 			type: "bookmarkEnd",
-			id: attrs.id
+			id: attrs.id,
+			...bookmarkBoundaryDisplacement(attrs)
 		});
 		return;
 	}
@@ -1818,6 +1885,14 @@ function createInlineSdtFromNode(node, textBoxAnchorMarkers, formattingContext)
 /**
 * Create a Run containing an image
 */
+/**
+* Restore the `w:rPr` an inline atom carried from its source run.
+*
+* Image and shape nodes do not hold the run's formatting marks
+* (`withRunBoundaryMarks` in toProseDoc keeps them off), so the run rebuilt
+* around one has no other record of the properties it was authored with.
+*/
+const carriedRunFormatting = (formatting) => formatting && Object.keys(formatting).length > 0 ? { formatting } : {};
 function createImageRun(node) {
 	const attrs = expectImageAttrs(node);
 	const wrap = { type: attrs.wrapType || "inline" };
@@ -1888,6 +1963,7 @@ function createImageRun(node) {
 	}
 	return {
 		type: "run",
+		...carriedRunFormatting(attrs._docxRunFormatting),
 		content: [drawingFromImageAttrs(image, attrs)]
 	};
 }
@@ -1984,12 +2060,14 @@ function createShapeRun(node) {
 		if (attrs.outlineColor) shapeOutline.color = attrs.outlineColorValue ?? { rgb: attrs.outlineColor.replace("#", "") };
 		shape.outline = shapeOutline;
 	}
+	const shapeContent = {
+		type: "shape",
+		shape
+	};
 	return {
 		type: "run",
-		content: [{
-			type: "shape",
-			shape
-		}]
+		...carriedRunFormatting(attrs._docxRunFormatting),
+		content: [shapeContent]
 	};
 }
 const RUN_FORMATTING_VISUAL_GROUPS = {
@@ -2550,6 +2628,17 @@ function marksToTextFormatting(marks, options) {
 /**
 * Convert a ProseMirror table node to our Table type
 */
+/**
+* A table the editor created carries no `w:tblPr`, so the borders its cells
+* were built with are the only record of what the table looks like. Lift the
+* first bordered cell's set to the table.
+*
+* Only for such a table: a table read from a package states its own
+* `w:tblBorders` or deliberately states none, and its cells' borders may be
+* the table style's rather than their own. Inferring there invents a
+* `w:tblBorders` the source never had, and it outranks the table style on
+* reload (`formatting.borders: absent became object` in the corpus census).
+*/
 function inferTableBorders(rows) {
 	for (const row of rows) for (const cell of row.cells) {
 		const borders = cell.formatting?.borders;
@@ -2571,7 +2660,7 @@ function convertPMTable(node, documentCounts, styleResolver = null) {
 	const attrs = expectTableAttrs(node);
 	const rows = convertPMTableRows(node, documentCounts, styleResolver);
 	const formatting = tableAttrsToFormatting(attrs) || void 0;
-	if (!formatting?.borders) {
+	if (!formatting?.borders && !attrs._originalFormatting) {
 		const inferredBorders = inferTableBorders(rows);
 		if (inferredBorders) if (formatting) formatting.borders = inferredBorders;
 		else {
@@ -2590,7 +2679,7 @@ function convertPMTable(node, documentCounts, styleResolver = null) {
 		rows
 	};
 	if (attrs.columnWidths) table.columnWidths = attrs.columnWidths;
-	if (formatting) table.formatting = formatting;
+	if (formatting && Object.keys(formatting).length > 0) table.formatting = formatting;
 	restoreTablePropertyChanges(table, attrs);
 	return table;
 }

package/dist/prosemirror/conversion/toProseDoc.d.ts

@@ -1,7 +1,6 @@
 import { document_d_exports } from "../../types/document.js";
 import { StyleEngine } from "../../style-engine/styleEngine.js";
 import "../../style-engine/index.js";
-import { schema } from "../schema/index.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/conversion/toProseDoc.d.ts
 type UnsupportedDocxToProseMirrorOwner = "complex-field-instruction" | "field-result" | "page-break-bearing-run" | "paragraph-borders" | "paragraph-frame" | "paragraph-outline" | "paragraph-text-box-anchor" | "table-cell" | "text-box";
@@ -39,18 +38,6 @@ declare function resolveParagraphDefaultTextFormatting(styleId: string | undefin
   includeParagraphMarkRunProperties?: boolean;
 }): document_d_exports.TextFormatting | undefined;
 declare function standaloneTableCellToProseMirror(cell: document_d_exports.TableCell, nodeType: "tableCell" | "tableHeader"): Node;
-type AuthoredRunFormattingCarrier = "preserve" | "reconstruct";
-/**
- * Convert TextFormatting to ProseMirror marks
- */
-type TextFormattingToMarksOptions = {
-  overrideFormatting: document_d_exports.TextFormatting | undefined;
-  /** Direct standard font properties whose authored provenance must survive. */
-  directFormatting?: document_d_exports.TextFormatting | undefined;
-  /** Whether direct authorship is reconstructible from structural marks and the style context. */
-  authoredCarrier?: AuthoredRunFormattingCarrier;
-};
-declare function textFormattingToMarks(formatting: document_d_exports.TextFormatting | undefined, options?: TextFormattingToMarksOptions): ReturnType<typeof schema.mark>[];
 /**
  * Convert HeaderFooter content (array of Paragraph/Table blocks) to a ProseMirror document.
  * Used for editing headers/footers in their own ProseMirror editor and for
@@ -66,4 +53,4 @@ declare function footnoteToProseDoc(content: document_d_exports.BlockContent[],
  */
 declare function createEmptyDoc(): Node;
 //#endregion
-export { ToProseDocOptions, UnsupportedDocxToProseMirrorConversionError, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, resolveParagraphDefaultTextFormatting, standaloneTableCellToProseMirror, textFormattingToMarks, toProseDoc };
+export { ToProseDocOptions, UnsupportedDocxToProseMirrorConversionError, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, resolveParagraphDefaultTextFormatting, standaloneTableCellToProseMirror, toProseDoc };