@stll/folio-core 0.37.4 → 0.38.0

package/dist/docx/blockContentParser.js

@@ -7,7 +7,7 @@ import { enrichParagraphTextBoxes } from "./paragraphTextBoxEnrichment.js";
 import { parseSdtProperties } from "./sdtProperties.js";
 import { parseTable } from "./tableParser.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
-import { findChild, getChildElements, getLocalName, mergeXmlnsDeclarations } from "./xmlParser.js";
+import { findChild, getChildElements, getLocalName, mergeXmlnsDeclarations, selectAlternateContentBranch } from "./xmlParser.js";
 //#region src/docx/blockContentParser.ts
 const computeListMarker = (paragraph, { numbering, listCounters, abstractCounters, restartedNumIds, previousList }) => {
 	const listRendering = paragraph.listRendering;
@@ -80,6 +80,13 @@ const computeListMarker = (paragraph, { numbering, listCounters, abstractCounter
 	}
 	listRendering.marker = computedMarker;
 };
+const withContainerXmlns = (state, element) => ({
+	...state,
+	options: {
+		...state.options,
+		rootXmlns: mergeXmlnsDeclarations(state.options?.rootXmlns ?? {}, element)
+	}
+});
 const parseBlockContent = (parent, styles, theme, numbering, rels, media, options) => parseBlockContentWithState(parent, styles, theme, numbering, rels, media, {
 	listCounters: /* @__PURE__ */ new Map(),
 	abstractCounters: /* @__PURE__ */ new Map(),
@@ -132,12 +139,17 @@ const parseBlockContentWithState = (parent, styles, theme, numbering, rels, medi
 			const blockSdt = {
 				type: "blockSdt",
 				properties,
-				content: sdtContent ? parseBlockContentWithState(sdtContent, styles, theme, numbering, rels, media, state) : []
+				content: sdtContent ? parseBlockContentWithState(sdtContent, styles, theme, numbering, rels, media, withContainerXmlns(withContainerXmlns(state, child), sdtContent)) : []
 			};
 			if (prependBookmarkMarkersToFirstParagraphInBlocks(blockSdt.content, pendingBookmarkMarkers)) pendingBookmarkMarkers.length = 0;
 			content.push(blockSdt);
 			continue;
 		}
+		if (localName === "AlternateContent") {
+			const selectedBranch = selectAlternateContentBranch(child);
+			if (selectedBranch) content.push(...parseBlockContentWithState(selectedBranch, styles, theme, numbering, rels, media, withContainerXmlns(withContainerXmlns(state, child), selectedBranch)));
+			continue;
+		}
 		if (localName === "bookmarkStart" || localName === "bookmarkEnd") {
 			const marker = parseBookmarkMarker(child, localName);
 			if (!appendBookmarkMarkerToLastParagraphInBlocks(content, marker)) pendingBookmarkMarkers.push(marker);

package/dist/docx/drawingIdNormalization.js

@@ -1,6 +1,27 @@
+import { isNewDataUrlDrawing } from "./newImage.js";
 import { visitDocxParagraphs, visitParagraphRuns } from "./paragraphTraversal.js";
+import { toTransitionalNamespaceUri } from "./transitionalSpelling.js";
+import { captureVerbatimXml } from "./verbatimCapture.js";
+import { NAMESPACES, OOXML_NAMESPACE_SCOPE, getLocalName, getNamespaceUri, parseXml } from "./xmlParser.js";
+import { panic } from "better-result";
 //#region src/docx/drawingIdNormalization.ts
 const GENERATED_DRAWING_ID_START = 1e5;
+const isDetachedRawDrawing = (drawing) => drawing?.rawXml !== void 0 && isNewDataUrlDrawing(drawing);
+const reassignRawDrawingId = ({ xml, id }) => {
+	const root = parseXml(xml, OOXML_NAMESPACE_SCOPE);
+	let foundDocPr = false;
+	const visit = (element) => {
+		if (toTransitionalNamespaceUri(getNamespaceUri(element) ?? "") === NAMESPACES.wp && getLocalName(element.name) === "docPr" || toTransitionalNamespaceUri(getNamespaceUri(element) ?? "") === NAMESPACES.pic && getLocalName(element.name) === "cNvPr") {
+			for (const name of Object.keys(element.attributes ?? {})) if (getLocalName(name) === "id" && element.attributes) {
+				element.attributes[name] = id;
+				if (toTransitionalNamespaceUri(getNamespaceUri(element) ?? "") === NAMESPACES.wp && getLocalName(element.name) === "docPr") foundDocPr = true;
+			}
+		}
+		for (const child of element.elements ?? []) visit(child);
+	};
+	visit(root);
+	return foundDocPr ? (root.elements ?? []).map(captureVerbatimXml).join("") : null;
+};
 const needsGeneratedId = ({ id }) => id === void 0 || id === "" || id === "0";
 const normalizeDrawingIds = (surfaces) => {
 	const entries = [];
@@ -16,12 +37,13 @@ const normalizeDrawingIds = (surfaces) => {
 				}
 				if (content.type === "drawing") entries.push({
 					drawing: content.image,
-					generateWhenMissing: content.rawXml === void 0
+					generateWhenMissing: content.rawXml === void 0,
+					...content.rawXml !== void 0 ? { rawDrawing: content } : {}
 				});
 			}
 		});
 	});
