@stll/folio-core 0.36.0 → 0.37.1

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" | "glyphRun" | "rect" | "line" | "clipGroup" | "rotateGroup" | "opacityGroup")[];
 /**
  * Dash geometry of each stroke pattern, as multiples of the stroke thickness.
  *

package/dist/document-operations.d.ts

@@ -5,6 +5,8 @@ import { FolioAIEditView, FolioRevisionStamp, FolioWordDiffOptions } from "./ai-
 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"];
@@ -95,12 +97,12 @@ 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", "alignment", "listLevel", "moveId", "pageBreakBefore", "styleId", "comment"];
-  readonly insertBeforeBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "text", "inheritFormatting", "alignment", "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"];
-  readonly mergeBlockWithNext: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "separator"];
+  readonly splitBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "offset", "separator", "firstParagraphProperties", "secondParagraphProperties"];
+  readonly mergeBlockWithNext: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "separator", "mergedParagraphProperties"];
   readonly setBlockParagraphProperties: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "properties"];
   readonly insertTable: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "position", "rows"];
   readonly deleteTable: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId"];
@@ -119,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;
@@ -280,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, 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 };
+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,10 +1,12 @@
 import { applyFolioAIEditOperations, previewFolioAIEditOperations } from "./ai-edits/apply.js";
-import { PARAGRAPH_ALIGNMENT_VALUES } from "./types/documentEnumValues.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",
@@ -146,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;
@@ -175,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
@@ -194,6 +202,46 @@ const readClearableParagraphAlignment = ({ value, key, path }) => {
 	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
@@ -214,14 +262,15 @@ const readTableRows = (value, path) => {
 	if (parsed.some((row) => row.length !== width)) return invalidBatch(rowsPath, "expected every row to hold the same number of cells");
 	return parsed;
 };
-const readParagraphProperties = (value, path) => {
-	const candidate = value["properties"];
-	const propertiesPath = `${path}.properties`;
+const readParagraphProperties = ({ value, key, path }) => {
+	const candidate = value[key];
+	const propertiesPath = `${path}.${key}`;
 	if (!isPlainObject(candidate)) return invalidBatch(propertiesPath, "expected an object");
 	assertAllowedKeys(candidate, propertiesPath, [
 		"styleId",
 		"listLevel",
-		"alignment"
+		"alignment",
+		"spacing"
 	]);
 	const styleId = candidate["styleId"] === null ? null : readOptionalString(candidate, "styleId", propertiesPath);
 	const listLevel = readClearableNonNegativeInteger(candidate, "listLevel", propertiesPath);
@@ -230,11 +279,17 @@ const readParagraphProperties = (value, path) => {
 		key: "alignment",
 		path: propertiesPath
 	});
-	if (styleId === void 0 && listLevel === void 0 && alignment === void 0) return invalidBatch(propertiesPath, "expected at least one property to set");
+	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 },
-		...alignment !== void 0 && { alignment }
+		...alignment !== void 0 && { alignment },
+		...spacing !== void 0 && { spacing }
 	};
 };
 const readTextRange = (value, path) => {
@@ -280,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);
@@ -374,6 +429,7 @@ const FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE = Object.freeze({
 		"text",
 		"inheritFormatting",
 		"alignment",
+		"spacing",
 		"listLevel",
 		"moveId",
 		"pageBreakBefore",
@@ -385,6 +441,7 @@ const FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE = Object.freeze({
 		"text",
 		"inheritFormatting",
 		"alignment",
+		"spacing",
 		"listLevel",
 		"moveId",
 		"pageBreakBefore",
@@ -406,9 +463,15 @@ const FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE = Object.freeze({
 	splitBlock: [
 		...COMMON_OPERATION_KEYS,
 		"offset",
-		"separator"
+		"separator",
+		"firstParagraphProperties",
+		"secondParagraphProperties"
+	],
+	mergeBlockWithNext: [
+		...COMMON_OPERATION_KEYS,
+		"separator",
+		"mergedParagraphProperties"
 	],
-	mergeBlockWithNext: [...COMMON_OPERATION_KEYS, "separator"],
 	setBlockParagraphProperties: [...COMMON_OPERATION_KEYS, "properties"],
 	insertTable: [
 		...COMMON_OPERATION_KEYS,
@@ -531,24 +594,48 @@ const parseDocumentOperation = (value, index) => {
 		id,
 		type,
 		blockId,
-		properties: readParagraphProperties(value, path)
+		properties: readParagraphProperties({
+			value,
+			key: "properties",
+			path
+		})
 	};
 	if (type === "splitBlock" || type === "mergeBlockWithNext") {
 		const separator = readOptionalString(value, "separator", path);
-		if (type === "mergeBlockWithNext") return {
-			...operationMeta,
-			id,
-			type,
-			blockId,
-			...separator !== void 0 && { separator }
-		};
+		if (type === "mergeBlockWithNext") {
+			const mergedParagraphProperties = value["mergedParagraphProperties"] === void 0 ? void 0 : readParagraphProperties({
+				value,
+				key: "mergedParagraphProperties",
+				path
+			});
+			return {
+				...operationMeta,
+				id,
+				type,
+				blockId,
+				...separator !== void 0 && { separator },
+				...mergedParagraphProperties !== void 0 && { mergedParagraphProperties }
+			};
+		}
+		const firstParagraphProperties = value["firstParagraphProperties"] === void 0 ? void 0 : readParagraphProperties({
+			value,
+			key: "firstParagraphProperties",
+			path
+		});
+		const secondParagraphProperties = value["secondParagraphProperties"] === void 0 ? void 0 : readParagraphProperties({
+			value,
+			key: "secondParagraphProperties",
+			path
+		});
 		return {
 			...operationMeta,
 			id,
 			type,
 			blockId,
 			offset: readNonNegativeInteger(value, "offset", path),
-			...separator !== void 0 && { separator }
+			...separator !== void 0 && { separator },
+			...firstParagraphProperties !== void 0 && { firstParagraphProperties },
+			...secondParagraphProperties !== void 0 && { secondParagraphProperties }
 		};
 	}
 	if (type === "replaceInBlock") return {
@@ -571,6 +658,11 @@ const parseDocumentOperation = (value, index) => {
 			key: "alignment",
 			path
 		});
+		const spacing = readClearableParagraphSpacing({
+			value,
+			key: "spacing",
+			path
+		});
 		return {
 			...operationMeta,
 			id,
@@ -579,6 +671,7 @@ const parseDocumentOperation = (value, index) => {
 			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 },
@@ -762,6 +855,8 @@ const recoveryByReason = {
 	preconditionFailed: "refreshDocument",
 	staleRange: "refreshDocument",
 	emptyOperation: "removeOperation",
+	pendingParagraphPropertyChange: "resolveTrackedChange",
+	pendingRunPropertyChange: "resolveTrackedChange",
 	noopOperation: "removeOperation",
 	documentVersionMismatch: "refreshDocument",
 	documentNotEditable: "retryLater"
@@ -778,7 +873,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]
 		};
 	});
@@ -1008,4 +1103,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, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, 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/ensureParaIds.js

@@ -392,10 +392,15 @@ const ensureParaIdsInternal = async (docx, options) => {
 	};
 	const zip = await JSZip.loadAsync(docx);
 	if (hasDigitalSignatureParts(zip) && options.allowSignedPackageMutation !== true) throw createEnsureParaIdsError("Refusing to normalize a digitally signed package because rewriting OOXML invalidates its signatures. Warn the user and pass allowSignedPackageMutation only if invalidation is acceptable.");
-	for (const [partPath, content] of updates) zip.file(partPath, content, {
-		compression: "DEFLATE",
-		compressionOptions: { level: 6 }
-	});
+	for (const [partPath, content] of updates) {
+		const sourceEntry = zip.file(partPath);
+		if (sourceEntry === null) throw createEnsureParaIdsError(`Package part disappeared during normalization: ${partPath}`);
+		zip.file(partPath, content, {
+			compression: "DEFLATE",
+			compressionOptions: { level: 6 },
+			date: sourceEntry.date
+		});
+	}
 	return {
 		docx: await zip.generateAsync({
 			type: "uint8array",

package/dist/docx/numberingParser.d.ts

@@ -80,5 +80,7 @@ declare function getBulletCharacter(level: document_d_exports.ListLevel): string
  * Check if a list level is a bullet (not numbered)
  */
 declare function isBulletLevel(level: document_d_exports.ListLevel): boolean;
