@stll/folio-core 0.37.4 → 0.38.0

package/dist/docx/selectiveSave.js

@@ -2,13 +2,12 @@ import { parseCommentsExtended } from "./commentParser.js";
 import { withoutOrphanCommentRanges } from "./commentRangeIntegrity.js";
 import { hasUnsynthesizedReplyRanges } from "./commentReplyMarkers.js";
 import { validateFolioDocumentModel } from "./modelValidation.js";
-import { isNewDataUrlDrawing } from "./newImage.js";
 import { parseNumbering } from "./numberingParser.js";
 import { isUnsafePackagePath } from "./packageParts.js";
 import { RELATIONSHIP_TYPES } from "./relsParser.js";
-import { COMMENTS_CONTENT_TYPE, COMMENTS_EXTENDED_PART_LOWER, addCommentsExtendedOverride, addCommentsExtendedRelationship, applyUpdatesToZip, collectHeaderFooterUpdates, findMaxRId, hasModelDrivenPictureWatermark, hasUnmaterializedHeaderFooter, updateCoreProperties, withoutAttachedTemplate } from "./rezip.js";
+import { COMMENTS_CONTENT_TYPE, COMMENTS_EXTENDED_PART_LOWER, addCommentsExtendedOverride, addCommentsExtendedRelationship, applyUpdatesToZip, collectHeaderFooterUpdates, findMaxRId, hasModelDrivenPictureWatermark, hasUnmaterializedHeaderFooter, hasUnmaterializedInlineResources, updateCoreProperties, withoutAttachedTemplate } from "./rezip.js";
 import "./selectiveSaveFlags.js";
-import { buildPatchedDocumentXml, buildPatchedNoteXml, buildPatchedNumberingXml, collectChangedNumberingDefs, collectParaIds } from "./selectiveXmlPatch.js";
+import { buildPatchedDocumentXml, buildPatchedNoteXml, collectParaIds, patchNumberingDefinitions } from "./selectiveXmlPatch.js";
 import { ensureThreadedCommentParaIds, serializeComments, serializeCommentsExtended } from "./serializer/commentSerializer.js";
 import { serializeDocument } from "./serializer/documentSerializer.js";
 import { serializeEndnotes, serializeFootnotes } from "./serializer/noteSerializer.js";
@@ -16,25 +15,6 @@ import { serializeNumberingXml } from "./serializer/numberingSerializer.js";
 import { readRootNamespaceBindings } from "./serializer/partNamespaces.js";
 //#region src/docx/selectiveSave.ts
 /**
-* Check if document content has new images (data: URL without rId) or
-* new hyperlinks (href without rId). Combined into a single traversal
-* to avoid walking the block tree twice.
-*/
-function hasNewImagesOrHyperlinks(blocks) {
-	const runHasNewImage = (run) => run.content.some(isNewDataUrlDrawing);
-	for (const block of blocks) if (block.type === "paragraph") {
-		for (const item of block.content) if (item.type === "run") {
-			if (runHasNewImage(item)) return true;
-		} else if (item.type === "hyperlink" && item.href && !item.rId && !item.anchor) return true;
-		else if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") {
-			for (const sub of item.content) if (sub.type === "run" && runHasNewImage(sub)) return true;
-		}
-	} else if (block.type === "table") {
-		for (const row of block.rows) for (const cell of row.cells) if (hasNewImagesOrHyperlinks(cell.content)) return true;
-	}
-	return false;
-}
-/**
 * Splice edited footnote/endnote paragraphs into their parts and return the
 * candidate ids that could NOT be routed to a note part (an id that is neither
 * a body nor a note paragraph — the caller bails on those).
@@ -139,7 +119,7 @@ async function ensureCommentsExtendedPackaging(zip, updates) {
 * Numbering definitions carry no `paraId`, so this is NOT keyed off
 * `changedParaIds` — it always runs (like the comments/header updates) and uses
 * a re-parse+re-serialize baseline to detect which `w:abstractNum` / `w:num`
-* definitions actually changed. The model omits parts of numbering.xml
+* definitions changed or were minted. The model omits parts of numbering.xml
 * (`w:nsid`/`w:tmpl`, custom formats, level sub-elements), so only the changed
 * definitions are spliced by id; every other definition stays byte-exact.
 *
@@ -159,12 +139,12 @@ async function patchNumberingPart(zip, doc, updates) {
 	}
 	if (!file) return;
 	const originalXml = await file.async("text");
-	const baselineXml = serializeNumberingXml(parseNumbering(originalXml).definitions);
-	const currentXml = serializeNumberingXml(numbering);
-	const changed = collectChangedNumberingDefs(baselineXml, currentXml);
-	if (changed.abstractNums.size === 0 && changed.nums.size === 0) return;
-	const patched = buildPatchedNumberingXml(originalXml, currentXml, changed);
-	if (patched === null) return;
+	const patched = patchNumberingDefinitions({
+		originalXml,
+		baselineXml: serializeNumberingXml(parseNumbering(originalXml).definitions),
+		currentXml: serializeNumberingXml(numbering)
+	});
+	if (patched === null || patched === originalXml) return;
 	updates.set(file.name, patched);
 }
 /**
@@ -196,13 +176,13 @@ async function attemptSelectiveSave(doc, originalBuffer, options) {
 	if (hasUntrackedChanges) return null;
 	if (originalBuffer.byteLength > maxBytes) return null;
 	const content = doc.package.document.content;
-	if (hasNewImagesOrHyperlinks(content)) return null;
+	if (hasUnmaterializedInlineResources(content)) return null;
 	for (const part of [
 		...doc.package.headers?.values() ?? [],
 		...doc.package.footers?.values() ?? [],
 		...doc.package.footnotes ?? [],
 		...doc.package.endnotes ?? []
-	]) if (hasNewImagesOrHyperlinks(part.content)) return null;
+	]) if (hasUnmaterializedInlineResources(part.content)) return null;
 	if (hasUnmaterializedHeaderFooter(doc)) return null;
 	if (hasModelDrivenPictureWatermark(doc)) return null;
 	if (withoutOrphanCommentRanges(doc) !== doc) return null;

package/dist/docx/selectiveXmlPatch.d.ts

@@ -159,6 +159,13 @@ declare function buildPatchedNumberingXml(originalXml: string, currentXml: strin
  * because they cannot be spliced by id; they are appended instead.
  */
 declare function collectAddedNumberingDefs(baselineXml: string, currentXml: string): ChangedNumberingDefs;
