@stll/folio-core 0.36.0 → 0.37.1

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

@@ -1,7 +1,10 @@
 import { FONT_THEME_VALUES } from "../../../types/documentEnumValues.js";
 import { mergeFontFamily } from "../../../utils/fontFamilyMerge.js";
-import { expectFontFamilyMarkAttrs } from "../../attrs/index.js";
+import { expectFontFamilyMarkAttrs, expectRunFormattingOverrideMarkAttrs } from "../../attrs/index.js";
+import { selectRunFormattingCarrierRepresentations } from "../../runFormattingInlineCarriers.js";
+import { hasRunFormattingOverrideAttrs } from "../../runFormattingProvenance.js";
 import { applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs } from "./RunFormattingOverrideExtension.js";
+import { toggleMark } from "prosemirror-commands";
 //#region src/prosemirror/extensions/marks/markUtils.ts
 const isFontTheme = (value) => value !== void 0 && FONT_THEME_VALUES.some((theme) => theme === value);
 const fontFamilyAttrsToFormatting = ({ ascii, hAnsi, eastAsia, cs, hint, asciiTheme, hAnsiTheme, eastAsiaTheme, csTheme }) => ({
@@ -158,6 +161,89 @@ function setMark(markType, attrs) {
 		return true;
 	};
 }
+const DIRECT_FONT_PROPERTIES = [
+	"color",
+	"fontFamily",
+	"fontSize"
+];
+const updatePairedToggleAttrs = (attrs, property, enabled) => {
+	const next = { ...attrs };
+	const complexProperty = property === "bold" ? "boldCs" : "italicCs";
+	if (property === "bold") {
+		next.bold = enabled;
+		next.boldCs = enabled;
+	} else {
+		next.italic = enabled;
+		next.italicCs = enabled;
+	}
+	const absences = next.complexScriptPropertyAbsences?.filter((candidate) => candidate !== complexProperty);
+	if (absences && absences.length > 0) next.complexScriptPropertyAbsences = absences;
+	else delete next.complexScriptPropertyAbsences;
+	return next;
+};
+const updateFontSizeCompanionAttrs = (attrs, size) => {
+	const next = { ...attrs };
+	const directFontProperties = new Set(next.directFontProperties ?? []);
+	if (size === void 0) {
+		delete next.fontSizeCs;
+		directFontProperties.delete("fontSize");
+	} else {
+		next.fontSizeCs = size;
+		directFontProperties.add("fontSize");
+	}
+	if (directFontProperties.size > 0) next.directFontProperties = DIRECT_FONT_PROPERTIES.filter((property) => directFontProperties.has(property));
+	else delete next.directFontProperties;
+	const absences = next.complexScriptPropertyAbsences?.filter((candidate) => candidate !== "fontSizeCs");
+	if (absences && absences.length > 0) next.complexScriptPropertyAbsences = absences;
+	else delete next.complexScriptPropertyAbsences;
+	return next;
+};
+const updateRunFormattingOverrideMarks = (marks, overrideType, update) => {
+	const existing = overrideType.isInSet(marks);
+	const attrs = update(existing ? expectRunFormattingOverrideMarkAttrs(existing) : {});
+	const withoutExisting = marks.filter((mark) => mark.type !== overrideType);
+	return hasRunFormattingOverrideAttrs(attrs) ? overrideType.create(attrs).addToSet(withoutExisting) : withoutExisting;
+};
+const updateRunFormattingOverride = (state, tr, update) => {
+	const overrideType = state.schema.marks["runFormattingOverride"];
+	if (!overrideType) return tr;
+	const { from, to, empty } = state.selection;
+	if (empty) {
+		const marks = updateRunFormattingOverrideMarks(tr.storedMarks ?? state.storedMarks ?? state.selection.$from.marks(), overrideType, update);
+		saveStoredMarksToParagraph(state, tr, marks);
+		tr.setStoredMarks(marks);
+		return tr;
+	}
+	const representations = selectRunFormattingCarrierRepresentations({
+		doc: tr.doc,
+		from,
+		to
+	});
+	for (const representation of representations) {
+		const { node, position } = representation;
+		const nextMarks = updateRunFormattingOverrideMarks(node.marks, overrideType, update);
+		if (node.isText) {
+			tr.removeMark(representation.from, representation.to, overrideType);
+			const nextOverride = overrideType.isInSet(nextMarks);
+			if (nextOverride) tr.addMark(representation.from, representation.to, nextOverride);
+			continue;
+		}
+		tr.setNodeMarkup(position, void 0, node.attrs, nextMarks);
+	}
+	return tr;
+};
+const withRunFormattingOverride = (command, update) => (state, dispatch) => command(state, dispatch ? (tr) => {
+	dispatch(updateRunFormattingOverride(state, tr, update));
+} : void 0);
+/** UI toggle whose direct-formatting contract explicitly targets both script families. */
+const toggleMarkForAllScripts = (markType, property) => (state, dispatch) => {
+	const enabled = !isMarkActive(state, markType);
+	return withRunFormattingOverride(toggleMark(markType), (attrs) => updatePairedToggleAttrs(attrs, property, enabled))(state, dispatch);
+};
+/** UI size command whose direct-formatting contract explicitly targets both script families. */
+const setFontSizeForAllScripts = (markType, size) => withRunFormattingOverride(setMark(markType, { size }), (attrs) => updateFontSizeCompanionAttrs(attrs, size));
+/** Clears both ordinary and complex-script direct size through the UI command boundary. */
+const clearFontSizeForAllScripts = (markType) => withRunFormattingOverride(removeMark(markType), (attrs) => updateFontSizeCompanionAttrs(attrs, void 0));
 function selectionHasVisibleUnderline(state, markType) {
 	const { from, to, empty, $from } = state.selection;
 	if (empty) {
@@ -321,4 +407,4 @@ function createRemoveMarkCommand(markType) {
 	return removeMark(markType);
 }
 //#endregion
-export { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setMark, textFormattingToMarks, toggleUnderlineMark };
+export { clearFontSizeForAllScripts, clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setFontSizeForAllScripts, setMark, textFormattingToMarks, toggleMarkForAllScripts, toggleUnderlineMark };

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

@@ -1,7 +1,9 @@
-import { expectBookmarkBoundaryAttrs } from "../../bookmarkBoundaryAttrs.js";
+import { readParagraphAttrs } from "../../attrs/index.js";
+import { expectBookmarkBoundaryAttrs, readBookmarkBoundaryAttrs } from "../../bookmarkBoundaryAttrs.js";
+import { findInvalidBookmarkBoundaryIds } from "../../bookmarkBoundaryIntegrity.js";
 import { createNodeExtension } from "../create.js";
+import { Plugin } from "prosemirror-state";
 //#region src/prosemirror/extensions/nodes/BookmarkBoundaryExtension.ts
-/** Zero-width bookmark boundary that preserves its position through ProseMirror edits. */
 function readNonnegativeInteger(value) {
 	if (value === null || !/^(?:0|[1-9]\d*)$/.test(value)) return false;
 	const parsed = Number(value);
@@ -13,6 +15,37 @@ function readOptionalColumn(dom, attribute) {
 }
 /** The node name, for callers asking whether a paragraph holds any content. */
 const BOOKMARK_BOUNDARY_NODE_NAME = "bookmarkBoundary";
+const collectInvalidBoundaries = (doc) => {
+	const boundaries = [];
+	const malformedBoundaries = [];
+	const paragraphBookmarkIds = /* @__PURE__ */ new Set();
+	doc.descendants((node, position) => {
+		if (node.type.name === "paragraph") {
+			const attrs = readParagraphAttrs(node);
+			if (attrs.ok) for (const bookmark of attrs.value.bookmarks ?? []) paragraphBookmarkIds.add(bookmark.id);
+		}
+		if (node.type.name !== "bookmarkBoundary") return true;
+		const result = readBookmarkBoundaryAttrs(node);
+		if (!result.ok) {
+			malformedBoundaries.push({
+				position,
+				node
+			});
+			return false;
+		}
+		const attrs = result.value;
+		const boundary = {
+			id: attrs.id,
+			type: attrs.type,
+			position,
+			node
+		};
+		boundaries.push(boundary);
+		return false;
+	});
+	const invalidIds = findInvalidBookmarkBoundaryIds(boundaries, paragraphBookmarkIds);
+	return [...boundaries.filter(({ id }) => invalidIds.has(id)), ...malformedBoundaries];
+};
 const BookmarkBoundaryExtension = createNodeExtension({
 	name: BOOKMARK_BOUNDARY_NODE_NAME,
 	schemaNodeName: BOOKMARK_BOUNDARY_NODE_NAME,
@@ -63,7 +96,15 @@ const BookmarkBoundaryExtension = createNodeExtension({
 				...options.getInternalClipboardToken ? { "data-docx-internal-clipboard": options.getInternalClipboardToken() } : {}
 			}];
 		}
-	})
+	}),
+	onSchemaReady: () => ({ plugins: [new Plugin({ appendTransaction(transactions, _oldState, newState) {
+		if (!transactions.some(({ docChanged }) => docChanged)) return null;
+		const invalidBoundaries = collectInvalidBoundaries(newState.doc);
+		if (invalidBoundaries.length === 0) return null;
+		const transaction = newState.tr;
+		for (const { node, position } of invalidBoundaries.toSorted((first, second) => second.position - first.position)) transaction.delete(position, position + node.nodeSize);
+		return transaction;
+	} })] })
 });
 //#endregion
 export { BOOKMARK_BOUNDARY_NODE_NAME, BookmarkBoundaryExtension };

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

