@stll/folio-core 0.52.0 → 0.54.0

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

@@ -1,6 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-import { StyleEngine } from "../../style-engine/styleEngine.js";
-import "../../style-engine/index.js";
 import { ParseContext } from "../../docx/parseContext.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/conversion/toProseDoc.d.ts
@@ -26,15 +24,10 @@ type ToProseDocOptions = {
  */
 declare function toProseDoc(document: document_d_exports.Document, options?: ToProseDocOptions): Node;
 /**
- * Resolve an embedded character-style reference without importing
- * `docDefaults`. The caller already has the paragraph cascade, including
- * document defaults, and will layer these own properties over it.
+ * Whether a cell carries content a vertical-merge continuation must not hide.
+ * The reader keeps such a continuation as a cell of its own.
  */
-type ParagraphDefaultFormattingResolver = Pick<StyleEngine, "getStyle" | "getDocDefaults" | "getDefaultParagraphStyle" | "getDefaultCharacterStyle" | "getRunStyleOwnProperties">;
-/** @internal Recompute a paragraph's inherited run defaults from authored package state. */
-declare function resolveParagraphDefaultTextFormatting(styleId: string | undefined, formatting: document_d_exports.Paragraph["formatting"] | undefined, styleResolver: ParagraphDefaultFormattingResolver, options?: {
-  includeParagraphMarkRunProperties?: boolean;
-}): document_d_exports.TextFormatting | undefined;
+declare function tableCellHasMeaningfulContent(cell: document_d_exports.TableCell): boolean;
 declare function standaloneTableCellToProseMirror(cell: document_d_exports.TableCell, nodeType: "tableCell" | "tableHeader"): Node;
 /**
  * Convert HeaderFooter content (array of Paragraph/Table blocks) to a ProseMirror document.
@@ -51,4 +44,4 @@ declare function footnoteToProseDoc(content: document_d_exports.BlockContent[],
  */
 declare function createEmptyDoc(): Node;
 //#endregion
-export { ToProseDocOptions, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, resolveParagraphDefaultTextFormatting, standaloneTableCellToProseMirror, toProseDoc };
+export { ToProseDocOptions, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, tableCellHasMeaningfulContent, toProseDoc };

package/dist/prosemirror/conversion/toProseDoc.js

@@ -1,7 +1,6 @@
 import { rangedCommentIds } from "../../docx/commentAnchorIndex.js";
 import { resolveColorValueToHex } from "../../docx/drawingUtils.js";
 import { isInlineSdtContent, isTrackedChangeWrapperChild } from "../../docx/inlineWrapperContent.js";
-import { mergeParagraphNumbering as mergeParagraphNumbering$1, paragraphNumberingReferenceId as paragraphNumberingReferenceId$1 } from "../../docx/numberingReference.js";
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, createProseParagraphWithPropertySource, getDocumentParagraphPropertySourceContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithParagraphPropertySource, transportTableCellsWithParagraphPropertySources } from "../../docx/paragraphPropertySource.js";
 import { isBaselineVertAlign } from "../../docx/runParser.js";
 import { replayableShapeAlternateContent } from "../../docx/shapeAlternateContent.js";
@@ -13,7 +12,7 @@ import { createStyleEngine } from "../../style-engine/styleEngine.js";
 import { outlineAttrForDash } from "../../types/documentEnumValues.js";
 import { cssBorderStyleForDash } from "../../utils/borderCss.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
-import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
+import { mergeParagraphFormatting } from "../../utils/paragraphFormattingMerge.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels, emuToStrokePixels } from "../../utils/units.js";
@@ -22,6 +21,7 @@ import { expectInlineWrapperMarkAttrs, expectTrackedChangeMarkAttrs } from "../a
 import { authoredTransformAttrs } from "../authoredTransformAttrs.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { withEnclosingRevision } from "../contentControlRevisions.js";
+import { emptyFieldRunPropertyChanges } from "../emptyFieldResultRuns.js";
 import { planEmptyRanges } from "../emptyRangeAnchor.js";
 import { INLINE_WRAPPER_MARK_NAME } from "../extensions/marks/InlineWrapperExtension.js";
 import { textFormattingToMarks } from "../extensions/marks/markUtils.js";
@@ -34,14 +34,15 @@ import { stampNumberedRefFieldBaselines } from "../numberedRefFields.js";
 import { paragraphNumberingAttr } from "../numberingAttr.js";
 import { pageBreakRunParagraphProjectionDispositionForFeatures } from "../pageBreakRunProjection.js";
 import { directionFromBidi } from "../paragraphDirection.js";
