@stll/folio-core 0.44.0 → 0.46.0

package/dist/docx/serializer/sectionPropertiesSerializer.js

@@ -1,11 +1,13 @@
+import { serializePreservedAttributes } from "../attributeRemainder.js";
 import { getUnserializedSectionPropertyChildNames } from "../sectionParser.js";
 import { serializeSectionReferenceHistory } from "../sectionReferenceHistory.js";
 import { serializeBorder } from "./borderSerializer.js";
 import { serializeTrackedChangeAttributes } from "./trackedChangeAttributes.js";
-import { escapeXml, intAttr } from "./xmlUtils.js";
+import { intAttr } from "./xmlUtils.js";
+import { escapeXmlAttribute } from "@stll/docx-core";
 //#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)}"/>`;
+const serializeHeaderReference = (ref) => `<w:headerReference w:type="${ref.type}" r:id="${escapeXmlAttribute(ref.rId)}"/>`;
+const serializeFooterReference = (ref) => `<w:footerReference w:type="${ref.type}" r:id="${escapeXmlAttribute(ref.rId)}"/>`;
 function serializeFootnoteProperties(props) {
 	if (!props) return "";
 	const parts = [];
@@ -52,12 +54,12 @@ function serializePaperSource(props) {
 	return attrs.length > 0 ? `<w:paperSrc ${attrs.join(" ")}/>` : "";
 }
 function serializeColumns(props) {
-	if (props.columnCount === void 0 && !props.columns?.length && props.columnSpace === void 0 && props.equalWidth === void 0) return "";
+	if (props.columnCount === void 0 && !props.columns?.length && props.columnSpace === void 0 && props.equalWidth === void 0 && props.separator === void 0) return "";
 	const attrs = [];
 	if (props.columnCount !== void 0 && props.columnCount >= 1) attrs.push(`w:num="${intAttr(props.columnCount)}"`);
 	if (props.columnSpace !== void 0) attrs.push(`w:space="${intAttr(props.columnSpace)}"`);
 	if (props.equalWidth !== void 0) attrs.push(`w:equalWidth="${props.equalWidth ? "1" : "0"}"`);
-	if (props.separator) attrs.push("w:sep=\"1\"");
+	if (props.separator !== void 0) attrs.push(`w:sep="${props.separator ? "1" : "0"}"`);
 	const colElements = (props.columns ?? []).map((col) => {
 		const colAttrs = [];
 		if (col.width !== void 0) colAttrs.push(`w:w="${intAttr(col.width)}"`);
@@ -84,7 +86,7 @@ function serializePageNumbering(props) {
 	if (pageNumbering.format) attrs.push(`w:fmt="${pageNumbering.format}"`);
 	if (pageNumbering.start !== void 0) attrs.push(`w:start="${intAttr(pageNumbering.start)}"`);
 	if (pageNumbering.chapterStyle !== void 0) attrs.push(`w:chapStyle="${intAttr(pageNumbering.chapterStyle)}"`);
-	if (pageNumbering.chapterSeparator) attrs.push(`w:chapSep="${escapeXml(pageNumbering.chapterSeparator)}"`);
+	if (pageNumbering.chapterSeparator) attrs.push(`w:chapSep="${escapeXmlAttribute(pageNumbering.chapterSeparator)}"`);
 	return attrs.length > 0 ? `<w:pgNumType ${attrs.join(" ")}/>` : "";
 }
 function serializePageBorders(props) {
@@ -114,10 +116,10 @@ function serializeBackground(props) {
 	const attrs = [];
 	const { background } = props;
 	if (background.color?.auto) attrs.push("w:color=\"auto\"");
-	else if (background.color?.rgb) attrs.push(`w:color="${escapeXml(background.color.rgb)}"`);
-	if (background.themeColor ?? background.color?.themeColor) attrs.push(`w:themeColor="${escapeXml(background.themeColor ?? background.color?.themeColor ?? "")}"`);
-	if (background.themeTint ?? background.color?.themeTint) attrs.push(`w:themeTint="${escapeXml(background.themeTint ?? background.color?.themeTint ?? "")}"`);
-	if (background.themeShade ?? background.color?.themeShade) attrs.push(`w:themeShade="${escapeXml(background.themeShade ?? background.color?.themeShade ?? "")}"`);
+	else if (background.color?.rgb) attrs.push(`w:color="${escapeXmlAttribute(background.color.rgb)}"`);
+	if (background.themeColor ?? background.color?.themeColor) attrs.push(`w:themeColor="${escapeXmlAttribute(background.themeColor ?? background.color?.themeColor ?? "")}"`);
+	if (background.themeTint ?? background.color?.themeTint) attrs.push(`w:themeTint="${escapeXmlAttribute(background.themeTint ?? background.color?.themeTint ?? "")}"`);
+	if (background.themeShade ?? background.color?.themeShade) attrs.push(`w:themeShade="${escapeXmlAttribute(background.themeShade ?? background.color?.themeShade ?? "")}"`);
 	return attrs.length > 0 ? `<w:background ${attrs.join(" ")}/>` : "";
 }
 function serializeDocGrid(props) {
@@ -127,7 +129,7 @@ function serializeDocGrid(props) {
 	if (dg.type) attrs.push(`w:type="${dg.type}"`);
 	if (dg.linePitch !== void 0) attrs.push(`w:linePitch="${intAttr(dg.linePitch)}"`);
 	if (dg.charSpace !== void 0) attrs.push(`w:charSpace="${intAttr(dg.charSpace)}"`);
-	return attrs.length > 0 ? `<w:docGrid ${attrs.join(" ")}/>` : "";
+	return attrs.length > 0 ? `<w:docGrid ${attrs.join(" ")}/>` : "<w:docGrid/>";
 }
 function serializeOnOffElement(value, name) {
 	if (value === void 0) return "";
@@ -173,12 +175,15 @@ function serializeSectionProperties(props) {
 		serializeOnOffElement(props.noEndnote, "noEndnote"),
 		serializeOnOffElement(props.rtlGutter, "rtlGutter")
 	]) if (xml) parts.push(xml);
-	if (props.printerSettingsRelationshipId) parts.push(`<w:printerSettings r:id="${escapeXml(props.printerSettingsRelationshipId)}"/>`);
+	if (props.printerSettingsRelationshipId) parts.push(`<w:printerSettings r:id="${escapeXmlAttribute(props.printerSettingsRelationshipId)}"/>`);
 	for (const change of props.propertyChanges ?? []) parts.push(serializeSectionPropertyChange(change));
 	const unserializedChildNames = getUnserializedSectionPropertyChildNames(props);
 	if (unserializedChildNames && unserializedChildNames.length > 0) return "";
-	if (parts.length > 0) return `<w:sectPr>${parts.join("")}</w:sectPr>`;
-	if (Object.keys(props).length > 0) return "";
+	const attributes = serializePreservedAttributes([], props.preservedAttributes);
+	const startTag = attributes.length > 0 ? `<w:sectPr ${attributes.join(" ")}` : "<w:sectPr";
+	if (parts.length > 0) return `${startTag}>${parts.join("")}</w:sectPr>`;
+	if (Object.keys(props).some((key) => key !== "preservedAttributes")) return "";
+	if (attributes.length > 0) return `${startTag}/>`;
 	return "<w:sectPr/>";
 }
 //#endregion

package/dist/docx/serializer/settingsSerializer.js

@@ -1,5 +1,6 @@
 import { serializePartElement } from "./partNamespaces.js";
-import { escapeXml, intAttr } from "./xmlUtils.js";
+import { intAttr } from "./xmlUtils.js";
+import { escapeXmlAttribute } from "@stll/docx-core";
 //#region src/docx/serializer/settingsSerializer.ts
 const serializeSettingsXml = (settings) => {
 	const parts = [`<w:defaultTabStop w:val="${intAttr(settings.defaultTabStop)}"/>`];
@@ -7,8 +8,8 @@ const serializeSettingsXml = (settings) => {
 	if (settings.updateFields) parts.push("<w:updateFields w:val=\"true\"/>");
 	if (settings.themeFontLang) {
 		const attrs = [];
-		if (settings.themeFontLang.eastAsia) attrs.push(`w:eastAsia="${escapeXml(settings.themeFontLang.eastAsia)}"`);
-		if (settings.themeFontLang.bidi) attrs.push(`w:bidi="${escapeXml(settings.themeFontLang.bidi)}"`);
+		if (settings.themeFontLang.eastAsia) attrs.push(`w:eastAsia="${escapeXmlAttribute(settings.themeFontLang.eastAsia)}"`);
+		if (settings.themeFontLang.bidi) attrs.push(`w:bidi="${escapeXmlAttribute(settings.themeFontLang.bidi)}"`);
 		if (attrs.length > 0) parts.push(`<w:themeFontLang ${attrs.join(" ")}/>`);
 	}
 	return "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + serializePartElement({

package/dist/docx/serializer/stylesSerializer.js

@@ -2,7 +2,7 @@ import { serializeParagraphFormatting } from "./paragraphSerializer.js";
 import { serializePartElement } from "./partNamespaces.js";
 import { serializeTableCellFormatting, serializeTableFormatting, serializeTableRowFormatting } from "./tableSerializer.js";
 import { serializeTextFormatting } from "./textFormattingSerializer.js";
-import { escapeXml } from "./xmlUtils.js";
+import { escapeXmlAttribute } from "@stll/docx-core";
 //#region src/docx/serializer/stylesSerializer.ts
 const serializeStylesXml = (definitions) => {
 	return "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + serializePartElement({
@@ -28,12 +28,12 @@ const serializeLatentStyles = (definitions) => {
 	return `<w:latentStyles${attrs.length > 0 ? ` ${attrs.join(" ")}` : ""}/>`;
 };
 const serializeStyle = (style) => {
-	const attrs = [`w:type="${style.type}"`, `w:styleId="${escapeXml(style.styleId)}"`];
+	const attrs = [`w:type="${style.type}"`, `w:styleId="${escapeXmlAttribute(style.styleId)}"`];
 	if (style.default) attrs.push("w:default=\"1\"");
-	const parts = [`<w:name w:val="${escapeXml(style.name ?? style.styleId)}"/>`];
-	if (style.basedOn) parts.push(`<w:basedOn w:val="${escapeXml(style.basedOn)}"/>`);
-	if (style.next) parts.push(`<w:next w:val="${escapeXml(style.next)}"/>`);
-	if (style.link) parts.push(`<w:link w:val="${escapeXml(style.link)}"/>`);
+	const parts = [`<w:name w:val="${escapeXmlAttribute(style.name ?? style.styleId)}"/>`];
+	if (style.basedOn) parts.push(`<w:basedOn w:val="${escapeXmlAttribute(style.basedOn)}"/>`);
+	if (style.next) parts.push(`<w:next w:val="${escapeXmlAttribute(style.next)}"/>`);
+	if (style.link) parts.push(`<w:link w:val="${escapeXmlAttribute(style.link)}"/>`);
 	if (style.uiPriority !== void 0) parts.push(`<w:uiPriority w:val="${style.uiPriority}"/>`);
 	pushBooleanElement(parts, "hidden", style.hidden);
 	pushBooleanElement(parts, "semiHidden", style.semiHidden);

package/dist/docx/serializer/tableSerializer.js

@@ -1,13 +1,15 @@
 import { canonicalJson } from "../../utils/canonicalJson.js";
 import { isValidHexColor } from "../../utils/colorResolver.js";
-import { withBlockRangeMarkers } from "../blockRangeMarkers.js";
+import { serializePreservedAttributes } from "../attributeRemainder.js";
+import { serializeWithPreservedChildren } from "../containerChildren.js";
 import { TABLE_LOOK_FLAGS } from "../tableLook.js";
 import { parseTableCellProperties, parseTableGrid, parseTableProperties, parseTableRowProperties } from "../tableParser.js";
 import { sanitizeCapturedXmlElement } from "../verbatimCapture.js";
 import { NAMESPACES, OOXML_NAMESPACE_SCOPE, parseXml } from "../xmlParser.js";
 import { serializeBorder } from "./borderSerializer.js";
 import { serializeTrackedChangeAttributes } from "./trackedChangeAttributes.js";
-import { escapeXml, intAttr } from "./xmlUtils.js";
+import { intAttr } from "./xmlUtils.js";
+import { escapeXmlAttribute } from "@stll/docx-core";
 //#region src/docx/serializer/tableSerializer.ts
 /**
 * The captured element with the revision children written back into it.
@@ -130,15 +132,15 @@ function serializeCellMargins(margins, elementName) {
 function serializeShading(shading) {
 	if (!shading) return "";
 	const attrs = [];
-	if (shading.pattern) attrs.push(`w:val="${escapeXml(shading.pattern)}"`);
+	if (shading.pattern) attrs.push(`w:val="${escapeXmlAttribute(shading.pattern)}"`);
 	else attrs.push("w:val=\"clear\"");
-	if (shading.color?.rgb && isValidHexColor(shading.color.rgb)) attrs.push(`w:color="${escapeXml(shading.color.rgb)}"`);
+	if (shading.color?.rgb && isValidHexColor(shading.color.rgb)) attrs.push(`w:color="${escapeXmlAttribute(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)}"`);
+	if (shading.fill?.rgb && isValidHexColor(shading.fill.rgb)) attrs.push(`w:fill="${escapeXmlAttribute(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 (shading.fill?.themeColor) attrs.push(`w:themeFill="${escapeXmlAttribute(shading.fill.themeColor)}"`);
+	if (shading.fill?.themeTint) attrs.push(`w:themeFillTint="${escapeXmlAttribute(shading.fill.themeTint)}"`);
+	if (shading.fill?.themeShade) attrs.push(`w:themeFillShade="${escapeXmlAttribute(shading.fill.themeShade)}"`);
 	if (attrs.length === 0) return "";
 	return `<w:shd ${attrs.join(" ")}/>`;
 }
@@ -154,7 +156,7 @@ function serializeShading(shading) {
 function serializeTableLook(look) {
 	if (!look) return "";
 	const attrs = [];
-	if (look.val !== void 0) attrs.push(`w:val="${escapeXml(look.val)}"`);
+	if (look.val !== void 0) attrs.push(`w:val="${escapeXmlAttribute(look.val)}"`);
 	for (const flag of TABLE_LOOK_FLAGS) {
 		const stated = look[flag];
 		if (stated !== void 0) attrs.push(`w:${flag}="${stated ? "1" : "0"}"`);
@@ -189,7 +191,7 @@ function serializeTableFormatting(formatting, propertyChanges) {
 	if (tableSource !== null) return withRevisionChildren(tableSource, (propertyChanges ?? []).map((change) => serializeTablePropertyChange(change)));
 	const parts = [];
 	if (formatting) {
-		if (formatting.styleId) parts.push(`<w:tblStyle w:val="${escapeXml(formatting.styleId)}"/>`);
+		if (formatting.styleId) parts.push(`<w:tblStyle w:val="${escapeXmlAttribute(formatting.styleId)}"/>`);
 		const floatingXml = serializeFloatingTableProperties(formatting.floating);
 		if (floatingXml) parts.push(floatingXml);
 		if (formatting.overlap) parts.push(`<w:tblOverlap w:val="${formatting.overlap}"/>`);
@@ -368,8 +370,14 @@ const replayableGridChangeXml = (gridChangeXml) => sanitizeCapturedXmlElement(gr
 * Serialize cell content (paragraphs, nested tables)
 */
 function serializeCellContent(content, serializeParagraph) {
-	const parts = [];
-	for (const item of content) parts.push(withBlockRangeMarkers(item, item.type === "paragraph" ? serializeParagraph(item) : serializeTable(item, serializeParagraph)));
+	const parts = content.map((block) => {
+		switch (block.type) {
+			case "paragraph": return serializeParagraph(block);
+			case "table": return serializeTable(block, serializeParagraph);
+			case "preservedBlock": return block.xml;
+			default: return block;
+		}
+	});
 	if (parts.length === 0) parts.push("<w:p/>");
 	return parts.join("");
 }
@@ -390,8 +398,9 @@ function serializeTableRow(row, serializeParagraph) {
 	const parts = [];
 	const trPrXml = serializeTableRowFormatting(row.formatting, row.propertyChanges, row.structuralChange);
 	if (trPrXml) parts.push(trPrXml);
-	for (const cell of row.cells) parts.push(serializeTableCell(cell, serializeParagraph));
-	return `<w:tr>${parts.join("")}</w:tr>`;
+	parts.push(serializeWithPreservedChildren(row.cells.map((cell) => serializeTableCell(cell, serializeParagraph)), row.preserved));
+	const attrs = serializePreservedAttributes([], row.preservedAttributes);
+	return `<w:tr${attrs.length > 0 ? ` ${attrs.join(" ")}` : ""}>${parts.join("")}</w:tr>`;
 }
 /**
 * Serialize a table to OOXML XML (w:tbl)
@@ -400,9 +409,11 @@ function serializeTableRow(row, serializeParagraph) {
 * @returns XML string for the table
 */
 function serializeTable(table, serializeParagraph) {
-	const parts = [serializeTableFormatting(table.formatting, table.propertyChanges) || "<w:tblPr/>", serializeTableGrid(table)];
-	for (const row of table.rows) parts.push(serializeTableRow(row, serializeParagraph));
-	return `<w:tbl>${parts.join("")}</w:tbl>`;
+	return `<w:tbl>${[
+		serializeTableFormatting(table.formatting, table.propertyChanges) || "<w:tblPr/>",
+		serializeTableGrid(table),
+		serializeWithPreservedChildren(table.rows.map((row) => serializeTableRow(row, serializeParagraph)), table.preserved)
+	].join("")}</w:tbl>`;
 }
 /**
 * Serialize multiple tables to OOXML XML

package/dist/docx/serializer/textFormattingSerializer.js

@@ -1,7 +1,8 @@
 import { HIGHLIGHT_COLOR_VALUES } from "../../types/documentEnumValues.js";
 import { isValidHexColor } from "../../utils/colorResolver.js";
 import { roundHorizontalScalePercentForSerialization } from "../../utils/horizontalScale.js";
-import { escapeXml, intAttr } from "./xmlUtils.js";
+import { intAttr } from "./xmlUtils.js";
+import { escapeXmlAttribute } from "@stll/docx-core";
 //#region src/docx/serializer/textFormattingSerializer.ts
 const VALID_HIGHLIGHT_COLORS = new Set(HIGHLIGHT_COLOR_VALUES);
 /**
@@ -12,10 +13,10 @@ function serializeColorElement(color) {
 	const { auto, rgb, themeColor, themeTint, themeShade } = color;
 	const attrs = [];
 	if (auto) attrs.push("w:val=\"auto\"");
-	else if (rgb && isValidHexColor(rgb)) attrs.push(`w:val="${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)}"`);
+	else if (rgb && isValidHexColor(rgb)) attrs.push(`w:val="${escapeXmlAttribute(rgb)}"`);
+	if (themeColor) attrs.push(`w:themeColor="${escapeXmlAttribute(themeColor)}"`);
+	if (themeTint) attrs.push(`w:themeTint="${escapeXmlAttribute(themeTint)}"`);
+	if (themeShade) attrs.push(`w:themeShade="${escapeXmlAttribute(themeShade)}"`);
 	return attrs.length === 0 ? "" : `<w:color ${attrs.join(" ")}/>`;
 }
 /**
@@ -25,20 +26,20 @@ function serializeShading(shading) {
 	if (!shading) return "";
 	const { pattern, color, fill } = shading;
 	const attrs = [];
-	if (pattern) attrs.push(`w:val="${escapeXml(pattern)}"`);
+	if (pattern) attrs.push(`w:val="${escapeXmlAttribute(pattern)}"`);
 	else attrs.push("w:val=\"clear\"");
 	if (color) {
 		const { rgb, auto, themeColor: _themeColor, themeTint: _themeTint, themeShade: _themeShade } = color;
-		if (rgb && isValidHexColor(rgb)) attrs.push(`w:color="${escapeXml(rgb)}"`);
+		if (rgb && isValidHexColor(rgb)) attrs.push(`w:color="${escapeXmlAttribute(rgb)}"`);
 		else if (auto) attrs.push("w:color=\"auto\"");
 	}
 	if (fill) {
 		const { rgb, auto, themeColor, themeTint, themeShade } = fill;
-		if (rgb && isValidHexColor(rgb)) attrs.push(`w:fill="${escapeXml(rgb)}"`);
+		if (rgb && isValidHexColor(rgb)) attrs.push(`w:fill="${escapeXmlAttribute(rgb)}"`);
 		else if (auto) attrs.push("w:fill=\"auto\"");
-		if (themeColor) attrs.push(`w:themeFill="${escapeXml(themeColor)}"`);
-		if (themeTint) attrs.push(`w:themeFillTint="${escapeXml(themeTint)}"`);
-		if (themeShade) attrs.push(`w:themeFillShade="${escapeXml(themeShade)}"`);
+		if (themeColor) attrs.push(`w:themeFill="${escapeXmlAttribute(themeColor)}"`);
+		if (themeTint) attrs.push(`w:themeFillTint="${escapeXmlAttribute(themeTint)}"`);
+		if (themeShade) attrs.push(`w:themeFillShade="${escapeXmlAttribute(themeShade)}"`);
 	}
 	return attrs.length === 0 ? "" : `<w:shd ${attrs.join(" ")}/>`;
 }
@@ -49,19 +50,19 @@ function serializeTextFormatting(input) {
 	if (!input) return "";
 	const { bold, boldCs, italic, italicCs, underline, strike, doubleStrike, vertAlign, smallCaps, allCaps, hidden, noProof, color, highlight, shading, fontSize, fontSizeCs, fontFamily, language, spacing, position, scale, kerning, effect, emphasisMark, emboss, imprint, outline, shadow, rtl, cs, styleId } = input;
 	const parts = [];
-	if (styleId) parts.push(`<w:rStyle w:val="${escapeXml(styleId)}"/>`);
+	if (styleId) parts.push(`<w:rStyle w:val="${escapeXmlAttribute(styleId)}"/>`);
 	if (fontFamily) {
 		const { ascii, hAnsi, eastAsia, cs: complexScript, hint, asciiTheme, hAnsiTheme, eastAsiaTheme, csTheme } = fontFamily;
 		const fontAttrs = [];
-		if (ascii) fontAttrs.push(`w:ascii="${escapeXml(ascii)}"`);
-		if (hAnsi) fontAttrs.push(`w:hAnsi="${escapeXml(hAnsi)}"`);
-		if (eastAsia) fontAttrs.push(`w:eastAsia="${escapeXml(eastAsia)}"`);
-		if (complexScript) fontAttrs.push(`w:cs="${escapeXml(complexScript)}"`);
-		if (hint) fontAttrs.push(`w:hint="${escapeXml(hint)}"`);
-		if (asciiTheme) fontAttrs.push(`w:asciiTheme="${escapeXml(asciiTheme)}"`);
-		if (hAnsiTheme) fontAttrs.push(`w:hAnsiTheme="${escapeXml(hAnsiTheme)}"`);
-		if (eastAsiaTheme) fontAttrs.push(`w:eastAsiaTheme="${escapeXml(eastAsiaTheme)}"`);
-		if (csTheme) fontAttrs.push(`w:cstheme="${escapeXml(csTheme)}"`);
+		if (ascii) fontAttrs.push(`w:ascii="${escapeXmlAttribute(ascii)}"`);
+		if (hAnsi) fontAttrs.push(`w:hAnsi="${escapeXmlAttribute(hAnsi)}"`);
+		if (eastAsia) fontAttrs.push(`w:eastAsia="${escapeXmlAttribute(eastAsia)}"`);
+		if (complexScript) fontAttrs.push(`w:cs="${escapeXmlAttribute(complexScript)}"`);
+		if (hint) fontAttrs.push(`w:hint="${escapeXmlAttribute(hint)}"`);
+		if (asciiTheme) fontAttrs.push(`w:asciiTheme="${escapeXmlAttribute(asciiTheme)}"`);
+		if (hAnsiTheme) fontAttrs.push(`w:hAnsiTheme="${escapeXmlAttribute(hAnsiTheme)}"`);
+		if (eastAsiaTheme) fontAttrs.push(`w:eastAsiaTheme="${escapeXmlAttribute(eastAsiaTheme)}"`);
+		if (csTheme) fontAttrs.push(`w:cstheme="${escapeXmlAttribute(csTheme)}"`);
 		if (fontAttrs.length > 0) parts.push(`<w:rFonts ${fontAttrs.join(" ")}/>`);
 	}
 	if (bold === true) parts.push("<w:b/>");
@@ -114,10 +115,10 @@ function serializeTextFormatting(input) {
 		const uAttrs = [`w:val="${style}"`];
 		if (underlineColor) {
 			const { rgb, themeColor, themeTint, themeShade, auto: _auto } = underlineColor;
-			if (rgb && isValidHexColor(rgb)) uAttrs.push(`w:color="${escapeXml(rgb)}"`);
-			if (themeColor) uAttrs.push(`w:themeColor="${escapeXml(themeColor)}"`);
-			if (themeTint) uAttrs.push(`w:themeTint="${escapeXml(themeTint)}"`);
-			if (themeShade) uAttrs.push(`w:themeShade="${escapeXml(themeShade)}"`);
+			if (rgb && isValidHexColor(rgb)) uAttrs.push(`w:color="${escapeXmlAttribute(rgb)}"`);
+			if (themeColor) uAttrs.push(`w:themeColor="${escapeXmlAttribute(themeColor)}"`);
+			if (themeTint) uAttrs.push(`w:themeTint="${escapeXmlAttribute(themeTint)}"`);
+			if (themeShade) uAttrs.push(`w:themeShade="${escapeXmlAttribute(themeShade)}"`);
 		}
 		parts.push(`<w:u ${uAttrs.join(" ")}/>`);
 	}
@@ -133,9 +134,9 @@ function serializeTextFormatting(input) {
 	if (language) {
 		const { val, eastAsia, bidi } = language;
 		const languageAttrs = [];
-		if (val) languageAttrs.push(`w:val="${escapeXml(val)}"`);
-		if (eastAsia) languageAttrs.push(`w:eastAsia="${escapeXml(eastAsia)}"`);
-		if (bidi) languageAttrs.push(`w:bidi="${escapeXml(bidi)}"`);
+		if (val) languageAttrs.push(`w:val="${escapeXmlAttribute(val)}"`);
+		if (eastAsia) languageAttrs.push(`w:eastAsia="${escapeXmlAttribute(eastAsia)}"`);
+		if (bidi) languageAttrs.push(`w:bidi="${escapeXmlAttribute(bidi)}"`);
 		if (languageAttrs.length > 0) parts.push(`<w:lang ${languageAttrs.join(" ")}/>`);
 	}
 	return parts.length === 0 ? "" : `<w:rPr>${parts.join("")}</w:rPr>`;

package/dist/docx/serializer/themeSerializer.js

@@ -1,8 +1,8 @@
 import { serializePartElement } from "./partNamespaces.js";
-import { escapeXml } from "./xmlUtils.js";
+import { escapeXmlAttribute } from "@stll/docx-core";
 //#region src/docx/serializer/themeSerializer.ts
 const serializeThemeXml = (theme) => {
-	const name = escapeXml(theme.name ?? "Folio Theme");
+	const name = escapeXmlAttribute(theme.name ?? "Folio Theme");
 	const elements = `${serializeColorScheme(theme.colorScheme)}${serializeFontScheme(theme)}${serializeFormatScheme(theme)}`;
 	return "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + serializePartElement({
 		partPath: "word/theme/theme1.xml",
@@ -28,17 +28,17 @@ const serializeColorScheme = (colors) => {
 		hlink: colors?.hlink ?? "0563C1",
 		folHlink: colors?.folHlink ?? "954F72"
 	};
-	return `<a:clrScheme name="Folio">${Object.entries(values).map(([slot, value]) => `<a:${slot}><a:srgbClr val="${escapeXml(value)}"/></a:${slot}>`).join("")}</a:clrScheme>`;
+	return `<a:clrScheme name="Folio">${Object.entries(values).map(([slot, value]) => `<a:${slot}><a:srgbClr val="${escapeXmlAttribute(value)}"/></a:${slot}>`).join("")}</a:clrScheme>`;
 };
 const serializeFontScheme = (theme) => {
 	return `<a:fontScheme name="Folio">${serializeThemeFont(theme.fontScheme?.majorFont, "majorFont", "Arial")}${serializeThemeFont(theme.fontScheme?.minorFont, "minorFont", "Arial")}</a:fontScheme>`;
 };
 const serializeThemeFont = (font, element, fallback) => {
-	const scriptFonts = Object.entries(font?.fonts ?? {}).map(([script, typeface]) => `<a:font script="${escapeXml(script)}" typeface="${escapeXml(typeface)}"/>`).join("");
-	return `<a:${element}><a:latin typeface="${escapeXml(font?.latin ?? fallback)}"/><a:ea typeface="${escapeXml(font?.ea ?? "")}"/><a:cs typeface="${escapeXml(font?.cs ?? "")}"/>${scriptFonts}</a:${element}>`;
+	const scriptFonts = Object.entries(font?.fonts ?? {}).map(([script, typeface]) => `<a:font script="${escapeXmlAttribute(script)}" typeface="${escapeXmlAttribute(typeface)}"/>`).join("");
+	return `<a:${element}><a:latin typeface="${escapeXmlAttribute(font?.latin ?? fallback)}"/><a:ea typeface="${escapeXmlAttribute(font?.ea ?? "")}"/><a:cs typeface="${escapeXmlAttribute(font?.cs ?? "")}"/>${scriptFonts}</a:${element}>`;
 };
 const serializeFormatScheme = (theme) => {
-	return `<a:fmtScheme name="${escapeXml(theme.formatScheme?.name ?? "Folio")}"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:fillStyleLst><a:lnStyleLst><a:ln w="6350" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:bgFillStyleLst></a:fmtScheme>`;
+	return `<a:fmtScheme name="${escapeXmlAttribute(theme.formatScheme?.name ?? "Folio")}"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:fillStyleLst><a:lnStyleLst><a:ln w="6350" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:bgFillStyleLst></a:fmtScheme>`;
 };
 //#endregion
 export { serializeThemeXml };

package/dist/docx/serializer/trackedChangeAttributes.js

@@ -1,6 +1,6 @@
 import { DATE_UTC_ATTRIBUTE } from "../trackedChangeInfo.js";
-import { escapeXml } from "./xmlUtils.js";
 import { panic } from "better-result";
+import { escapeXmlAttribute } from "@stll/docx-core";
 import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/serializer/trackedChangeAttributes.ts
 /** Enforces the singular `w:rPrChange` child in a run-property container. */
@@ -26,6 +26,6 @@ const trackedChangeAttributeEntries = (info) => {
 	return entries;
 };
 const trackedChangeAttributeRecord = (info) => Object.fromEntries(trackedChangeAttributeEntries(info));
-const serializeTrackedChangeAttributes = (info) => trackedChangeAttributeEntries(info).map(([name, value]) => `${name}="${escapeXml(value)}"`).join(" ");
+const serializeTrackedChangeAttributes = (info) => trackedChangeAttributeEntries(info).map(([name, value]) => `${name}="${escapeXmlAttribute(value)}"`).join(" ");
 //#endregion
 export { getSingularRunPropertyChange, serializeTrackedChangeAttributes, trackedChangeAttributeEntries, trackedChangeAttributeRecord };

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

@@ -2,7 +2,6 @@
 /**
  * Shared XML utility functions for serializers.
  */
-declare function escapeXml(text: string): string;
 /**
  * Format a numeric value as an integer XML attribute.
  *
@@ -29,4 +28,4 @@ declare function intAttr(value: number | undefined | null): string;
  */
 declare function isSingleWellFormedElement(xml: string, expectedLocalName: string): boolean;
 //#endregion
-export { escapeXml, intAttr, isSingleWellFormedElement };
+export { intAttr, isSingleWellFormedElement };

package/dist/docx/serializer/xmlUtils.js

@@ -3,18 +3,6 @@ import { getLocalName, parseXml } from "../xmlParser.js";
 /**
 * Shared XML utility functions for serializers.
 */
-const XML_SPECIAL_CHARACTER_PATTERN = /[&<>"']/u;
-const XML_SPECIAL_CHARACTER_GLOBAL_PATTERN = /[&<>"']/gu;
-function escapeXml(text) {
-	if (!XML_SPECIAL_CHARACTER_PATTERN.test(text)) return text;
-	return text.replace(XML_SPECIAL_CHARACTER_GLOBAL_PATTERN, (character) => {
-		if (character === "&") return "&amp;";
-		if (character === "<") return "&lt;";
-		if (character === ">") return "&gt;";
-		if (character === "\"") return "&quot;";
-		return "&apos;";
-	});
-}
 /**
 * Format a numeric value as an integer XML attribute.
 *
@@ -57,4 +45,4 @@ function isSingleWellFormedElement(xml, expectedLocalName) {
 	return root?.name !== void 0 && getLocalName(root.name) === expectedLocalName;
 }
 //#endregion
-export { escapeXml, intAttr, isSingleWellFormedElement };
+export { intAttr, isSingleWellFormedElement };

package/dist/docx/server/boundedArchive.d.ts

@@ -1,3 +1,4 @@
+import { XmlResourceLimits } from "../xmlResourceLimits.js";
 import JSZip from "jszip";
 //#region src/docx/server/boundedArchive.d.ts
 declare module "jszip" {
@@ -27,6 +28,17 @@ type DocxArchiveOptions = {
   maxEntryBytes?: number;
   maxTotalBytes?: number;
   maxEntries?: number;
+  /**
+   * Bounds on parsed XML structure, applied to every XML part this archive
+   * hands out as a string.
+   *
+   * Every consumer of `readEntryString` parses the result into an object tree,
+   * and the byte caps above bound the markup, not the tree. Enforcing the
+   * element and attribute bounds here rather than at each parse site means a
+   * new consumer is bounded by construction: there is no way to obtain a part
+   * string from this archive that has not been counted.
+   */
+  xmlLimits?: Partial<XmlResourceLimits>;
 };
 type DocxArchiveEntry = {
   readonly path: string;

package/dist/docx/server/boundedArchive.js

@@ -1,3 +1,4 @@
+import { FOLIO_XML_RESOURCE_LIMITS, assertXmlResourceLimits, createXmlPackageBudget } from "../xmlResourceLimits.js";
 import { TaggedError } from "better-result";
 import JSZip from "jszip";
 //#region src/docx/server/boundedArchive.ts
@@ -117,6 +118,12 @@ const loadDocxArchive = async (bytes, options = {}) => {
 		message: `DOCX archive declares ${declaredTotalBytes} cumulative bytes (max ${maxTotalBytes})`,
 		reason: "total-too-large"
 	});
+	const xmlLimits = {
+		...FOLIO_XML_RESOURCE_LIMITS,
+		...options.xmlLimits
+	};
+	const xmlBudget = createXmlPackageBudget();
+	const countedParts = /* @__PURE__ */ new Set();
 	let totalBytesRead = 0;
 	let readChain = Promise.resolve();
 	const readEntry = async (path, readOptions = {}) => {
@@ -151,7 +158,19 @@ const loadDocxArchive = async (bytes, options = {}) => {
 		}))),
 		async readEntryString(path) {
 			const content = await readEntry(path);
-			return content === null ? null : new TextDecoder("utf-8", { ignoreBOM: true }).decode(content);
+			if (content === null) return null;
+			const xml = new TextDecoder("utf-8", { ignoreBOM: true }).decode(content);
+			const lower = path.toLowerCase();
+			if (!lower.endsWith(".xml") && !lower.endsWith(".rels")) return xml;
+			const charged = countedParts.has(path);
+			countedParts.add(path);
+			assertXmlResourceLimits({
+				xml,
+				limits: xmlLimits,
+				partPath: path,
+				...charged ? {} : { budget: xmlBudget }
+			});
+			return xml;
 		},
 		readEntryUint8: readEntry
 	};

package/dist/docx/server/createBilingualDocument.js

@@ -203,6 +203,7 @@ const flattenBlocks = (content) => {
 			out.push(block);
 			return;
 		}
+		if (block.type === "preservedBlock") return;
 		for (const child of block.content) visit(child);
 	};
 	for (const block of content) visit(block);
@@ -462,7 +463,7 @@ const remapListRendering = (rendering, cloner) => {
 const collectTableParagraphs = (table) => {
 	const out = [];
 	for (const row of table.rows) for (const cell of row.cells) for (const item of cell.content) if (item.type === "paragraph") out.push(item);
-	else out.push(...collectTableParagraphs(item));
+	else if (item.type === "table") out.push(...collectTableParagraphs(item));
 	return out;
 };
 const cloneTableForTarget = ({ table, editableParagraphIds, paraIds, styleCloner, cloner, bookmarkIds }) => {
@@ -475,6 +476,7 @@ const cloneTableForTarget = ({ table, editableParagraphIds, paraIds, styleCloner
 				...structuredClone(cell),
 				content: cell.content.map((item) => {
 					if (item.type === "table") return cloneTable(item);
+					if (item.type !== "paragraph") return structuredClone(item);
 					const targetParaId = paraIds.mint(item.paraId);
 					const copy = cloneParagraphForTarget(item, targetParaId, styleCloner, cloner, bookmarkIds);
 					if (isTranslatableParagraph(item, editableParagraphIds)) paragraphs.push({

package/dist/docx/server/materializeYjsDocx.d.ts

@@ -4,7 +4,7 @@ declare const FOLIO_YJS_PROSEMIRROR_FRAGMENT_NAME = "prosemirror";
 /** Maximum accepted size of a complete Yjs collaboration state update. */
 declare const FOLIO_YJS_UPDATE_MAX_BYTES: number;
 /** Stable failure codes returned by server-side Yjs-to-DOCX materialization. */
-declare const FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES: readonly ["empty_update", "invalid_update", "missing_document", "source_mismatch", "update_too_large"];
+declare const FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES: readonly ["empty_update", "invalid_update", "missing_document", "source_mismatch", "stale_attr_schema", "update_too_large"];
 /** Failure code for a rejected Yjs-to-DOCX materialization request. */
 type FolioYjsDocxMaterializationErrorCode = (typeof FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES)[number];
 declare const FolioYjsDocxMaterializationError_base: import("better-result").TaggedErrorClass<"FolioYjsDocxMaterializationError">;

package/dist/docx/server/materializeYjsDocx.js

@@ -1,6 +1,6 @@
 import { fromProseDoc } from "../../prosemirror/conversion/fromProseDoc.js";
 import { schema } from "../../prosemirror/schema/index.js";
-import { readYjsParagraphSourceContract, withParagraphSourceContract } from "../../prosemirror/yjsParagraphSourceContract.js";
+import { applyAttrSchemaMigrations, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract } from "../../prosemirror/yjsDocumentMetadata.js";
 import { ParagraphPropertySourceValidationError } from "../paragraphPropertySource.js";
 import { parseDocx } from "../parser.js";
 import { repackDocx } from "../rezip.js";
@@ -18,6 +18,7 @@ const FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES = [
 	"invalid_update",
 	"missing_document",
 	"source_mismatch",
+	"stale_attr_schema",
 	"update_too_large"
 ];
 /** Typed failure raised when a collaboration snapshot cannot be materialized. */
@@ -40,6 +41,13 @@ const readProseMirrorDocument = (yjsUpdate) => {
 				code: "missing_document",
 				message: "Yjs update does not contain a Folio document."
 			});
+			const attrSchemaVersion = readYjsAttrSchemaVersion(ydoc);
+			if (attrSchemaVersion.isErr()) throw new FolioYjsDocxMaterializationError({
+				cause: attrSchemaVersion.error,
+				code: "stale_attr_schema",
+				message: attrSchemaVersion.error.message
+			});
+			applyAttrSchemaMigrations(ydoc, fragment, attrSchemaVersion.value);
 			const contract = readYjsParagraphSourceContract(ydoc);
 			if (!contract) throw new FolioYjsDocxMaterializationError({
 				code: "source_mismatch",

package/dist/docx/server/migrateYjsAttrSchema.d.ts

@@ -0,0 +1,55 @@
+import { FolioYjsAttrSchemaVersion } from "../../prosemirror/yjsDocumentMetadata.js";
+import { Result } from "better-result";
+//#region src/docx/server/migrateYjsAttrSchema.d.ts
+/** Stable failure codes returned by an offline snapshot migration. */
+declare const FOLIO_YJS_SNAPSHOT_MIGRATION_ERROR_CODES: readonly ["invalid_update", "unsupported_version", "update_too_large"];
+/** Failure code for a snapshot that could not be migrated. */
+type FolioYjsSnapshotMigrationErrorCode = (typeof FOLIO_YJS_SNAPSHOT_MIGRATION_ERROR_CODES)[number];
+declare const FolioYjsSnapshotMigrationError_base: import("better-result").TaggedErrorClass<"FolioYjsSnapshotMigrationError">;
+/** Typed failure raised when a collaboration snapshot cannot be migrated. */
+declare class FolioYjsSnapshotMigrationError extends FolioYjsSnapshotMigrationError_base<{
+  code: FolioYjsSnapshotMigrationErrorCode;
+  message: string;
+  cause?: unknown;
+}> {}
+/** What an offline migration did to one snapshot. */
+type FolioYjsSnapshotMigrationResult = {
+  /** The complete state update to store in place of the input. */
+  update: Uint8Array;
+  /** The attr-schema version the input was written under. */
+  fromVersion: FolioYjsAttrSchemaVersion;
+  /** The attr-schema version the output carries. */
+  toVersion: FolioYjsAttrSchemaVersion;
+  /** Paragraphs whose attrs the migration rewrote. */
+  paragraphsRewritten: number;
+};
+/**
+ * Carry a stored collaboration snapshot forward to the attr schema this build
+ * writes, without a ProseMirror schema and without rebuilding a single node.
+ *
+ * A Yjs XML element's attributes are ordinary CRDT map entries holding JSON, so
+ * {@link applyAttrSchemaMigrations} rewrites values in the fragment directly.
+ * Nothing here can trip y-prosemirror's node rebuild, which deletes an element
+ * it fails to construct. The function is pure and offline: no network, no
+ * DOCX, no editor.
+ *
+ * A snapshot already at the current version is returned byte for byte, so a
+ * host may run this over its whole corpus repeatedly.
+ *
+ * **The contract a reseed must respect.** This function never reseeds and never
+ * touches the paragraph-source contract: it preserves whichever source binding
+ * the snapshot already carries. A reseed does the opposite, and Folio holds it
+ * to one rule: *the DOCX handed to the seeding editor must be the same bytes
+ * the host will later pass to `materializeYjsDocx` as that room's source*.
+ * The contract is a digest of those bytes, so seeding from one document while
+ * recording another as the room's source makes every later save fail with
+ * `source_mismatch`. The reverse mistake is worse and Folio cannot see it: a
+ * host that reseeds from the document a room was *created* from, rather than
+ * from the latest content it published, produces a perfectly well-formed
+ * snapshot whose collaborative history has been replaced by an older document.
+ * Rebind the recorded source in the same statement that clears the seed, or do
+ * not clear it.
+ */
+declare const migrateFolioYjsSnapshot: (update: Uint8Array) => Result<FolioYjsSnapshotMigrationResult, FolioYjsSnapshotMigrationError>;
+//#endregion
+export { FOLIO_YJS_SNAPSHOT_MIGRATION_ERROR_CODES, FolioYjsSnapshotMigrationError, FolioYjsSnapshotMigrationErrorCode, FolioYjsSnapshotMigrationResult, migrateFolioYjsSnapshot };