+type PatchNumberingDefinitionsOptions = {
+  originalXml: string;
+  baselineXml: string;
+  currentXml: string;
+};
+/** Both save paths must write changed definitions and newly referenced instances together. */
+declare const patchNumberingDefinitions: ({ originalXml, baselineXml, currentXml }: PatchNumberingDefinitionsOptions) => string | null;
 /**
  * Append added `w:abstractNum` / `w:num` definitions from `currentXml` to
  * `xml`. ECMA-376 §17.9 orders every `w:abstractNum` before the first `w:num`,
@@ -171,4 +178,4 @@ declare function collectAddedNumberingDefs(baselineXml: string, currentXml: stri
  */
 declare function appendNumberingDefs(xml: string, currentXml: string, added: ChangedNumberingDefs): string | null;
 //#endregion
-export { ChangedNumberingDefs, ParagraphOffsets, PatchSafetyOptions, PatchValidationResult, appendNumberingDefs, buildParagraphOffsetIndex, buildPatchedDocumentXml, buildPatchedNotePartXml, buildPatchedNoteXml, buildPatchedNumberingXml, collectAddedNumberingDefs, collectChangedNoteParaIds, collectChangedNumberingDefs, collectParaIds, countParagraphElements, extractParagraphXml, findParagraphOffsets, isXmlNameBoundary, validatePatchSafety };
+export { ChangedNumberingDefs, ParagraphOffsets, PatchSafetyOptions, PatchValidationResult, appendNumberingDefs, buildParagraphOffsetIndex, buildPatchedDocumentXml, buildPatchedNotePartXml, buildPatchedNoteXml, buildPatchedNumberingXml, collectAddedNumberingDefs, collectChangedNoteParaIds, collectChangedNumberingDefs, collectParaIds, countParagraphElements, extractParagraphXml, findParagraphOffsets, isXmlNameBoundary, patchNumberingDefinitions, validatePatchSafety };

package/dist/docx/selectiveXmlPatch.js

