@stll/folio-core 0.35.1 → 0.37.0

package/dist/controller/noteEditorManager.js

@@ -5,6 +5,7 @@ import { ExtensionManager } from "../prosemirror/extensions/ExtensionManager.js"
 import { createStarterKit } from "../prosemirror/extensions/StarterKit.js";
 import { ensureBaseDirectionInState } from "../prosemirror/extensions/features/AutoBidiDetectionExtension.js";
 import { ensureParaIdsInState } from "../prosemirror/extensions/features/ParaIdAllocatorExtension.js";
+import { createDocumentNumberingPlugin } from "../prosemirror/plugins/documentNumbering.js";
 import { createDocumentStylesPlugin } from "../prosemirror/plugins/documentStyles.js";
 import { schema } from "../prosemirror/schema/index.js";
 import { EditorState } from "prosemirror-state";
@@ -31,14 +32,15 @@ const noteToProseDocument = (note, styles, theme) => {
 	if (theme !== void 0) options.theme = theme;
 	return footnoteToProseDoc(note.content, options);
 };
-const buildInitialState = (document, styles, manager, externalPlugins) => {
+const buildInitialState = (document, styles, numbering, manager, externalPlugins) => {
 	return ensureBaseDirectionInState(ensureParaIdsInState(EditorState.create({
 		doc: document,
 		schema,
 		plugins: [
 			...manager.getPlugins(),
 			...externalPlugins,
-			createDocumentStylesPlugin(styles)
+			createDocumentStylesPlugin(styles),
+			createDocumentNumberingPlugin(numbering)
 		]
 	})));
 };
@@ -65,6 +67,7 @@ const createNoteEditorManager = (deps) => {
 		const document = deps.getDocument();
 		const styles = deps.getStyles();
 		const theme = deps.getTheme();
+		const numbering = document?.package.numbering;
 		const externalPlugins = deps.getPlugins?.() ?? EMPTY_PLUGINS;
 		const wanted = new Map(enumerateDocumentNoteStories(document).map((story) => [storyMapKey(story), story]));
 		const activeKey = active ? storyMapKey(active) : null;
@@ -81,18 +84,19 @@ const createNoteEditorManager = (deps) => {
 			if (existing) {
 				if (existing.mountNode.parentElement !== host) host.append(existing.mountNode);
 				const nextProseDocument = noteToProseDocument(note, styles, theme);
-				const contextIsCurrent = existing.appliedStyles === styles && existing.appliedTheme === theme && existing.appliedPlugins === externalPlugins;
+				const contextIsCurrent = existing.appliedStyles === styles && existing.appliedTheme === theme && existing.appliedNumbering === numbering && existing.appliedPlugins === externalPlugins;
 				if ((existing.appliedNote === note && existing.appliedContent === note.content || existing.appliedProseDocument.eq(nextProseDocument)) && contextIsCurrent) {
 					existing.appliedNote = note;
 					existing.appliedContent = note.content;
 					existing.appliedProseDocument = nextProseDocument;
 					continue;
 				}
-				existing.view.updateState(buildInitialState(nextProseDocument, styles, existing.manager, externalPlugins));
+				existing.view.updateState(buildInitialState(nextProseDocument, styles, numbering, existing.manager, externalPlugins));
 				existing.appliedNote = note;
 				existing.appliedContent = note.content;
 				existing.appliedStyles = styles;
 				existing.appliedTheme = theme;
+				existing.appliedNumbering = numbering;
 				existing.appliedPlugins = externalPlugins;
 				existing.appliedProseDocument = nextProseDocument;
 				existing.dirty = false;
@@ -107,7 +111,7 @@ const createNoteEditorManager = (deps) => {
 			host.append(mountNode);
 			const proseDocument = noteToProseDocument(note, styles, theme);
 			const view = new EditorView(mountNode, {
-				state: buildInitialState(proseDocument, styles, manager, externalPlugins),
+				state: buildInitialState(proseDocument, styles, numbering, manager, externalPlugins),
 				dispatchTransaction(transaction) {
 					view.updateState(view.state.apply(transaction));
 					const mountedStory = mounted.get(key);
@@ -123,6 +127,7 @@ const createNoteEditorManager = (deps) => {
 			mounted.set(key, {
 				appliedContent: note.content,
 				appliedNote: note,
+				appliedNumbering: numbering,
 				appliedPlugins: externalPlugins,
 				appliedProseDocument: proseDocument,
 				appliedStyles: styles,
@@ -169,7 +174,7 @@ const createNoteEditorManager = (deps) => {
 					}
 					const updated = {
 						...current,
-						content: proseDocToBlocks(story.view.state.doc)
+						content: proseDocToBlocks(story.view.state.doc, current.content, document.package.styles)
 					};
 					footnotes[index] = updated;
 					story.appliedNote = updated;
@@ -186,7 +191,7 @@ const createNoteEditorManager = (deps) => {
 				}
 				const updated = {
 					...current,
-					content: proseDocToBlocks(story.view.state.doc)
+					content: proseDocToBlocks(story.view.state.doc, current.content, document.package.styles)
 				};
 				endnotes[index] = updated;
 				story.appliedNote = updated;

package/dist/display-list/build/headerFooterPrimitives.js

@@ -28,6 +28,7 @@ const paintHeaderFooter = ({ composer, page, section, content, distancePx, conte
 			xPx: page.margins.left,
 			yPx: originYPx,
 			widthPx: page.size.w - page.margins.left - page.margins.right,
+			page,
 			context: {
 				...context,
 				story

package/dist/display-list/build/storyPrimitives.d.ts

@@ -1,4 +1,4 @@
-import { FlowBlock, Measure } from "../../layout-engine/types.js";
+import { FlowBlock, Measure, Page } from "../../layout-engine/types.js";
 import { BuildContext } from "./buildContext.js";
 import { PageComposer } from "./regions.js";
 //#region src/display-list/build/storyPrimitives.d.ts
@@ -13,6 +13,9 @@ type PaintStoryOptions = {
   readonly context: BuildContext;
   readonly label: string;
 };
+type PaintHeaderFooterStoryOptions = PaintStoryOptions & {
+  readonly page: Page;
+};
 /**
  * A footnote body: every block stacks by its measured height, which is the
  * height the paginator reserved the band from.
@@ -24,6 +27,6 @@ declare const paintFootnoteBlocks: ({ composer, blocks, measures, xPx, yPx, widt
  * they are reported rather than painted: their position resolves against page
  * and margin anchors the display list producer does not carry.
  */
-declare const paintHeaderFooterBlocks: ({ composer, blocks, measures, xPx, yPx, widthPx, context, label }: PaintStoryOptions) => void;
+declare const paintHeaderFooterBlocks: ({ composer, blocks, measures, xPx, yPx, widthPx, page, context, label }: PaintHeaderFooterStoryOptions) => void;
 //#endregion
 export { PaintStoryOptions, paintFootnoteBlocks, paintHeaderFooterBlocks };

package/dist/display-list/build/storyPrimitives.js

@@ -1,6 +1,7 @@
 import { isFloatingImageRun, isFloatingTextBoxBlock } from "../../layout-engine/types.js";
+import { resolveAnchoredImagePosition } from "../../layout-painter/anchoredImagePosition.js";
 import { HIT_REGION_KINDS } from "../primitives.js";
-import { paintImageFragment } from "./imagePrimitives.js";
+import { paintImage, paintImageFragment } from "./imagePrimitives.js";
 import { paintParagraphFragment } from "./paragraphPrimitives.js";
 import { blockRegion } from "./regions.js";
 import { paintTableFragment } from "./tablePrimitives.js";
@@ -150,6 +151,47 @@ const measuredHeightPx = (measure) => {
 		default: return 0;
 	}
 };
+const paintHeaderFooterFloatingImage = ({ composer, run, block, paragraphYPx, page, context, label }) => {
+	const contentWidth = page.size.w - page.margins.left - page.margins.right;
+	const geometry = {
+		pageWidth: page.size.w,
+		pageHeight: page.size.h,
+		marginLeft: page.margins.left,
+		marginTop: page.margins.top,
+		marginRight: page.margins.right,
+		marginBottom: page.margins.bottom,
+		...page.authoredMargins === void 0 ? {} : { authoredMargins: page.authoredMargins },
+		contentWidth,
+		contentHeight: page.size.h - page.margins.top - page.margins.bottom
+	};
+	const position = resolveAnchoredImagePosition(run, paragraphYPx - page.margins.top, geometry);
+	const fragment = {
+		blockId: block.id,
+		x: page.margins.left + position.x,
+		y: page.margins.top + position.y,
+		width: run.width,
+		height: run.height,
+		...run.pmStart === void 0 ? {} : { pmStart: run.pmStart },
+		...run.pmEnd === void 0 ? {} : { pmEnd: run.pmEnd }
+	};
+	composer.region(blockRegion({
+		fragment,
+		kind: HIT_REGION_KINDS.image,
+		context
+	}), () => {
+		composer.push(paintImage({
+			source: run,
+			rect: {
+				xPx: fragment.x,
+				yPx: fragment.y,
+				widthPx: fragment.width,
+				heightPx: fragment.height
+			},
+			context,
+			label: `${label} floating image`
+		}));
+	});
+};
 /**
 * A footnote body: every block stacks by its measured height, which is the
 * height the paginator reserved the band from.
@@ -182,7 +224,7 @@ const paintFootnoteBlocks = ({ composer, blocks, measures, xPx, yPx, widthPx, co
 * they are reported rather than painted: their position resolves against page
 * and margin anchors the display list producer does not carry.
 */
-const paintHeaderFooterBlocks = ({ composer, blocks, measures, xPx, yPx, widthPx, context, label }) => {
+const paintHeaderFooterBlocks = ({ composer, blocks, measures, xPx, yPx, widthPx, page, context, label }) => {
 	let cursorYPx = yPx;
 	const reportOutOfFlow = (detail) => {
 		context.unsupported.report(UNSUPPORTED_CONSTRUCT.headerFooterContent, context.pageIndex, `${label}: ${detail}`);
@@ -196,7 +238,6 @@ const paintHeaderFooterBlocks = ({ composer, blocks, measures, xPx, yPx, widthPx
 		switch (block.kind) {
 			case "paragraph":
 				if (measure.kind !== "paragraph") break;
-				if (block.runs.some((run) => run.kind === "image" && (isFloatingImageRun(run) || run.position !== void 0))) reportOutOfFlow(`paragraph ${String(block.id)} anchors a floating picture, which resolves against page and margin anchors the display list does not carry`);
 				paintStoryBlock({
 					composer,
 					block,
@@ -208,6 +249,22 @@ const paintHeaderFooterBlocks = ({ composer, blocks, measures, xPx, yPx, widthPx
 					label,
 					construct: UNSUPPORTED_CONSTRUCT.headerFooterContent
 				});
+				for (const run of block.runs) {
+					if (run.kind !== "image" || !isFloatingImageRun(run) && run.position === void 0) continue;
+					if (run.wrapType === "behind") {
+						reportOutOfFlow(`paragraph ${String(block.id)} anchors a behind-text picture that requires the page-underlay paint phase`);
+						continue;
+					}
+					paintHeaderFooterFloatingImage({
+						composer,
+						run,
+						block,
+						paragraphYPx: cursorYPx,
+						page,
+						context,
+						label
+					});
+				}
 				cursorYPx += measure.totalHeight;
 				continue;
 			case "table":

package/dist/display-list/build/tablePrimitives.js

@@ -1,5 +1,6 @@
 import { createTableCellFlowState, placeTableCellBlock } from "../../layout-engine/measure/tableCellFlow.js";
 import { buildTableCellGrid, buildTableCellPlacements, getSourceCellAt } from "../../layout-engine/measure/tableCellGrid.js";
+import { tableFragmentBottomBorders } from "../../layout-engine/measure/tableFragmentBorderGeometry.js";
 import { resolveTableCellPadding } from "../../layout-engine/types.js";
 import { HIT_REGION_KINDS } from "../primitives.js";
 import { parseDisplayColor } from "./colors.js";
@@ -332,6 +333,28 @@ const paintTableBody = ({ composer, block, measure, xPx, yPx, fromRow, toRow, he
 		cursorYPx += rowMeasure.height;
 	}
 };
+const paintFragmentBottomBorders = ({ composer, fragment, block, measure, context }) => {
+	if (fragment.continuesOnNext !== true || fragment.bottomClip === void 0) return;
+	const primitives = [];
+	for (const { left, width, border } of tableFragmentBottomBorders({
+		fragment,
+		block,
+		measure
+	})) {
+		const stroke = strokeFor(border, context, "table fragment bottom border");
+		if (!stroke) continue;
+		const yPx = fragment.y + fragment.height - stroke.thicknessPx / 2;
+		primitives.push({
+			kind: "line",
+			x1Px: fragment.x + left,
+			y1Px: yPx,
+			x2Px: fragment.x + left + width,
+			y2Px: yPx,
+			stroke
+		});
+	}
+	composer.push(primitives);
+};
 /** A whole, unpaginated table: what a nested table inside a cell or box is. */
 const paintTableBlock = ({ composer, block, measure, xPx, yPx, context, paintTextBox }) => paintTableBody({
 	composer,
@@ -404,6 +427,13 @@ const paintTableFragment = ({ composer, fragment, block, measure, context, paint
 		children: [...clipped.primitives()],
 		regions: [...clipped.regions()]
 	}]);
+	paintFragmentBottomBorders({
+		composer,
+		fragment,
+		block,
+		measure,
+		context
+	});
 };
 //#endregion
 export { paintTableBlock, paintTableFragment };

package/dist/display-list/primitives.d.ts

@@ -15,7 +15,7 @@ import { hasComplexScript, isComplexScriptCodePoint } from "../utils/scriptSegme
  * advances rightward from its origin whatever the paragraph does.
  */
 declare const glyphCellOffsetsPx: (run: DisplayGlyphRun) => readonly number[];
-declare const DISPLAY_PRIMITIVE_KINDS: ("glyphRun" | "rect" | "line" | "image" | "clipGroup" | "rotateGroup" | "opacityGroup")[];
+declare const DISPLAY_PRIMITIVE_KINDS: ("image" | "line" | "rect" | "glyphRun" | "clipGroup" | "rotateGroup" | "opacityGroup")[];
 /**
  * Dash geometry of each stroke pattern, as multiples of the stroke thickness.
  *

package/dist/document-operations.d.ts

@@ -3,6 +3,10 @@ import { FolioAIEditAppliedOperation, FolioAIEditApplyMode, FolioAIEditNormaliza
 import { FolioAIEditView, FolioRevisionStamp, FolioWordDiffOptions } from "./ai-edits/apply.js";
 //#region src/document-operations.d.ts
 declare const FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION: 1;
+/** Direct paragraph-alignment values accepted by the operation contract. */
+declare const FOLIO_PARAGRAPH_ALIGNMENT_VALUES: readonly ("left" | "center" | "right" | "both" | "distribute" | "mediumKashida" | "highKashida" | "lowKashida" | "thaiDistribute")[];
+/** `w:spacing/@w:lineRule` values accepted by the operation contract. */
+declare const FOLIO_LINE_SPACING_RULE_VALUES: readonly ("auto" | "exact" | "atLeast")[];
 declare const FOLIO_DOCUMENT_OPERATION_TYPES: readonly ["replaceInBlock", "replaceRange", "commentOnRange", "formatRange", "insertAfterBlock", "insertBeforeBlock", "replaceBlock", "deleteBlock", "splitBlock", "mergeBlockWithNext", "setBlockParagraphProperties", "insertTable", "deleteTable", "commentOnBlock", "insertSignatureTable", "insertTableRow", "deleteTableRow", "insertTableColumn", "deleteTableColumn", "mergeTableCells", "splitTableCell"];
 declare const FOLIO_DOCUMENT_OPERATION_MODES: readonly ["direct", "tracked-changes", "suggested"];
 declare const FOLIO_DOCUMENT_OPERATION_STORIES: readonly ["main", "header", "footer", "footnote", "endnote"];
@@ -93,8 +97,8 @@ declare const FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE: Readonly<{
   readonly replaceRange: readonly ["id", "type", "range", "severity", "area", "precondition", "suggestionId", "replace", "comment"];
   readonly commentOnRange: readonly ["id", "type", "range", "severity", "area", "precondition", "comment"];
   readonly formatRange: readonly ["id", "type", "range", "severity", "area", "precondition", "suggestionId", "formatting"];
-  readonly insertAfterBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "text", "inheritFormatting", "listLevel", "moveId", "pageBreakBefore", "styleId", "comment"];
-  readonly insertBeforeBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "text", "inheritFormatting", "listLevel", "moveId", "pageBreakBefore", "styleId", "comment"];
+  readonly insertAfterBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "text", "inheritFormatting", "alignment", "spacing", "listLevel", "moveId", "pageBreakBefore", "styleId", "comment"];
+  readonly insertBeforeBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "text", "inheritFormatting", "alignment", "spacing", "listLevel", "moveId", "pageBreakBefore", "styleId", "comment"];
   readonly replaceBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "text", "preserveFormatting", "styleId", "comment"];
   readonly deleteBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "moveId", "comment"];
   readonly splitBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "offset", "separator"];
@@ -117,7 +121,7 @@ declare const parseFolioDocumentOperationBatch: (value: unknown) => FolioDocumen
  * review queue instead of applying it; the core apply path never produces it.
  */
 type FolioDocumentOperationStatus = "committed" | "previewed" | "rejected" | "queued";
-type FolioDocumentOperationRecovery = "refreshDocument" | "narrowMatch" | "changeMode" | "changeTarget" | "removeOperation" | "inspectBatch" | "retryLater";
+type FolioDocumentOperationRecovery = "refreshDocument" | "narrowMatch" | "changeMode" | "changeTarget" | "removeOperation" | "inspectBatch" | "resolveTrackedChange" | "retryLater";
 type FolioDocumentOperationIssue = {
   operationId: string;
   operationIndex: number;
@@ -278,4 +282,4 @@ type ApplyFolioDocumentOperationsOptions = {
 };
 declare const applyFolioDocumentOperations: ({ view, snapshot, batch, story, author, createCommentId, createUndoHandle, revisionStamp, wordDiff, tableTemplates }: ApplyFolioDocumentOperationsOptions) => FolioDocumentOperationResult;
 //#endregion
-export { ApplyFolioDocumentOperationsOptions, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_BATCH_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FolioDocumentOperation, FolioDocumentOperationAffectedTarget, FolioDocumentOperationBatch, FolioDocumentOperationBatchPrecondition, FolioDocumentOperationCapabilities, FolioDocumentOperationIssue, FolioDocumentOperationMode, FolioDocumentOperationPrecondition, FolioDocumentOperationQueuedOperation, FolioDocumentOperationReceipt, FolioDocumentOperationRecovery, FolioDocumentOperationResult, FolioDocumentOperationResultBase, FolioDocumentOperationStatus, FolioDocumentOperationStory, FolioDocumentOperationType, FolioDocumentOperationUndoFailureReason, FolioDocumentOperationUndoHandle, FolioDocumentOperationUndoResult, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch };
+export { ApplyFolioDocumentOperationsOptions, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_BATCH_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FolioDocumentOperation, FolioDocumentOperationAffectedTarget, FolioDocumentOperationBatch, FolioDocumentOperationBatchPrecondition, FolioDocumentOperationCapabilities, FolioDocumentOperationIssue, FolioDocumentOperationMode, FolioDocumentOperationPrecondition, FolioDocumentOperationQueuedOperation, FolioDocumentOperationReceipt, FolioDocumentOperationRecovery, FolioDocumentOperationResult, FolioDocumentOperationResultBase, FolioDocumentOperationStatus, FolioDocumentOperationStory, FolioDocumentOperationType, FolioDocumentOperationUndoFailureReason, FolioDocumentOperationUndoHandle, FolioDocumentOperationUndoResult, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch };

package/dist/document-operations.js

@@ -1,7 +1,12 @@
 import { applyFolioAIEditOperations, previewFolioAIEditOperations } from "./ai-edits/apply.js";
+import { LINE_SPACING_RULE_VALUES, PARAGRAPH_ALIGNMENT_VALUES } from "./types/documentEnumValues.js";
 import { TaggedError } from "better-result";
 //#region src/document-operations.ts
 const FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION = 1;
+/** Direct paragraph-alignment values accepted by the operation contract. */
+const FOLIO_PARAGRAPH_ALIGNMENT_VALUES = Object.freeze([...PARAGRAPH_ALIGNMENT_VALUES]);
+/** `w:spacing/@w:lineRule` values accepted by the operation contract. */
+const FOLIO_LINE_SPACING_RULE_VALUES = Object.freeze([...LINE_SPACING_RULE_VALUES]);
 const FOLIO_DOCUMENT_OPERATION_TYPES = Object.freeze([
 	"replaceInBlock",
 	"replaceRange",
@@ -143,6 +148,12 @@ const readOptionalBoolean = (value, key, path) => {
 	if (typeof candidate === "boolean") return candidate;
 	return invalidBatch(`${path}.${key}`, "expected a boolean when provided");
 };
+const readClearableBoolean = (value, key, path) => {
+	const candidate = value[key];
+	if (candidate === void 0 || candidate === null) return candidate;
+	if (typeof candidate === "boolean") return candidate;
+	return invalidBatch(`${path}.${key}`, "expected a boolean or null when provided");
+};
 const readClearableNonEmptyString = (value, key, path) => {
 	const candidate = value[key];
 	if (candidate === void 0 || candidate === null) return candidate;
@@ -172,8 +183,8 @@ const readOptionalStringArray = (value, key, path) => {
 };
 const readNonNegativeInteger = (value, key, path) => {
 	const candidate = value[key];
-	if (typeof candidate === "number" && Number.isInteger(candidate) && candidate >= 0) return candidate;
-	return invalidBatch(`${path}.${key}`, "expected a non-negative integer");
+	if (typeof candidate === "number" && Number.isSafeInteger(candidate) && candidate >= 0) return candidate;
+	return invalidBatch(`${path}.${key}`, "expected a non-negative safe integer");
 };
 /**
 * A non-negative integer that may also be cleared. `undefined` is "say
@@ -185,6 +196,52 @@ const readClearableNonNegativeInteger = (value, key, path) => {
 	if (candidate === void 0) return;
 	return candidate === null ? null : readNonNegativeInteger(value, key, path);
 };
+const readClearableParagraphAlignment = ({ value, key, path }) => {
+	const candidate = value[key];
+	if (candidate === void 0 || candidate === null) return candidate;
+	for (const alignment of FOLIO_PARAGRAPH_ALIGNMENT_VALUES) if (candidate === alignment) return alignment;
+	return invalidBatch(`${path}.${key}`, `expected one of ${FOLIO_PARAGRAPH_ALIGNMENT_VALUES.join(", ")} or null when provided`);
+};
+const PARAGRAPH_SPACING_KEYS = [
+	"spaceBefore",
+	"spaceAfter",
+	"lineSpacing",
+	"lineSpacingRule",
+	"beforeAutospacing",
+	"afterAutospacing"
+];
+const isLineSpacingRule = (value) => FOLIO_LINE_SPACING_RULE_VALUES.some((rule) => value === rule);
+/**
+* Read one complete direct `w:spacing` cluster. Individual fields are
+* optional so explicit zero and false survive; null removes the child.
+*/
+const readClearableParagraphSpacing = ({ value, key, path }) => {
+	const candidate = value[key];
+	if (candidate === void 0 || candidate === null) return candidate;
+	const spacingPath = `${path}.${key}`;
+	if (!isPlainObject(candidate)) return invalidBatch(spacingPath, "expected an object or null when provided");
+	assertAllowedKeys(candidate, spacingPath, PARAGRAPH_SPACING_KEYS);
+	if (Object.keys(candidate).length === 0) return invalidBatch(spacingPath, "expected at least one spacing property");
+	const spacing = {};
+	for (const unsignedKey of ["spaceBefore", "spaceAfter"]) if (candidate[unsignedKey] !== void 0) spacing[unsignedKey] = readNonNegativeInteger(candidate, unsignedKey, spacingPath);
+	const lineSpacing = candidate["lineSpacing"];
+	if (lineSpacing !== void 0) {
+		if (typeof lineSpacing !== "number" || !Number.isSafeInteger(lineSpacing)) return invalidBatch(`${spacingPath}.lineSpacing`, "expected a safe signed integer when provided");
+		spacing.lineSpacing = lineSpacing;
+	}
+	const lineSpacingRule = candidate["lineSpacingRule"];
+	if (lineSpacingRule !== void 0) {
+		if (!isLineSpacingRule(lineSpacingRule)) return invalidBatch(`${spacingPath}.lineSpacingRule`, `expected one of ${FOLIO_LINE_SPACING_RULE_VALUES.join(", ")} when provided`);
+		spacing.lineSpacingRule = lineSpacingRule;
+	}
+	for (const booleanKey of ["beforeAutospacing", "afterAutospacing"]) {
+		const booleanValue = candidate[booleanKey];
+		if (booleanValue === void 0) continue;
+		if (typeof booleanValue !== "boolean") return invalidBatch(`${spacingPath}.${booleanKey}`, "expected a boolean when provided");
+		spacing[booleanKey] = booleanValue;
+	}
+	return spacing;
+};
 /**
 * A rectangular grid of cell texts. Rectangular because a table whose rows
 * hold different cell counts is not a table any consumer can lay out, and the
@@ -209,13 +266,30 @@ const readParagraphProperties = (value, path) => {
 	const candidate = value["properties"];
 	const propertiesPath = `${path}.properties`;
 	if (!isPlainObject(candidate)) return invalidBatch(propertiesPath, "expected an object");
-	assertAllowedKeys(candidate, propertiesPath, ["styleId", "listLevel"]);
+	assertAllowedKeys(candidate, propertiesPath, [
+		"styleId",
+		"listLevel",
+		"alignment",
+		"spacing"
+	]);
 	const styleId = candidate["styleId"] === null ? null : readOptionalString(candidate, "styleId", propertiesPath);
 	const listLevel = readClearableNonNegativeInteger(candidate, "listLevel", propertiesPath);
-	if (styleId === void 0 && listLevel === void 0) return invalidBatch(propertiesPath, "expected at least one property to set");
+	const alignment = readClearableParagraphAlignment({
+		value: candidate,
+		key: "alignment",
+		path: propertiesPath
+	});
+	const spacing = readClearableParagraphSpacing({
+		value: candidate,
+		key: "spacing",
+		path: propertiesPath
+	});
+	if (styleId === void 0 && listLevel === void 0 && alignment === void 0 && spacing === void 0) return invalidBatch(propertiesPath, "expected at least one property to set");
 	return {
 		...styleId !== void 0 && { styleId },
-		...listLevel !== void 0 && { listLevel }
+		...listLevel !== void 0 && { listLevel },
+		...alignment !== void 0 && { alignment },
+		...spacing !== void 0 && { spacing }
 	};
 };
 const readTextRange = (value, path) => {
@@ -261,10 +335,10 @@ const readInlineFormatting = (value, path) => {
 		"fontSizePt",
 		"color"
 	]);
-	const bold = readOptionalBoolean(candidate, "bold", formattingPath);
-	const italic = readOptionalBoolean(candidate, "italic", formattingPath);
-	const underline = readOptionalBoolean(candidate, "underline", formattingPath);
-	const strike = readOptionalBoolean(candidate, "strike", formattingPath);
+	const bold = readClearableBoolean(candidate, "bold", formattingPath);
+	const italic = readClearableBoolean(candidate, "italic", formattingPath);
+	const underline = readClearableBoolean(candidate, "underline", formattingPath);
+	const strike = readClearableBoolean(candidate, "strike", formattingPath);
 	const fontFamily = readClearableNonEmptyString(candidate, "fontFamily", formattingPath);
 	const fontSizePt = readClearableFontSize(candidate, "fontSizePt", formattingPath);
 	const color = readClearableRgbColor(candidate, "color", formattingPath);
@@ -354,6 +428,8 @@ const FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE = Object.freeze({
 		...COMMON_OPERATION_KEYS,
 		"text",
 		"inheritFormatting",
+		"alignment",
+		"spacing",
 		"listLevel",
 		"moveId",
 		"pageBreakBefore",
@@ -364,6 +440,8 @@ const FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE = Object.freeze({
 		...COMMON_OPERATION_KEYS,
 		"text",
 		"inheritFormatting",
+		"alignment",
+		"spacing",
 		"listLevel",
 		"moveId",
 		"pageBreakBefore",
@@ -545,6 +623,16 @@ const parseDocumentOperation = (value, index) => {
 		const styleId = value["styleId"] === null ? null : readOptionalString(value, "styleId", path);
 		const moveId = readOptionalString(value, "moveId", path);
 		const listLevel = readClearableNonNegativeInteger(value, "listLevel", path);
+		const alignment = readClearableParagraphAlignment({
+			value,
+			key: "alignment",
+			path
+		});
+		const spacing = readClearableParagraphSpacing({
+			value,
+			key: "spacing",
+			path
+		});
 		return {
 			...operationMeta,
 			id,
@@ -552,6 +640,8 @@ const parseDocumentOperation = (value, index) => {
 			blockId,
 			text: readString(value, "text", path),
 			...inheritFormatting !== void 0 && { inheritFormatting },
+			...alignment !== void 0 && { alignment },
+			...spacing !== void 0 && { spacing },
 			...listLevel !== void 0 && { listLevel },
 			...moveId !== void 0 && { moveId },
 			...pageBreakBefore !== void 0 && { pageBreakBefore },
@@ -561,7 +651,7 @@ const parseDocumentOperation = (value, index) => {
 	}
 	if (type === "replaceBlock") {
 		const preserveFormatting = readOptionalBoolean(value, "preserveFormatting", path);
-		const styleId = readOptionalString(value, "styleId", path);
+		const styleId = value["styleId"] === null ? null : readOptionalString(value, "styleId", path);
 		return {
 			...operationMeta,
 			id,
@@ -735,6 +825,8 @@ const recoveryByReason = {
 	preconditionFailed: "refreshDocument",
 	staleRange: "refreshDocument",
 	emptyOperation: "removeOperation",
+	pendingParagraphPropertyChange: "resolveTrackedChange",
+	pendingRunPropertyChange: "resolveTrackedChange",
 	noopOperation: "removeOperation",
 	documentVersionMismatch: "refreshDocument",
 	documentNotEditable: "retryLater"
@@ -751,7 +843,7 @@ const getFolioDocumentOperationIssues = (operations, skipped) => {
 			operationIndex,
 			path: `$.operations[${operationIndex}]`,
 			code: reason,
-			retryable: reason !== "emptyOperation" && reason !== "noopOperation",
+			retryable: reason !== "emptyOperation" && reason !== "noopOperation" && reason !== "pendingParagraphPropertyChange" && reason !== "pendingRunPropertyChange",
 			recovery: recoveryByReason[reason]
 		};
 	});
@@ -981,4 +1073,4 @@ const applyFolioDocumentOperations = ({ view, snapshot, batch, story = "main", a
 	};
 };
 //#endregion
-export { FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_BATCH_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch };
+export { FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_BATCH_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch };

package/dist/docx/blockContentParser.js

@@ -9,7 +9,7 @@ import { parseTable } from "./tableParser.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
 import { findChild, getChildElements, getLocalName, mergeXmlnsDeclarations } from "./xmlParser.js";
 //#region src/docx/blockContentParser.ts
-const computeListMarker = (paragraph, { numbering, listCounters, abstractCounters, restartedNumIds, previousList, siblingNumIdsByAbstractNumId }) => {
+const computeListMarker = (paragraph, { numbering, listCounters, abstractCounters, restartedNumIds, previousList }) => {
 	const listRendering = paragraph.listRendering;
 	if (!listRendering || !numbering) {
 		previousList.abstractNumId = null;
@@ -26,26 +26,17 @@ const computeListMarker = (paragraph, { numbering, listCounters, abstractCounter
 	}
 	const firstEncounter = !listCounters.has(numId);
 	if (firstEncounter) listCounters.set(numId, Array.from({ length: 9 }).fill(NaN));
-	const counters = listCounters.get(numId);
+	let counters = listCounters.get(numId);
 	if (!counters) return;
 	const abstractNumId = numbering.getAbstractNumId(numId);
-	if (firstEncounter && abstractNumId !== null) {
-		let siblingNumIds = siblingNumIdsByAbstractNumId.get(abstractNumId);
-		if (!siblingNumIds) {
-			siblingNumIds = /* @__PURE__ */ new Set();
-			siblingNumIdsByAbstractNumId.set(abstractNumId, siblingNumIds);
-		}
-		siblingNumIds.add(numId);
-	}
 	const styleNumbering = paragraph.formatting?.numPrFromStyle;
-	let resumedAbstractCounters;
 	const resumesRestartedInstance = firstEncounter && listRendering.startOverride === void 0 && abstractNumId !== null && previousList.abstractNumId === abstractNumId && previousList.numId !== null && previousList.numId !== numId && restartedNumIds.has(previousList.numId);
 	const resumesStyleInstance = firstEncounter && !styleNumbering && listRendering.startOverride === void 0 && abstractNumId !== null && previousList.abstractNumId === abstractNumId && previousList.fromStyle === true;
 	if (abstractNumId !== null && (styleNumbering || resumesRestartedInstance || resumesStyleInstance)) {
 		const latestAbstractCounters = abstractCounters.get(abstractNumId);
 		if (latestAbstractCounters) {
-			for (let i = 0; i < counters.length; i += 1) counters[i] = latestAbstractCounters[i] ?? NaN;
-			resumedAbstractCounters = latestAbstractCounters;
+			counters = latestAbstractCounters;
+			listCounters.set(numId, counters);
 		}
 	}
 	if (listRendering.startOverride !== void 0 || resumesRestartedInstance || previousList.numId === numId && restartedNumIds.has(numId)) restartedNumIds.add(numId);
@@ -64,17 +55,7 @@ const computeListMarker = (paragraph, { numbering, listCounters, abstractCounter
 		const childCounter = counters[level + 1];
 		counters[level + 1] = (childCounter === void 0 || Number.isNaN(childCounter) ? 0 : childCounter) + childAdvances;
 	}
-	if (abstractNumId !== null) {
-		if (resumedAbstractCounters) {
-			const siblingNumIds = siblingNumIdsByAbstractNumId.get(abstractNumId);
-			for (const otherNumId of siblingNumIds ?? []) {
-				const otherCounters = listCounters.get(otherNumId);
-				if (otherNumId === numId || !otherCounters || !otherCounters.every((value, index) => Object.is(value, resumedAbstractCounters[index]))) continue;
-				for (let i = 0; i < otherCounters.length; i += 1) otherCounters[i] = counters[i] ?? NaN;
-			}
-		}
-		abstractCounters.set(abstractNumId, [...counters]);
-	}
+	if (abstractNumId !== null) abstractCounters.set(abstractNumId, counters);
 	previousList.abstractNumId = abstractNumId;
 	previousList.fromStyle = Boolean(styleNumbering);
 	previousList.numId = numId;
@@ -108,7 +89,6 @@ const parseBlockContent = (parent, styles, theme, numbering, rels, media, option
 		fromStyle: false,
 		numId: null
 	},
-	siblingNumIdsByAbstractNumId: /* @__PURE__ */ new Map(),
 	options: {
 		...options,
 		rootXmlns: mergeXmlnsDeclarations(options?.rootXmlns ?? {}, parent)
@@ -129,8 +109,7 @@ const parseBlockContentWithState = (parent, styles, theme, numbering, rels, medi
 				listCounters: state.listCounters,
 				abstractCounters: state.abstractCounters,
 				restartedNumIds: state.restartedNumIds,
-				previousList: state.previousList,
-				siblingNumIdsByAbstractNumId: state.siblingNumIdsByAbstractNumId
+				previousList: state.previousList
 			});
 			content.push(paragraph);
 			continue;

package/dist/docx/commentParser.js

@@ -1,4 +1,5 @@
 import { parseParagraph } from "./paragraphParser.js";
+import { cloneParagraphWithPropertySource } from "./paragraphPropertySource.js";
 import { parseRunProperties } from "./runParser.js";
 import { findChild, getAttribute, getChildElements, getLocalName, parseXml } from "./xmlParser.js";
 //#region src/docx/commentParser.ts
@@ -14,10 +15,7 @@ const normalizeFirstCommentParagraph = (paragraphElement, paragraph, theme) => {
 	const annotationReferenceFormatting = normalizeAnnotationReferenceFormatting(runProperties ? parseRunProperties(runProperties, theme) : void 0);
 	const firstParsedContent = paragraph.content.at(0);
 	return {
-		paragraph: firstParsedContent?.type === "run" && firstParsedContent.content.length === 0 ? {
-			...paragraph,
-			content: paragraph.content.slice(1)
-		} : paragraph,
+		paragraph: firstParsedContent?.type === "run" && firstParsedContent.content.length === 0 ? cloneParagraphWithPropertySource(paragraph, { content: paragraph.content.slice(1) }) : paragraph,
 		...annotationReferenceFormatting !== void 0 ? { annotationReferenceFormatting } : {}
 	};
 };

package/dist/docx/commentRangeIntegrity.js

@@ -1,3 +1,4 @@
+import { cloneParagraphWithPropertySource } from "./paragraphPropertySource.js";
 //#region src/docx/commentRangeIntegrity.ts
 const withoutOrphanCommentRanges = (doc) => {
 	const validCommentIds = new Set((doc.package.document.comments ?? []).map((comment) => comment.id));
@@ -176,10 +177,7 @@ const withoutOrphanParagraphMarkers = (paragraph, validCommentIds) => {
 		content.push(item);
 	}
 	if (!changed) return paragraph;
-	return {
-		...paragraph,
-		content
-	};
+	return cloneParagraphWithPropertySource(paragraph, { content });
 };
 const isCommentMarker = (content) => content.type === "commentRangeStart" || content.type === "commentRangeEnd" || content.type === "commentReference";
 //#endregion

package/dist/docx/documentClone.d.ts

@@ -0,0 +1,2 @@
+import { cloneDocumentWithParagraphPropertySources } from "./paragraphPropertySource.js";
+export { cloneDocumentWithParagraphPropertySources };