@stll/folio-core 0.43.0 → 0.45.0

package/dist/docx/serializer/tableSerializer.js

@@ -1,10 +1,14 @@
 import { canonicalJson } from "../../utils/canonicalJson.js";
 import { isValidHexColor } from "../../utils/colorResolver.js";
+import { withBlockRangeMarkers } from "../blockRangeMarkers.js";
+import { TABLE_LOOK_FLAGS } from "../tableLook.js";
 import { parseTableCellProperties, parseTableGrid, parseTableProperties, parseTableRowProperties } from "../tableParser.js";
-import { OOXML_NAMESPACE_SCOPE, parseXml } from "../xmlParser.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.
@@ -127,30 +131,35 @@ 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(" ")}/>`;
 }
 /**
-* Serialize table look flags (w:tblLook)
+* Serialize a `w:tblLook`: what the author wrote, in the order they wrote it.
+*
+* A flag is written when it was authored, true or false. Writing only the true
+* ones drops an explicit `w:lastRow="0"`, and an absent flag is not an off one:
+* it falls back to `w:val`'s bit, so the two spell different tables under the
+* same table style. `w:val` leads, then the flags in `CT_TblLook` order, which
+* is the order Word writes them.
 */
 function serializeTableLook(look) {
 	if (!look) return "";
 	const attrs = [];
-	if (look.firstRow) attrs.push("w:firstRow=\"1\"");
-	if (look.lastRow) attrs.push("w:lastRow=\"1\"");
-	if (look.firstColumn) attrs.push("w:firstColumn=\"1\"");
-	if (look.lastColumn) attrs.push("w:lastColumn=\"1\"");
-	if (look.noHBand) attrs.push("w:noHBand=\"1\"");
-	if (look.noVBand) attrs.push("w:noVBand=\"1\"");
+	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"}"`);
+	}
 	if (attrs.length === 0) return "";
 	return `<w:tblLook ${attrs.join(" ")}/>`;
 }
@@ -181,7 +190,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}"/>`);
@@ -344,17 +353,24 @@ function serializeTableGrid(table) {
 	if (gridSourceXml !== void 0) {
 		if (canonicalJson(parseTableGrid(parseXml(gridSourceXml, OOXML_NAMESPACE_SCOPE).elements?.[0] ?? null)) === canonicalJson(columnWidths)) return gridSourceXml;
 	}
-	if (columnWidths && columnWidths.length > 0) return `<w:tblGrid>${columnWidths.map((w) => `<w:gridCol w:w="${intAttr(w)}"/>`).join("")}</w:tblGrid>`;
+	const gridChange = replayableGridChangeXml(table.formatting?.gridChangeXml) ?? "";
+	if (columnWidths && columnWidths.length > 0) return `<w:tblGrid>${columnWidths.map((w) => `<w:gridCol w:w="${intAttr(w)}"/>`).join("")}${gridChange}</w:tblGrid>`;
 	const columns = gridColumnCount(table);
-	return columns === 0 ? "<w:tblGrid/>" : `<w:tblGrid>${"<w:gridCol/>".repeat(columns)}</w:tblGrid>`;
-}
+	return columns === 0 && gridChange === "" ? "<w:tblGrid/>" : `<w:tblGrid>${"<w:gridCol/>".repeat(columns)}${gridChange}</w:tblGrid>`;
+}
+const GRID_CHANGE_ROOT_NAME = /* @__PURE__ */ new Set(["tblGridChange"]);
+const WORDPROCESSINGML_NAMESPACE = /* @__PURE__ */ new Set([NAMESPACES.w]);
+const replayableGridChangeXml = (gridChangeXml) => sanitizeCapturedXmlElement(gridChangeXml, {
+	allowedLocalNames: GRID_CHANGE_ROOT_NAME,
+	allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
+	inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE
+});
 /**
 * Serialize cell content (paragraphs, nested tables)
 */
 function serializeCellContent(content, serializeParagraph) {
 	const parts = [];
-	for (const item of content) if (item.type === "paragraph") parts.push(serializeParagraph(item));
-	else parts.push(serializeTable(item, serializeParagraph));
+	for (const item of content) parts.push(withBlockRangeMarkers(item, item.type === "paragraph" ? serializeParagraph(item) : serializeTable(item, serializeParagraph)));
 	if (parts.length === 0) parts.push("<w:p/>");
 	return parts.join("");
 }

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