@@ -1,4 +1,5 @@
-import { WORDPROCESSINGML_NAMESPACE_URIS, findAttributeByNamespaceUri, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, parseXmlDocument } from "./xmlParser.js";
+import { captureVerbatimXml } from "./verbatimCapture.js";
+import { WORDPROCESSINGML_NAMESPACE_URIS, cloneElement, findAttributeByNamespaceUri, getAttributeByNamespaceUri, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/selectiveXmlPatch.ts
 /**
 * Selective XML Patch Module
@@ -757,6 +758,65 @@ function collectAddedNumberingDefs(baselineXml, currentXml) {
 	};
 }
 const NUMBERING_CLOSE_ROOT = "</w:numbering>";
+const numberingDefinitionIdentity = (element) => {
+	if (!WORDPROCESSINGML_NAMESPACE_URIS.has(getNamespaceUri(element) ?? "")) return null;
+	const kind = getLocalName(element.name);
+	if (kind !== "abstractNum" && kind !== "num") return null;
+	const id = getAttributeByNamespaceUri(element, WORDPROCESSINGML_NAMESPACE_URIS, kind === "num" ? "numId" : "abstractNumId");
+	return id === null ? null : {
+		kind,
+		id
+	};
+};
+const patchNumberingByNamespace = ({ original, currentXml, changed, added }) => {
+	const current = parseXmlDocument(currentXml);
+	if (!current) return null;
+	const replacements = /* @__PURE__ */ new Map();
+	const namespaceDeclarations = Object.fromEntries(Object.entries(current.attributes ?? {}).filter(([name]) => name === "xmlns" || name.startsWith("xmlns:")));
+	for (const child of getChildElements(current)) {
+		const identity = numberingDefinitionIdentity(child);
+		if (!identity) continue;
+		const detached = parseXmlDocument(captureVerbatimXml(cloneElement(child, { attributes: {
+			...namespaceDeclarations,
+			...child.attributes
+		} })));
+		if (!detached) return null;
+		replacements.set(`${identity.kind}:${identity.id}`, detached);
+	}
+	const elements = [];
+	for (const child of original.elements ?? []) {
+		const identity = numberingDefinitionIdentity(child);
+		if (!identity || !changed[identity.kind === "num" ? "nums" : "abstractNums"].has(identity.id)) {
+			elements.push(child);
+			continue;
+		}
+		const replacement = replacements.get(`${identity.kind}:${identity.id}`);
+		if (!replacement) return null;
+		elements.push(replacement);
+	}
+	for (const [kind, ids] of [["abstractNum", added.abstractNums], ["num", added.nums]]) for (const id of ids) {
+		const replacement = replacements.get(`${kind}:${id}`);
+		if (!replacement) return null;
+		const firstNum = kind === "abstractNum" ? elements.findIndex((child) => numberingDefinitionIdentity(child)?.kind === "num") : -1;
+		elements.splice(firstNum < 0 ? elements.length : firstNum, 0, replacement);
+	}
+	return captureVerbatimXml(cloneElement(original, { elements }));
+};
+/** Both save paths must write changed definitions and newly referenced instances together. */
+const patchNumberingDefinitions = ({ originalXml, baselineXml, currentXml }) => {
+	const changed = collectChangedNumberingDefs(baselineXml, currentXml);
+	const added = collectAddedNumberingDefs(baselineXml, currentXml);
+	const original = parseXmlDocument(originalXml);
+	if (!original || getLocalName(original.name) !== "numbering" || !WORDPROCESSINGML_NAMESPACE_URIS.has(getNamespaceUri(original) ?? "")) return null;
+	if (getNamespacePrefix(original.name ?? "") !== "w") return patchNumberingByNamespace({
+		original,
+		currentXml,
+		changed,
+		added
+	});
+	const spliced = buildPatchedNumberingXml(originalXml, currentXml, changed);
+	return spliced === null ? null : appendNumberingDefs(spliced, currentXml, added);
+};
 /**
 * Append added `w:abstractNum` / `w:num` definitions from `currentXml` to
 * `xml`. ECMA-376 §17.9 orders every `w:abstractNum` before the first `w:num`,
@@ -812,4 +872,4 @@ function escapeRegExp(str) {
 	return str.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
 }
 //#endregion
-export { appendNumberingDefs, buildParagraphOffsetIndex, buildPatchedDocumentXml, buildPatchedNotePartXml, buildPatchedNoteXml, buildPatchedNumberingXml, collectAddedNumberingDefs, collectChangedNoteParaIds, collectChangedNumberingDefs, collectParaIds, countParagraphElements, extractParagraphXml, findParagraphOffsets, isXmlNameBoundary, validatePatchSafety };
+export { appendNumberingDefs, buildParagraphOffsetIndex, buildPatchedDocumentXml, buildPatchedNotePartXml, buildPatchedNoteXml, buildPatchedNumberingXml, collectAddedNumberingDefs, collectChangedNoteParaIds, collectChangedNumberingDefs, collectParaIds, countParagraphElements, extractParagraphXml, findParagraphOffsets, isXmlNameBoundary, patchNumberingDefinitions, validatePatchSafety };

package/dist/docx/serializer/borderSerializer.d.ts

@@ -1,5 +1,8 @@
 import { document_d_exports } from "../../types/document.js";
 //#region src/docx/serializer/borderSerializer.d.ts
+type ExhaustiveFields<Source, Classified extends keyof Source> = Exclude<keyof Source, Classified> extends never ? Source : never;
+type ClassifiedBorderField = "style" | "color" | "size" | "space" | "shadow" | "frame" | "artRelationshipId" | "topLeftArtRelationshipId" | "topRightArtRelationshipId" | "bottomLeftArtRelationshipId" | "bottomRightArtRelationshipId";
+type ExhaustiveBorder = ExhaustiveFields<document_d_exports.BorderSpec, ClassifiedBorderField>;
 /**
  * Serialize a single border element (`<w:top .../>`, `<w:left .../>`, ...).
  *
@@ -19,6 +22,6 @@ import { document_d_exports } from "../../types/document.js";
  * untrusted and are `escapeXml`'d before re-entering XML attributes; for valid
  * documents these are enum/hex values, so escaping is a no-op.
  */
-declare function serializeBorder(border: document_d_exports.BorderSpec | undefined, elementName: string): string;
+declare function serializeBorder(input: ExhaustiveBorder | undefined, elementName: string): string;
 //#endregion
 export { serializeBorder };

package/dist/docx/serializer/borderSerializer.js

