@stll/folio-core 0.35.0 → 0.36.0

package/dist/docx/serializer/paragraphSerializer.js

@@ -1,11 +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 { 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 { serializeSectionProperties } from "./sectionPropertiesSerializer.js";
+import { serializeTrackedChangeAttributes, trackedChangeAttributeRecord } from "./trackedChangeAttributes.js";
 import { escapeXml, intAttr, isSingleWellFormedElement } from "./xmlUtils.js";
-import { normalizeRevisionId } from "@stll/docx-core/model";
+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)
@@ -131,16 +139,278 @@ function serializeFrameProperties(frame) {
 /**
 * Serialize paragraph formatting properties to w:pPr XML
 */
-function serializeTrackedChangeAttrs(info) {
-	const parts = [`w:id="${normalizeRevisionId(info.id)}"`, `w:author="${escapeXml(info.author)}"`];
-	if (info.date !== void 0) parts.push(`w:date="${escapeXml(info.date)}"`);
-	return parts.join(" ");
-}
 function serializeParagraphMarkChange(mark) {
-	const attrs = serializeTrackedChangeAttrs(mark.info);
+	const attrs = serializeTrackedChangeAttributes(mark.info);
 	return `<w:${mark.kind} ${attrs}/>`;
 }
-const serializeParagraphFormattingWithOptions = (formatting, { propertyChanges, paragraphMarkChange, sectionProperties } = {}) => {
+const RESERVED_PARAGRAPH_PROPERTY_CHILDREN = /* @__PURE__ */ new Set(["pPrChange", "sectPr"]);
+const RESERVED_PARAGRAPH_CAPTURE_CHILDREN = /* @__PURE__ */ new Set([
+	...RESERVED_PARAGRAPH_PROPERTY_CHILDREN,
+	...PARAGRAPH_MARK_CHANGE_KINDS,
+	"cellDel",
+	"cellIns",
+	"cellMerge",
+	"numberingChange",
+	"rPrChange",
+	"tblGridChange",
+	"tblPrChange",
+	"tcPrChange",
+	"trPrChange"
+]);
+const PARAGRAPH_PROPERTY_ROOT_NAME = /* @__PURE__ */ new Set(["pPr"]);
+const WORDPROCESSINGML_NAMESPACE = /* @__PURE__ */ new Set([NAMESPACES.w]);
+const PARAGRAPH_APPEND_PREFIXES = /* @__PURE__ */ new Map([
+	["w", NAMESPACES.w],
+	["r", NAMESPACES.r],
+	["w15", NAMESPACES.w15]
+]);
+const PARAGRAPH_PROPERTY_CHILD_ORDER = new Map([
+	"pStyle",
+	"keepNext",
+	"keepLines",
+	"pageBreakBefore",
+	"framePr",
+	"widowControl",
+	"numPr",
+	"suppressLineNumbers",
+	"pBdr",
+	"shd",
+	"tabs",
+	"suppressAutoHyphens",
+	"kinsoku",
+	"wordWrap",
+	"overflowPunct",
+	"topLinePunct",
+	"autoSpaceDE",
+	"autoSpaceDN",
+	"bidi",
+	"adjustRightInd",
+	"snapToGrid",
+	"spacing",
+	"ind",
+	"contextualSpacing",
+	"mirrorIndents",
+	"suppressOverlap",
+	"jc",
+	"textDirection",
+	"textAlignment",
+	"textboxTightWrap",
+	"outlineLvl",
+	"divId",
+	"cnfStyle",
+	"rPr"
+].map((name, index) => [name, index]));
+const PARAGRAPH_MARK_BASE_CHILDREN = /* @__PURE__ */ new Set([
+	"rStyle",
+	"rFonts",
+	"b",
+	"bCs",
+	"i",
+	"iCs",
+	"caps",
+	"smallCaps",
+	"strike",
+	"dstrike",
+	"outline",
+	"shadow",
+	"emboss",
+	"imprint",
+	"snapToGrid",
+	"vanish",
+	"webHidden",
+	"color",
+	"spacing",
+	"w",
+	"kern",
+	"position",
+	"sz",
+	"szCs",
+	"noProof",
+	"highlight",
+	"u",
+	"effect",
+	"bdr",
+	"shd",
+	"fitText",
+	"vertAlign",
+	"rtl",
+	"cs",
+	"em",
+	"lang",
+	"eastAsianLayout",
+	"specVanish",
+	"oMath"
+]);
+const PARAGRAPH_NESTED_PROPERTY_CHILDREN = /* @__PURE__ */ new Map([
+	["numPr", /* @__PURE__ */ new Set(["ilvl", "numId"])],
+	["pBdr", /* @__PURE__ */ new Set([
+		"top",
+		"left",
+		"bottom",
+		"right",
+		"between",
+		"bar"
+	])],
+	["tabs", /* @__PURE__ */ new Set(["tab"])],
+	["rPr", PARAGRAPH_MARK_BASE_CHILDREN]
+]);
+const resolveNamespaceBinding = (scope, prefix) => {
+	for (let current = scope; current; current = current.parent) {
+		const value = current.bindings.get(prefix);
+		if (value !== void 0) return value;
+	}
+};
+const hasDescendantNamed = (element, namespaceUri, localName) => {
+	const pending = [...getChildElements(element)];
+	while (pending.length > 0) {
+		const child = pending.pop();
+		if (!child) continue;
+		if (getLocalName(child.name) === localName && toTransitionalNamespaceUri(child.namespaceUri ?? "") === namespaceUri) return true;
+		for (const descendant of getChildElements(child)) pending.push(descendant);
+	}
+	return false;
+};
+const hasInvalidParagraphPropertyRevision = (root) => {
+	const pending = [...getChildElements(root)];
+	while (pending.length > 0) {
+		const element = pending.pop();
+		if (!element) continue;
+		if (toTransitionalNamespaceUri(element.namespaceUri ?? "") === NAMESPACES.w) {
+			const localName = getLocalName(element.name);
+			if (RESERVED_PARAGRAPH_CAPTURE_CHILDREN.has(localName)) return true;
+		}
+		for (const child of getChildElements(element)) pending.push(child);
+	}
+	return false;
+};
+const hasInvalidParagraphPropertyShape = (root) => {
+	const pending = getChildElements(root).map((element) => ({
+		element,
+		parent: root
+	}));
+	if ((root.elements ?? []).some((child) => child.type === "text" && String(child.text ?? "").trim() !== "")) return true;
+	while (pending.length > 0) {
+		const entry = pending.pop();
+		if (!entry) continue;
+		const { element, parent } = entry;
+		if ((element.elements ?? []).some((child) => child.type === "text" && String(child.text ?? "").trim() !== "")) return true;
+		if (toTransitionalNamespaceUri(element.namespaceUri ?? "") === NAMESPACES.w && parent !== root) {
+			if (toTransitionalNamespaceUri(parent.namespaceUri ?? "") !== NAMESPACES.w) return true;
+			if (!PARAGRAPH_NESTED_PROPERTY_CHILDREN.get(getLocalName(parent.name))?.has(getLocalName(element.name))) return true;
+		}
+		for (const child of getChildElements(element)) pending.push({
+			element: child,
+			parent: element
+		});
+	}
+	return false;
+};
+const sourceShadowsDateUtcPrefix = (sourceXml) => {
+	const root = parseXml(sourceXml, OOXML_NAMESPACE_SCOPE).elements?.at(0);
+	if (!root || root.type !== "element") return true;
+	const pending = [root];
+	while (pending.length > 0) {
+		const element = pending.pop();
+		if (!element) continue;
+		const resolved = resolveNamespaceBinding(element.namespaceScope, "w16du");
+		if (resolved !== void 0 && resolved !== "http://schemas.microsoft.com/office/word/2023/wordml/word16du") return true;
+		for (const child of getChildElements(element)) pending.push(child);
+	}
+	return false;
+};
+const hasInvalidParagraphMarkProperties = (root) => {
+	for (const child of getChildElements(root)) {
+		if (toTransitionalNamespaceUri(child.namespaceUri ?? "") !== NAMESPACES.w) continue;
+		const localName = getLocalName(child.name);
+		if (!PARAGRAPH_MARK_BASE_CHILDREN.has(localName)) return true;
+	}
+	return false;
+};
+const replayableParagraphPropertySourceXml = (sourceXml) => {
+	return sanitizeCapturedXmlElement(sourceXml, {
+		allowedLocalNames: PARAGRAPH_PROPERTY_ROOT_NAME,
+		allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
+		inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE,
+		requiredNamespaceBindings: PARAGRAPH_APPEND_PREFIXES,
+		validate: (root) => {
+			let paragraphMarkProperties = null;
+			const seenChildren = /* @__PURE__ */ new Set();
+			let previousChildOrder = -1;
+			for (const child of getChildElements(root)) {
+				const localName = getLocalName(child.name);
+				const isWordprocessingChild = toTransitionalNamespaceUri(child.namespaceUri ?? "") === NAMESPACES.w;
+				if (isWordprocessingChild) {
+					if (RESERVED_PARAGRAPH_PROPERTY_CHILDREN.has(localName)) return false;
+					const childOrder = PARAGRAPH_PROPERTY_CHILD_ORDER.get(localName);
+					if (childOrder === void 0 || seenChildren.has(localName) || childOrder < previousChildOrder) return false;
+					seenChildren.add(localName);
+					previousChildOrder = childOrder;
+				}
+				if (localName !== "rPr" || !isWordprocessingChild) {
+					if (hasDescendantNamed(child, NAMESPACES.w, "rPr")) return false;
+					continue;
+				}
+				if (paragraphMarkProperties !== null || toTransitionalNamespaceUri(resolveNamespaceBinding(child.namespaceScope, "w") ?? "") !== NAMESPACES.w) return false;
+				paragraphMarkProperties = child;
+			}
+			return !(paragraphMarkProperties && hasInvalidParagraphMarkProperties(paragraphMarkProperties) || hasInvalidParagraphPropertyShape(root) || hasInvalidParagraphPropertyRevision(root));
+		}
+	});
+};
+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;
+};
+const withTrailingParagraphPropertyChildren = (sourceXml, children) => {
+	const written = children.join("");
+	if (written.length === 0) return sourceXml;
+	const selfClosing = /^<((?:[A-Za-z_][\w.-]*:)?pPr)\b([^>]*)\/>$/u.exec(sourceXml);
+	if (selfClosing) {
+		const [, name, attrs] = selfClosing;
+		return `<${name}${attrs}>${written}</${name}>`;
+	}
+	const close = sourceXml.lastIndexOf("</");
+	return close === -1 ? sourceXml : `${sourceXml.slice(0, close)}${written}${sourceXml.slice(close)}`;
+};
+const withParagraphMarkChange = (sourceXml, mark) => {
+	const root = parseXml(sourceXml, OOXML_NAMESPACE_SCOPE).elements?.at(0);
+	if (!root || root.type !== "element") panic("A validated paragraph-property capture could not be parsed for composition");
+	const attributes = trackedChangeAttributeRecord(mark.info);
+	const markElement = cloneElement(root, {
+		name: `w:${mark.kind}`,
+		attributes,
+		elements: []
+	});
+	const elements = [...root.elements ?? []];
+	const paragraphMarkIndex = elements.findIndex((child) => child.type === "element" && getLocalName(child.name) === "rPr" && toTransitionalNamespaceUri(child.namespaceUri ?? "") === NAMESPACES.w);
+	if (paragraphMarkIndex === -1) elements.push(cloneElement(root, {
+		name: "w:rPr",
+		attributes: {},
+		elements: [markElement]
+	}));
+	else {
+		const paragraphMarkProperties = elements[paragraphMarkIndex];
+		if (!paragraphMarkProperties || paragraphMarkProperties.type !== "element") panic("A validated paragraph-mark property node disappeared during composition");
+		elements[paragraphMarkIndex] = cloneElement(paragraphMarkProperties, { elements: [markElement, ...paragraphMarkProperties.elements ?? []] });
+	}
+	return captureVerbatimXml(cloneElement(root, { elements }));
+};
+const serializeParagraphFormattingWithOptions = (formatting, { propertyChanges, paragraphMarkChange, propertySource, sectionProperties } = {}) => {
+	const paragraphMarkXml = paragraphMarkChange ? serializeParagraphMarkChange(paragraphMarkChange) : "";
+	const sectionPropertiesXml = serializeSectionProperties(sectionProperties);
+	const propertyChangesXml = (propertyChanges ?? []).map((change) => serializeParagraphPropertyChange(change));
+	const composedChildrenUseDateUtc = [
+		paragraphMarkXml,
+		sectionPropertiesXml,
+		...propertyChangesXml
+	].some((xml) => xml.includes(`${DATE_UTC_ATTRIBUTE}=`));
+	const verifiedSource = verifiedParagraphPropertySource(formatting, 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}/>`);
@@ -156,13 +426,13 @@ const serializeParagraphFormattingWithOptions = (formatting, { propertyChanges,
 		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("suppressLineNumbers", formatting.suppressLineNumbers);
 		pushToggle("suppressAutoHyphens", formatting.suppressAutoHyphens);
 		pushToggle("kinsoku", formatting.kinsoku);
 		pushToggle("overflowPunct", formatting.overflowPunctuation);
@@ -176,12 +446,12 @@ const serializeParagraphFormattingWithOptions = (formatting, { propertyChanges,
 		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 ? serializeParagraphMarkChange(paragraphMarkChange) : ""}${formatting.runProperties ? extractRPrInner(serializeTextFormatting(formatting.runProperties)) : ""}${formatting.runInWithNext ? "<w:specVanish/>" : ""}`;
+			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>${serializeParagraphMarkChange(paragraphMarkChange)}</w:rPr>`);
-	parts.push(serializeSectionProperties(sectionProperties));
-	if (propertyChanges && propertyChanges.length > 0) parts.push(...propertyChanges.map((change) => serializeParagraphPropertyChange(change)));
+	} else if (paragraphMarkChange) parts.push(`<w:rPr>${paragraphMarkXml}</w:rPr>`);
+	parts.push(sectionPropertiesXml);
+	if (propertyChangesXml.length > 0) parts.push(...propertyChangesXml);
 	const inner = parts.join("");
 	if (inner.length === 0) return "";
 	return `<w:pPr>${inner}</w:pPr>`;
@@ -206,17 +476,9 @@ function extractRPrInner(rPrXml) {
 	return rPrXml.slice(7, -8);
 }
 function serializeParagraphPropertyChange(change) {
-	const normalizedId = normalizeRevisionId(change.info.id);
-	const authorCandidate = typeof change.info.author === "string" ? change.info.author.trim() : "";
-	const normalizedAuthor = authorCandidate.length > 0 ? authorCandidate : "Unknown";
-	const normalizedDate = typeof change.info.date === "string" ? change.info.date.trim() : void 0;
-	const normalizedRsid = typeof change.info.rsid === "string" ? change.info.rsid.trim() : void 0;
-	const attrs = [`w:id="${normalizedId}"`, `w:author="${escapeXml(normalizedAuthor)}"`];
-	if (normalizedDate) attrs.push(`w:date="${escapeXml(normalizedDate)}"`);
-	if (normalizedRsid) attrs.push(`w:rsid="${escapeXml(normalizedRsid)}"`);
 	const previousPPrInner = extractPPrInner(serializeParagraphFormatting(change.previousFormatting) || "<w:pPr/>");
 	const normalizedPreviousPPr = previousPPrInner.length > 0 ? `<w:pPr>${previousPPrInner}</w:pPr>` : "<w:pPr/>";
-	return `<w:pPrChange ${attrs.join(" ")}>${normalizedPreviousPPr}</w:pPrChange>`;
+	return `<w:pPrChange ${serializeTrackedChangeAttributes(change.info)}>${normalizedPreviousPPr}</w:pPrChange>`;
 }
 /** The attribute list of a `w:hyperlink`, without its children. */
 function hyperlinkAttributes(hyperlink) {
@@ -390,13 +652,7 @@ function trackedChangeTag(change) {
 	}
 }
 function serializeTrackedChange(tag, change) {
-	const info = change.info;
-	const normalizedId = normalizeRevisionId(info.id);
-	const authorCandidate = typeof info.author === "string" ? info.author.trim() : "";
-	const normalizedAuthor = authorCandidate.length > 0 ? authorCandidate : "Unknown";
-	const normalizedDate = typeof info.date === "string" ? info.date.trim() : void 0;
-	const attrs = [`w:id="${normalizedId}"`, `w:author="${escapeXml(normalizedAuthor)}"`];
-	if (normalizedDate) attrs.push(`w:date="${escapeXml(normalizedDate)}"`);
+	const attrs = serializeTrackedChangeAttributes(change.info);
 	const serializeDeletedRun = (run) => {
 		const xml = serializeRun(run);
 		if (!run.content.some((c) => c.type === "drawing" || c.type === "shape")) return rewriteRunTextAsDeleted(xml);
@@ -420,7 +676,7 @@ function serializeTrackedChange(tag, change) {
 		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);
 	};
-	const open = `<w:${tag} ${attrs.join(" ")}>`;
+	const open = `<w:${tag} ${attrs}>`;
 	const close = `</w:${tag}>`;
 	const wrap = (inner) => inner.length === 0 ? "" : `${open}${inner}${close}`;
 	if (change.content.length === 0) return `${open}${close}`;
@@ -497,6 +753,7 @@ function serializeParagraph(paragraph) {
 	parts.push(serializeParagraphFormattingWithOptions(paragraph.formatting, {
 		propertyChanges: paragraph.propertyChanges,
 		paragraphMarkChange: paragraph.pPrMark,
+		propertySource: getParagraphPropertySource(paragraph),
 		sectionProperties: paragraph.sectionProperties
 	}));
 	const explicitCommentReferenceIds = /* @__PURE__ */ new Set();

package/dist/docx/serializer/runSerializer.js

@@ -5,9 +5,9 @@ import { THEME_COLOR_TO_DRAWING_SCHEME } from "../drawingUtils.js";
 import { requiresXmlSpacePreserve } from "../textWhitespace.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
 import { serializeTable } from "./tableSerializer.js";
+import { serializeTrackedChangeAttributes } from "./trackedChangeAttributes.js";
 import { escapeXml, intAttr } from "./xmlUtils.js";
 import { panic } from "better-result";
-import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/serializer/runSerializer.ts
 /**
 * Run Serializer - Serialize runs to OOXML XML
@@ -169,16 +169,8 @@ function extractRPrInner(rPrXml) {
 	return rPrXml.slice(7, -8);
 }
 function serializeRunPropertyChange(change) {
-	const normalizedId = normalizeRevisionId(change.info.id);
-	const authorCandidate = typeof change.info.author === "string" ? change.info.author.trim() : "";
-	const normalizedAuthor = authorCandidate.length > 0 ? authorCandidate : "Unknown";
-	const normalizedDate = typeof change.info.date === "string" ? change.info.date.trim() : void 0;
-	const normalizedRsid = typeof change.info.rsid === "string" ? change.info.rsid.trim() : void 0;
-	const attrs = [`w:id="${normalizedId}"`, `w:author="${escapeXml(normalizedAuthor)}"`];
-	if (normalizedDate) attrs.push(`w:date="${escapeXml(normalizedDate)}"`);
-	if (normalizedRsid) attrs.push(`w:rsid="${escapeXml(normalizedRsid)}"`);
 	const previousRPrXml = serializeTextFormatting(change.previousFormatting) || "<w:rPr/>";
-	return `<w:rPrChange ${attrs.join(" ")}>${previousRPrXml}</w:rPrChange>`;
+	return `<w:rPrChange ${serializeTrackedChangeAttributes(change.info)}>${previousRPrXml}</w:rPrChange>`;
 }
 function serializeRunProperties(formatting, propertyChanges) {
 	const currentRPrXml = serializeTextFormatting(formatting);

package/dist/docx/serializer/sectionPropertiesSerializer.js

@@ -1,7 +1,7 @@
 import { getUnserializedSectionPropertyChildNames } from "../sectionParser.js";
 import { serializeBorder } from "./borderSerializer.js";
+import { serializeTrackedChangeAttributes } from "./trackedChangeAttributes.js";
 import { escapeXml, intAttr } from "./xmlUtils.js";
-import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/serializer/sectionPropertiesSerializer.ts
 const serializeHeaderReference = (ref) => `<w:headerReference w:type="${ref.type}" r:id="${escapeXml(ref.rId)}"/>`;
 const serializeFooterReference = (ref) => `<w:footerReference w:type="${ref.type}" r:id="${escapeXml(ref.rId)}"/>`;
@@ -133,16 +133,8 @@ function serializeOnOffElement(value, name) {
 	return value ? `<w:${name}/>` : `<w:${name} w:val="0"/>`;
 }
 function serializeSectionPropertyChange(change) {
-	const normalizedId = normalizeRevisionId(change.info.id);
-	const authorCandidate = typeof change.info.author === "string" ? change.info.author.trim() : "";
-	const normalizedAuthor = authorCandidate.length > 0 ? authorCandidate : "Unknown";
-	const normalizedDate = typeof change.info.date === "string" ? change.info.date.trim() : void 0;
-	const normalizedRsid = typeof change.info.rsid === "string" ? change.info.rsid.trim() : void 0;
-	const attrs = [`w:id="${normalizedId}"`, `w:author="${escapeXml(normalizedAuthor)}"`];
-	if (normalizedDate) attrs.push(`w:date="${escapeXml(normalizedDate)}"`);
-	if (normalizedRsid) attrs.push(`w:rsid="${escapeXml(normalizedRsid)}"`);
 	const previousSectPrXml = serializeSectionProperties(change.previousProperties) || "<w:sectPr/>";
-	return `<w:sectPrChange ${attrs.join(" ")}>${previousSectPrXml}</w:sectPrChange>`;
+	return `<w:sectPrChange ${serializeTrackedChangeAttributes(change.info)}>${previousSectPrXml}</w:sectPrChange>`;
 }
 function serializeSectionProperties(props) {
 	if (!props) return "";

package/dist/docx/serializer/tableSerializer.js

@@ -3,8 +3,8 @@ import { isValidHexColor } from "../../utils/colorResolver.js";
 import { parseTableCellProperties, parseTableGrid, parseTableProperties, parseTableRowProperties } from "../tableParser.js";
 import { OOXML_NAMESPACE_SCOPE, parseXml } from "../xmlParser.js";
 import { serializeBorder } from "./borderSerializer.js";
+import { serializeTrackedChangeAttributes } from "./trackedChangeAttributes.js";
 import { escapeXml, intAttr } from "./xmlUtils.js";
-import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/serializer/tableSerializer.ts
 /**
 * The captured element with the revision children written back into it.
@@ -69,25 +69,6 @@ const verifiedSourceXml = (formatting, parse) => {
 	const reparsed = parse(parseXml(sourceXml, OOXML_NAMESPACE_SCOPE).elements?.[0] ?? null);
 	return canonicalJson(withoutCaptures(reparsed)) === canonicalJson(withoutCaptures(formatting)) ? sourceXml : null;
 };
-function normalizeTrackedChangeInfo(info) {
-	const normalizedId = normalizeRevisionId(info.id);
-	const authorCandidate = typeof info.author === "string" ? info.author.trim() : "";
-	const normalizedAuthor = authorCandidate.length > 0 ? authorCandidate : "Unknown";
-	const normalizedDate = typeof info.date === "string" ? info.date.trim() : void 0;
-	return {
-		id: normalizedId,
-		author: normalizedAuthor,
-		...normalizedDate !== void 0 ? { date: normalizedDate } : {}
-	};
-}
-function serializeTrackedChangeAttributes(info, rsid) {
-	const normalized = normalizeTrackedChangeInfo(info);
-	const attrs = [`w:id="${normalized.id}"`, `w:author="${escapeXml(normalized.author)}"`];
-	if (normalized.date) attrs.push(`w:date="${escapeXml(normalized.date)}"`);
-	if (info.utcDate) attrs.push(`${info.utcDate.attribute}="${escapeXml(info.utcDate.value)}"`);
-	if (rsid && rsid.trim().length > 0) attrs.push(`w:rsid="${escapeXml(rsid.trim())}"`);
-	return attrs.join(" ");
-}
 /**
 * Serialize a table measurement (width, height)
 */
@@ -231,7 +212,7 @@ function extractTblPrInner(tblPrXml) {
 	return tblPrXml.slice(9, -10);
 }
 function serializeTablePropertyChange(change) {
-	const attrs = serializeTrackedChangeAttributes(change.info, change.info.rsid);
+	const attrs = serializeTrackedChangeAttributes(change.info);
 	const previousTblPrInner = extractTblPrInner(serializeTableFormatting(change.previousFormatting) || "<w:tblPr/>");
 	return `<w:tblPrChange ${attrs}>${previousTblPrInner.length > 0 ? `<w:tblPr>${previousTblPrInner}</w:tblPr>` : "<w:tblPr/>"}</w:tblPrChange>`;
 }
@@ -269,7 +250,7 @@ function extractTrPrInner(trPrXml) {
 	return trPrXml.slice(8, -9);
 }
 function serializeTableRowPropertyChange(change) {
-	const attrs = serializeTrackedChangeAttributes(change.info, change.info.rsid);
+	const attrs = serializeTrackedChangeAttributes(change.info);
 	const previousTrPrInner = extractTrPrInner(serializeTableRowFormatting(change.previousFormatting) || "<w:trPr/>");
 	return `<w:trPrChange ${attrs}>${previousTrPrInner.length > 0 ? `<w:trPr>${previousTrPrInner}</w:trPr>` : "<w:trPr/>"}</w:trPrChange>`;
 }
@@ -333,7 +314,7 @@ function extractTcPrInner(tcPrXml) {
 	return tcPrXml.slice(8, -9);
 }
 function serializeTableCellPropertyChange(change) {
-	const attrs = serializeTrackedChangeAttributes(change.info, change.info.rsid);
+	const attrs = serializeTrackedChangeAttributes(change.info);
 	const previousTcPrInner = extractTcPrInner(serializeTableCellFormatting(change.previousFormatting) || "<w:tcPr/>");
 	return `<w:tcPrChange ${attrs}>${previousTcPrInner.length > 0 ? `<w:tcPr>${previousTcPrInner}</w:tcPr>` : "<w:tcPr/>"}</w:tcPrChange>`;
 }

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

@@ -0,0 +1,9 @@
+import { document_d_exports } from "../../types/document.js";
+//#region src/docx/serializer/trackedChangeAttributes.d.ts
+type SerializableTrackedChangeInfo = document_d_exports.TrackedChangeInfo | document_d_exports.PropertyChangeInfo;
+/** Normalized, unescaped attributes in schema order for an XML element or string serializer. */
+declare const trackedChangeAttributeEntries: (info: SerializableTrackedChangeInfo) => readonly (readonly [string, string])[];
+declare const trackedChangeAttributeRecord: (info: SerializableTrackedChangeInfo) => Record<string, string>;
+declare const serializeTrackedChangeAttributes: (info: SerializableTrackedChangeInfo) => string;
+//#endregion
+export { serializeTrackedChangeAttributes, trackedChangeAttributeEntries, trackedChangeAttributeRecord };

package/dist/docx/serializer/trackedChangeAttributes.js

@@ -0,0 +1,21 @@
+import { DATE_UTC_ATTRIBUTE } from "../trackedChangeInfo.js";
+import { escapeXml } from "./xmlUtils.js";
+import { normalizeRevisionId } from "@stll/docx-core/model";
+//#region src/docx/serializer/trackedChangeAttributes.ts
+/** Normalized, unescaped attributes in schema order for an XML element or string serializer. */
+const trackedChangeAttributeEntries = (info) => {
+	const author = typeof info.author === "string" ? info.author.trim() : "";
+	const date = typeof info.date === "string" ? info.date.trim() : "";
+	const rawUtcDate = info.utcDate;
+	const utcDate = typeof rawUtcDate === "object" && rawUtcDate !== null && "value" in rawUtcDate && typeof rawUtcDate.value === "string" ? rawUtcDate.value.trim() : "";
+	const rsid = "rsid" in info && typeof info.rsid === "string" ? info.rsid.trim() : "";
+	const entries = [["w:id", String(normalizeRevisionId(info.id))], ["w:author", author.length > 0 ? author : "Unknown"]];
+	if (date.length > 0) entries.push(["w:date", date]);
+	if (utcDate.length > 0) entries.push([DATE_UTC_ATTRIBUTE, utcDate]);
+	if (rsid.length > 0) entries.push(["w:rsid", rsid]);
+	return entries;
+};
+const trackedChangeAttributeRecord = (info) => Object.fromEntries(trackedChangeAttributeEntries(info));
+const serializeTrackedChangeAttributes = (info) => trackedChangeAttributeEntries(info).map(([name, value]) => `${name}="${escapeXml(value)}"`).join(" ");
+//#endregion
+export { serializeTrackedChangeAttributes, trackedChangeAttributeEntries, trackedChangeAttributeRecord };

package/dist/docx/server/createBilingualDocument.js

@@ -1,5 +1,6 @@
 import { deterministicHexId } from "../../utils/hexId.js";
 import { getParagraphText } from "../paragraphParser.js";
+import { cloneParagraphWithoutPropertySource } from "../paragraphPropertySource.js";
 import { TaggedError } from "better-result";
 //#region src/docx/server/createBilingualDocument.ts
 /**
@@ -365,7 +366,6 @@ const createStyleCloner = ({ styleById, suffix, cloner }) => {
 	};
 };
 const cloneParagraphForTarget = (paragraph, targetParaId, styleCloner, cloner, bookmarkIds) => {
-	const { textId: _textId, sectionProperties: _sectionProperties, ...rest } = paragraph;
 	const formatting = paragraph.formatting;
 	const nextFormatting = formatting && {
 		...formatting,
@@ -379,13 +379,15 @@ const cloneParagraphForTarget = (paragraph, targetParaId, styleCloner, cloner, b
 			numId: cloner.cloneNumId(formatting.numPrFromStyle.numId)
 		} }
 	};
-	return {
-		...rest,
+	const cloned = cloneParagraphWithoutPropertySource(paragraph, {
 		content: remapClonedBookmarkIds(structuredClone(paragraph.content), bookmarkIds),
 		paraId: targetParaId,
 		...nextFormatting && { formatting: nextFormatting },
 		...paragraph.listRendering && { listRendering: remapListRendering(paragraph.listRendering, cloner) }
-	};
+	});
+	Reflect.deleteProperty(cloned, "textId");
+	Reflect.deleteProperty(cloned, "sectionProperties");
+	return cloned;
 };
 const createBookmarkIdMinter = (source) => {
 	let nextId = 0;
@@ -526,7 +528,7 @@ const projectParagraphIntoColumn = (paragraph, geometry, sourceWidth, columnWidt
 		indentLeft = minimumLeftIndent + Math.round(flexibleLeft / flexibleTotal * flexibleMaximum);
 		indentRight = maxSideIndent - indentLeft;
 	}
-	const formatting = {
+	return cloneParagraphWithoutPropertySource(paragraph, { formatting: {
 		...paragraph.formatting,
 		...(geometry.indentLeft !== void 0 || minimumLeftIndent > 0) && { indentLeft },
 		...geometry.indentRight !== void 0 && { indentRight },
@@ -536,11 +538,7 @@ const projectParagraphIntoColumn = (paragraph, geometry, sourceWidth, columnWidt
 			...tab,
 			position: Math.min(Math.max(0, Math.round(tab.position * scale)), Math.max(0, columnWidth - MIN_TAB_TRAILING_WIDTH_TWIPS))
 		})) }
-	};
-	return {
-		...paragraph,
-		formatting
-	};
+	} });
 };
 const projectSideIndent = (value, scale, maximum) => Math.min(Math.max(0, Math.round((value ?? 0) * scale)), maximum);
 const buildCell = (paragraph) => ({

package/dist/docx/server/evaluateDocxXmlPatchProposal.js

@@ -29,6 +29,20 @@ const FOLIO_DOCX_XML_PATCH_PROPOSAL_ISSUE_CODES = Object.freeze([
 	"base-hash-mismatch",
 	"package-inspection-failed"
 ]);
+const XML_SAFETY_ISSUE = {
+	"doctype-forbidden": {
+		code: "xml-doctype-forbidden",
+		message: "Replacement XML must not declare a document type."
+	},
+	"entity-forbidden": {
+		code: "xml-not-well-formed",
+		message: "Replacement XML contains an invalid entity reference."
+	},
+	"not-well-formed": {
+		code: "xml-not-well-formed",
+		message: "Replacement XML must be well formed."
+	}
+};
 var InvalidFolioDocxXmlPatchProposalError = class extends TaggedError("InvalidFolioDocxXmlPatchProposalError") {};
 var InvalidFolioDocxXmlPatchProposalOptionsError = class extends TaggedError("InvalidFolioDocxXmlPatchProposalOptionsError") {};
 const SHA256_PATTERN = /^[\da-f]{64}$/u;
@@ -271,19 +285,14 @@ const evaluateDocxXmlPatchProposal = async ({ bytes, proposal: rawProposal, allo
 		if (exceedsEncodedPart || totalLimitReported) continue;
 		encodedByPath.set(replacement.path, replacementBytes);
 		const safetyIssue = getDocxXmlSafetyIssue(replacement.replacementXml);
-		if (safetyIssue === "doctype-forbidden") issues.push({
-			code: "xml-doctype-forbidden",
-			message: "Replacement XML must not declare a document type.",
-			proposalPath: `${proposalPath}.replacementXml`,
-			part: replacement.path
-		});
-		else if (safetyIssue === "not-well-formed") issues.push({
-			code: "xml-not-well-formed",
-			message: "Replacement XML must be well formed.",
-			proposalPath: `${proposalPath}.replacementXml`,
-			part: replacement.path
-		});
-		else {
+		if (safetyIssue !== null) {
+			const issue = XML_SAFETY_ISSUE[safetyIssue];
+			issues.push({
+				...issue,
+				proposalPath: `${proposalPath}.replacementXml`,
+				part: replacement.path
+			});
+		} else {
 			const declaredEncoding = replacement.replacementXml.match(XML_DECLARED_ENCODING_PATTERN)?.at(1);
 			if (declaredEncoding !== void 0 && declaredEncoding.toLowerCase() !== "utf-8" && declaredEncoding.toLowerCase() !== "utf8") issues.push({
 				code: "xml-encoding-mismatch",