+/** Whether a numbering level reserves horizontal space for a visible marker. */
+declare const numberingLevelHasMarkerSlot: (level: Pick<document_d_exports.ListLevel, "numFmt">) => boolean;
 //#endregion
-export { NumberingMap, computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerFormattingFromLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };
+export { NumberingMap, computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerFormattingFromLevel, numPrEqual, numberingLevelHasMarkerSlot, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/numberingParser.js

@@ -542,6 +542,7 @@ function computeListRendering(numPr, numbering) {
 		level: ilvl,
 		numId,
 		marker: level.lvlText,
+		markerTemplate: level.lvlText,
 		isBullet: level.numFmt === "bullet",
 		numFmt: level.isLgl ? "decimal" : level.numFmt,
 		levelNumFmts,
@@ -609,5 +610,7 @@ function getBulletCharacter(level) {
 function isBulletLevel(level) {
 	return level.numFmt === "bullet" || level.numFmt === "none";
 }
+/** Whether a numbering level reserves horizontal space for a visible marker. */
+const numberingLevelHasMarkerSlot = (level) => level.numFmt !== "none";
 //#endregion
-export { computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerFormattingFromLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };
+export { computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerFormattingFromLevel, numPrEqual, numberingLevelHasMarkerSlot, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/paragraphParser.js

@@ -4,7 +4,7 @@ import { isValidHexId } from "../utils/hexId.js";
 import { parseBookmarkEnd as parseBookmarkEnd$1, parseBookmarkStart as parseBookmarkStart$1 } from "./bookmarkParser.js";
 import { parseFieldType } from "./fieldParser.js";
 import { parseHyperlink as parseHyperlink$1, parseHyperlinkChild } from "./hyperlinkParser.js";
-import { markerFormattingFromLevel } from "./numberingParser.js";
+import { markerFormattingFromLevel, numberingLevelHasMarkerSlot } from "./numberingParser.js";
 import { paraIdInRange } from "./paraIdRangeNormalization.js";
 import { assignParagraphPropertySource } from "./paragraphPropertySource.js";
 import { BorderStyleSchema, FrameWrapSchema, FrameXAlignSchema, FrameYAlignSchema, LineSpacingRuleSchema, ParagraphAlignmentSchema, ShadingPatternSchema, TabLeaderSchema, TabStopAlignmentSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
@@ -495,10 +495,10 @@ function normalizeDeletionContentElement(node) {
 	let mappedName = node.name;
 	if (localName === "delText") mappedName = replaceLocalName(node.name, "t");
 	else if (localName === "delInstrText") mappedName = replaceLocalName(node.name, "instrText");
-	const result = { ...node };
-	if (mappedName !== void 0) result.name = mappedName;
-	if (node.elements) result.elements = node.elements.map(normalizeDeletionContentElement);
-	return result;
+	return cloneElement(node, {
+		...mappedName !== void 0 ? { name: mappedName } : {},
+		...node.elements ? { elements: node.elements.map(normalizeDeletionContentElement) } : {}
+	});
 }
 function parseParagraphPropertyChanges(pPr, theme, styles, currentFormatting) {
 	if (!pPr) return;
@@ -1122,6 +1122,7 @@ function parseParagraph(node, styles, theme, numbering, rels = null, media = nul
 					level: ilvl,
 					numId,
 					marker: level.lvlText,
+					markerTemplate: level.lvlText,
 					isBullet: level.numFmt === "bullet",
 					levelNumFmts,
 					levelStarts
@@ -1186,7 +1187,7 @@ function parseParagraph(node, styles, theme, numbering, rels = null, media = nul
 					const directHanging = directInd ? parseNumericAttribute(directInd, "w", "hanging") : void 0;
 					const hasDirectFirstLineOrHanging = directFirstLine !== void 0 && directFirstLine !== 0 || directHanging !== void 0 && directHanging !== 0;
 					if (!hasDirectLeft && !chainInd.left && level.pPr.indentLeft !== void 0) paragraph.formatting.indentLeft = level.pPr.indentLeft;
-					if (!hasDirectFirstLineOrHanging && !chainInd.firstLine) {
+					if (!hasDirectFirstLineOrHanging && !chainInd.firstLine && numberingLevelHasMarkerSlot(level)) {
 						if (level.pPr.indentFirstLine !== void 0) paragraph.formatting.indentFirstLine = level.pPr.indentFirstLine;
 						if (level.pPr.hangingIndent !== void 0) paragraph.formatting.hangingIndent = level.pPr.hangingIndent;
 					}

package/dist/docx/paragraphTraversal.js

@@ -1,41 +1,37 @@
 //#region src/docx/paragraphTraversal.ts
 /** Visit every run directly owned by a paragraph's inline-content tree. */
 const visitParagraphRuns = (paragraph, visit) => {
-	const visitRun = (run) => {
-		visit(run);
-	};
-	const visitHyperlink = (hyperlink) => {
-		for (const child of hyperlink.children) if (child.type === "run") visitRun(child);
-	};
-	const visitInlineContent = (content) => {
-		for (const child of content) {
-			if (child.type === "run") {
-				visitRun(child);
-				continue;
-			}
-			if (child.type === "hyperlink") visitHyperlink(child);
-		}
-	};
 	const visitParagraphContent = (content) => {
-		if (content.type === "run") {
-			visitRun(content);
-			return;
-		}
-		if (content.type === "hyperlink") {
-			visitHyperlink(content);
-			return;
-		}
-		if (content.type === "simpleField" || content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo") {
-			visitInlineContent(content.content);
-			return;
-		}
-		if (content.type === "inlineSdt") {
-			for (const child of content.content) visitParagraphContent(child);
-			return;
-		}
-		if (content.type === "complexField") {
-			for (const run of content.fieldCode) visitRun(run);
-			for (const run of content.fieldResult) visitRun(run);
+		switch (content.type) {
+			case "run":
+				visit(content);
+				return;
+			case "hyperlink":
+				for (const child of content.children) visitParagraphContent(child);
+				return;
+			case "simpleField":
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo":
+			case "inlineSdt":
+				for (const child of content.content) visitParagraphContent(child);
+				return;
+			case "complexField":
+				for (const run of content.fieldCode) visit(run);
+				for (const run of content.fieldResult) visit(run);
+				return;
+			case "bookmarkStart":
+			case "bookmarkEnd":
+			case "commentRangeStart":
+			case "commentRangeEnd":
+			case "commentReference":
+			case "moveFromRangeStart":
+			case "moveFromRangeEnd":
+			case "moveToRangeStart":
+			case "moveToRangeEnd":
+			case "mathEquation": return;
+			default: return content;
 		}
 	};
 	for (const content of paragraph.content) visitParagraphContent(content);

package/dist/docx/rezip.d.ts

@@ -28,14 +28,6 @@ type RepackOptions = {
   /** Changed note paragraphs that must be serialized even without source paraIds. */
   changedNoteParaIds?: ReadonlySet<string>;
 };
-/**
- * Repack a Document into a valid DOCX file
- *
- * @param doc - Document with modified content
- * @param options - Optional repack options
- * @returns Promise resolving to DOCX as ArrayBuffer
- * @throws {Error} if document has no original buffer for round-trip
- */
 declare function repackDocx(doc: document_d_exports.Document, options?: RepackOptions): Promise<ArrayBuffer>;
 /**
  * Repack a Document using raw content for more control