@@ -1,10 +1,9 @@
 import { document_d_exports } from "../../types/document.js";
 //#region src/docx/serializer/textFormattingSerializer.d.ts
-type ExhaustiveFields<Source, Classified extends keyof Source> = Exclude<keyof Source, Classified> extends never ? Source : never;
 type ClassifiedShadingField = "color" | "fill" | "pattern";
-type ExhaustiveShadingProperties = ExhaustiveFields<document_d_exports.ShadingProperties, ClassifiedShadingField>;
+type ExhaustiveShadingProperties = document_d_exports.ExhaustiveFields<document_d_exports.ShadingProperties, ClassifiedShadingField>;
 type ClassifiedTextFormattingField = "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";
-type ExhaustiveTextFormatting = ExhaustiveFields<document_d_exports.TextFormatting, ClassifiedTextFormattingField>;
+type ExhaustiveTextFormatting = document_d_exports.ExhaustiveFields<document_d_exports.TextFormatting, ClassifiedTextFormattingField>;
 /**
  * Serialize shading properties (w:shd)
  */

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/build.js

@@ -26,7 +26,14 @@ const HEADING_LEVELS = [
 	5,
 	6
 ];
-/** Outline levels a `TOC \o` switch may name (ECMA-376 `w:outlineLvl` 0-8). */
+/**
+* The heading levels a `TOC \o` field-argument may name (ECMA-376 17.16.5.68).
+*
+* `\o` selects by *style id* — "each integer corresponds to the style with a
+* style ID of HeadingX" — not by outline level, which is what `\u` reads. The
+* domain here is therefore the 1-9 of `Heading1`…`Heading9`, not the 0-8 of
+* `w:outlineLvl`.
+*/
 const TOC_LEVEL_MIN = 1;
 const TOC_LEVEL_MAX = 9;
 /**

package/dist/docx/server/createBilingualDocument.js

@@ -1,4 +1,5 @@
 import { deterministicHexId } from "../../utils/hexId.js";
+import { createBuiltInStyleIndex, resolveHeadingLevel } from "../builtInStyles.js";
 import { isNumberingReference } from "../numberingReference.js";
 import { getParagraphText } from "../paragraphParser.js";
 import { cloneParagraphWithoutPropertySource } from "../paragraphPropertySource.js";
@@ -77,6 +78,7 @@ function createBilingualDocument(source, options) {
 	const styles = source.package.styles;
 	const numbering = source.package.numbering;
 	const styleById = new Map((styles?.styles ?? []).map((style) => [style.styleId, style]));
+	const builtInStyles = createBuiltInStyleIndex(styleById.values(), styles?.docDefaults);
 	const blocks = flattenBlocks(source.package.document.content);
 	const cloner = createNumberingCloner({
 		numbering,
@@ -124,7 +126,7 @@ function createBilingualDocument(source, options) {
 			}
 			const { copy, ref } = copyParagraph(block);
 			rows.push({
-				kind: classifyParagraph(block, styleById),
+				kind: classifyParagraph(block, styleById, builtInStyles),
 				rowId: ref.targetParaId,
 				...ref
 			});
@@ -235,26 +237,15 @@ const isFieldOnlyParagraph = (paragraph) => {
 * them would surface as a missing handle rather than as the rule it is.
 */
 const isTranslatableParagraph = (paragraph, editableParagraphIds) => paragraph.paraId !== void 0 && editableParagraphIds.has(paragraph.paraId) && !isFieldOnlyParagraph(paragraph);
