@stll/folio-core 0.62.0 → 0.63.0

package/dist/docx/imageParser.js

@@ -204,7 +204,8 @@ function findBlipFillElement(container) {
 }
 /** `a:graphic > a:graphicData > pic:pic`, the one walk every picture read shares. */
 function findPictureElement(container) {
-	return findByFullName(findByFullName(findByFullName(container, "a:graphic"), "a:graphicData"), "pic:pic");
+	const graphicData = findByFullName(findByFullName(container, "a:graphic"), "a:graphicData");
+	return findByFullName(graphicData, "pic:pic");
 }
 /**
 * `pic:cNvPr` — the picture's own name, alt text and title.
@@ -299,7 +300,8 @@ function extractBlipRId(blip) {
 * Path: a:graphic > a:graphicData > pic:pic > pic:spPr > a:xfrm
 */
 function findPictureTransform(container) {
-	return findByFullName(findByFullName(findPictureElement(container), "pic:spPr"), "a:xfrm");
+	const spPr = findByFullName(findPictureElement(container), "pic:spPr");
+	return findByFullName(spPr, "a:xfrm");
 }
 /**
 * Normalize a target path to the standard word/media/... format
@@ -399,7 +401,8 @@ const imageDerivedFactsOf = ({ id, pictureNames, imageData }) => ({
 */
 function parseInline(inlineEl, rels, media) {
 	const size = parseExtent(findDrawingChild(inlineEl, "extent"));
-	const padding = parseDrawingEffectExtent(findDrawingChild(inlineEl, "effectExtent"));
+	const effectExtent = findDrawingChild(inlineEl, "effectExtent");
+	const padding = parseDrawingEffectExtent(effectExtent);
 	const props = parseDocProps(findDrawingChild(inlineEl, "docPr"));
 	const frameLocks = parseGraphicFrameLocks(inlineEl);
 	const pictureNames = parseNonVisualDrawingNames(findPictureNonVisualProps(inlineEl));

package/dist/docx/imageRawXml.d.ts

@@ -1,17 +1,17 @@
 import { document_d_exports } from "../types/document.js";
 //#region src/docx/imageRawXml.d.ts
 /** An unclassified drawing is an ordinary editable projection; a classified one is not. */
-declare const allowsDirectDrawingEdit: (mode: document_d_exports.DrawingRawXmlMode | undefined) => boolean;
+export declare const allowsDirectDrawingEdit: (mode: document_d_exports.DrawingRawXmlMode | undefined) => boolean;
 /** Narrow an unvalidated value (a ProseMirror attr) to a raw-XML mode. */
-declare const isDrawingRawXmlMode: (value: unknown) => value is document_d_exports.DrawingRawXmlMode;
+export declare const isDrawingRawXmlMode: (value: unknown) => value is document_d_exports.DrawingRawXmlMode;
 /**
  * Stands in for a preview's fingerprint once the editor has changed the image
  * it renders. `canonicalJson` always produces an object literal, so this can
  * never collide with a real fingerprint and the drawing can never replay.
  */
-declare const EDITED_PREVIEW_FINGERPRINT = "editedPreview";
+export declare const EDITED_PREVIEW_FINGERPRINT = "editedPreview";
 /** Fingerprints modeled image fields which make raw DrawingML stale when edited. */
-declare const imageRawXmlFingerprint: (image: document_d_exports.Image) => string;
+export declare const imageRawXmlFingerprint: (image: document_d_exports.Image) => string;
 /**
  * Whether the serializer writes the captured raw XML back.
  *
@@ -26,14 +26,14 @@ declare const imageRawXmlFingerprint: (image: document_d_exports.Image) => strin
  * which {@link classifyDrawingSafety} reports as `opaque`, and never that
  * folio may build a replacement.
  */
-declare const canReplayEditableImageRawXml: (drawing: document_d_exports.DrawingContent) => boolean;
+export declare const canReplayEditableImageRawXml: (drawing: document_d_exports.DrawingContent) => boolean;
 /**
  * What a drawing costs the document when Folio writes it back.
  *
  * `native` and `replayable` both survive a save intact, so neither restricts
  * editing; only `opaque` loses content.
  */
-declare const DRAWING_SAFETY_CLASSES: {
+export declare const DRAWING_SAFETY_CLASSES: {
   /** No raw XML: Folio owns the whole drawing and regenerates it from the model. */
   readonly NATIVE: "native";
   /** Raw XML the serializer replays verbatim, so every unmodeled attribute survives. */
@@ -41,13 +41,12 @@ declare const DRAWING_SAFETY_CLASSES: {
   /** Raw XML the serializer can neither replay nor regenerate without losing the media. */
   readonly OPAQUE: "opaque";
 };
-type DrawingSafetyClass = (typeof DRAWING_SAFETY_CLASSES)[keyof typeof DRAWING_SAFETY_CLASSES];
+export type DrawingSafetyClass = (typeof DRAWING_SAFETY_CLASSES)[keyof typeof DRAWING_SAFETY_CLASSES];
 /**
  * Classify a drawing by what the run serializer will do with it.
  *
  * Shares {@link canReplayEditableImageRawXml} with the serializer so a
  * compatibility probe and a save can never disagree about the same drawing.
  */
-declare const classifyDrawingSafety: (drawing: document_d_exports.DrawingContent) => DrawingSafetyClass;
-//#endregion
-export { DRAWING_SAFETY_CLASSES, DrawingSafetyClass, EDITED_PREVIEW_FINGERPRINT, allowsDirectDrawingEdit, canReplayEditableImageRawXml, classifyDrawingSafety, imageRawXmlFingerprint, isDrawingRawXmlMode };
+export declare const classifyDrawingSafety: (drawing: document_d_exports.DrawingContent) => DrawingSafetyClass;
+//#endregion

package/dist/docx/importedIdCollisions.d.ts

@@ -1,7 +1,7 @@
 import { ParseContext } from "./parseContext.js";
 //#region src/docx/importedIdCollisions.d.ts
 /** Definition sites only: paired markers and references never claim an identity. */
-declare const IMPORTED_ID_COLLISION_REGISTRY: {
+export declare const IMPORTED_ID_COLLISION_REGISTRY: {
   readonly bookmark: {
     readonly kind: "bookmark";
     readonly scope: "part";
@@ -131,6 +131,5 @@ declare const IMPORTED_ID_COLLISION_REGISTRY: {
   };
 };
 /** Reports repeated source definitions without changing the package or choosing a winner. */
-declare const diagnoseImportedIdCollisions: (parts: ReadonlyMap<string, string>, context: ParseContext) => void;
-//#endregion
-export { IMPORTED_ID_COLLISION_REGISTRY, diagnoseImportedIdCollisions };
+export declare const diagnoseImportedIdCollisions: (parts: ReadonlyMap<string, string>, context: ParseContext) => void;
+//#endregion

package/dist/docx/inlineContentRemovals.d.ts

@@ -6,7 +6,7 @@ import { InlineContentSlot } from "./paragraphTraversal.js";
  * Removal shifts every later index in that array, so a normaliser records the
  * positions while it reads and drops them once, after it has finished reading.
  */
-declare class InlineContentRemovals {
+export declare class InlineContentRemovals {
   #private;
   mark({ content, index }: Pick<InlineContentSlot, "content" | "index">): void;
   /**
@@ -24,5 +24,4 @@ declare class InlineContentRemovals {
    */
   apply(): number;
 }
-//#endregion
-export { InlineContentRemovals };
+//#endregion

package/dist/docx/inlineWrapperContent.d.ts

@@ -11,11 +11,12 @@ import { document_d_exports } from "../types/document.js";
  * Neither says anything about the revision, so lifting one out of a revision
  * takes its text out of the revision with it.
  *
- * Move-range markers stay inside the revision that owns their authored
- * position. Comment ranges remain paragraph-level because the editor projects
- * them as marks over content rather than as boundary atoms.
+ * Range markers stay inside the revision that owns their authored position.
+ * Comment range markers are positions even though the editor projects their
+ * extent as marks; lifting a marker changes which side of the tracked content
+ * owns that position when the revision is resolved.
  */
-declare const TRACKED_CHANGE_WRAPPER_CONTENT: {
+export declare const TRACKED_CHANGE_WRAPPER_CONTENT: {
   readonly inlineWrapper: true;
   readonly bookmarkEnd: true;
   readonly bookmarkStart: true;
@@ -30,9 +31,9 @@ declare const TRACKED_CHANGE_WRAPPER_CONTENT: {
   readonly preservedInline: true;
   readonly run: true;
   readonly simpleField: true;
-  readonly commentRangeEnd: false;
-  readonly commentRangeStart: false;
-  readonly commentReference: false;
+  readonly commentRangeEnd: true;
+  readonly commentRangeStart: true;
+  readonly commentReference: true;
   readonly moveFromRangeEnd: true;
   readonly moveFromRangeStart: true;
   readonly moveToRangeEnd: true;
@@ -47,20 +48,25 @@ declare const TRACKED_CHANGE_WRAPPER_CONTENT: {
  * does not model, and the bidirectional controls directly inside
  * `<w:sdtContent>`.
  *
- * The bookmark boundaries are admitted for the reason the revision wrapper
- * admits them: `CT_SdtContentRun` reaches `EG_RangeMarkupElements` through
+ * The bookmark and comment boundaries are admitted for the reason the
+ * revision wrapper admits them: `CT_SdtContentRun` reaches
+ * `EG_RangeMarkupElements` through
  * `EG_RunLevelElts`, so the marker is valid where Word wrote it, and lifting
  * it out changes what the bookmark covers. A range whose extent was the
  * control's content comes back covering the control plus whatever follows, so
  * a `REF` field or a link to it resolves to the wrong text.
  *
- * Move-range boundaries stay where the source put them. The editor has
- * zero-width boundary nodes for them, so lifting one beside the control would
- * change which content the tracked move covers without any representational
- * need. Comment ranges remain paragraph-level because the editor projects
- * them as marks shared across the whole story rather than boundary atoms.
+ * Point comment references are lifted from their required run carrier and
+ * rebuilt as a run by the serializer; they are not emitted as direct
+ * `<w:sdtContent>` children. Move-range boundaries stay where the source put
+ * them. The editor has zero-width boundary nodes for them, so lifting one
+ * beside the control would change which content the tracked move covers
+ * without any representational need. Comment range boundaries are
+ * paragraph-position markers in the editor, but `CT_SdtContentRun` also
+ * admits them as direct children. Keeping them here preserves the authored
+ * container when neighboring wrappers collapse.
  */
-declare const INLINE_SDT_CONTENT: {
+export declare const INLINE_SDT_CONTENT: {
   readonly inlineWrapper: true;
   readonly bookmarkEnd: true;
   readonly bookmarkStart: true;
@@ -75,9 +81,9 @@ declare const INLINE_SDT_CONTENT: {
   readonly preservedInline: true;
   readonly run: true;
   readonly simpleField: true;
-  readonly commentRangeEnd: false;
-  readonly commentRangeStart: false;
-  readonly commentReference: false;
+  readonly commentRangeEnd: true;
+  readonly commentRangeStart: true;
+  readonly commentReference: true;
   readonly moveFromRangeEnd: true;
   readonly moveFromRangeStart: true;
   readonly moveToRangeEnd: true;
@@ -96,15 +102,15 @@ declare const INLINE_SDT_CONTENT: {
  * schema's: OOXML nests `w:ins` inside `w:hyperlink` and folio nests the link
  * inside the revision, so the paragraph parser hoists one around the link.
  */
-declare const HYPERLINK_CONTENT: {
+export declare const HYPERLINK_CONTENT: {
   readonly bookmarkEnd: true;
   readonly bookmarkStart: true;
+  readonly commentRangeEnd: true;
+  readonly commentRangeStart: true;
+  readonly commentReference: true;
   readonly inlineWrapper: true;
   readonly preservedInline: true;
   readonly run: true;
-  readonly commentRangeEnd: false;
-  readonly commentRangeStart: false;
-  readonly commentReference: false;
   readonly complexField: false;
   readonly deletion: false;
   readonly hyperlink: false;
@@ -112,11 +118,11 @@ declare const HYPERLINK_CONTENT: {
   readonly insertion: false;
   readonly mathEquation: false;
   readonly moveFrom: false;
-  readonly moveFromRangeEnd: false;
-  readonly moveFromRangeStart: false;
+  readonly moveFromRangeEnd: true;
+  readonly moveFromRangeStart: true;
   readonly moveTo: false;
-  readonly moveToRangeEnd: false;
-  readonly moveToRangeStart: false;
+  readonly moveToRangeEnd: true;
+  readonly moveToRangeStart: true;
   readonly simpleField: false;
 };
 /**
@@ -127,7 +133,7 @@ declare const HYPERLINK_CONTENT: {
  * model. `w:fldData` is the field's own child rather than its content, so it
  * rides `dispatchChildren`'s sink like any other capture.
  */
-declare const SIMPLE_FIELD_CONTENT: {
+export declare const SIMPLE_FIELD_CONTENT: {
   readonly hyperlink: true;
   readonly inlineWrapper: true;
   readonly preservedInline: true;
@@ -157,12 +163,11 @@ declare const SIMPLE_FIELD_CONTENT: {
  * keeps that narrowing: filtering a list the bidirectional wrappers are
  * already flattened out of must not put one back into the result type.
  */
-declare const isTrackedChangeWrapperChild: <Content extends document_d_exports.ParagraphContent>(content: Content) => content is Extract<Content, document_d_exports.TrackedRunContent>;
+export declare const isTrackedChangeWrapperChild: <Content extends document_d_exports.ParagraphContent>(content: Content) => content is Extract<Content, document_d_exports.TrackedRunContent>;
 /** Whether an inline content control keeps this content inside `<w:sdtContent>`. */
-declare const isInlineSdtContent: <Content extends document_d_exports.ParagraphContent>(content: Content) => content is Extract<Content, document_d_exports.InlineSdt["content"][number]>;
+export declare const isInlineSdtContent: <Content extends document_d_exports.ParagraphContent>(content: Content) => content is Extract<Content, document_d_exports.InlineSdt["content"][number]>;
 /** Whether a `w:hyperlink` keeps this content inside itself. */
-declare const isHyperlinkContent: <Content extends document_d_exports.ParagraphContent>(content: Content) => content is Extract<Content, document_d_exports.Hyperlink["children"][number]>;
+export declare const isHyperlinkContent: <Content extends document_d_exports.ParagraphContent>(content: Content) => content is Extract<Content, document_d_exports.Hyperlink["children"][number]>;
 /** Whether a `w:fldSimple` keeps this content inside itself. */
-declare const isSimpleFieldContent: <Content extends document_d_exports.ParagraphContent>(content: Content) => content is Extract<Content, document_d_exports.SimpleField["content"][number]>;
-//#endregion
-export { HYPERLINK_CONTENT, INLINE_SDT_CONTENT, SIMPLE_FIELD_CONTENT, TRACKED_CHANGE_WRAPPER_CONTENT, isHyperlinkContent, isInlineSdtContent, isSimpleFieldContent, isTrackedChangeWrapperChild };
+export declare const isSimpleFieldContent: <Content extends document_d_exports.ParagraphContent>(content: Content) => content is Extract<Content, document_d_exports.SimpleField["content"][number]>;
+//#endregion

package/dist/docx/inlineWrapperContent.js

@@ -10,9 +10,10 @@
 * Neither says anything about the revision, so lifting one out of a revision
 * takes its text out of the revision with it.
 *
-* Move-range markers stay inside the revision that owns their authored
-* position. Comment ranges remain paragraph-level because the editor projects
-* them as marks over content rather than as boundary atoms.
+* Range markers stay inside the revision that owns their authored position.
+* Comment range markers are positions even though the editor projects their
+* extent as marks; lifting a marker changes which side of the tracked content
+* owns that position when the revision is resolved.
 */
 const TRACKED_CHANGE_WRAPPER_CONTENT = {
 	inlineWrapper: true,
@@ -29,9 +30,9 @@ const TRACKED_CHANGE_WRAPPER_CONTENT = {
 	preservedInline: true,
 	run: true,
 	simpleField: true,
-	commentRangeEnd: false,
-	commentRangeStart: false,
-	commentReference: false,
+	commentRangeEnd: true,
+	commentRangeStart: true,
+	commentReference: true,
 	moveFromRangeEnd: true,
 	moveFromRangeStart: true,
 	moveToRangeEnd: true,
@@ -46,18 +47,23 @@ const TRACKED_CHANGE_WRAPPER_CONTENT = {
 * does not model, and the bidirectional controls directly inside
 * `<w:sdtContent>`.
 *
-* The bookmark boundaries are admitted for the reason the revision wrapper
-* admits them: `CT_SdtContentRun` reaches `EG_RangeMarkupElements` through
+* The bookmark and comment boundaries are admitted for the reason the
+* revision wrapper admits them: `CT_SdtContentRun` reaches
+* `EG_RangeMarkupElements` through
 * `EG_RunLevelElts`, so the marker is valid where Word wrote it, and lifting
 * it out changes what the bookmark covers. A range whose extent was the
 * control's content comes back covering the control plus whatever follows, so
 * a `REF` field or a link to it resolves to the wrong text.
 *
-* Move-range boundaries stay where the source put them. The editor has
-* zero-width boundary nodes for them, so lifting one beside the control would
-* change which content the tracked move covers without any representational
-* need. Comment ranges remain paragraph-level because the editor projects
-* them as marks shared across the whole story rather than boundary atoms.
+* Point comment references are lifted from their required run carrier and
+* rebuilt as a run by the serializer; they are not emitted as direct
+* `<w:sdtContent>` children. Move-range boundaries stay where the source put
+* them. The editor has zero-width boundary nodes for them, so lifting one
+* beside the control would change which content the tracked move covers
+* without any representational need. Comment range boundaries are
+* paragraph-position markers in the editor, but `CT_SdtContentRun` also
+* admits them as direct children. Keeping them here preserves the authored
+* container when neighboring wrappers collapse.
 */
 const INLINE_SDT_CONTENT = {
 	inlineWrapper: true,
@@ -74,9 +80,9 @@ const INLINE_SDT_CONTENT = {
 	preservedInline: true,
 	run: true,
 	simpleField: true,
-	commentRangeEnd: false,
-	commentRangeStart: false,
-	commentReference: false,
+	commentRangeEnd: true,
+	commentRangeStart: true,
+	commentReference: true,
 	moveFromRangeEnd: true,
 	moveFromRangeStart: true,
 	moveToRangeEnd: true,
@@ -98,12 +104,12 @@ const INLINE_SDT_CONTENT = {
 const HYPERLINK_CONTENT = {
 	bookmarkEnd: true,
 	bookmarkStart: true,
+	commentRangeEnd: true,
+	commentRangeStart: true,
+	commentReference: true,
 	inlineWrapper: true,
 	preservedInline: true,
 	run: true,
-	commentRangeEnd: false,
-	commentRangeStart: false,
-	commentReference: false,
 	complexField: false,
 	deletion: false,
 	hyperlink: false,
@@ -111,11 +117,11 @@ const HYPERLINK_CONTENT = {
 	insertion: false,
 	mathEquation: false,
 	moveFrom: false,
-	moveFromRangeEnd: false,
-	moveFromRangeStart: false,
+	moveFromRangeEnd: true,
+	moveFromRangeStart: true,
 	moveTo: false,
-	moveToRangeEnd: false,
-	moveToRangeStart: false,
+	moveToRangeEnd: true,
+	moveToRangeStart: true,
 	simpleField: false
 };
 /**

package/dist/docx/inlineWrapperParser.d.ts

@@ -2,10 +2,9 @@ import { document_d_exports } from "../types/document.js";
 import { XmlElement } from "./xmlParser.js";
 //#region src/docx/inlineWrapperParser.d.ts
 /** The elements that spell a transparent inline wrapper. */
-declare const INLINE_WRAPPER_ELEMENTS: readonly ["bdo", "dir", "smartTag", "customXml"];
+export declare const INLINE_WRAPPER_ELEMENTS: readonly ["bdo", "dir", "smartTag", "customXml"];
 /** One of them, as the child dispatcher names it. */
-type InlineWrapperElement = (typeof INLINE_WRAPPER_ELEMENTS)[number];
+export type InlineWrapperElement = (typeof INLINE_WRAPPER_ELEMENTS)[number];
 /** The wrapper `element` spells, around content the caller has already read. */
-declare const inlineWrapperOf: (element: InlineWrapperElement, node: XmlElement, content: document_d_exports.ParagraphContent[]) => document_d_exports.InlineWrapper;
-//#endregion
-export { INLINE_WRAPPER_ELEMENTS, InlineWrapperElement, inlineWrapperOf };
+export declare const inlineWrapperOf: (element: InlineWrapperElement, node: XmlElement, content: document_d_exports.ParagraphContent[]) => document_d_exports.InlineWrapper;
+//#endregion

package/dist/docx/inlineWrapperParser.js

@@ -2,6 +2,20 @@ import { captureVerbatimXml } from "./verbatimCapture.js";
 import { findChild, getAttribute } from "./xmlParser.js";
 import { BIDI_CONTROLS } from "@stll/docx-core/model";
 //#region src/docx/inlineWrapperParser.ts
+/**
+* The four transparent inline wrappers, read from the element that spells one.
+*
+* `w:bdo`, `w:dir`, `w:smartTag` and the run-level `w:customXml` are declared
+* by `EG_PContent`, so every container that holds inline content holds them:
+* a paragraph, a revision, an inline content control, a link and a simple
+* field. What the wrapper adds — a layout control, or a name, a URI and a
+* properties bag — is decided by the element alone, so it is read here once.
+*
+* What the wrapper *holds* is the container's own question, because the
+* declared children of a `w:bdo` are the declared children of whatever the
+* `w:bdo` sits in. So the caller walks the content with its own handler map
+* and hands the result in; this module never recurses.
+*/
 /** The elements that spell a transparent inline wrapper. */
 const INLINE_WRAPPER_ELEMENTS = [
 	"bdo",

package/dist/docx/linkedSdtPreservation.d.ts

@@ -1,10 +1,10 @@
 import { XmlElement } from "./xmlParser.js";
 //#region src/docx/linkedSdtPreservation.d.ts
 declare const UnrepresentableLinkedSdtRevisionError_base: import("better-result").TaggedErrorClass<"UnrepresentableLinkedSdtRevisionError">;
-declare class UnrepresentableLinkedSdtRevisionError extends UnrepresentableLinkedSdtRevisionError_base<{
+export declare class UnrepresentableLinkedSdtRevisionError extends UnrepresentableLinkedSdtRevisionError_base<{
   message: string;
 }> {}
 /** Capture only the unsupported hyperlink child, never its enclosing revision. */
-declare const preserveLinkedSdt: (root: XmlElement) => import("@stll/docx-core/model").PreservedInline;
+export declare const preserveLinkedSdt: (root: XmlElement) => import("@stll/docx-core/model").PreservedInline;
 //#endregion
-export { UnrepresentableLinkedSdtRevisionError, preserveLinkedSdt };
+export {};

package/dist/docx/listMarkerComputation.d.ts

@@ -1,18 +1,17 @@
 import { document_d_exports } from "../types/document.js";
 import { NumberingMap } from "./numberingParser.js";
 //#region src/docx/listMarkerComputation.d.ts
-type PreviousListState = {
+export type PreviousListState = {
   abstractNumId: number | null;
   fromStyle: boolean;
   numId: number | null;
 };
-type ComputeListMarkerOptions = {
+export type ComputeListMarkerOptions = {
   numbering: NumberingMap | null;
   listCounters: Map<number, number[]>;
   abstractCounters: Map<number, number[]>;
   restartedNumIds: Set<number>;
   previousList: PreviousListState;
 };
-declare const computeListMarker: (paragraph: document_d_exports.Paragraph, { numbering, listCounters, abstractCounters, restartedNumIds, previousList }: ComputeListMarkerOptions) => void;
-//#endregion
-export { ComputeListMarkerOptions, PreviousListState, computeListMarker };
+export declare const computeListMarker: (paragraph: document_d_exports.Paragraph, { numbering, listCounters, abstractCounters, restartedNumIds, previousList }: ComputeListMarkerOptions) => void;
+//#endregion

package/dist/docx/listModelNormalization.d.ts

@@ -5,6 +5,6 @@ type CanonicalListNormalization = {
   document: document_d_exports.Document;
   inverse: DocumentOp[];
 };
-declare const normalizeListModelRendering: (document: document_d_exports.Document) => CanonicalListNormalization;
+export declare const normalizeListModelRendering: (document: document_d_exports.Document) => CanonicalListNormalization;
 //#endregion
-export { normalizeListModelRendering };
+export {};

package/dist/docx/listModelNormalization.js

@@ -9,6 +9,7 @@ import { listRenderingDefinitionsMatch } from "./listRendering.js";
 import { computeListRendering, getCachedNumberingMap } from "./numberingParser.js";
 import { assignParagraphIndentationProjection, cloneParagraphWithPropertySource, paragraphFormattingWithAuthoredIndentation, sameParagraphIndentationProjection } from "./paragraphPropertySource.js";
 import { panic } from "better-result";
+import { finalizeParagraphFormatting } from "@stll/docx-core/model";
 import { DOCUMENT_OP_TYPES, EMPTY_PROPERTY_SETS, OP_STORIES, registerParagraphPropertySnapshot, withBodyContent } from "@stll/docx-core/ops";
 //#region src/docx/listModelNormalization.ts
 /** Canonical edits retain authored fields; list rendering follows the current numbering. */
@@ -64,19 +65,21 @@ const normalizeListModelRendering = (document) => {
 			const cached = paragraph.listRendering;
 			const rendering = definition !== null && cached !== void 0 && listRenderingDefinitionsMatch(cached, definition) ? { ...cached } : definition;
 			const authoredFormatting = paragraphFormattingWithAuthoredIndentation(next);
+			const authored = paragraphIndentationFromFormatting(authoredFormatting);
+			const inheritance = listIndentationProvenancePatch({
+				direct: authored,
+				styleFormatting: styles.resolveParagraphStyle(next.formatting?.styleId).paragraphFormatting,
+				numberingSource: next.formatting?.numPr?.kind === "reference" || next.formatting?.numPrFromStyle === void 0 ? "paragraph" : "style",
+				numPr: numPr?.kind === "reference" ? {
+					numId: numPr.numId,
+					ilvl: numPr.ilvl ?? 0
+				} : void 0,
+				numbering
+			});
 			assignParagraphIndentationProjection({
 				paragraph: next,
 				authored: authoredFormatting,
-				inherited: paragraphIndentationFromFormatting(listIndentationProvenancePatch({
-					direct: paragraphIndentationFromFormatting(authoredFormatting),
-					styleFormatting: styles.resolveParagraphStyle(next.formatting?.styleId).paragraphFormatting,
-					numberingSource: next.formatting?.numPr?.kind === "reference" || next.formatting?.numPrFromStyle === void 0 ? "paragraph" : "style",
-					numPr: numPr?.kind === "reference" ? {
-						numId: numPr.numId,
-						ilvl: numPr.ilvl ?? 0
-					} : void 0,
-					numbering
-				})._resolvedFormatting) ?? {}
+				inherited: paragraphIndentationFromFormatting(inheritance._resolvedFormatting) ?? {}
 			});
 			if (canonicalJson(paragraphIndentationFromFormatting(next.formatting)) !== canonicalJson(paragraphIndentationFromFormatting(formatting))) inverse.unshift({
 				type: DOCUMENT_OP_TYPES.SET_PARAGRAPH_PROPS,
@@ -110,7 +113,8 @@ const normalizeListModelRendering = (document) => {
 				paragraph: next,
 				snapshot: authoredFormatting
 			});
-			if (sameParagraphIndentationProjection({
+			if (finalizeParagraphFormatting(next.formatting) === void 0) delete next.formatting;
+			if (finalizeParagraphFormatting(formatting) === formatting && sameParagraphIndentationProjection({
 				left: next,
 				right: paragraph
 			}) && canonicalJson(next.formatting) === canonicalJson(formatting) && canonicalJson(next.listRendering) === canonicalJson(cached)) return paragraph;

package/dist/docx/listNumberingInstances.d.ts

@@ -1,10 +1,10 @@
 import { document_d_exports } from "../types/document.js";
 //#region src/docx/listNumberingInstances.d.ts
 /** The two kinds of list a command can create. */
-declare const LIST_KINDS: readonly ["bullet", "numbered"];
-type ListKind = (typeof LIST_KINDS)[number];
+export declare const LIST_KINDS: readonly ["bullet", "numbered"];
+export type ListKind = (typeof LIST_KINDS)[number];
 /** What a numbered list's first level counts in and how its marker reads. */
-type ListLevelFormat = {
+export type ListLevelFormat = {
   numFmt: document_d_exports.NumberFormat;
   /** `w:lvlText` for level 0, e.g. `%1.` or `%1)`. */
   lvlText: string;
@@ -27,7 +27,7 @@ type MintedListInstance = {
  * document references (see {@link completeListNumbering}), so the new ids
  * collide with none of them.
  */
-declare const mintListInstance: (definitions: document_d_exports.NumberingDefinitions | null | undefined, { kind, format, start }: NewListDefinition) => MintedListInstance;
+export declare const mintListInstance: (definitions: document_d_exports.NumberingDefinitions | null | undefined, { kind, format, start }: NewListDefinition) => MintedListInstance;
 type RestartListInstanceOptions = {
   abstractNumId: number;
   ilvl: number;
@@ -39,9 +39,9 @@ type RestartListInstanceOptions = {
  * makes a consumer count the instance on its own rather than continue the
  * other instances of the same definition.
  */
-declare const restartListInstance: (definitions: document_d_exports.NumberingDefinitions | null | undefined, { abstractNumId, ilvl, start }: RestartListInstanceOptions) => MintedListInstance;
+export declare const restartListInstance: (definitions: document_d_exports.NumberingDefinitions | null | undefined, { abstractNumId, ilvl, start }: RestartListInstanceOptions) => MintedListInstance;
 /** One paragraph's numbering reference and the rendering it resolved to. */
-type ListInstanceReference = {
+export type ListInstanceReference = {
   numId: number;
   ilvl: number;
   rendering: document_d_exports.ListRendering;
@@ -54,6 +54,6 @@ type ListInstanceReference = {
  * id read from a file) has no rendering and so is never defined here. Returns
  * `definitions` itself when nothing is missing.
  */
-declare const completeListNumbering: (definitions: document_d_exports.NumberingDefinitions | undefined, references: Iterable<ListInstanceReference>) => document_d_exports.NumberingDefinitions | undefined;
+export declare const completeListNumbering: (definitions: document_d_exports.NumberingDefinitions | undefined, references: Iterable<ListInstanceReference>) => document_d_exports.NumberingDefinitions | undefined;
 //#endregion
-export { LIST_KINDS, ListInstanceReference, ListKind, ListLevelFormat, completeListNumbering, mintListInstance, restartListInstance };
+export {};

package/dist/docx/listRendering.d.ts

@@ -2,17 +2,16 @@ import { document_d_exports } from "../types/document.js";
 import { NumberingMap } from "./numberingParser.js";
 //#region src/docx/listRendering.d.ts
 /** Compare scalar fields directly; only nested records need canonical ordering. */
-declare const listRenderingDefinitionsMatch: (left: document_d_exports.ListRendering, right: document_d_exports.ListRendering) => boolean;
-type ListRenderingDefinition = {
+export declare const listRenderingDefinitionsMatch: (left: document_d_exports.ListRendering, right: document_d_exports.ListRendering) => boolean;
+export type ListRenderingDefinition = {
   rendering: document_d_exports.ListRendering | null;
   nextSlotOffset: number | undefined;
 };
 /** Resolve numbering facts independently of any paragraph's cached counters. */
-declare const resolveListRenderingDefinition: (numPr: {
+export declare const resolveListRenderingDefinition: (numPr: {
   numId: number;
   ilvl?: number;
 }, numbering: NumberingMap | undefined) => ListRenderingDefinition;
 /** Keep content-derived counter/folded-field facts only while their definition is current. */
-declare const resolveCachedListRendering: (cached: document_d_exports.ListRendering | undefined, { rendering, nextSlotOffset }: ListRenderingDefinition) => document_d_exports.ListRendering | null;
-//#endregion
-export { ListRenderingDefinition, listRenderingDefinitionsMatch, resolveCachedListRendering, resolveListRenderingDefinition };
+export declare const resolveCachedListRendering: (cached: document_d_exports.ListRendering | undefined, { rendering, nextSlotOffset }: ListRenderingDefinition) => document_d_exports.ListRendering | null;
+//#endregion

package/dist/docx/listTemplate.d.ts

@@ -1,12 +1,12 @@
 import { document_d_exports } from "../types/document.js";
 //#region src/docx/listTemplate.d.ts
-type ResolvedListComponent = {
+export type ResolvedListComponent = {
   level: number;
   relativeStart: number;
   start: number;
   end: number;
 };
-type ResolvedListTemplate = {
+export type ResolvedListTemplate = {
   value: string;
   components: readonly ResolvedListComponent[];
 };
@@ -16,7 +16,7 @@ type ResolveListTemplateOptions = {
   levelFormats?: readonly (document_d_exports.CounterFormat | undefined)[] | undefined;
   forceDecimal?: boolean | undefined;
 };
-declare function resolveListTemplate(options: ResolveListTemplateOptions): string;
-declare function resolveListTemplateWithComponents({ template, counters, levelFormats, forceDecimal }: ResolveListTemplateOptions): ResolvedListTemplate;
+export declare function resolveListTemplate(options: ResolveListTemplateOptions): string;
+export declare function resolveListTemplateWithComponents({ template, counters, levelFormats, forceDecimal }: ResolveListTemplateOptions): ResolvedListTemplate;
 //#endregion
-export { ResolvedListComponent, ResolvedListTemplate, resolveListTemplate, resolveListTemplateWithComponents };
+export {};

package/dist/docx/markupRangeMarker.d.ts

@@ -1,8 +1,9 @@
 import { document_d_exports } from "../types/document.js";
 import { XmlElement } from "./xmlParser.js";
 //#region src/docx/markupRangeMarker.d.ts
-declare const parseMarkupRangeMarker: (node: XmlElement) => document_d_exports.MarkupRangeMarker;
-declare const parseBookmarkRangeMarker: (node: XmlElement) => document_d_exports.BookmarkRangeMarker;
+export declare const parseMarkupRangeMarker: (node: XmlElement) => document_d_exports.MarkupRangeMarker;
+export declare const parseCopyOriginMarker: (node: XmlElement) => Pick<document_d_exports.BookmarkStart, "copyOriginAncestors">;
+export declare const parseBookmarkRangeMarker: (node: XmlElement) => Omit<document_d_exports.BookmarkStart, "type">;
 /**
  * `w:author` is required on `CT_MoveBookmark`, so an absent one takes the same
  * `Unknown` fallback a tracked change takes rather than leaving the saved
@@ -10,6 +11,22 @@ declare const parseBookmarkRangeMarker: (node: XmlElement) => document_d_exports
  * but inventing a timestamp would state a fact about the document that is not
  * true, so an absent date stays absent.
  */
-declare const parseMoveBookmarkMarker: (node: XmlElement) => document_d_exports.MoveBookmarkMarker;
+export declare const parseMoveBookmarkMarker: (node: XmlElement) => Omit<document_d_exports.MoveFromRangeStart, "type">;
+/**
+ * A move's range markers between blocks, as every block container reads them.
+ * They are typed blocks, not captured bytes, so the passes that pair a start
+ * with its end can see both halves wherever a container holds them.
+ */
+type BlockMoveRangeMarkerHandler = (child: XmlElement, walk: {
+  modelled: document_d_exports.BlockContent[];
+}) => void;
+/** Spelled out, so its declaration reads the same on every build. */
+type BlockMoveRangeMarkerHandlers = {
+  readonly moveFromRangeStart: BlockMoveRangeMarkerHandler;
+  readonly moveFromRangeEnd: BlockMoveRangeMarkerHandler;
+  readonly moveToRangeStart: BlockMoveRangeMarkerHandler;
+  readonly moveToRangeEnd: BlockMoveRangeMarkerHandler;
+};
+export declare const BLOCK_MOVE_RANGE_MARKER_HANDLERS: BlockMoveRangeMarkerHandlers;
 //#endregion
-export { parseBookmarkRangeMarker, parseMarkupRangeMarker, parseMoveBookmarkMarker };
+export {};