@@ -74,7 +74,7 @@ const StructuredFieldExtension = createNodeExtension({
 	nodeSpec: (options) => ({
 		inline: true,
 		group: "inline",
-		content: "(text | bookmarkBoundary | tab | symbol | hardBreak | image | shape | renderedPageBreak | textBoxAnchor)+",
+		content: "(text | bookmarkBoundary | tab | symbol | hardBreak | pageBreakRun | image | shape | renderedPageBreak | textBoxAnchor)+",
 		atom: true,
 		selectable: true,
 		attrs: createFieldAttrs(),

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

@@ -1,3 +1,4 @@
+import { expectHardBreakAttrs } from "../../attrs/index.js";
 import { createNodeExtension } from "../create.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/nodes/HardBreakExtension.ts
@@ -10,19 +11,29 @@ const HardBreakExtension = createNodeExtension({
 	nodeSpec: {
 		inline: true,
 		group: "inline",
-		attrs: { breakType: { default: null } },
+		attrs: {
+			breakType: { default: null },
+			clear: { default: null }
+		},
 		selectable: false,
 		parseDOM: [{
 			tag: "br",
 			getAttrs(node) {
 				if (!(node instanceof HTMLElement)) return null;
 				const breakType = node.dataset["docxBreakType"];
-				return breakType === "column" ? { breakType } : null;
+				const clear = node.dataset["docxBreakClear"];
+				const attrs = {};
+				if (breakType === "column" || breakType === "textWrapping") attrs["breakType"] = breakType;
+				if (clear === "none" || clear === "left" || clear === "right" || clear === "all") attrs["clear"] = clear;
+				return Object.keys(attrs).length > 0 ? attrs : null;
 			}
 		}],
 		toDOM(node) {
-			if (node.attrs["breakType"] === "column") return ["br", { "data-docx-break-type": "column" }];
-			return ["br"];
+			const { breakType, clear } = expectHardBreakAttrs(node);
+			const attrs = {};
+			if (breakType !== void 0) attrs["data-docx-break-type"] = breakType;
+			if (clear !== void 0) attrs["data-docx-break-clear"] = clear;
+			return Object.keys(attrs).length > 0 ? ["br", attrs] : ["br"];
 		}
 	},
 	onSchemaReady(ctx) {

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

@@ -3,6 +3,12 @@ import { NodeExtension } from "../types.js";
 /**
  * Page Break Extension — block node representing a DOCX page break
  */
+/**
+ * LEGACY_PAGE_BREAK_NODE_REMOVAL_CONDITION: delete the block node after persisted editor
+ * snapshots created before `pageBreakRun` have been normalized and telemetry
+ * confirms that no loaded snapshot contains a block-level page break. DOCX
+ * import and editor commands must never create this legacy shape.
+ */
 declare const PageBreakExtension: (options?: Partial<Record<string, unknown>> | undefined) => NodeExtension;
 //#endregion
 export { PageBreakExtension };

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

@@ -3,6 +3,12 @@ import { createNodeExtension } from "../create.js";
 /**
 * Page Break Extension — block node representing a DOCX page break
 */
+/**
+* LEGACY_PAGE_BREAK_NODE_REMOVAL_CONDITION: delete the block node after persisted editor
+* snapshots created before `pageBreakRun` have been normalized and telemetry
+* confirms that no loaded snapshot contains a block-level page break. DOCX
+* import and editor commands must never create this legacy shape.
+*/
 const PageBreakExtension = createNodeExtension({
 	name: "pageBreak",
 	schemaNodeName: "pageBreak",

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

@@ -0,0 +1,6 @@
+import { NodeExtension } from "../types.js";
+//#region src/prosemirror/extensions/nodes/PageBreakRunExtension.d.ts
+/** Inline owner for an authored `<w:br w:type="page"/>` run child. */
+declare const PageBreakRunExtension: (options?: Partial<Record<string, unknown>> | undefined) => NodeExtension;
+//#endregion
+export { PageBreakRunExtension };

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

@@ -0,0 +1,36 @@
+import { expectPageBreakRunAttrs } from "../../attrs/index.js";
+import { createNodeExtension } from "../create.js";
+//#region src/prosemirror/extensions/nodes/PageBreakRunExtension.ts
+/** Inline owner for an authored `<w:br w:type="page"/>` run child. */
+const PAGE_BREAK_RUN_NODE_NAME = "pageBreakRun";
+const PageBreakRunExtension = createNodeExtension({
+	name: PAGE_BREAK_RUN_NODE_NAME,
+	schemaNodeName: PAGE_BREAK_RUN_NODE_NAME,
+	nodeSpec: {
+		inline: true,
+		group: "inline",
+		atom: true,
+		marks: "_",
+		attrs: { clear: { default: null } },
+		selectable: true,
+		parseDOM: [{
+			tag: "span[data-docx-page-break-run]",
+			getAttrs(node) {
+				if (!(node instanceof HTMLElement)) return false;
+				const clear = node.dataset["docxBreakClear"];
+				return clear === "none" || clear === "left" || clear === "right" || clear === "all" ? { clear } : null;
+			}
+		}],
+		toDOM(node) {
+			const { clear } = expectPageBreakRunAttrs(node);
+			return ["span", {
+				"aria-hidden": "true",
+				"data-docx-page-break-run": "true",
+				...clear ? { "data-docx-break-clear": clear } : {},
+				style: "display: inline-block; overflow: hidden; width: 0;"
+			}];
+		}
+	}
+});
+//#endregion
+export { PageBreakRunExtension };

package/dist/prosemirror/findReplaceSelection.js

@@ -88,18 +88,23 @@ function resolveTextRangeInParagraph({ paragraph, paragraphPos, startOffset, end
 		from: null,
 		to: null
 	};
+	const pageBreakOffsets = [];
 	paragraph.descendants((node, pos) => {
+		if (node.type.name === "pageBreakRun") {
+			pageBreakOffsets.push(textOffset);
+			return false;
+		}
 		const tokenLength = getSearchTextTokenLength(node);
 		if (tokenLength === 0) return true;
 		const textStart = textOffset;
 		const textEnd = textStart + tokenLength;
 		const nodeStart = paragraphPos + 1 + pos;
-		if (range.from === null && startOffset >= textStart && startOffset <= textEnd) range.from = nodeStart + Math.min(startOffset - textStart, node.nodeSize);
-		if (range.to === null && endOffset >= textStart && endOffset <= textEnd) range.to = nodeStart + Math.min(endOffset - textStart, node.nodeSize);
+		if (range.from === null && startOffset >= textStart && startOffset < textEnd) range.from = nodeStart + Math.min(startOffset - textStart, node.nodeSize);
+		if (range.to === null && endOffset > textStart && endOffset <= textEnd) range.to = nodeStart + Math.min(endOffset - textStart, node.nodeSize);
 		textOffset = textEnd;
 		return range.to === null;
 	});
-	if (range.from === null || range.to === null || range.from >= range.to) return null;
+	if (range.from === null || range.to === null || range.from >= range.to || pageBreakOffsets.some((offset) => offset > startOffset && offset < endOffset)) return null;
 	return {
 		from: range.from,
 		to: range.to

package/dist/prosemirror/index.d.ts

@@ -1,9 +1,10 @@
 import { FontFamilyAttrs, FontSizeAttrs, HyperlinkAttrs, TextColorAttrs, UnderlineAttrs } from "./schema/marks.js";
 import { ImageAttrs, ParagraphAttrs } from "./schema/nodes.js";
+import { ResolvedParagraphStyle, StyleResolver, createStyleResolver } from "./styles/styleResolver.js";
 import { schema, singletonManager } from "./schema/index.js";
 import { getParagraphAlignment, getParagraphBidi, getStyleId } from "./extensions/core/ParagraphExtension.js";
 import { BorderPreset, TableBorderPreset, TableContextInfo, getTableContext, isInTable as isInTableCell } from "./extensions/nodes/TableExtension.js";
-import { PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./commands/formatPainter.js";
+import { CapturedTextFormatting, PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./commands/formatPainter.js";
 import { clearFormatting, getMarkAttr, isMarkActive } from "./extensions/marks/markUtils.js";
 import { getHyperlinkAttrs, getSelectedText, isHyperlinkActive } from "./extensions/marks/HyperlinkExtension.js";
 import { clearFontFamily, clearFontSize, clearHighlight, clearTextColor, insertHyperlink, removeHyperlink, setFontFamily, setFontSize, setHighlight, setHyperlink, setTextColor, toggleBold, toggleItalic, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "./commands/formatting.js";
@@ -19,11 +20,10 @@ import { ProseMirrorDocumentValidationIssue, ValidateProseMirrorDocumentResult,
 import "./conversion/index.js";
 import { SelectionChangeCallback, SelectionContext, createSelectionTrackerPlugin, extractSelectionContext, getSelectionContext, selectionTrackerKey } from "./plugins/selectionTracker.js";
 import { ensureParaIdsInState } from "./extensions/features/ParaIdAllocatorExtension.js";
-import { ResolvedParagraphStyle, StyleResolver, createStyleResolver } from "./styles/styleResolver.js";
 import "./styles/index.js";
 import { SelectionState, extractSelectionState } from "./selectionState.js";
 import { createDocumentStylesPlugin, documentStylesKey, getDocumentStyleResolver } from "./plugins/documentStyles.js";
 import "./plugins/index.js";
 import { insertPageBreakInView, insertTableInView, insertTableOfContentsInView } from "./insertOperations.js";
 import { TextSelection } from "prosemirror-state";
-export { type BorderPreset, type FontFamilyAttrs, type FontSizeAttrs, type HyperlinkAttrs, type ImageAttrs, PAINTABLE_MARK_NAMES, type ParagraphAttrs, type ProseMirrorDocumentValidationIssue, type ResolvedParagraphStyle, type SelectionChangeCallback, type SelectionContext, type SelectionState, StyleResolver, type TableBorderPreset, type TableContextInfo, type TextColorAttrs, TextSelection, type ToProseDocOptions, type UnderlineAttrs, type ValidateProseMirrorDocumentResult, 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 { type BorderPreset, type CapturedTextFormatting, type FontFamilyAttrs, type FontSizeAttrs, type HyperlinkAttrs, type ImageAttrs, PAINTABLE_MARK_NAMES, type ParagraphAttrs, type ProseMirrorDocumentValidationIssue, type ResolvedParagraphStyle, type SelectionChangeCallback, type SelectionContext, type SelectionState, StyleResolver, type TableBorderPreset, type TableContextInfo, type TextColorAttrs, TextSelection, type ToProseDocOptions, type UnderlineAttrs, type ValidateProseMirrorDocumentResult, 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 };

package/dist/prosemirror/listMarker.d.ts

@@ -5,6 +5,12 @@ type ListCounterState = {
   counters: Map<number, number[]>;
   abstractCounters: Map<number, number[]>;
   seenLevels: Set<string>;
+  restartedNumIds?: Set<number>;
+  previousList?: {
+    abstractNumId: number | null;
+    fromStyle: boolean;
+    numId: number | null;
+  };
   lastAdvancedNumId?: number;
 };
 type ListCounterStreams = {
@@ -36,6 +42,25 @@ type ResolvedListTemplate = {
   components: readonly ResolvedListComponent[];
 };
 declare const MAX_LIST_LEVEL = 8;
+declare const LIST_RENDERING_ATTR_KEYS: readonly ["listIsBullet", "listIsLegal", "listNumFmt", "listMarker", "listMarkerTemplate", "listMarkerHidden", "listMarkerFormatting", "listMarkerAlignment", "listMarkerSuffix", "listMarkerAllCaps", "listImplicitChildLevelAdvances", "listMarkerSecondSlotOffsetTwips", "listLevelNumFmts", "listLevelStarts", "listAbstractNumId", "listStartOverride"];
+declare const CLEARED_LIST_RENDERING_ATTRS: Readonly<{
+  listIsBullet: null;
+  listIsLegal: null;
+  listNumFmt: null;
+  listMarker: null;
+  listMarkerTemplate: null;
+  listMarkerHidden: null;
+  listMarkerFormatting: null;
+  listMarkerAlignment: null;
+  listMarkerSuffix: null;
+  listMarkerAllCaps: null;
+  listImplicitChildLevelAdvances: null;
+  listMarkerSecondSlotOffsetTwips: null;
+  listLevelNumFmts: null;
+  listLevelStarts: null;
+  listAbstractNumId: null;
+  listStartOverride: null;
+}>;
 declare function createListCounterState(): ListCounterState;
 declare function cloneListCounterState(state: ListCounterState): ListCounterState;
 /**
@@ -55,4 +80,4 @@ declare function resolveListTemplate(options: ResolveListTemplateOptions): strin
 declare function resolveListTemplateWithComponents({ template, counters, levelFormats, forceDecimal }: ResolveListTemplateOptions): ResolvedListTemplate;
 declare function advanceListMarker(attrs: ParagraphAttrs, state: ListCounterState): string | null;
 //#endregion
-export { AdvancedListMarker, ListCounterState, ListCounterStream, ListCounterStreams, MAX_LIST_LEVEL, ResolvedListComponent, ResolvedListTemplate, VisibleListMarker, advanceListMarker, advanceVisibleListMarker, cloneListCounterState, createListCounterState, formatCounter, resolveListTemplate, resolveListTemplateWithComponents };
+export { AdvancedListMarker, CLEARED_LIST_RENDERING_ATTRS, LIST_RENDERING_ATTR_KEYS, ListCounterState, ListCounterStream, ListCounterStreams, MAX_LIST_LEVEL, ResolvedListComponent, ResolvedListTemplate, VisibleListMarker, advanceListMarker, advanceVisibleListMarker, cloneListCounterState, createListCounterState, formatCounter, resolveListTemplate, resolveListTemplateWithComponents };

package/dist/prosemirror/listMarker.js

@@ -2,22 +2,78 @@ import { convertBulletToUnicode } from "../docx/bulletMarkers.js";
 import { formatOoxmlCounter } from "../docx/ooxmlCounterFormatter.js";
 //#region src/prosemirror/listMarker.ts
 const MAX_LIST_LEVEL = 8;
+const LIST_RENDERING_ATTR_KEYS = [
+	"listIsBullet",
+	"listIsLegal",
+	"listNumFmt",
+	"listMarker",
+	"listMarkerTemplate",
+	"listMarkerHidden",
+	"listMarkerFormatting",
+	"listMarkerAlignment",
+	"listMarkerSuffix",
+	"listMarkerAllCaps",
+	"listImplicitChildLevelAdvances",
+	"listMarkerSecondSlotOffsetTwips",
+	"listLevelNumFmts",
+	"listLevelStarts",
+	"listAbstractNumId",
+	"listStartOverride"
+];
+const CLEARED_LIST_RENDERING_ATTRS = Object.freeze({
+	listIsBullet: null,
+	listIsLegal: null,
+	listNumFmt: null,
+	listMarker: null,
+	listMarkerTemplate: null,
+	listMarkerHidden: null,
+	listMarkerFormatting: null,
+	listMarkerAlignment: null,
+	listMarkerSuffix: null,
+	listMarkerAllCaps: null,
+	listImplicitChildLevelAdvances: null,
+	listMarkerSecondSlotOffsetTwips: null,
+	listLevelNumFmts: null,
+	listLevelStarts: null,
+	listAbstractNumId: null,
+	listStartOverride: null
+});
 function createListCounterState() {
 	return {
 		counters: /* @__PURE__ */ new Map(),
 		abstractCounters: /* @__PURE__ */ new Map(),
-		seenLevels: /* @__PURE__ */ new Set()
+		seenLevels: /* @__PURE__ */ new Set(),
+		restartedNumIds: /* @__PURE__ */ new Set(),
+		previousList: {
+			abstractNumId: null,
+			fromStyle: false,
+			numId: null
+		}
 	};
 }
 function cloneListCounterState(state) {
+	const clonedArrays = /* @__PURE__ */ new Map();
+	const cloneCounters = (source) => {
+		const existing = clonedArrays.get(source);
+		if (existing) return existing;
+		const cloned = [...source];
+		clonedArrays.set(source, cloned);
+		return cloned;
+	};
 	const counters = /* @__PURE__ */ new Map();
-	for (const [numId, values] of state.counters) counters.set(numId, [...values]);
+	for (const [numId, values] of state.counters) counters.set(numId, cloneCounters(values));
 	const abstractCounters = /* @__PURE__ */ new Map();
-	for (const [abstractNumId, values] of state.abstractCounters) abstractCounters.set(abstractNumId, [...values]);
+	for (const [abstractNumId, values] of state.abstractCounters) abstractCounters.set(abstractNumId, cloneCounters(values));
 	return {
 		counters,
 		abstractCounters,
 		seenLevels: new Set(state.seenLevels),
+		restartedNumIds: new Set(state.restartedNumIds ?? []),
+		previousList: { ...state.previousList ?? {
+			abstractNumId: null,
+			fromStyle: false,
+			numId: null
+		} },
 		...state.lastAdvancedNumId !== void 0 ? { lastAdvancedNumId: state.lastAdvancedNumId } : {}
 	};
 }
@@ -35,7 +91,14 @@ function previousListAttrs(attrs) {
 		...previous.listIsLegal !== void 0 ? { listIsLegal: previous.listIsLegal } : {},
 		...previous.listNumFmt !== void 0 ? { listNumFmt: previous.listNumFmt } : {},
 		...previous.listMarker !== void 0 ? { listMarker: previous.listMarker } : {},
+		...previous.listMarkerTemplate !== void 0 ? { listMarkerTemplate: previous.listMarkerTemplate } : {},
 		...previous.listMarkerHidden !== void 0 ? { listMarkerHidden: previous.listMarkerHidden } : {},
+		...previous.listMarkerFormatting !== void 0 ? { listMarkerFormatting: previous.listMarkerFormatting } : {},
+		...previous.listMarkerAlignment !== void 0 ? { listMarkerAlignment: previous.listMarkerAlignment } : {},
+		...previous.listMarkerSuffix !== void 0 ? { listMarkerSuffix: previous.listMarkerSuffix } : {},
+		...previous.listMarkerAllCaps !== void 0 ? { listMarkerAllCaps: previous.listMarkerAllCaps } : {},
+		...previous.listImplicitChildLevelAdvances !== void 0 ? { listImplicitChildLevelAdvances: previous.listImplicitChildLevelAdvances } : {},
+		...previous.listMarkerSecondSlotOffsetTwips !== void 0 ? { listMarkerSecondSlotOffsetTwips: previous.listMarkerSecondSlotOffsetTwips } : {},
 		...previous.listLevelNumFmts !== void 0 ? { listLevelNumFmts: previous.listLevelNumFmts } : {},
 		...previous.listLevelStarts !== void 0 ? { listLevelStarts: previous.listLevelStarts } : {},
 		...previous.listAbstractNumId !== void 0 ? { listAbstractNumId: previous.listAbstractNumId } : {},
@@ -129,26 +192,52 @@ function formatNumberedMarker(counters, level) {
 	return parts.length === 0 ? "1." : `${parts.join(".")}.`;
 }
 function advanceListMarker(attrs, state) {
+	const markerTemplate = attrs.listMarkerTemplate ?? attrs.listMarker;
 	const level = attrs.numPr?.ilvl ?? 0;
 	if (!Number.isInteger(level) || level < 0 || level > 8) return null;
 	const numId = attrs.numPr?.numId;
 	if (numId === void 0 || numId === 0) {
-		if (attrs.listMarker?.includes("%") && !attrs.listIsBullet) {
+		let marker = null;
+		if (markerTemplate?.includes("%") && !attrs.listIsBullet) {
 			const counters = getLastListCounters(state);
-			if (counters) return resolveListTemplate({
-				template: attrs.listMarker,
+			if (counters) marker = resolveListTemplate({
+				template: markerTemplate,
 				counters,
 				levelFormats: attrs.listLevelNumFmts,
 				forceDecimal: attrs.listIsLegal
 			});
 		}
-		return null;
+		state.previousList = {
+			abstractNumId: null,
+			fromStyle: false,
+			numId: null
+		};
+		return marker;
 	}
-	if (attrs.listIsBullet) return convertBulletToUnicode(attrs.listMarker ?? "");
-	const counters = state.counters.get(numId) ?? Array.from({ length: 9 }, () => NaN);
+	if (attrs.listIsBullet) {
+		state.previousList = {
+			abstractNumId: null,
+			fromStyle: false,
+			numId: null
+		};
+		return convertBulletToUnicode(attrs.listMarker ?? markerTemplate ?? "");
+	}
+	const firstInstanceEncounter = !state.counters.has(numId);
+	let counters = state.counters.get(numId) ?? Array.from({ length: 9 }, () => NaN);
 	const abstractNumId = attrs.listAbstractNumId;
+	const previousList = state.previousList ?? {
+		abstractNumId: null,
+		fromStyle: false,
+		numId: null
+	};
+	const restartedNumIds = state.restartedNumIds ??= /* @__PURE__ */ new Set();
+	const latestAbstractCounters = abstractNumId === void 0 ? void 0 : state.abstractCounters.get(abstractNumId);
+	const styleNumbering = attrs.numPrFromStyle;
+	const resumesRestartedInstance = firstInstanceEncounter && attrs.listStartOverride == null && abstractNumId !== void 0 && previousList.abstractNumId === abstractNumId && previousList.numId !== null && previousList.numId !== numId && restartedNumIds.has(previousList.numId);
+	const resumesStyleInstance = firstInstanceEncounter && !styleNumbering && attrs.listStartOverride == null && abstractNumId !== void 0 && previousList.abstractNumId === abstractNumId && previousList.fromStyle;
+	if (latestAbstractCounters && (styleNumbering || resumesRestartedInstance || resumesStyleInstance)) counters = latestAbstractCounters;
+	if (attrs.listStartOverride != null || resumesRestartedInstance || previousList.numId === numId && restartedNumIds.has(numId)) restartedNumIds.add(numId);
 	if (level > 0) {
-		const latestAbstractCounters = abstractNumId === void 0 ? void 0 : state.abstractCounters.get(abstractNumId);
 		if (counters.slice(0, level).every((counter) => !Number.isFinite(counter))) for (let index = 0; index < level; index += 1) {
 			const latestCounter = latestAbstractCounters?.[index];
 			counters[index] = latestCounter !== void 0 && Number.isFinite(latestCounter) ? latestCounter : attrs.listLevelStarts?.[index] ?? 1;
@@ -169,10 +258,15 @@ function advanceListMarker(attrs, state) {
 	}
 	state.counters.set(numId, counters);
 	state.lastAdvancedNumId = numId;
-	if (abstractNumId !== void 0) state.abstractCounters.set(abstractNumId, [...counters]);
+	if (abstractNumId !== void 0) state.abstractCounters.set(abstractNumId, counters);
+	state.previousList = {
+		abstractNumId: abstractNumId ?? null,
+		fromStyle: Boolean(styleNumbering),
+		numId
+	};
 	const levelFormats = attrs.listLevelNumFmts ?? (attrs.listNumFmt ? [attrs.listNumFmt] : void 0);
-	if (attrs.listMarker?.includes("%")) return resolveListTemplate({
-		template: attrs.listMarker,
+	if (markerTemplate?.includes("%")) return resolveListTemplate({
+		template: markerTemplate,
 		counters,
 		levelFormats,
 		forceDecimal: attrs.listIsLegal
@@ -182,4 +276,4 @@ function advanceListMarker(attrs, state) {
 	return formatNumberedMarker(counters, level);
 }
 //#endregion
-export { MAX_LIST_LEVEL, advanceListMarker, advanceVisibleListMarker, cloneListCounterState, createListCounterState, formatCounter, resolveListTemplate, resolveListTemplateWithComponents };
+export { CLEARED_LIST_RENDERING_ATTRS, LIST_RENDERING_ATTR_KEYS, MAX_LIST_LEVEL, advanceListMarker, advanceVisibleListMarker, cloneListCounterState, createListCounterState, formatCounter, resolveListTemplate, resolveListTemplateWithComponents };

package/dist/prosemirror/pageBreakRunProjection.d.ts

@@ -0,0 +1,28 @@
+import { document_d_exports } from "../types/document.js";
+import { ParagraphAttrs } from "./schema/nodes.js";
+import { Node } from "prosemirror-model";
+//#region src/prosemirror/pageBreakRunProjection.d.ts
+declare const PAGE_BREAK_RUN_PARAGRAPH_PROJECTION_MESSAGES: {
+  readonly borders: "A bordered paragraph containing an explicit page-break run cannot be projected";
+  readonly frame: "A framed paragraph containing an explicit page-break run cannot be projected";
+  readonly outline: "An outline paragraph containing an explicit page-break run cannot be projected";
+  readonly textBoxAnchor: "A paragraph containing both an explicit page-break run and a text-box anchor cannot be projected";
+};
+type PageBreakRunParagraphProjectionReason = keyof typeof PAGE_BREAK_RUN_PARAGRAPH_PROJECTION_MESSAGES;
+type PageBreakRunParagraphProjectionDisposition = {
+  status: "supported";
+} | {
+  status: "unsupported";
+  reason: PageBreakRunParagraphProjectionReason;
+  message: (typeof PAGE_BREAK_RUN_PARAGRAPH_PROJECTION_MESSAGES)[keyof typeof PAGE_BREAK_RUN_PARAGRAPH_PROJECTION_MESSAGES];
+};
+type PageBreakRunParagraphFeatures = {
+  attrs: ParagraphAttrs;
+  effectiveFrame: document_d_exports.ParagraphFormatting["frame"];
+  hasTextBoxAnchor: boolean;
+};
+/** Keep source-import and ProseMirror-layout ownership decisions on one predicate. */
+declare const pageBreakRunParagraphProjectionDispositionForFeatures: ({ attrs, effectiveFrame, hasTextBoxAnchor }: PageBreakRunParagraphFeatures) => PageBreakRunParagraphProjectionDisposition;
+declare const pageBreakRunParagraphProjectionDisposition: (paragraph: Node) => PageBreakRunParagraphProjectionDisposition;
+//#endregion
+export { PageBreakRunParagraphProjectionDisposition, PageBreakRunParagraphProjectionReason, pageBreakRunParagraphProjectionDisposition, pageBreakRunParagraphProjectionDispositionForFeatures };