-	const usedIds = new Set(entries.flatMap(({ drawing }) => needsGeneratedId(drawing) ? [] : [drawing.id]));
+	const usedIds = new Set(entries.flatMap(({ drawing, rawDrawing }) => needsGeneratedId(drawing) || isDetachedRawDrawing(rawDrawing) ? [] : [drawing.id]));
 	let nextId = GENERATED_DRAWING_ID_START;
 	for (const { drawing, generateWhenMissing } of entries) {
 		if (!generateWhenMissing || !needsGeneratedId(drawing)) continue;
@@ -30,6 +52,25 @@ const normalizeDrawingIds = (surfaces) => {
 		usedIds.add(drawing.id);
 		nextId += 1;
 	}
+	for (const { drawing, rawDrawing } of entries) {
+		if (!isDetachedRawDrawing(rawDrawing)) continue;
+		if (!needsGeneratedId(drawing) && !usedIds.has(drawing.id)) {
+			usedIds.add(drawing.id);
+			continue;
+		}
+		while (usedIds.has(String(nextId))) nextId += 1;
+		const sourceXml = rawDrawing.rawXml;
+		if (sourceXml === void 0) panic("Detached raw drawing must retain its XML.");
+		const rawXml = reassignRawDrawingId({
+			xml: sourceXml,
+			id: String(nextId)
+		});
+		if (rawXml === null) panic("Detached raw drawing must contain wp:docPr.");
+		drawing.id = String(nextId);
+		rawDrawing.rawXml = rawXml;
+		usedIds.add(drawing.id);
+		nextId += 1;
+	}
 };
 //#endregion
 export { normalizeDrawingIds };

package/dist/docx/drawingRelationships.d.ts

@@ -0,0 +1,10 @@
+//#region src/docx/drawingRelationships.d.ts
+type RebindDrawingImageRelationshipOptions = {
+  xml: string;
+  previousId: string;
+  nextId: string;
+};
+/** Only a single embedded image can travel without importing other package resources. */
+declare const rebindDrawingImageRelationship: ({ xml, previousId, nextId }: RebindDrawingImageRelationshipOptions) => string | null;
+//#endregion
+export { rebindDrawingImageRelationship };

package/dist/docx/drawingRelationships.js

@@ -0,0 +1,28 @@
+import { captureVerbatimXml } from "./verbatimCapture.js";
+import { OFFICE_RELATIONSHIP_NAMESPACE_URIS, OOXML_NAMESPACE_SCOPE, findAttributeByNamespaceUri, getLocalName, getNamespaceUri, parseXml } from "./xmlParser.js";
+//#region src/docx/drawingRelationships.ts
+/** Only a single embedded image can travel without importing other package resources. */
+const rebindDrawingImageRelationship = ({ xml, previousId, nextId }) => {
+	const root = parseXml(xml, OOXML_NAMESPACE_SCOPE);
+	let embeddedCount = 0;
+	let unsupported = false;
+	const visit = (element) => {
+		for (const name of Object.keys(element.attributes ?? {})) {
+			const localName = getLocalName(name);
+			const attribute = findAttributeByNamespaceUri(element, OFFICE_RELATIONSHIP_NAMESPACE_URIS, localName);
+			if (!attribute || attribute.name !== name) continue;
+			if (!(localName === "embed" || localName === "id" && getLocalName(element.name) === "imagedata" && getNamespaceUri(element) === "urn:schemas-microsoft-com:vml") || attribute.value !== previousId) {
+				unsupported = true;
+				continue;
+			}
+			embeddedCount++;
+			if (element.attributes) element.attributes[name] = nextId;
+		}
+		for (const child of element.elements ?? []) visit(child);
+	};
+	visit(root);
+	if (unsupported || embeddedCount !== 1) return null;
+	return (root.elements ?? []).map(captureVerbatimXml).join("");
+};
+//#endregion
+export { rebindDrawingImageRelationship };