-import { styleResolvedParagraphFormatting } from "../paragraphFormattingProvenance.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
 import { RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs } from "../runIdentity.js";
 import { continueRunIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.js";
 import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
 import { schema } from "../schema/index.js";
 import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
+import { extractTableParagraphOverlay, paragraphStyleCascadeAttrs, resolveRunFormattingWithoutDefaults } from "../styles/paragraphStyleCascade.js";
 import { cascadeStyleTextFormatting } from "../styles/styleToggleCascade.js";
+import { tableCellStyleRegions, tableRowBand } from "../styles/tableStyleRegions.js";
 import { canCarryTrackedRunMark, trackedRunInlineAtomDisposition } from "../trackedRunInlineAtoms.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
@@ -197,6 +198,7 @@ const collectPairedBookmarkIds = (blocks) => {
 				}
 				break;
 			case "blockSdt":
+			case "blockCustomXml":
 				visitBlocks(block.content);
 				break;
 			case "preservedBlock": break;
@@ -250,6 +252,9 @@ function toProseDoc(document, options) {
 			case "blockSdt":
 				out.push(convertBlockSdt(block, convertBodyBlocks));
 				break;
+			case "blockCustomXml":
+				out.push(convertBlockCustomXml(block, convertBodyBlocks));
+				break;
 			case "preservedBlock":
 				out.push(convertPreservedBlock(block));
 				break;
@@ -282,7 +287,10 @@ function toProseDoc(document, options) {
 * no index and nothing has to keep one honest as the blocks around it change.
 */
 function convertPreservedBlock(block) {
-	return schema.node("preservedBlock", { xml: block.xml });
+	return schema.node("preservedBlock", {
+		xml: block.xml,
+		readerText: block.readerText ?? null
+	});
 }
 /**
 * Carry a bookmark marker that stands between two blocks into the editor.
@@ -354,6 +362,15 @@ function convertBlockSdt(blockSdt, convertBlocks) {
 	if (children.length === 0) children.push(schema.node("paragraph", {}, []));
 	return schema.node("blockSdt", attrs, children);
 }
+function convertBlockCustomXml(block, convertBlocks) {
+	const children = convertBlocks(block.content);
+	if (children.length === 0) children.push(schema.node("paragraph", {}, []));
+	return schema.node("blockCustomXml", {
+		openingXml: block.openingXml,
+		closingXml: block.closingXml,
+		_originallyEmpty: block.content.length === 0
+	}, children);
+}
 /**
 * Convert a Paragraph to a ProseMirror paragraph node
 *
@@ -755,54 +772,15 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	};
 	let stylePpr;
 	if (styleResolver) {
-		stylePpr = styleResolver.resolveParagraphStyleInTable(styleId, tableParagraphOverlay).paragraphFormatting;
-		const resolvedFormatting = styleResolvedParagraphFormatting(stylePpr);
-		if (resolvedFormatting) attrs._resolvedFormatting = resolvedFormatting;
-		set("alignment", formatting?.alignment ?? stylePpr?.alignment);
-		set("alignmentFromStyle", stylePpr?.alignment);
-		set("spaceBefore", formatting?.spaceBefore ?? stylePpr?.spaceBefore);
-		set("spaceAfter", formatting?.spaceAfter ?? stylePpr?.spaceAfter);
-		set("lineSpacing", formatting?.lineSpacing ?? stylePpr?.lineSpacing);
-		set("lineSpacingRule", formatting?.lineSpacingRule ?? stylePpr?.lineSpacingRule);
-		set("lineSpacingExplicit", lineSpacingProvenanceFromSpacing(formatting));
-		set("snapToGrid", formatting?.snapToGrid ?? stylePpr?.snapToGrid);
-		set("spacingExplicit", formatting?.spacingExplicit);
-		const paragraphStyle = styleId ? styleResolver.getStyle(styleId) ?? styleResolver.getDefaultParagraphStyle() : styleResolver.getDefaultParagraphStyle();
-		const docDefaultSpacing = styleResolver.getDocDefaults()?.pPr;
-		const spacingFromStyle = {};
-		if (formatting?.spaceBefore === void 0 && stylePpr?.spaceBefore !== void 0) spacingFromStyle.before = true;
-		if (formatting?.spaceAfter === void 0 && stylePpr?.spaceAfter !== void 0) spacingFromStyle.after = true;
-		if (spacingFromStyle.before || spacingFromStyle.after) attrs.spacingFromImplicitDefaultStyle = spacingFromStyle;
-		const spacingFromDocDefaults = {};
-		if (formatting?.spaceBefore === void 0 && tableParagraphOverlay?.spaceBefore === void 0 && paragraphStyle?.pPr?.spaceBefore === void 0 && docDefaultSpacing?.spaceBefore !== void 0) spacingFromDocDefaults.before = true;
-		if (formatting?.spaceAfter === void 0 && tableParagraphOverlay?.spaceAfter === void 0 && paragraphStyle?.pPr?.spaceAfter === void 0 && docDefaultSpacing?.spaceAfter !== void 0) spacingFromDocDefaults.after = true;
-		if (spacingFromDocDefaults.before || spacingFromDocDefaults.after) attrs.spacingFromDocDefaults = spacingFromDocDefaults;
-		const effectiveIndent = mergeParagraphFormatting(formatting?.numPr?.kind === "none" && paragraphNumberingReferenceId$1(stylePpr?.numPr) !== void 0 ? void 0 : stylePpr, formatting);
-		set("indentLeft", effectiveIndent?.indentLeft);
-		set("indentRight", formatting?.indentRight ?? stylePpr?.indentRight);
-		set("indentFirstLine", effectiveIndent?.indentFirstLine);
-		set("hangingIndent", effectiveIndent?.hangingIndent);
-		set("borders", formatting?.borders ?? stylePpr?.borders);
-		set("shading", formatting?.shading ?? stylePpr?.shading);
-		set("tabs", mergeParagraphTabStops(stylePpr?.tabs, formatting?.tabs));
-		set("kinsoku", formatting?.kinsoku ?? stylePpr?.kinsoku);
-		set("overflowPunctuation", formatting?.overflowPunctuation ?? stylePpr?.overflowPunctuation);
-		set("suppressAutoHyphens", formatting?.suppressAutoHyphens ?? stylePpr?.suppressAutoHyphens);
-		set("pageBreakBefore", formatting?.pageBreakBefore ?? stylePpr?.pageBreakBefore);
-		set("keepNext", formatting?.keepNext ?? stylePpr?.keepNext);
-		set("keepLines", formatting?.keepLines ?? stylePpr?.keepLines);
-		set("widowControl", formatting?.widowControl ?? stylePpr?.widowControl);
-		set("contextualSpacing", formatting?.contextualSpacing ?? stylePpr?.contextualSpacing);
-		set("runInWithNext", formatting?.runInWithNext ?? stylePpr?.runInWithNext);
-		set("outlineLevel", formatting?.outlineLevel ?? stylePpr?.outlineLevel);
-		set("direction", directionFromBidi(formatting?.bidi ?? stylePpr?.bidi));
-		set("defaultTextFormatting", resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, { includeParagraphMarkRunProperties: tableOfContentsLevel === void 0 && (styleId === void 0 || paragraph.content.length === 0) }));
-		const styleNumbering = stylePpr?.numPr;
-		if (styleNumbering?.kind === "reference" && (formatting?.numPr === void 0 || formatting.numPr.kind === "levelOnly")) {
-			const merged = mergeParagraphNumbering$1(styleNumbering, formatting?.numPr);
-			if (merged !== void 0) attrs.numPr = paragraphNumberingAttr(merged);
-			attrs.numPrFromStyle = paragraphNumberingAttr(styleNumbering);
-		}
+		const cascade = paragraphStyleCascadeAttrs({
+			styleId,
+			formatting,
+			styleResolver,
+			tableParagraphOverlay,
+			includeParagraphMarkRunProperties: tableOfContentsLevel === void 0 && (styleId === void 0 || paragraph.content.length === 0)
+		});
+		stylePpr = cascade.stylePpr;
+		Object.assign(attrs, cascade.attrs);
 	} else {
 		set("alignment", formatting?.alignment);
 		set("spaceBefore", formatting?.spaceBefore);
@@ -850,21 +828,6 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	};
 }
 /**
-* Pick the modeled paragraph fields out of a table style's (or conditional
-* region's) `w:pPr` for use as the cell-paragraph cascade overlay.
-*/
-function extractTableParagraphOverlay(pPr) {
-	if (!pPr) return;
-	const overlay = {};
-	if (pPr.spaceBefore !== void 0) overlay.spaceBefore = pPr.spaceBefore;
-	if (pPr.spaceAfter !== void 0) overlay.spaceAfter = pPr.spaceAfter;
-	if (pPr.lineSpacing !== void 0) overlay.lineSpacing = pPr.lineSpacing;
-	if (pPr.lineSpacingRule !== void 0) overlay.lineSpacingRule = pPr.lineSpacingRule;
-	if (pPr.contextualSpacing !== void 0) overlay.contextualSpacing = pPr.contextualSpacing;
-	if (pPr.frame !== void 0) overlay.frame = pPr.frame;
-	return Object.keys(overlay).length > 0 ? overlay : void 0;
-}
-/**
 * Resolve table style conditional formatting
 */
 function resolveTableStyleConditional(styleResolver, tableStyleId, conditionType) {
@@ -930,45 +893,6 @@ function resolveTextFormatting(formatting, styleResolver) {
 	if (!styleResolver) return formatting;
 	return mergeTextFormatting(styleResolver.resolveRunStyle(formatting.styleId), formatting);
 }
-function resolveRunFormattingWithoutDefaults(formatting, styleResolver) {
-	if (!formatting || !styleResolver) return formatting;
-	return cascadeStyleTextFormatting([{
-		formatting: formatting.styleId ? styleResolver.getRunStyleOwnProperties(formatting.styleId) : void 0,
-		type: "style"
-	}, {
-		formatting,
-		type: "direct"
-	}]).formatting;
-}
-/** @internal Recompute a paragraph's inherited run defaults from authored package state. */
-function resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, options = {}) {
-	const style = styleId ? styleResolver.getStyle(styleId) ?? styleResolver.getDefaultParagraphStyle() : styleResolver.getDefaultParagraphStyle();
-	const paragraphStyleRpr = style?.type === "paragraph" ? style.rPr : void 0;
-	const rawParagraphMarkRpr = options.includeParagraphMarkRunProperties === false ? void 0 : formatting?.runProperties;
-	const paragraphRunProperties = rawParagraphMarkRpr ? stripParagraphMarkOnlyFormatting(resolveRunFormattingWithoutDefaults(rawParagraphMarkRpr, styleResolver) ?? {}) : void 0;
-	const orderedBodyToggleFormatting = cascadeStyleTextFormatting([
-		{
-			formatting: styleResolver.getDocDefaults()?.rPr,
-			type: "defaults"
-		},
-		{
-			formatting: paragraphStyleRpr,
-			type: "style"
-		},
-		{
-			formatting: styleResolver.getDefaultCharacterStyle()?.rPr,
-			type: "style"
-		}
-	], { ordinaryFormatting: mergeTextFormatting(mergeTextFormatting(styleResolver.getDocDefaults()?.rPr, styleResolver.getDefaultCharacterStyle()?.rPr), paragraphStyleRpr) });
-	const bodyRunDefaults = orderedBodyToggleFormatting.formatting;
-	return cascadeStyleTextFormatting([{
-		cascade: orderedBodyToggleFormatting,
-		type: "carried"
-	}, {
-		formatting: paragraphRunProperties,
-		type: "direct"
-	}], { ordinaryFormatting: mergeTextFormatting(bodyRunDefaults, paragraphRunProperties) }).formatting;
-}
 function calculateRowSpans(table) {
 	const result = /* @__PURE__ */ new Map();
 	const numRows = table.rows.length;
@@ -1065,6 +989,10 @@ function closeVerticalMerge(activeMerges, result, colIndex) {
 function clearActiveVerticalMerges(activeMerges, result) {
 	for (const colIndex of [...activeMerges.keys()]) closeVerticalMerge(activeMerges, result, colIndex);
 }
+/**
+* Whether a cell carries content a vertical-merge continuation must not hide.
+* The reader keeps such a continuation as a cell of its own.
+*/
 function tableCellHasMeaningfulContent(cell) {
 	return cell.content.some(blockHasMeaningfulContent);
 }
@@ -1072,7 +1000,7 @@ function blockHasMeaningfulContent(block) {
 	if (block.type === "preservedBlock") return true;
 	if (block.type === "bookmarkStart" || block.type === "bookmarkEnd") return true;
 	if (block.type === "table") return block.rows.some((row) => row.cells.some((cell) => tableCellHasMeaningfulContent(cell)));
-	if (block.type === "blockSdt") return true;
+	if (block.type === "blockSdt" || block.type === "blockCustomXml") return true;
 	return block.content.some(paragraphContentHasMeaningfulContent);
 }
 function paragraphContentHasMeaningfulContent(content) {
@@ -1132,6 +1060,7 @@ function convertTable(table, styleResolver, context) {
 	if (table.propertyChanges && table.propertyChanges.length > 0) attrs.tblPrChange = [...table.propertyChanges];
 	if (table.bookmarks && table.bookmarks.length > 0) attrs._bookmarks = table.bookmarks;
 	if (hasSinkChildren(table.preserved)) attrs._preserved = table.preserved;
+	if (table.carrierStack?.length) attrs.carrierStack = table.carrierStack;
 	const conditionalStyles = {};
 	const setCS = (key, type) => {
 		const val = resolveTableStyleConditional(styleResolver, conditionalTableStyleId, type);
@@ -1152,24 +1081,13 @@ function convertTable(table, styleResolver, context) {
 	setCS("neCell", "neCell");
 	setCS("swCell", "swCell");
 	setCS("seCell", "seCell");
-	const bandingEnabledH = !look.noHBand;
-	const bandingEnabledV = !look.noVBand;
-	let dataRowIndex = 0;
 	const totalRows = table.rows.length;
 	const gridColumnCount = columnWidths?.length ?? 0;
 	const totalColumns = gridColumnCount > 0 ? gridColumnCount : countTableColumns(table.rows);
 	const rows = table.rows.map((row, rowIndex) => {
 		const isFirstRowStyled = rowIndex === 0 && look.firstRow;
-		const isLastRow = rowIndex === totalRows - 1 && look.lastRow;
-		const rowBandStyle = (() => {
-			if (bandingEnabledH && !isFirstRowStyled && !isLastRow) return (() => {
-				if (dataRowIndex % 2 === 0) return conditionalStyles.band1Horz;
-				return conditionalStyles.band2Horz;
-			})();
-		})();
-		if (bandingEnabledH && !isFirstRowStyled && !isLastRow) dataRowIndex++;
 		const resolvedRowJustification = tableStyle?.trPr?.justification ?? fallbackTableStyle?.trPr?.justification;
-		return convertTableRow(row, styleResolver, context, isFirstRowStyled, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, look, resolvedTableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, cellMarginsAttr, resolvedRowJustification);
+		return convertTableRow(row, styleResolver, context, isFirstRowStyled, columnWidths, totalWidth, conditionalStyles, tableRowBand(look, rowIndex, totalRows), look, resolvedTableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, cellMarginsAttr, resolvedRowJustification);
 	});
 	return schema.node("table", attrs, rows);
 }
@@ -1199,7 +1117,7 @@ function createOmittedGridSlotCell({ colspan, slot, columnWidths, totalWidth, st
 /**
 * Convert a TableRow to a ProseMirror table row node
 */
-function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, tableLook, tableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, defaultCellMargins, resolvedJustification) {
+function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths, totalWidth, conditionalStyles, rowBand, tableLook, tableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, defaultCellMargins, resolvedJustification) {
 	const attrsWithoutStructuralChange = { isHeader: !!row.formatting?.header };
 	if (row.formatting?.height?.value !== void 0) attrsWithoutStructuralChange.height = row.formatting.height.value;
 	if (row.formatting?.heightRule) attrsWithoutStructuralChange.heightRule = row.formatting.heightRule;
@@ -1212,6 +1130,7 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 	if (row.preservedAttributes && row.preservedAttributes.length > 0) attrsWithoutStructuralChange._preservedAttributes = row.preservedAttributes;
 	if (row.bookmarks && row.bookmarks.length > 0) attrsWithoutStructuralChange._bookmarks = row.bookmarks;
 	if (row.contentControls && row.contentControls.length > 0) attrsWithoutStructuralChange.contentControls = row.contentControls;
+	if (row.carrierStack?.length) attrsWithoutStructuralChange.carrierStack = row.carrierStack;
 	if (hasSinkChildren(row.preserved)) attrsWithoutStructuralChange._preserved = row.preserved;
 	let attrs = attrsWithoutStructuralChange;
 	const rowStructuralChange = row.structuralChange;
@@ -1248,8 +1167,6 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 	const isFirstRow = rowIndex === 0;
 	const isLastRow = rowIndex === (totalRows ?? 1) - 1;
 	const rowCnf = row.formatting?.conditionalFormat;
-	const rowIsFirstRow = rowCnf?.firstRow ?? isFirstRow;
-	const rowIsLastRow = rowCnf?.lastRow ?? isLastRow;
 	const totalCols = totalColumns != null && totalColumns > 0 ? totalColumns : Math.max(numCells, 1);
 	let effectiveCells = row.cells;
 	const uncoveredColumns = Math.max(0, totalCols - gridBefore - gridAfter);
@@ -1288,35 +1205,18 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 		if (shouldSkip) continue;
 		const isFirstCol = colIndex - colspan === 0;
 		const isLastCol = colIndex === totalCols;
-		const cellCnf = cell.formatting?.conditionalFormat;
-		const cellIsFirstRow = cellCnf?.firstRow ?? rowIsFirstRow;
-		const cellIsLastRow = cellCnf?.lastRow ?? rowIsLastRow;
-		const cellIsFirstCol = cellCnf?.firstColumn ?? isFirstCol;
-		const cellIsLastCol = cellCnf?.lastColumn ?? isLastCol;
-		let vertBandStyle;
-		if (bandingEnabledV) {
-			const firstColOffset = tableLook?.firstColumn ? 1 : 0;
-			const bandColIndex = colIndex - colspan - firstColOffset;
-			if (bandColIndex >= 0 && !(tableLook?.lastColumn && cellIsLastCol) && !(tableLook?.firstColumn && cellIsFirstCol)) vertBandStyle = bandColIndex % 2 === 0 ? conditionalStyles?.band1Vert : conditionalStyles?.band2Vert;
-		}
-		if (cellCnf?.oddVBand) vertBandStyle = conditionalStyles?.band1Vert;
-		else if (cellCnf?.evenVBand) vertBandStyle = conditionalStyles?.band2Vert;
-		let effectiveRowBandStyle = rowBandStyle;
-		if (rowCnf?.oddHBand) effectiveRowBandStyle = conditionalStyles?.band1Horz;
-		else if (rowCnf?.evenHBand) effectiveRowBandStyle = conditionalStyles?.band2Horz;
-		if (cellCnf?.oddHBand) effectiveRowBandStyle = conditionalStyles?.band1Horz;
-		else if (cellCnf?.evenHBand) effectiveRowBandStyle = conditionalStyles?.band2Horz;
-		let cellConditionalStyle = conditionalStyles?.wholeTable;
-		cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, effectiveRowBandStyle);
-		cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, vertBandStyle);
-		if (cellIsFirstCol && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.firstCol);
-		if (cellIsLastCol && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.lastCol);
-		if (cellIsFirstRow && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.firstRow);
-		if (cellIsLastRow && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.lastRow);
-		if (cellIsFirstRow && cellIsFirstCol && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow) && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.nwCell);
-		if (cellIsFirstRow && cellIsLastCol && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.neCell);
-		if (cellIsLastRow && cellIsFirstCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.swCell);
-		if (cellIsLastRow && cellIsLastCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.seCell);
+		let cellConditionalStyle;
+		for (const region of tableCellStyleRegions({
+			look: tableLook ?? resolveTableLook(void 0),
+			rowIndex: rowIndex ?? 0,
+			totalRows: totalRows ?? 1,
+			column: colIndex - colspan,
+			colspan,
+			totalColumns: totalCols,
+			rowBand,
+			rowConditionalFormat: rowCnf,
+			cellConditionalFormat: cell.formatting?.conditionalFormat
+		})) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.[region]);
 		cells.push(convertTableCell({
 			cell,
 			styleResolver,
@@ -1394,6 +1294,7 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 	if (formatting) attrs._originalFormatting = formatting;
 	if (cell.propertyChanges && cell.propertyChanges.length > 0) attrs.tcPrChange = [...cell.propertyChanges];
 	if (cell.contentControls && cell.contentControls.length > 0) attrs.contentControls = cell.contentControls;
+	if (cell.carrierStack?.length) attrs.carrierStack = cell.carrierStack;
 	const cellStructuralChange = cell.structuralChange;
 	if (cellStructuralChange) {
 		const info = {
@@ -1448,6 +1349,9 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 			case "blockSdt":
 				nodes.push(convertBlockSdt(block, convertCellBlocks));
 				break;
+			case "blockCustomXml":
+				nodes.push(convertBlockCustomXml(block, convertCellBlocks));
+				break;
 			case "preservedBlock":
 				nodes.push(convertPreservedBlock(block));
 				break;
@@ -1548,7 +1452,10 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 	const hasConvertedPreservedContent = inlineNodes.some((node) => node.type.name === "preservedXml");
 	const hasConvertedWrapperContent = inlineNodes.some((node) => node.marks.some((mark) => mark.type.name === INLINE_WRAPPER_MARK_NAME));
 	const createStructuredField = hasConvertedPageBreakContent || hasConvertedPreservedContent || hasStructuredSourceContent && (hasConvertedHyperlinkContent || hasConvertedWrapperContent);
-	if (!createStructuredField && fieldPropertyChanges && fieldPropertyChanges.length > 0) marks.push(schema.mark("runPropertyChange", { changes: [...fieldPropertyChanges] }));
+	const resultRuns = field.type === "simpleField" ? field.content.flatMap((content) => content.type === "run" ? [content] : []) : field.fieldResult;
+	const emptyResultRuns = displayText === "" && resultRuns.length > 0 && (field.type === "complexField" || field.content.length === resultRuns.length) && resultRuns.every((run) => run.content.every((item) => item.type === "text" && item.text === "")) ? resultRuns : void 0;
+	const resultPropertyChanges = emptyResultRuns ? emptyFieldRunPropertyChanges(emptyResultRuns) : fieldPropertyChanges;
+	if (!createStructuredField && resultPropertyChanges && resultPropertyChanges.length > 0) marks.push(schema.mark("runPropertyChange", { changes: [...resultPropertyChanges] }));
 	return schema.node(createStructuredField ? "structuredField" : "field", {
 		fieldType: field.fieldType,
 		instruction: field.instruction,
@@ -1556,7 +1463,13 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 		fieldKind: field.type === "simpleField" ? "simple" : "complex",
 		fldLock: field.fldLock ?? null,
 		dirty: field.dirty ?? null,
-		fieldResultIsFallback: field.type === "complexField" ? field.fieldResultIsFallback ?? null : null
+		fieldResultIsFallback: field.type === "complexField" ? field.fieldResultIsFallback ?? null : null,
+		formFieldDataXml: field.type === "complexField" ? field.formFieldDataXml ?? null : null,
+		_docxEmptyResultRuns: emptyResultRuns ?? null,
+		_docxFieldCode: field.type === "complexField" && field.fieldCode.length > 0 ? {
+			instruction: field.instruction,
+			runs: field.fieldCode
+		} : null
 	}, createStructuredField ? inlineNodes : void 0, marks);
 }
 /**
@@ -2897,6 +2810,9 @@ function headerFooterToProseDoc(content, options) {
 			case "blockSdt":
 				out.push(convertBlockSdt(block, convertBlocks));
 				break;
+			case "blockCustomXml":
+				out.push(convertBlockCustomXml(block, convertBlocks));
+				break;
 			case "preservedBlock":
 				out.push(convertPreservedBlock(block));
 				break;
@@ -2924,4 +2840,4 @@ function createEmptyDoc() {
 	return schema.node("doc", null, [schema.node("paragraph", {}, [])]);
 }
 //#endregion
-export { createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, resolveParagraphDefaultTextFormatting, standaloneTableCellToProseMirror, toProseDoc };
+export { createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, tableCellHasMeaningfulContent, toProseDoc };

package/dist/prosemirror/documentSchema.d.ts

@@ -0,0 +1,8 @@
+import { MarkType, Schema } from "prosemirror-model";
+//#region src/prosemirror/documentSchema.d.ts
+/** `type`'s counterpart in the schema of `state`. */
+declare const documentMarkType: (state: {
+  readonly schema: Schema;
+}, type: MarkType) => MarkType;
+//#endregion
+export { documentMarkType };

package/dist/prosemirror/documentSchema.js

@@ -0,0 +1,18 @@
+import { panic } from "better-result";
+//#region src/prosemirror/documentSchema.ts
+/**
+* The document's own mark types.
+*
+* An extension sees the schema its runtime was built with, but the editor it
+* runs in may hold a document of another schema instance with the same specs:
+* header, footer and note editors each build a runtime of their own, while
+* every document is parsed into the shared schema. Marks made from the
+* runtime's types do not belong to such a document, and a runtime type
+* compared against the document's marks never matches. Commands therefore
+* resolve the types they build with, and compare against, through the state
+* they act on.
+*/
+/** `type`'s counterpart in the schema of `state`. */
+const documentMarkType = (state, type) => type.schema === state.schema ? type : state.schema.marks[type.name] ?? panic(`The document schema has no mark ${type.name}`);
+//#endregion
+export { documentMarkType };

package/dist/prosemirror/emptyFieldResultRuns.d.ts

@@ -0,0 +1,18 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/prosemirror/emptyFieldResultRuns.d.ts
+/** The single field mark lists every revision held by its invisible result runs. */
+declare const emptyFieldRunPropertyChanges: (runs: readonly document_d_exports.Run[]) => document_d_exports.RunPropertyChange[];
+type ResolveEmptyFieldResultRunsOptions = {
+  runs: readonly document_d_exports.Run[];
+  mode: "accept" | "reject";
+  revisionIds: ReadonlySet<number> | null;
+};
+type ResolvedEmptyFieldResultRuns = {
+  runs: document_d_exports.Run[];
+  visibleFormatting: document_d_exports.TextFormatting | undefined;
+  visibleFormattingChanged: boolean;
+};
+/** Resolve each authored run separately; a field mark carries their combined revisions. */
+declare const resolveEmptyFieldResultRuns: ({ runs, mode, revisionIds }: ResolveEmptyFieldResultRunsOptions) => ResolvedEmptyFieldResultRuns | null;
+//#endregion
+export { emptyFieldRunPropertyChanges, resolveEmptyFieldResultRuns };

package/dist/prosemirror/emptyFieldResultRuns.js

@@ -0,0 +1,33 @@
+import { canonicalJson } from "../utils/canonicalJson.js";
+//#region src/prosemirror/emptyFieldResultRuns.ts
+/** The single field mark lists every revision held by its invisible result runs. */
+const emptyFieldRunPropertyChanges = (runs) => runs.flatMap((run) => run.propertyChanges ?? []);
+const visibleFormatting = (runs) => runs.find((run) => run.formatting !== void 0)?.formatting;
+/** Resolve each authored run separately; a field mark carries their combined revisions. */
+const resolveEmptyFieldResultRuns = ({ runs, mode, revisionIds }) => {
+	let changed = false;
+	const resolved = runs.map((run) => {
+		const matches = run.propertyChanges?.filter((change) => revisionIds === null || revisionIds.has(change.info.id));
+		if (!matches?.length) return run;
+		changed = true;
+		const remaining = run.propertyChanges?.filter((change) => revisionIds !== null && !revisionIds.has(change.info.id));
+		const formatting = mode === "reject" ? matches.at(0)?.previousFormatting : run.formatting;
+		return {
+			type: "run",
+			content: run.content,
+			...formatting !== void 0 ? { formatting } : {},
+			...remaining?.length ? { propertyChanges: remaining } : {},
+			...run.preservedAttributes ? { preservedAttributes: run.preservedAttributes } : {}
+		};
+	});
+	if (!changed) return null;
+	const before = visibleFormatting(runs);
+	const after = visibleFormatting(resolved);
+	return {
+		runs: resolved,
+		visibleFormatting: after,
+		visibleFormattingChanged: canonicalJson(before) !== canonicalJson(after)
+	};
+};
+//#endregion
+export { emptyFieldRunPropertyChanges, resolveEmptyFieldResultRuns };

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

@@ -1,6 +1,6 @@
 import { AnyExtension, CommandFactory, CommandMap, FolioCommandArguments, FolioCommandName } from "./types.js";
-import { Plugin } from "prosemirror-state";
 import { Schema } from "prosemirror-model";
+import { Plugin } from "prosemirror-state";
 //#region src/prosemirror/extensions/ExtensionManager.d.ts
 declare class ExtensionManager {
   private readonly extensions;

package/dist/prosemirror/extensions/ExtensionManager.js

@@ -1,3 +1,4 @@
+import { areTransactionInvariantsEnabled, createTransactionInvariantPlugin } from "../plugins/transactionInvariants.js";
 import { createTextInputPlugin } from "../textInput.js";
 import { panic } from "better-result";
 import { Schema } from "prosemirror-model";
@@ -50,7 +51,8 @@ var ExtensionManager = class {
 		this.plugins = [
 			createTextInputPlugin(),
 			...allPlugins,
-			...allKeyboardShortcuts.map((shortcuts) => keymap(shortcuts))
+			...allKeyboardShortcuts.map((shortcuts) => keymap(shortcuts)),
+			...areTransactionInvariantsEnabled() ? [createTransactionInvariantPlugin()] : []
 		];
 		this.commands = allCommands;
 	}

package/dist/prosemirror/extensions/StarterKit.js

@@ -11,6 +11,7 @@ import { EmptyParagraphFormatExtension } from "./features/EmptyParagraphFormatEx
 import { GapCursorExtension } from "./features/GapCursorExtension.js";
 import { ImageDragExtension } from "./features/ImageDragExtension.js";
 import { ImagePasteExtension } from "./features/ImagePasteExtension.js";
+import { JoinedRunStyleExtension } from "./features/JoinedRunStyleExtension.js";
 import { ListExtension } from "./features/ListExtension.js";
 import { ParaIdAllocatorExtension } from "./features/ParaIdAllocatorExtension.js";
 import { ParagraphChangeTrackerExtension } from "./features/ParagraphChangeTrackerExtension.js";
@@ -19,6 +20,7 @@ import { PasteStyleInlinerExtension } from "./features/PasteStyleInlinerExtensio
 import { SelectionTrackerExtension } from "./features/SelectionTrackerExtension.js";
 import { MARK_EXTENSIONS, MARK_NESTING_ORDER } from "./markRegistry.js";
 import { BlockBookmarkBoundaryExtension } from "./nodes/BlockBookmarkBoundaryExtension.js";
+import { BlockCustomXmlExtension } from "./nodes/BlockCustomXmlExtension.js";
 import { BlockSdtExtension } from "./nodes/BlockSdtExtension.js";
 import { BookmarkBoundaryExtension } from "./nodes/BookmarkBoundaryExtension.js";
 import { CommentReferenceExtension } from "./nodes/CommentReferenceExtension.js";
@@ -86,10 +88,11 @@ function createStarterKit(options = {}) {
 	add("pageBreak", PageBreakExtension());
 	add("pageBreakRun", PageBreakRunExtension());
 	add("renderedPageBreak", RenderedPageBreakExtension());
-	add("field", FieldExtension());
+	add("field", FieldExtension({ getInternalClipboardToken }));
 	add("field", StructuredFieldExtension({ getInternalClipboardToken }));
 	add("sdt", SdtExtension());
 	add("blockSdt", BlockSdtExtension());
+	add("blockCustomXml", BlockCustomXmlExtension());
 	add("preservedBlock", PreservedBlockExtension());
 	add("math", MathExtension());
 	if (!disabled.has("table")) extensions.push(...createTableExtensions());
@@ -98,6 +101,7 @@ function createStarterKit(options = {}) {
 	add("list", ListExtension());
 	add("baseKeymap", BaseKeymapExtension());
 	add("emptyParagraphFormat", EmptyParagraphFormatExtension());
+	add("joinedRunStyle", JoinedRunStyleExtension());
 	add("selectionTracker", options.onSelectionChange === void 0 ? SelectionTrackerExtension() : SelectionTrackerExtension({ onSelectionChange: options.onSelectionChange }));
 	add("paraIdAllocator", ParaIdAllocatorExtension());
 	add("paragraphChangeTracker", ParagraphChangeTrackerExtension());

package/dist/prosemirror/extensions/core/DocExtension.js

@@ -14,7 +14,7 @@ const DocExtension = createNodeExtension({
 			_adjustLineHeightInTable: { default: false },
 			_doNotUseIndentAsNumberingTabStop: { default: false }
 		},
-		content: "(paragraph | horizontalRule | pageBreak | table | textBox | blockSdt | preservedBlock | blockBookmarkBoundary)+"
+		content: "(paragraph | horizontalRule | pageBreak | table | textBox | blockSdt | blockCustomXml | preservedBlock | blockBookmarkBoundary)+"
 	}
 });
 //#endregion