@@ -19,25 +19,27 @@ import { escapeXml, intAttr } from "./xmlUtils.js";
 * untrusted and are `escapeXml`'d before re-entering XML attributes; for valid
 * documents these are enum/hex values, so escaping is a no-op.
 */
-function serializeBorder(border, elementName) {
-	if (!border) return "";
-	const attrs = [`w:val="${escapeXml(border.style)}"`];
-	if (border.size !== void 0) attrs.push(`w:sz="${intAttr(border.size)}"`);
-	if (border.space !== void 0) attrs.push(`w:space="${intAttr(border.space)}"`);
-	if (border.color) {
-		if (border.color.auto) attrs.push("w:color=\"auto\"");
-		else if (border.color.rgb) attrs.push(`w:color="${escapeXml(border.color.rgb)}"`);
-		if (border.color.themeColor) attrs.push(`w:themeColor="${escapeXml(border.color.themeColor)}"`);
-		if (border.color.themeTint) attrs.push(`w:themeTint="${escapeXml(border.color.themeTint)}"`);
-		if (border.color.themeShade) attrs.push(`w:themeShade="${escapeXml(border.color.themeShade)}"`);
+function serializeBorder(input, elementName) {
+	if (!input) return "";
+	const { style, color, size, space, shadow, frame, artRelationshipId, topLeftArtRelationshipId, topRightArtRelationshipId, bottomLeftArtRelationshipId, bottomRightArtRelationshipId } = input;
+	const attrs = [`w:val="${escapeXml(style)}"`];
+	if (size !== void 0) attrs.push(`w:sz="${intAttr(size)}"`);
+	if (space !== void 0) attrs.push(`w:space="${intAttr(space)}"`);
+	if (color) {
+		const { auto, rgb, themeColor, themeTint, themeShade } = color;
+		if (auto) attrs.push("w:color=\"auto\"");
+		else if (rgb) attrs.push(`w:color="${escapeXml(rgb)}"`);
+		if (themeColor) attrs.push(`w:themeColor="${escapeXml(themeColor)}"`);
+		if (themeTint) attrs.push(`w:themeTint="${escapeXml(themeTint)}"`);
+		if (themeShade) attrs.push(`w:themeShade="${escapeXml(themeShade)}"`);
 	}
-	if (border.shadow) attrs.push("w:shadow=\"true\"");
-	if (border.frame) attrs.push("w:frame=\"true\"");
-	if (border.artRelationshipId) attrs.push(`w:id="${escapeXml(border.artRelationshipId)}"`);
-	if (border.topLeftArtRelationshipId) attrs.push(`w:topLeft="${escapeXml(border.topLeftArtRelationshipId)}"`);
-	if (border.topRightArtRelationshipId) attrs.push(`w:topRight="${escapeXml(border.topRightArtRelationshipId)}"`);
-	if (border.bottomLeftArtRelationshipId) attrs.push(`w:bottomLeft="${escapeXml(border.bottomLeftArtRelationshipId)}"`);
-	if (border.bottomRightArtRelationshipId) attrs.push(`w:bottomRight="${escapeXml(border.bottomRightArtRelationshipId)}"`);
+	if (shadow) attrs.push("w:shadow=\"true\"");
+	if (frame) attrs.push("w:frame=\"true\"");
+	if (artRelationshipId) attrs.push(`w:id="${escapeXml(artRelationshipId)}"`);
+	if (topLeftArtRelationshipId) attrs.push(`w:topLeft="${escapeXml(topLeftArtRelationshipId)}"`);
+	if (topRightArtRelationshipId) attrs.push(`w:topRight="${escapeXml(topRightArtRelationshipId)}"`);
+	if (bottomLeftArtRelationshipId) attrs.push(`w:bottomLeft="${escapeXml(bottomLeftArtRelationshipId)}"`);
+	if (bottomRightArtRelationshipId) attrs.push(`w:bottomRight="${escapeXml(bottomRightArtRelationshipId)}"`);
 	return `<w:${elementName} ${attrs.join(" ")}/>`;
 }
 //#endregion

package/dist/docx/serializer/commentSerializer.js

@@ -1,7 +1,7 @@
 import { deterministicHexId } from "../../utils/hexId.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
 import { serializePartElement } from "./partNamespaces.js";
-import { serializeTextFormatting } from "./runSerializer.js";
+import { serializeTextFormatting } from "./textFormattingSerializer.js";
 import { escapeXml } from "./xmlUtils.js";
 //#region src/docx/serializer/commentSerializer.ts
 /**

package/dist/docx/serializer/numberingSerializer.js

@@ -1,5 +1,5 @@
 import { serializePartElement } from "./partNamespaces.js";
-import { serializeTextFormatting } from "./runSerializer.js";
+import { serializeTextFormatting } from "./textFormattingSerializer.js";
 import { escapeXml, intAttr } from "./xmlUtils.js";
 //#region src/docx/serializer/numberingSerializer.ts
 /**

package/dist/docx/serializer/paragraphSerializer.js

@@ -1,142 +1,19 @@
-import { canonicalJson } from "../../utils/canonicalJson.js";
-import { isValidHexColor } from "../../utils/colorResolver.js";
-import { numPrEqual } from "../numberingParser.js";
-import { getParagraphPropertySource } from "../paragraphPropertySource.js";
+import { modelParagraphFormattingEmission } from "../../internal/paragraphFormattingSerialization.js";
+import { getParagraphPropertySource, paragraphPropertySourceMatchesEmission } from "../paragraphPropertySource.js";
 import { reconcileRawSdtPr } from "../sdtPropertiesPatch.js";
 import { DATE_UTC_ATTRIBUTE } from "../trackedChangeInfo.js";
 import { toTransitionalNamespaceUri } from "../transitionalSpelling.js";
 import { captureVerbatimXml, sanitizeCapturedXmlElement } from "../verbatimCapture.js";
 import { NAMESPACES, OOXML_NAMESPACE_SCOPE, cloneElement, getChildElements, getLocalName, parseXml } from "../xmlParser.js";
-import { serializeBorder } from "./borderSerializer.js";
-import { serializeRun, serializeTextFormatting } from "./runSerializer.js";
+import { serializeRun } from "./runSerializer.js";
 import { serializeSectionProperties } from "./sectionPropertiesSerializer.js";
+import { serializeTextFormatting } from "./textFormattingSerializer.js";
 import { serializeTrackedChangeAttributes, trackedChangeAttributeRecord } from "./trackedChangeAttributes.js";
-import { escapeXml, intAttr, isSingleWellFormedElement } from "./xmlUtils.js";
+import { escapeXml, isSingleWellFormedElement } from "./xmlUtils.js";
 import { panic } from "better-result";
 import { PARAGRAPH_MARK_CHANGE_KINDS } from "@stll/docx-core/model";
 //#region src/docx/serializer/paragraphSerializer.ts
 /**
-* Serialize paragraph borders (w:pBdr)
-*/
-function serializeParagraphBorders(borders) {
-	if (!borders) return "";
-	const parts = [];
-	if (borders.top) {
-		const topXml = serializeBorder(borders.top, "top");
-		if (topXml) parts.push(topXml);
-	}
-	if (borders.left) {
-		const leftXml = serializeBorder(borders.left, "left");
-		if (leftXml) parts.push(leftXml);
-	}
-	if (borders.bottom) {
-		const bottomXml = serializeBorder(borders.bottom, "bottom");
-		if (bottomXml) parts.push(bottomXml);
-	}
-	if (borders.right) {
-		const rightXml = serializeBorder(borders.right, "right");
-		if (rightXml) parts.push(rightXml);
-	}
-	if (borders.between) {
-		const betweenXml = serializeBorder(borders.between, "between");
-		if (betweenXml) parts.push(betweenXml);
-	}
-	if (borders.bar) {
-		const barXml = serializeBorder(borders.bar, "bar");
-		if (barXml) parts.push(barXml);
-	}
-	if (parts.length === 0) return "";
-	return `<w:pBdr>${parts.join("")}</w:pBdr>`;
-}
-/**
-* Serialize shading properties (w:shd)
-*/
-function serializeShading(shading) {
-	if (!shading) return "";
-	const attrs = [];
-	if (shading.pattern) attrs.push(`w:val="${escapeXml(shading.pattern)}"`);
-	else attrs.push("w:val=\"clear\"");
-	if (shading.color?.rgb && isValidHexColor(shading.color.rgb)) attrs.push(`w:color="${escapeXml(shading.color.rgb)}"`);
-	else if (shading.color?.auto) attrs.push("w:color=\"auto\"");
-	if (shading.fill?.rgb && isValidHexColor(shading.fill.rgb)) attrs.push(`w:fill="${escapeXml(shading.fill.rgb)}"`);
-	else if (shading.fill?.auto) attrs.push("w:fill=\"auto\"");
-	if (shading.fill?.themeColor) attrs.push(`w:themeFill="${escapeXml(shading.fill.themeColor)}"`);
-	if (shading.fill?.themeTint) attrs.push(`w:themeFillTint="${escapeXml(shading.fill.themeTint)}"`);
-	if (shading.fill?.themeShade) attrs.push(`w:themeFillShade="${escapeXml(shading.fill.themeShade)}"`);
-	if (attrs.length === 0) return "";
-	return `<w:shd ${attrs.join(" ")}/>`;
-}
-/**
-* Serialize tab stops (w:tabs)
-*/
-function serializeTabStops(tabs) {
-	if (!tabs || tabs.length === 0) return "";
-	return `<w:tabs>${tabs.map((tab) => {
-		const attrs = [`w:val="${tab.alignment}"`, `w:pos="${intAttr(tab.position)}"`];
-		if (tab.leader && tab.leader !== "none") attrs.push(`w:leader="${tab.leader}"`);
-		return `<w:tab ${attrs.join(" ")}/>`;
-	}).join("")}</w:tabs>`;
-}
-/**
-* Serialize spacing properties (w:spacing)
-*/
-function serializeSpacing(formatting) {
-	const attrs = [];
-	if (formatting.spaceBefore !== void 0) attrs.push(`w:before="${intAttr(formatting.spaceBefore)}"`);
-	if (formatting.spaceAfter !== void 0) attrs.push(`w:after="${intAttr(formatting.spaceAfter)}"`);
-	if (formatting.lineSpacing !== void 0) attrs.push(`w:line="${intAttr(formatting.lineSpacing)}"`);
-	if (formatting.lineSpacingRule) attrs.push(`w:lineRule="${formatting.lineSpacingRule}"`);
-	if (formatting.beforeAutospacing !== void 0) attrs.push(`w:beforeAutospacing="${formatting.beforeAutospacing ? "1" : "0"}"`);
-	if (formatting.afterAutospacing !== void 0) attrs.push(`w:afterAutospacing="${formatting.afterAutospacing ? "1" : "0"}"`);
-	if (attrs.length === 0) return "";
-	return `<w:spacing ${attrs.join(" ")}/>`;
-}
-/**
-* Serialize indentation properties (w:ind)
-*/
-function serializeIndentation(formatting) {
-	const attrs = [];
-	if (formatting.indentLeft !== void 0) attrs.push(`w:left="${intAttr(formatting.indentLeft)}"`);
-	if (formatting.indentRight !== void 0) attrs.push(`w:right="${intAttr(formatting.indentRight)}"`);
-	if (formatting.indentFirstLine !== void 0) if (formatting.hangingIndent) attrs.push(`w:hanging="${intAttr(Math.abs(formatting.indentFirstLine))}"`);
-	else attrs.push(`w:firstLine="${intAttr(formatting.indentFirstLine)}"`);
-	if (attrs.length === 0) return "";
-	return `<w:ind ${attrs.join(" ")}/>`;
-}
-/**
-* Serialize numbering properties (w:numPr)
-*/
-function serializeNumbering(numPr) {
-	if (!numPr) return "";
-	const parts = [];
-	if (numPr.ilvl !== void 0) parts.push(`<w:ilvl w:val="${intAttr(numPr.ilvl)}"/>`);
-	if (numPr.numId !== void 0) parts.push(`<w:numId w:val="${intAttr(numPr.numId)}"/>`);
-	if (parts.length === 0) return "";
-	return `<w:numPr>${parts.join("")}</w:numPr>`;
-}
-/**
-* Serialize frame properties (w:framePr)
-*/
-function serializeFrameProperties(frame) {
-	if (!frame) return "";
-	const attrs = [];
-	if (frame.dropCap) attrs.push(`w:dropCap="${frame.dropCap}"`);
-	if (frame.lines !== void 0) attrs.push(`w:lines="${intAttr(frame.lines)}"`);
-	if (frame.width !== void 0) attrs.push(`w:w="${intAttr(frame.width)}"`);
-	if (frame.height !== void 0) attrs.push(`w:h="${intAttr(frame.height)}"`);
-	if (frame.hSpace !== void 0) attrs.push(`w:hSpace="${intAttr(frame.hSpace)}"`);
-	if (frame.vSpace !== void 0) attrs.push(`w:vSpace="${intAttr(frame.vSpace)}"`);
-	if (frame.hAnchor) attrs.push(`w:hAnchor="${frame.hAnchor}"`);
-	if (frame.vAnchor) attrs.push(`w:vAnchor="${frame.vAnchor}"`);
-	if (frame.x !== void 0) attrs.push(`w:x="${frame.x}"`);
-	if (frame.y !== void 0) attrs.push(`w:y="${frame.y}"`);
-	if (frame.xAlign) attrs.push(`w:xAlign="${frame.xAlign}"`);
-	if (frame.yAlign) attrs.push(`w:yAlign="${frame.yAlign}"`);
-	if (frame.wrap) attrs.push(`w:wrap="${frame.wrap}"`);
-	if (attrs.length === 0) return "";
-	return `<w:framePr ${attrs.join(" ")}/>`;
-}
-/**
 * Serialize paragraph formatting properties to w:pPr XML
 */
 function serializeParagraphMarkChange(mark) {
@@ -361,7 +238,7 @@ const verifiedParagraphPropertySource = (formatting, source) => {
 	if (!source) return null;
 	const replayableSource = replayableParagraphPropertySourceXml(source.xml);
 	if (replayableSource === null) return null;
-	return canonicalJson(formatting ?? {}) === source.formattingJson ? replayableSource : null;
+	return paragraphPropertySourceMatchesEmission(source, formatting) ? replayableSource : null;
 };
 const withTrailingParagraphPropertyChildren = (sourceXml, children) => {
 	const written = children.join("");
@@ -398,6 +275,7 @@ const withParagraphMarkChange = (sourceXml, mark) => {
 	return captureVerbatimXml(cloneElement(root, { elements }));
 };
 const serializeParagraphFormattingWithOptions = (formatting, { propertyChanges, paragraphMarkChange, propertySource, sectionProperties } = {}) => {
+	const modeledFormatting = modelParagraphFormattingEmission(formatting);
 	const serializablePropertyChangeCount = propertyChanges?.length ?? 0;
 	if (serializablePropertyChangeCount > 1) panic("A paragraph cannot serialize more than one w:pPrChange", { count: serializablePropertyChangeCount });
 	const paragraphMarkXml = paragraphMarkChange ? serializeParagraphMarkChange(paragraphMarkChange) : "";
@@ -408,50 +286,15 @@ const serializeParagraphFormattingWithOptions = (formatting, { propertyChanges,
 		sectionPropertiesXml,
 		...propertyChangesXml
 	].some((xml) => xml.includes(`${DATE_UTC_ATTRIBUTE}=`));
-	const verifiedSource = verifiedParagraphPropertySource(formatting, propertySource);
+	const verifiedSource = verifiedParagraphPropertySource(modeledFormatting, propertySource);
 	if (verifiedSource !== null && (!composedChildrenUseDateUtc || !sourceShadowsDateUtcPrefix(verifiedSource))) {
 		const sourceWithMark = paragraphMarkChange ? withParagraphMarkChange(verifiedSource, paragraphMarkChange) : verifiedSource;
 		return withTrailingParagraphPropertyChildren(sourceWithMark, [sectionPropertiesXml, ...propertyChangesXml]);
 	}
 	const parts = [];
-	const pushToggle = (name, value) => {
-		if (value === true) parts.push(`<w:${name}/>`);
-		else if (value === false) parts.push(`<w:${name} w:val="0"/>`);
-	};
-	if (formatting) {
-		if (formatting.styleId) parts.push(`<w:pStyle w:val="${escapeXml(formatting.styleId)}"/>`);
-		pushToggle("keepNext", formatting.keepNext);
-		pushToggle("keepLines", formatting.keepLines);
-		pushToggle("pageBreakBefore", formatting.pageBreakBefore);
-		const frameXml = serializeFrameProperties(formatting.frame);
-		if (frameXml) parts.push(frameXml);
-		pushToggle("widowControl", formatting.widowControl);
-		const numPrXml = formatting.numPrFromStyle != null && numPrEqual(formatting.numPr, formatting.numPrFromStyle) ? "" : serializeNumbering(formatting.numPr);
-		if (numPrXml) parts.push(numPrXml);
-		pushToggle("suppressLineNumbers", formatting.suppressLineNumbers);
-		const bordersXml = serializeParagraphBorders(formatting.borders);
-		if (bordersXml) parts.push(bordersXml);
-		const shadingXml = serializeShading(formatting.shading);
-		if (shadingXml) parts.push(shadingXml);
-		const tabsXml = serializeTabStops(formatting.tabs);
-		if (tabsXml) parts.push(tabsXml);
-		pushToggle("suppressAutoHyphens", formatting.suppressAutoHyphens);
-		pushToggle("kinsoku", formatting.kinsoku);
-		pushToggle("overflowPunct", formatting.overflowPunctuation);
-		pushToggle("bidi", formatting.bidi);
-		pushToggle("snapToGrid", formatting.snapToGrid);
-		const spacingXml = serializeSpacing(formatting);
-		if (spacingXml) parts.push(spacingXml);
-		const indXml = serializeIndentation(formatting);
-		if (indXml) parts.push(indXml);
-		pushToggle("contextualSpacing", formatting.contextualSpacing);
-		if (formatting.alignment) parts.push(`<w:jc w:val="${formatting.alignment}"/>`);
-		if (formatting.outlineLevel !== void 0) parts.push(`<w:outlineLvl w:val="${formatting.outlineLevel}"/>`);
-		if (paragraphMarkChange || formatting.runProperties || formatting.runInWithNext) {
-			const fullInner = `${paragraphMarkChange ? paragraphMarkXml : ""}${formatting.runProperties ? extractRPrInner(serializeTextFormatting(formatting.runProperties)) : ""}${formatting.runInWithNext ? "<w:specVanish/>" : ""}`;
-			if (fullInner.length > 0) parts.push(`<w:rPr>${fullInner}</w:rPr>`);
-		}
-	} else if (paragraphMarkChange) parts.push(`<w:rPr>${paragraphMarkXml}</w:rPr>`);
+	if (modeledFormatting.propertiesXml) parts.push(modeledFormatting.propertiesXml);
+	const paragraphMarkPropertiesInnerXml = `${paragraphMarkXml}${modeledFormatting.paragraphMarkPropertiesInnerXml ?? ""}`;
+	if (paragraphMarkPropertiesInnerXml) parts.push(`<w:rPr>${paragraphMarkPropertiesInnerXml}</w:rPr>`);
 	parts.push(sectionPropertiesXml);
 	if (propertyChangesXml.length > 0) parts.push(...propertyChangesXml);
 	const inner = parts.join("");
@@ -468,15 +311,6 @@ function extractPPrInner(pPrXml) {
 	if (!pPrXml.startsWith("<w:pPr>") || !pPrXml.endsWith("</w:pPr>")) return "";
 	return pPrXml.slice(7, -8);
 }
-/**
-* Strip the outer `<w:rPr>...</w:rPr>` wrapper so callers can splice
-* additional rPr children (e.g. `<w:specVanish/>`) and re-emit a
-* single rPr element.
-*/
-function extractRPrInner(rPrXml) {
-	if (!rPrXml.startsWith("<w:rPr>") || !rPrXml.endsWith("</w:rPr>")) return "";
-	return rPrXml.slice(7, -8);
-}
 function serializeParagraphPropertyChange(change) {
 	const previousPPrInner = extractPPrInner(serializeParagraphFormatting(change.previousFormatting) || "<w:pPr/>");
 	const normalizedPreviousPPr = previousPPrInner.length > 0 ? `<w:pPr>${previousPPrInner}</w:pPr>` : "<w:pPr/>";
@@ -675,6 +509,7 @@ function serializeTrackedChange(tag, change) {
 			const xml = item.type === "simpleField" ? serializeSimpleField(item) : serializeComplexField(item);
 			return tag === "del" || tag === "moveFrom" ? rewriteRunTextAsDeleted(xml) : xml;
 		}
+		if (item.type === "mathEquation") return item.ommlXml;
 		if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") return serializeTrackedChange(trackedChangeTag(item), item);
 		return item.type === "bookmarkStart" ? serializeBookmarkStart(item) : serializeBookmarkEnd(item);
 	};
@@ -751,6 +586,7 @@ function serializeParagraph(paragraph) {
 	const attrs = [];
 	if (paragraph.paraId) attrs.push(`w14:paraId="${escapeXml(paragraph.paraId)}"`);
 	if (paragraph.textId) attrs.push(`w14:textId="${escapeXml(paragraph.textId)}"`);
+	if (paragraph.reviewCarrier) attrs.push(`folio:reviewCarrier="${paragraph.reviewCarrier}"`);
 	const attrsStr = attrs.length > 0 ? ` ${attrs.join(" ")}` : "";
 	parts.push(serializeParagraphFormattingWithOptions(paragraph.formatting, {
 		propertyChanges: paragraph.propertyChanges,

package/dist/docx/serializer/partNamespaces.d.ts

@@ -25,7 +25,7 @@ type PackagingPrefix = "ct" | "pr";
  * over the union: a member with no entry, or an entry with no member, does not
  * compile.
  */
-type OoxmlNamespacePrefix = Exclude<OoxmlPrefix, PackagingPrefix> | "cx" | "cx1" | "cx2" | "cx3" | "cx4" | "cx5" | "cx6" | "cx7" | "cx8" | "aink" | "am3d" | "oel" | "w10" | "w16" | "w16cex" | "w16cid" | "w16du" | "w16sdtdh" | "w16se" | "wpi" | "wne";
+type OoxmlNamespacePrefix = Exclude<OoxmlPrefix, PackagingPrefix> | "cx" | "cx1" | "cx2" | "cx3" | "cx4" | "cx5" | "cx6" | "cx7" | "cx8" | "aink" | "am3d" | "oel" | "w10" | "w16" | "w16cex" | "w16cid" | "w16du" | "w16sdtdh" | "w16se" | "folio" | "wpi" | "wne";
 /**
  * Every namespace a rebuilt part can declare, in the order producers write them.
  *

package/dist/docx/serializer/partNamespaces.js

@@ -143,6 +143,10 @@ const OOXML_NAMESPACES = {
 		uri: "http://schemas.microsoft.com/office/word/2015/wordml/symex",
 		ignorable: true
 	},
+	folio: {
+		uri: "urn:stella:folio:review-history:1",
+		ignorable: true
+	},
 	wpg: {
 		uri: OOXML_NS.wpg,
 		ignorable: false

package/dist/docx/serializer/runSerializer.d.ts

@@ -5,10 +5,6 @@ import { document_d_exports } from "../../types/document.js";
  * to keep IDs deterministic across saves.
  */
 declare function resetAutoIdCounter(): void;
-/**
- * Serialize text formatting properties to w:rPr XML
- */
-declare function serializeTextFormatting(formatting: document_d_exports.TextFormatting | undefined): string;
 /**
  * Serialize a run to OOXML XML (w:r)
  *
@@ -52,4 +48,4 @@ declare function createBreakRun(breakType?: "page" | "column" | "textWrapping",
  */
 declare function createTabRun(formatting?: document_d_exports.TextFormatting): document_d_exports.Run;
 //#endregion
-export { createBreakRun, createEmptyRun, createTabRun, createTextRun, getRunPlainText, hasRunContent, hasRunFormatting, resetAutoIdCounter, serializeRun, serializeRuns, serializeTextFormatting };
+export { createBreakRun, createEmptyRun, createTabRun, createTextRun, getRunPlainText, hasRunContent, hasRunFormatting, resetAutoIdCounter, serializeRun, serializeRuns };