package/dist/docx/fieldParser.js

@@ -209,7 +209,7 @@ function resetComplexFieldContext(ctx) {
 function finalizeComplexField(ctx) {
 	return {
 		type: "complexField",
-		instruction: ctx.instruction.trim(),
+		instruction: ctx.instruction,
 		fieldType: parseFieldType(ctx.instruction),
 		fieldCode: ctx.codeRuns,
 		fieldResult: ctx.resultRuns,

package/dist/docx/hyperlinkParser.js

@@ -52,8 +52,7 @@ function parseHyperlink(node, rels, styles = null, theme = null, media = null, r
 		if (rels) {
 			const rel = rels.get(rId);
 			if (rel) {
-				const safeHref = sanitizeExternalUrl(rel.target);
-				if (safeHref) hyperlink.href = safeHref;
+				if (sanitizeExternalUrl(rel.target)) hyperlink.href = rel.target;
 			}
 		}
 	}
@@ -172,9 +171,8 @@ function resolveHyperlinkUrl(hyperlink, rels) {
 	if (hyperlink.rId) {
 		const rel = rels.get(hyperlink.rId);
 		if (rel) {
-			const safeHref = sanitizeExternalUrl(rel.target);
-			if (safeHref) {
-				hyperlink.href = safeHref;
+			if (sanitizeExternalUrl(rel.target)) {
+				hyperlink.href = rel.target;
 				return hyperlink.href;
 			}
 		}

package/dist/docx/imageRawXml.d.ts

@@ -0,0 +1,8 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/docx/imageRawXml.d.ts
+/** Fingerprints modeled image fields which make raw DrawingML stale when edited. */
+declare const imageRawXmlFingerprint: (image: document_d_exports.Image) => string;
+/** Editable raw drawing XML can replay only while its modeled projection is unchanged. */
+declare const canReplayEditableImageRawXml: (drawing: document_d_exports.DrawingContent) => boolean;
+//#endregion
+export { canReplayEditableImageRawXml, imageRawXmlFingerprint };

package/dist/docx/imageRawXml.js

@@ -0,0 +1,13 @@
+import { canonicalJson } from "../utils/canonicalJson.js";
+import { DRAWING_RAW_XML_MODES } from "@stll/docx-core/model";
+//#region src/docx/imageRawXml.ts
+const editableImageProjection = ({ id: _id, rId: _rId, src: _src, mimeType: _mimeType, filename: _filename, ...image }) => image;
+/** Fingerprints modeled image fields which make raw DrawingML stale when edited. */
+const imageRawXmlFingerprint = (image) => canonicalJson(editableImageProjection(image));
+/** Editable raw drawing XML can replay only while its modeled projection is unchanged. */
+const canReplayEditableImageRawXml = (drawing) => {
+	if (drawing.rawXmlMode === DRAWING_RAW_XML_MODES.PRESERVE_ONLY) return true;
+	return drawing.rawImageFingerprint === void 0 || drawing.rawImageFingerprint === imageRawXmlFingerprint(drawing.image);
+};
+//#endregion
+export { canReplayEditableImageRawXml, imageRawXmlFingerprint };

package/dist/docx/newImage.d.ts

@@ -3,8 +3,8 @@ import { DrawingContent, RunContent } from "../types/content.js";
 /**
  * A drawing needs a new package image part only when it is model-driven.
  *
- * Raw OOXML drawings can carry data-URL previews for browser rendering, but
- * save replays their raw XML instead of serializing the preview image.
+ * Raw OOXML drawings can carry previews for browser rendering. Only an explicit
+ * synthetic relationship opts a detached raw picture into media registration.
  */
 declare const isNewDataUrlDrawing: (content: RunContent) => content is DrawingContent;
 //#endregion

package/dist/docx/newImage.js

@@ -3,9 +3,9 @@ const SYNTHETIC_IMAGE_RID_PREFIX = "rId_img_";
 /**
 * A drawing needs a new package image part only when it is model-driven.
 *
-* Raw OOXML drawings can carry data-URL previews for browser rendering, but
-* save replays their raw XML instead of serializing the preview image.
+* Raw OOXML drawings can carry previews for browser rendering. Only an explicit
+* synthetic relationship opts a detached raw picture into media registration.
 */
-const isNewDataUrlDrawing = (content) => content.type === "drawing" && !content.rawXml && content.image.src?.startsWith("data:") === true && (!content.image.rId || content.image.rId.startsWith(SYNTHETIC_IMAGE_RID_PREFIX));
+const isNewDataUrlDrawing = (content) => content.type === "drawing" && (!content.rawXml || content.image.rId?.startsWith(SYNTHETIC_IMAGE_RID_PREFIX) === true) && content.image.src?.startsWith("data:") === true && (!content.image.rId || content.image.rId.startsWith(SYNTHETIC_IMAGE_RID_PREFIX));
 //#endregion
 export { isNewDataUrlDrawing };

package/dist/docx/numberingParser.d.ts

@@ -48,18 +48,6 @@ declare function computeListRendering(numPr: {
 }, numbering: NumberingMap): (document_d_exports.ListRendering & {
   levelStarts: number[];
 }) | null;
-/**
- * Compare two `numPr` references by value — `numId` plus `ilvl` (a missing
- * `ilvl` is level 0). Used for the style-sourced-numbering provenance check;
- * avoids JSON.stringify equality, which is sensitive to key order.
- */
-declare function numPrEqual(a: {
-  numId?: number;
-  ilvl?: number;
-} | null | undefined, b: {
-  numId?: number;
-  ilvl?: number;
-} | null | undefined): boolean;
 /**
  * Render list marker text by replacing placeholders with formatted numbers
  *
@@ -83,4 +71,4 @@ 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, numberingLevelHasMarkerSlot, padDecimal, parseNumbering, renderListMarker };
+export { NumberingMap, computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerFormattingFromLevel, numberingLevelHasMarkerSlot, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/numberingParser.js

@@ -1,7 +1,7 @@
 import { formatOoxmlCounter, padDecimal } from "./ooxmlCounterFormatter.js";
 import { LevelSuffixSchema, narrowEnum } from "./parserEnums.js";
 import { parseRunProperties } from "./runParser.js";
-import { findChild, findChildren, getAttribute, parseBooleanElement, parseNumericAttribute, parseXmlDocument } from "./xmlParser.js";
+import { WORDPROCESSINGML_NAMESPACE_URIS, findChild, findChildren, getAttribute, getLocalName, getNamespaceUri, parseBooleanElement, parseNumericAttribute, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/numberingParser.ts
 const NUMBER_FORMAT_MAP = {
 	decimal: "decimal",
@@ -65,6 +65,7 @@ const NUMBER_FORMAT_MAP = {
 	thaiNumbers: "thaiNumbers",
 	thaiCounting: "thaiCounting"
 };
+const wordprocessingLocalName = (element) => WORDPROCESSINGML_NAMESPACE_URIS.has(getNamespaceUri(element) ?? "") ? getLocalName(element.name) : null;
 /**
 * Parse numbering.xml into NumberingDefinitions
 *
@@ -110,20 +111,20 @@ function parseAbstractNumbering(element) {
 	const levelElements = [];
 	for (const child of element.elements ?? []) {
 		if (child.type !== "element") continue;
-		switch (child.name) {
-			case "w:multiLevelType":
+		switch (wordprocessingLocalName(child)) {
+			case "multiLevelType":
 				multiLevelTypeEl ??= child;
 				break;
-			case "w:name":
+			case "name":
 				nameEl ??= child;
 				break;
-			case "w:numStyleLink":
+			case "numStyleLink":
 				numStyleLinkEl ??= child;
 				break;
-			case "w:styleLink":
+			case "styleLink":
 				styleLinkEl ??= child;
 				break;
-			case "w:lvl":
+			case "lvl":
 				levelElements.push(child);
 				break;
 			default: break;
@@ -164,11 +165,11 @@ function parseNumberingInstance(element) {
 	const overrideElements = [];
 	for (const child of element.elements ?? []) {
 		if (child.type !== "element") continue;
-		if (child.name === "w:abstractNumId") {
+		if (wordprocessingLocalName(child) === "abstractNumId") {
 			abstractNumIdEl ??= child;
 			continue;
 		}
-		if (child.name === "w:lvlOverride") overrideElements.push(child);
+		if (wordprocessingLocalName(child) === "lvlOverride") overrideElements.push(child);
 	}
 	if (!abstractNumIdEl) return null;
 	const abstractNumIdStr = getAttribute(abstractNumIdEl, "w", "val");
@@ -191,11 +192,11 @@ function parseNumberingInstance(element) {
 			let lvlEl;
 			for (const child of overrideEl.elements ?? []) {
 				if (child.type !== "element") continue;
-				if (child.name === "w:startOverride") {
+				if (wordprocessingLocalName(child) === "startOverride") {
 					startOverrideEl ??= child;
 					continue;
 				}
-				if (child.name === "w:lvl") lvlEl ??= child;
+				if (wordprocessingLocalName(child) === "lvl") lvlEl ??= child;
 			}
 			if (startOverrideEl) {
 				const startVal = getAttribute(startOverrideEl, "w", "val");
@@ -239,38 +240,40 @@ function parseListLevel(element) {
 	let rPrEl;
 	for (const child of element.elements ?? []) {
 		if (child.type !== "element") continue;
-		switch (child.name) {
-			case "w:start":
+		const localName = wordprocessingLocalName(child);
+		if (localName === null) {
+			if (getLocalName(child.name) === "AlternateContent") alternateEl ??= child;
+			continue;
+		}
+		switch (localName) {
+			case "start":
 				startEl ??= child;
 				break;
-			case "w:numFmt":
+			case "numFmt":
 				numFmtEl ??= child;
 				break;
-			case "mc:AlternateContent":
-				alternateEl ??= child;
-				break;
-			case "w:lvlText":
+			case "lvlText":
 				lvlTextEl ??= child;
 				break;
-			case "w:lvlJc":
+			case "lvlJc":
 				lvlJcEl ??= child;
 				break;
-			case "w:suff":
+			case "suff":
 				suffEl ??= child;
 				break;
-			case "w:isLgl":
+			case "isLgl":
 				isLglEl ??= child;
 				break;
-			case "w:lvlRestart":
+			case "lvlRestart":
 				lvlRestartEl ??= child;
 				break;
-			case "w:legacy":
+			case "legacy":
 				legacyEl ??= child;
 				break;
-			case "w:pPr":
+			case "pPr":
 				pPrEl ??= child;
 				break;
-			case "w:rPr":
+			case "rPr":
 				rPrEl ??= child;
 				break;
 			default: break;
@@ -361,11 +364,11 @@ function parseLevelParagraphProps(pPr) {
 	let tabsEl;
 	for (const child of pPr.elements ?? []) {
 		if (child.type !== "element") continue;
-		if (child.name === "w:ind") {
+		if (wordprocessingLocalName(child) === "ind") {
 			indEl ??= child;
 			continue;
 		}
-		if (child.name === "w:tabs") tabsEl ??= child;
+		if (wordprocessingLocalName(child) === "tabs") tabsEl ??= child;
 	}
 	if (indEl) {
 		const left = parseNumericAttribute(indEl, "w", "left");
@@ -560,15 +563,6 @@ function computeListRendering(numPr, numbering) {
 	return rendering;
 }
 /**
-* Compare two `numPr` references by value — `numId` plus `ilvl` (a missing
-* `ilvl` is level 0). Used for the style-sourced-numbering provenance check;
-* avoids JSON.stringify equality, which is sensitive to key order.
-*/
-function numPrEqual(a, b) {
-	if (a == null || b == null) return a == null && b == null;
-	return a.numId === b.numId && (a.ilvl ?? 0) === (b.ilvl ?? 0);
-}
-/**
 * Render list marker text by replacing placeholders with formatted numbers
 *
 * @param lvlText - The level text pattern (e.g., "%1.", "%1.%2")
@@ -613,4 +607,4 @@ function isBulletLevel(level) {
 /** 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, numberingLevelHasMarkerSlot, padDecimal, parseNumbering, renderListMarker };
+export { computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerFormattingFromLevel, numberingLevelHasMarkerSlot, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/paragraphParser.js

@@ -1,4 +1,3 @@
-import { canonicalJson } from "../utils/canonicalJson.js";
 import { isValidHexColor } from "../utils/colorResolver.js";
 import { isValidHexId } from "../utils/hexId.js";
 import { parseBookmarkEnd as parseBookmarkEnd$1, parseBookmarkStart as parseBookmarkStart$1 } from "./bookmarkParser.js";
@@ -14,10 +13,11 @@ import { parseSdtProperties } from "./sdtProperties.js";
 import { parseSectionProperties } from "./sectionParser.js";
 import { parsePropertyChangeInfo, parseTrackedChangeInfo } from "./trackedChangeInfo.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
-import { WORDPROCESSINGML_NAMESPACE_URIS, cloneElement, findChild, findChildByNamespaceUri, findChildren, findChildrenByNamespaceUri, getAttribute, getChildElements, getLocalName, matchesName, mergeXmlnsDeclarations, parseBooleanElement, parseNumberingLevelAttribute, parseNumericAttribute } from "./xmlParser.js";
+import { WORDPROCESSINGML_NAMESPACE_URIS, cloneElement, findChild, findChildByNamespaceUri, findChildren, findChildrenByNamespaceUri, getAttribute, getAttributeByNamespaceUri, getChildElements, getLocalName, matchesName, mergeXmlnsDeclarations, parseBooleanElement, parseNumberingLevelAttribute, parseNumericAttribute, selectAlternateContentBranch } from "./xmlParser.js";
 import { panic } from "better-result";
-import { PARAGRAPH_MARK_CHANGE_KINDS } from "@stll/docx-core/model";
+import { PARAGRAPH_MARK_CHANGE_KINDS, REVIEW_CARRIERS } from "@stll/docx-core/model";
 //#region src/docx/paragraphParser.ts
+const FOLIO_REVIEW_HISTORY_NAMESPACES = /* @__PURE__ */ new Set(["urn:stella:folio:review-history:1"]);
 /**
 * Extract plain text from a math element (recursive text content extraction)
 */
@@ -533,7 +533,7 @@ function parseParagraphMarkChange(pPr) {
 	}
 }
 function isTrackedChangeWrapperChild(content) {
-	return content.type === "run" || content.type === "hyperlink" || content.type === "bookmarkStart" || content.type === "bookmarkEnd" || content.type === "simpleField" || content.type === "complexField" || content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo";
+	return content.type === "run" || content.type === "hyperlink" || content.type === "bookmarkStart" || content.type === "bookmarkEnd" || content.type === "simpleField" || content.type === "complexField" || content.type === "mathEquation" || content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo";
 }
 function isInlineSdtContent(content) {
 	return content.type === "run" || content.type === "hyperlink" || content.type === "simpleField" || content.type === "complexField" || content.type === "inlineSdt" || content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo" || content.type === "mathEquation";
@@ -888,7 +888,7 @@ function parseParagraphContents(paraElement, styles, theme, _numbering, rels, me
 						}];
 						const complexField = {
 							type: "complexField",
-							instruction: complexFieldInstr.trim(),
+							instruction: complexFieldInstr,
 							fieldType: parseFieldType(complexFieldInstr),
 							fieldCode: complexFieldCodeRuns,
 							fieldResult: resultRuns
@@ -912,6 +912,11 @@ function parseParagraphContents(paraElement, styles, theme, _numbering, rels, me
 				} else if (run.content.length > 0 || hasRunPayloadElement(runElement)) contents.push(run);
 				break;
 			}
+			case "AlternateContent": {
+				const selectedBranch = selectAlternateContentBranch(child);
+				if (selectedBranch) contents.push(...parseParagraphContents(selectedBranch, styles, theme, null, rels, media, trackedContext, mergeXmlnsDeclarations(inScopeXmlns, child)));
+				break;
+			}
 			case "hyperlink":
 				contents.push(...parseHyperlinkParagraphContents(child, rels, styles, theme, media, inScopeXmlns));
 				break;
@@ -1079,6 +1084,7 @@ function parseParagraph(node, styles, theme, numbering, rels = null, media = nul
 	if (paraId && isValidHexId(paraId)) paragraph.paraId = paraIdInRange(paraId);
 	const textId = getAttribute(node, "w14", "textId") ?? getAttribute(node, "w", "textId");
 	if (textId && isValidHexId(textId)) paragraph.textId = paraIdInRange(textId);
+	if (getAttributeByNamespaceUri(node, FOLIO_REVIEW_HISTORY_NAMESPACES, "reviewCarrier") === REVIEW_CARRIERS.TERMINAL_TABLE) paragraph.reviewCarrier = REVIEW_CARRIERS.TERMINAL_TABLE;
 	if (!options?.inHeaderFooter && paragraphStartsWithRenderedPageBreak(node)) paragraph.renderedPageBreakBefore = true;
 	const pPr = findChild(node, "w", "pPr");
 	if (pPr) {
@@ -1195,10 +1201,7 @@ function parseParagraph(node, styles, theme, numbering, rels = null, media = nul
 			}
 		}
 	}
-	if (pPr) assignParagraphPropertySource(paragraph, {
-		xml: captureParagraphPropertySource(pPr),
-		formattingJson: canonicalJson(paragraph.formatting ?? {})
-	});
+	if (pPr) assignParagraphPropertySource(paragraph, captureParagraphPropertySource(pPr));
 	return paragraph;
 }
 /**

package/dist/docx/paragraphPropertySource.d.ts

@@ -1,11 +1,13 @@
 import { document_d_exports } from "../types/document.js";
+import { ModeledParagraphFormattingEmission } from "../internal/paragraphFormattingSerialization.js";
 import { Transaction } from "prosemirror-state";
 import { Fragment, Mark, Node, NodeType } from "prosemirror-model";
 //#region src/docx/paragraphPropertySource.d.ts
-type ParagraphPropertySource = {
+declare const paragraphPropertySourceEmissionFingerprint: unique symbol;
+type ParagraphPropertySource = Readonly<{
   xml: string;
-  formattingJson: string;
-};
+  [paragraphPropertySourceEmissionFingerprint]: string;
+}>;
 declare const PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR = "_docxParagraphSourceToken";
 declare const PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR = "_docxParagraphSourceContract";
 /** Durable identity nested inside opaque collapsed-cell ProseMirror attrs; stripped on restore. */
@@ -26,8 +28,9 @@ declare const isParagraphPropertySourceToken: (token: unknown) => token is strin
 declare const paragraphPropertySourceTokenMatchesContract: (token: unknown, contract: string) => token is string;
 /** Visit the v1 provenance scope in canonical OOXML body-story order. */
 declare const visitDocumentStoryParagraphs: (content: document_d_exports.Document["package"]["document"]["content"], visit: (paragraph: document_d_exports.Paragraph) => void) => void;
-declare const assignParagraphPropertySource: (paragraph: document_d_exports.Paragraph, source: ParagraphPropertySource) => void;
+declare const assignParagraphPropertySource: (paragraph: document_d_exports.Paragraph, xml: string) => void;
 declare const getParagraphPropertySource: (paragraph: document_d_exports.Paragraph) => ParagraphPropertySource | undefined;
+declare const paragraphPropertySourceMatchesEmission: (source: ParagraphPropertySource, emission: ModeledParagraphFormattingEmission) => boolean;
 /** Copy the captured `w:pPr` without claiming the source paragraph's durable identity. */
 declare const copyParagraphPropertyCapture: (target: document_d_exports.Paragraph, source: document_d_exports.Paragraph) => void;
 declare const copyParagraphPropertySource: (target: document_d_exports.Paragraph, source: document_d_exports.Paragraph) => void;
@@ -126,4 +129,4 @@ declare const linkParagraphPropertySourceCandidate: (target: document_d_exports.
 declare const getParagraphPropertySourceCandidate: (paragraph: document_d_exports.Paragraph) => document_d_exports.Paragraph | undefined;
 declare const getParagraphPropertySourceTransferId: (paragraph: document_d_exports.Paragraph) => string | undefined;
 //#endregion
-export { DecodedTableCellParagraphSourcePayload, PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceValidationCode, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, TableCellParagraphPropertySourceBinding, TableCellParagraphSourcePayloadErrorClassification, assignDocumentParagraphPropertySourceContract, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };
+export { DecodedTableCellParagraphSourcePayload, PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceValidationCode, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, TableCellParagraphPropertySourceBinding, TableCellParagraphSourcePayloadErrorClassification, assignDocumentParagraphPropertySourceContract, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };

package/dist/docx/paragraphPropertySource.js

@@ -1,8 +1,18 @@
+import { modelParagraphFormattingEmission } from "../internal/paragraphFormattingSerialization.js";
+import { canonicalJson } from "../utils/canonicalJson.js";
 import { visitDocxParagraphs } from "./paragraphTraversal.js";
 import { TaggedError, panic } from "better-result";
 import { PluginKey } from "prosemirror-state";
 //#region src/docx/paragraphPropertySource.ts
+const paragraphPropertySourceEmissionFingerprint = Symbol("paragraphPropertySourceEmissionFingerprint");
 const paragraphPropertySources = /* @__PURE__ */ new WeakMap();
+const paragraphFormattingEmissionFingerprint = (emission) => canonicalJson(emission);
+const ownedParagraphPropertySource = (paragraph, xml) => {
+	return Object.freeze({
+		xml,
+		[paragraphPropertySourceEmissionFingerprint]: paragraphFormattingEmissionFingerprint(modelParagraphFormattingEmission(paragraph.formatting))
+	});
+};
 const paragraphPropertySourceOwners = /* @__PURE__ */ new WeakMap();
 const proseParagraphSourceOwners = /* @__PURE__ */ new WeakMap();
 const paragraphPropertySourceCandidates = /* @__PURE__ */ new WeakMap();
@@ -80,16 +90,18 @@ const paragraphPropertySourceTokenMatchesContract = (token, contract) => {
 const visitDocumentStoryParagraphs = (content, visit) => {
 	visitDocxParagraphs({ documentBody: { content } }, visit);
 };
-const assignParagraphPropertySource = (paragraph, source) => {
-	paragraphPropertySources.set(paragraph, source);
+const assignParagraphPropertySource = (paragraph, xml) => {
+	paragraphPropertySources.set(paragraph, ownedParagraphPropertySource(paragraph, xml));
 	paragraphPropertySourceOwners.set(paragraph, paragraph);
 };
 const getParagraphPropertySource = (paragraph) => paragraphPropertySources.get(paragraph);
+const paragraphPropertySourceMatchesEmission = (source, emission) => source[paragraphPropertySourceEmissionFingerprint] === paragraphFormattingEmissionFingerprint(emission);
 /** Copy the captured `w:pPr` without claiming the source paragraph's durable identity. */
 const copyParagraphPropertyCapture = (target, source) => {
 	const propertySource = paragraphPropertySources.get(source);
 	if (propertySource) {
-		paragraphPropertySources.set(target, { ...propertySource });
+		const copiedSource = Object.freeze({ ...propertySource });
+		paragraphPropertySources.set(target, copiedSource);
 		paragraphPropertySourceOwners.set(target, paragraphPropertySourceOwners.get(source) ?? source);
 	}
 };
@@ -676,4 +688,4 @@ const linkParagraphPropertySourceCandidate = (target, source) => {
 const getParagraphPropertySourceCandidate = (paragraph) => paragraphPropertySourceCandidates.get(paragraph);
 const getParagraphPropertySourceTransferId = (paragraph) => paragraphPropertySourceTransferIds.get(paragraph);
 //#endregion
-export { PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, assignDocumentParagraphPropertySourceContract, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };
+export { PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, assignDocumentParagraphPropertySourceContract, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };

package/dist/docx/removeHeaderFooterParts.d.ts

@@ -0,0 +1,14 @@
+import { document_d_exports } from "../types/document.js";
+import { RemovedSectionReference } from "../internal/sectionEndpointResolution.js";
+import JSZip from "jszip";
+//#region src/docx/removeHeaderFooterParts.d.ts
+type RemoveResolvedHeaderFooterPartsOptions = {
+  document: document_d_exports.Document;
+  zip: JSZip;
+  removedReferences: readonly RemovedSectionReference[];
+  compressionLevel: number;
+};
+/** Remove only parts whose last selection was explicitly resolved out of the document. */
+declare const removeResolvedHeaderFooterParts: ({ document, zip, removedReferences, compressionLevel }: RemoveResolvedHeaderFooterPartsOptions) => Promise<void>;
+//#endregion
+export { removeResolvedHeaderFooterParts };