-/** Heading style families across Word UI languages (en, cs/sk, de, fr, pl). */
-const HEADING_STYLE_PATTERN = /heading|nadpis|berschrift|titre|nag[łl]/iu;
-const classifyParagraph = (paragraph, styleById) => {
+const classifyParagraph = (paragraph, styleById, builtInStyles) => {
 	const formatting = paragraph.formatting;
-	const style = formatting?.styleId ? styleById.get(formatting.styleId) : void 0;
-	const outlineLevel = formatting?.outlineLevel ?? resolveInheritedOutlineLevel(style, styleById);
-	if (outlineLevel !== void 0 && outlineLevel < 9) return "heading";
-	if (style && (HEADING_STYLE_PATTERN.test(style.styleId) || HEADING_STYLE_PATTERN.test(style.name ?? ""))) return "heading";
+	if (resolveHeadingLevel({
+		outlineLevel: formatting?.outlineLevel,
+		styleId: formatting?.styleId
+	}, builtInStyles) !== void 0) return "heading";
 	if (effectiveNumPr(paragraph, styleById) !== void 0) return "listItem";
 	return "paragraph";
 };
-const resolveInheritedOutlineLevel = (style, styleById) => {
-	const seen = /* @__PURE__ */ new Set();
-	let current = style;
-	while (current && !seen.has(current.styleId)) {
-		seen.add(current.styleId);
-		if (current.pPr?.outlineLevel !== void 0) return current.pPr.outlineLevel;
-		current = current.basedOn ? styleById.get(current.basedOn) : void 0;
-	}
-};
 /** The numbering a paragraph renders with: direct `numPr`, else the style chain's. */
 const effectiveNumPr = (paragraph, styleById) => {
 	const direct = paragraph.formatting?.numPr;
@@ -703,6 +694,7 @@ const createParaIdMinter = (taken) => {
 */
 function readBilingualDocument(document, editableParagraphIds) {
 	const styleById = new Map((document.package.styles?.styles ?? []).map((style) => [style.styleId, style]));
+	const builtInStyles = createBuiltInStyleIndex(styleById.values(), document.package.styles?.docDefaults);
 	const rows = [];
 	let missingHandleCount = 0;
 	for (const block of flattenBlocks(document.package.document.content)) {
@@ -777,7 +769,7 @@ function readBilingualDocument(document, editableParagraphIds) {
 			if (targetMissing) missingHandleCount += 1;
 			if (sourceMissing || targetMissing) continue;
 			rows.push({
-				kind: classifyParagraph(source, styleById),
+				kind: classifyParagraph(source, styleById, builtInStyles),
 				rowId: target.paraId,
 				sourceParaId: source.paraId,
 				targetParaId: target.paraId,

package/dist/docx/server/extractDocxText.js

@@ -1,6 +1,6 @@
 import { escapeTableCell } from "../../markdown/escape.js";
 import { RELATIONSHIP_TYPES, parseRelationships } from "../relsParser.js";
-import { findAllDeep, findDeep, getAttribute, getAttributeByNamespaceUri, getLocalName, getNamespaceUri, getTextContent, parseXml } from "../xmlParser.js";
+import { findAllDeep, findDeep, getAttribute, getAttributeByNamespaceUri, getLocalName, getNamespaceUri, getTextContent, parseOnOffValue, parseXml } from "../xmlParser.js";
 import { DocxArchiveError, loadDocxArchive } from "./boundedArchive.js";
 //#region src/docx/server/extractDocxText.ts
 const DOCUMENT_RELS_PATH = "word/_rels/document.xml.rels";
@@ -68,7 +68,7 @@ const readRunMetrics = (paragraph) => {
 		const properties = findWordChild(run, "rPr");
 		const boldProperty = findWordChild(properties, "b");
 		const boldValue = getWordAttribute(boldProperty, "val");
-		const bold = boldProperty !== null && boldValue !== "0" && boldValue !== "false";
+		const bold = boldProperty !== null && (parseOnOffValue(boldValue) ?? true);
 		const sizeProperty = findWordChild(properties, "sz");
 		const sizeValue = getWordAttribute(sizeProperty, "val");
 		const parsedSize = sizeValue === null ? NaN : Number.parseInt(sizeValue, 10);
@@ -270,8 +270,7 @@ const readTableCell = (cell, { depth, budget }) => {
 const declaresHeaderRow = (row) => {
 	const header = findWordChild(findWordChild(row, "trPr"), "tblHeader");
 	if (header === null) return false;
-	const value = getWordAttribute(header, "val");
-	return value !== "0" && value !== "false";
+	return parseOnOffValue(getWordAttribute(header, "val")) ?? true;
 };
 const readRowGridOffset = (row, localName) => {
 	const properties = findWordChild(row, "trPr");

package/dist/docx/server/validateDocxConformance.js

@@ -3,6 +3,7 @@ import { DOCX_CONTAINER_TYPES, detectDocxContainerType } from "../encryption/con
 import { DocxModelValidationError, validateFolioDocumentModel } from "../modelValidation.js";
 import { DocxParseError, parseDocx } from "../parser.js";
 import { findChildByLocalName, getAttributeAnyPrefix, getLocalName, getNamespacePrefix, parseXmlDocument } from "../xmlParser.js";
+import { XmlResourceLimitError } from "../xmlResourceLimits.js";
 import { getDocxXmlSafetyIssue } from "../xmlSafety.js";
 import { DocxArchiveError, loadDocxArchive } from "./boundedArchive.js";
 import { DOCX_CONFORMANCE_CLASSES } from "@stll/docx-core/model";
@@ -112,11 +113,31 @@ const XML_SAFETY_ISSUE = {
 		message: "An XML package part is not well formed."
 	}
 };
+/**
+* Read a part for inspection, including one the safe reader declines.
+*
+* `readEntryString` runs the XML structure preflight, and the preflight
+* refuses to scan markup it cannot count — a document type declaration, an
+* unterminated tag — which is exactly the markup this check exists to report.
+* Such a part is read raw and classified below, so the report names why the
+* package is invalid instead of saying it could not tell. A part that overran
+* a real bound still refuses, and the caller reports that as indeterminate,
+* because a package too large to scan is not a package known to be wrong.
+*/
+const readPartForInspection = async (archive, part) => {
+	try {
+		return await archive.readEntryString(part);
+	} catch (error) {
+		if (!(error instanceof XmlResourceLimitError) || error.limit !== "syntax") throw error;
+		const bytes = await archive.readEntryUint8(part);
+		return bytes === null ? null : new TextDecoder("utf-8", { ignoreBOM: true }).decode(bytes);
+	}
+};
 const validateXmlParts = async (archive, report) => {
 	const xmlByPath = /* @__PURE__ */ new Map();
 	let hasInvalidXml = false;
 	for (const part of archive.entries.filter((path) => XML_PART_PATTERN.test(path)).toSorted()) {
-		const xml = await archive.readEntryString(part);
+		const xml = await readPartForInspection(archive, part);
 		if (xml === null) continue;
 		xmlByPath.set(part, xml);
 		const safetyIssue = getDocxXmlSafetyIssue(xml);

package/dist/docx/shadingParser.d.ts

@@ -0,0 +1,6 @@
+import { document_d_exports } from "../types/document.js";
+import { XmlElement } from "./xmlParser.js";
+//#region src/docx/shadingParser.d.ts
+declare function parseShading(shd: XmlElement | null): document_d_exports.ShadingProperties | undefined;
+//#endregion
+export { parseShading };

package/dist/docx/shadingParser.js

@@ -0,0 +1,32 @@
+import { isValidHexColor } from "../utils/colorResolver.js";
+import { ShadingPatternSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
+import { getAttribute } from "./xmlParser.js";
+//#region src/docx/shadingParser.ts
+/** `ST_HexColor`'s reserved "let the consumer decide" token. */
+const AUTOMATIC_COLOR = "auto";
+const parseHexColor = (value) => {
+	if (value === AUTOMATIC_COLOR) return { auto: true };
+	if (value && isValidHexColor(value)) return { rgb: value };
+};
+function parseShading(shd) {
+	if (!shd) return;
+	const props = {};
+	const color = parseHexColor(getAttribute(shd, "w", "color"));
+	if (color) props.color = color;
+	const fill = parseHexColor(getAttribute(shd, "w", "fill"));
+	if (fill) props.fill = fill;
+	const themeFill = narrowEnum(getAttribute(shd, "w", "themeFill"), ThemeColorSlotSchema);
+	if (themeFill) {
+		props.fill ??= {};
+		props.fill.themeColor = themeFill;
+	}
+	const themeFillTint = getAttribute(shd, "w", "themeFillTint");
+	if (themeFillTint && props.fill) props.fill.themeTint = themeFillTint;
+	const themeFillShade = getAttribute(shd, "w", "themeFillShade");
+	if (themeFillShade && props.fill) props.fill.themeShade = themeFillShade;
+	const pattern = narrowEnum(getAttribute(shd, "w", "val"), ShadingPatternSchema);
+	if (pattern) props.pattern = pattern;
+	return Object.keys(props).length > 0 ? props : void 0;
+}
+//#endregion
+export { parseShading };