@stll/folio-core 0.46.0 → 0.47.1

package/dist/docx/serializer/textFormattingSerializer.js

@@ -1,8 +1,11 @@
 import { HIGHLIGHT_COLOR_VALUES } from "../../types/documentEnumValues.js";
 import { isValidHexColor } from "../../utils/colorResolver.js";
 import { roundHorizontalScalePercentForSerialization } from "../../utils/horizontalScale.js";
+import { serializePreservedAttributes } from "../attributeRemainder.js";
 import { intAttr } from "./xmlUtils.js";
-import { escapeXmlAttribute } from "@stll/docx-core";
+import { escapeXmlAttribute, serializeOnOffElement } from "@stll/docx-core";
+import { themeColorToken } from "@stll/docx-core/model";
+import { serializeSequenceChildren } from "@stll/docx-core/schema";
 //#region src/docx/serializer/textFormattingSerializer.ts
 const VALID_HIGHLIGHT_COLORS = new Set(HIGHLIGHT_COLOR_VALUES);
 /**
@@ -14,7 +17,7 @@ function serializeColorElement(color) {
 	const attrs = [];
 	if (auto) attrs.push("w:val=\"auto\"");
 	else if (rgb && isValidHexColor(rgb)) attrs.push(`w:val="${escapeXmlAttribute(rgb)}"`);
-	if (themeColor) attrs.push(`w:themeColor="${escapeXmlAttribute(themeColor)}"`);
+	if (themeColor) attrs.push(`w:themeColor="${escapeXmlAttribute(themeColorToken(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(" ")}/>`;
@@ -24,122 +27,129 @@ function serializeColorElement(color) {
 */
 function serializeShading(shading) {
 	if (!shading) return "";
-	const { pattern, color, fill } = shading;
+	const { pattern, color, fill, preservedAttributes } = shading;
 	const attrs = [];
 	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;
+		const { rgb, auto, themeColor, themeTint, themeShade } = color;
 		if (rgb && isValidHexColor(rgb)) attrs.push(`w:color="${escapeXmlAttribute(rgb)}"`);
 		else if (auto) attrs.push("w:color=\"auto\"");
+		if (themeColor) attrs.push(`w:themeColor="${escapeXmlAttribute(themeColorToken(themeColor))}"`);
+		if (themeTint) attrs.push(`w:themeTint="${escapeXmlAttribute(themeTint)}"`);
+		if (themeShade) attrs.push(`w:themeShade="${escapeXmlAttribute(themeShade)}"`);
 	}
 	if (fill) {
 		const { rgb, auto, themeColor, themeTint, themeShade } = fill;
 		if (rgb && isValidHexColor(rgb)) attrs.push(`w:fill="${escapeXmlAttribute(rgb)}"`);
 		else if (auto) attrs.push("w:fill=\"auto\"");
-		if (themeColor) attrs.push(`w:themeFill="${escapeXmlAttribute(themeColor)}"`);
+		if (themeColor) attrs.push(`w:themeFill="${escapeXmlAttribute(themeColorToken(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(" ")}/>`;
+	const written = serializePreservedAttributes(attrs, preservedAttributes);
+	return written.length === 0 ? "" : `<w:shd ${written.join(" ")}/>`;
 }
+const numberTag = (name, value) => value === void 0 ? "" : `<w:${name} w:val="${intAttr(value)}"/>`;
+const serializeFontFamily = (fontFamily) => {
+	if (!fontFamily) return "";
+	const { ascii, hAnsi, eastAsia, cs: complexScript, hint, asciiTheme, hAnsiTheme, eastAsiaTheme, csTheme } = fontFamily;
+	const attrs = [];
+	if (ascii) attrs.push(`w:ascii="${escapeXmlAttribute(ascii)}"`);
+	if (hAnsi) attrs.push(`w:hAnsi="${escapeXmlAttribute(hAnsi)}"`);
+	if (eastAsia) attrs.push(`w:eastAsia="${escapeXmlAttribute(eastAsia)}"`);
+	if (complexScript) attrs.push(`w:cs="${escapeXmlAttribute(complexScript)}"`);
+	if (hint) attrs.push(`w:hint="${escapeXmlAttribute(hint)}"`);
+	if (asciiTheme) attrs.push(`w:asciiTheme="${escapeXmlAttribute(asciiTheme)}"`);
+	if (hAnsiTheme) attrs.push(`w:hAnsiTheme="${escapeXmlAttribute(hAnsiTheme)}"`);
+	if (eastAsiaTheme) attrs.push(`w:eastAsiaTheme="${escapeXmlAttribute(eastAsiaTheme)}"`);
+	if (csTheme) attrs.push(`w:cstheme="${escapeXmlAttribute(csTheme)}"`);
+	return attrs.length === 0 ? "" : `<w:rFonts ${attrs.join(" ")}/>`;
+};
+const serializeUnderline = (underline) => {
+	if (!underline) return "";
+	const { style, color } = underline;
+	const attrs = [`w:val="${style}"`];
+	if (color) {
+		const { rgb, themeColor, themeTint, themeShade, auto: _auto } = color;
+		if (rgb && isValidHexColor(rgb)) attrs.push(`w:color="${escapeXmlAttribute(rgb)}"`);
+		if (themeColor) attrs.push(`w:themeColor="${escapeXmlAttribute(themeColorToken(themeColor))}"`);
+		if (themeTint) attrs.push(`w:themeTint="${escapeXmlAttribute(themeTint)}"`);
+		if (themeShade) attrs.push(`w:themeShade="${escapeXmlAttribute(themeShade)}"`);
+	}
+	return `<w:u ${attrs.join(" ")}/>`;
+};
+const serializeLanguage = (language) => {
+	if (!language) return "";
+	const { val, eastAsia, bidi } = language;
+	const attrs = [];
+	if (val) attrs.push(`w:val="${escapeXmlAttribute(val)}"`);
+	if (eastAsia) attrs.push(`w:eastAsia="${escapeXmlAttribute(eastAsia)}"`);
+	if (bidi) attrs.push(`w:bidi="${escapeXmlAttribute(bidi)}"`);
+	return attrs.length === 0 ? "" : `<w:lang ${attrs.join(" ")}/>`;
+};
 /**
-* Serialize text formatting properties to w:rPr XML
+* The single `w:rPr` writer.
+*
+* A run, the paragraph mark, a style, a numbering level and the snapshot
+* inside either kind of `w:rPrChange` all write their run properties through
+* here, so none of them can grow its own order or its own idea of which
+* children exist. `EG_RPrBase` is an `xsd:choice` referenced
+* `maxOccurs="unbounded"`, so a `w:rPr` in any order is valid and the order
+* below is a canonical form rather than a validity rule: it is the one Word
+* writes, and writing it from the generated declared-child list is what stops
+* two of folio's serializers from disagreeing. The restatement is what
+* drifted, and it is why folio wrote `w:vanish` before `w:noProof` while the
+* schema declares the reverse.
+*
+* @param owned children a sibling record holds; see {@link OwnedRunPropertyChild}
 */
-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="${escapeXmlAttribute(styleId)}"/>`);
-	if (fontFamily) {
-		const { ascii, hAnsi, eastAsia, cs: complexScript, hint, asciiTheme, hAnsiTheme, eastAsiaTheme, csTheme } = fontFamily;
-		const fontAttrs = [];
-		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/>");
-	else if (bold === false) parts.push("<w:b w:val=\"0\"/>");
-	if (boldCs === true) parts.push("<w:bCs/>");
-	else if (boldCs === false) parts.push("<w:bCs w:val=\"0\"/>");
-	if (italic === true) parts.push("<w:i/>");
-	else if (italic === false) parts.push("<w:i w:val=\"0\"/>");
-	if (italicCs === true) parts.push("<w:iCs/>");
-	else if (italicCs === false) parts.push("<w:iCs w:val=\"0\"/>");
-	if (allCaps === true) parts.push("<w:caps/>");
-	else if (allCaps === false) parts.push("<w:caps w:val=\"0\"/>");
-	if (smallCaps === true) parts.push("<w:smallCaps/>");
-	else if (smallCaps === false) parts.push("<w:smallCaps w:val=\"0\"/>");
-	if (strike === true) parts.push("<w:strike/>");
-	else if (strike === false) parts.push("<w:strike w:val=\"0\"/>");
-	if (doubleStrike === true) parts.push("<w:dstrike/>");
-	else if (doubleStrike === false) parts.push("<w:dstrike w:val=\"0\"/>");
-	if (outline === true) parts.push("<w:outline/>");
-	else if (outline === false) parts.push("<w:outline w:val=\"0\"/>");
-	if (shadow === true) parts.push("<w:shadow/>");
-	else if (shadow === false) parts.push("<w:shadow w:val=\"0\"/>");
-	if (emboss === true) parts.push("<w:emboss/>");
-	else if (emboss === false) parts.push("<w:emboss w:val=\"0\"/>");
-	if (imprint === true) parts.push("<w:imprint/>");
-	else if (imprint === false) parts.push("<w:imprint w:val=\"0\"/>");
-	if (hidden === true) parts.push("<w:vanish/>");
-	else if (hidden === false) parts.push("<w:vanish w:val=\"0\"/>");
-	if (noProof === true) parts.push("<w:noProof/>");
-	else if (noProof === false) parts.push("<w:noProof w:val=\"0\"/>");
-	const colorXml = serializeColorElement(color);
-	if (colorXml) parts.push(colorXml);
-	if (spacing !== void 0) parts.push(`<w:spacing w:val="${intAttr(spacing)}"/>`);
-	const horizontalScale = roundHorizontalScalePercentForSerialization(scale);
-	if (horizontalScale !== void 0) parts.push(`<w:w w:val="${intAttr(horizontalScale)}"/>`);
-	if (kerning !== void 0) parts.push(`<w:kern w:val="${intAttr(kerning)}"/>`);
-	if (position !== void 0) parts.push(`<w:position w:val="${intAttr(position)}"/>`);
-	if (fontSize !== void 0) parts.push(`<w:sz w:val="${intAttr(fontSize)}"/>`);
-	if (fontSizeCs !== void 0) parts.push(`<w:szCs w:val="${intAttr(fontSizeCs)}"/>`);
-	let customHighlightShadingXml = "";
-	if (highlight) {
-		if (VALID_HIGHLIGHT_COLORS.has(highlight)) parts.push(`<w:highlight w:val="${highlight}"/>`);
-		else if (!shading) {
-			const hex = highlight.replace(/^#/u, "");
-			if (/^[0-9a-fA-F]{6}$/u.test(hex)) customHighlightShadingXml = `<w:shd w:val="clear" w:color="auto" w:fill="${hex}"/>`;
-		}
-	}
-	if (underline) {
-		const { style, color: underlineColor } = underline;
-		const uAttrs = [`w:val="${style}"`];
-		if (underlineColor) {
-			const { rgb, themeColor, themeTint, themeShade, auto: _auto } = underlineColor;
-			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(" ")}/>`);
-	}
-	if (effect) parts.push(`<w:effect w:val="${effect}"/>`);
-	const shadingXml = serializeShading(shading) || customHighlightShadingXml;
-	if (shadingXml) parts.push(shadingXml);
-	if (vertAlign) parts.push(`<w:vertAlign w:val="${vertAlign}"/>`);
-	if (rtl === true) parts.push("<w:rtl/>");
-	else if (rtl === false) parts.push("<w:rtl w:val=\"0\"/>");
-	if (cs === true) parts.push("<w:cs/>");
-	else if (cs === false) parts.push("<w:cs w:val=\"0\"/>");
-	if (emphasisMark) parts.push(`<w:em w:val="${emphasisMark}"/>`);
-	if (language) {
-		const { val, eastAsia, bidi } = language;
-		const languageAttrs = [];
-		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>`;
+function serializeTextFormatting(input, owned = []) {
+	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, preserved } = input ?? {};
+	const namedHighlight = highlight && VALID_HIGHLIGHT_COLORS.has(highlight) ? highlight : void 0;
+	const customHighlightHex = highlight && !namedHighlight && !shading ? highlight.replace(/^#/u, "") : "";
+	const customHighlightShadingXml = /^[0-9a-fA-F]{6}$/u.test(customHighlightHex) ? `<w:shd w:val="clear" w:color="auto" w:fill="${customHighlightHex}"/>` : "";
+	const parts = serializeSequenceChildren({
+		container: "run-properties",
+		modelled: [
+			...owned,
+			["rStyle", styleId ? `<w:rStyle w:val="${escapeXmlAttribute(styleId)}"/>` : ""],
+			["rFonts", serializeFontFamily(fontFamily)],
+			["b", serializeOnOffElement(bold, "b")],
+			["bCs", serializeOnOffElement(boldCs, "bCs")],
+			["i", serializeOnOffElement(italic, "i")],
+			["iCs", serializeOnOffElement(italicCs, "iCs")],
+			["caps", serializeOnOffElement(allCaps, "caps")],
+			["smallCaps", serializeOnOffElement(smallCaps, "smallCaps")],
+			["strike", serializeOnOffElement(strike, "strike")],
+			["dstrike", serializeOnOffElement(doubleStrike, "dstrike")],
+			["outline", serializeOnOffElement(outline, "outline")],
+			["shadow", serializeOnOffElement(shadow, "shadow")],
+			["emboss", serializeOnOffElement(emboss, "emboss")],
+			["imprint", serializeOnOffElement(imprint, "imprint")],
+			["noProof", serializeOnOffElement(noProof, "noProof")],
+			["vanish", serializeOnOffElement(hidden, "vanish")],
+			["color", serializeColorElement(color)],
+			["spacing", numberTag("spacing", spacing)],
+			["w", numberTag("w", roundHorizontalScalePercentForSerialization(scale))],
+			["kern", numberTag("kern", kerning)],
+			["position", numberTag("position", position)],
+			["sz", numberTag("sz", fontSize)],
+			["szCs", numberTag("szCs", fontSizeCs)],
+			["highlight", namedHighlight ? `<w:highlight w:val="${namedHighlight}"/>` : ""],
+			["u", serializeUnderline(underline)],
+			["effect", effect ? `<w:effect w:val="${effect}"/>` : ""],
+			["shd", serializeShading(shading) || customHighlightShadingXml],
+			["vertAlign", vertAlign ? `<w:vertAlign w:val="${vertAlign}"/>` : ""],
+			["rtl", serializeOnOffElement(rtl, "rtl")],
+			["cs", serializeOnOffElement(cs, "cs")],
+			["em", emphasisMark ? `<w:em w:val="${emphasisMark}"/>` : ""],
+			["lang", serializeLanguage(language)]
+		],
+		preserved
+	});
+	if (parts.length === 0) return input !== void 0 && Object.keys(input).length === 0 ? "<w:rPr/>" : "";
+	return `<w:rPr>${parts.join("")}</w:rPr>`;
 }
 //#endregion
 export { serializeShading, serializeTextFormatting };

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

@@ -18,7 +18,7 @@ declare function intAttr(value: number | undefined | null): string;
 /**
  * Verify that `xml` parses to exactly one root element named `expectedLocalName`
  * (namespace prefix ignored). Used to gate raw XML snapshots — e.g. an SDT's
- * `rawPropertiesXml`/`rawEndPropertiesXml` — before splicing them verbatim
+ * `rawEndPropertiesXml` — before splicing it verbatim
  * into a serialized document. Those snapshots are normally produced by our
  * own parser, but they can also arrive from an untrusted surface (a
  * programmatically constructed node, a collaboration payload); a value that

package/dist/docx/serializer/xmlUtils.js

@@ -22,7 +22,7 @@ function intAttr(value) {
 /**
 * Verify that `xml` parses to exactly one root element named `expectedLocalName`
 * (namespace prefix ignored). Used to gate raw XML snapshots — e.g. an SDT's
-* `rawPropertiesXml`/`rawEndPropertiesXml` — before splicing them verbatim
+* `rawEndPropertiesXml` — before splicing it verbatim
 * into a serialized document. Those snapshots are normally produced by our
 * own parser, but they can also arrive from an untrusted surface (a
 * programmatically constructed node, a collaboration payload); a value that

package/dist/docx/server/createBilingualDocument.js

@@ -1,6 +1,6 @@
 import { deterministicHexId } from "../../utils/hexId.js";
 import { createBuiltInStyleIndex, resolveHeadingLevel } from "../builtInStyles.js";
-import { isNumberingReference } from "../numberingReference.js";
+import { mergeParagraphNumbering, paragraphNumberingReference, paragraphNumberingReferenceId } from "../numberingReference.js";
 import { getParagraphText } from "../paragraphParser.js";
 import { cloneParagraphWithoutPropertySource } from "../paragraphPropertySource.js";
 import { getRunText } from "../runParser.js";
@@ -203,7 +203,7 @@ const flattenBlocks = (content) => {
 			out.push(block);
 			return;
 		}
-		if (block.type === "preservedBlock") return;
+		if (block.type !== "blockSdt") return;
 		for (const child of block.content) visit(child);
 	};
 	for (const block of content) visit(block);
@@ -247,22 +247,24 @@ const classifyParagraph = (paragraph, styleById, builtInStyles) => {
 	if (effectiveNumPr(paragraph, styleById) !== void 0) return "listItem";
 	return "paragraph";
 };
-/** The numbering a paragraph renders with: direct `numPr`, else the style chain's. */
+/** The numbering a paragraph renders with after style and direct tiers fold. */
 const effectiveNumPr = (paragraph, styleById) => {
-	const direct = paragraph.formatting?.numPr;
-	if (direct?.numId !== void 0) return isNumberingReference(direct.numId) ? direct : void 0;
 	const styleId = paragraph.formatting?.styleId;
-	return styleId ? styleNumPr(styleById.get(styleId), styleById) : void 0;
+	const effective = mergeParagraphNumbering(styleId ? styleNumPr(styleById.get(styleId), styleById) : void 0, paragraph.formatting?.numPr);
+	return effective?.kind === "reference" ? effective : void 0;
 };
 const styleNumPr = (style, styleById) => {
 	const seen = /* @__PURE__ */ new Set();
+	const chain = [];
 	let current = style;
 	while (current && !seen.has(current.styleId)) {
 		seen.add(current.styleId);
-		const numPr = current.pPr?.numPr;
-		if (numPr?.numId !== void 0) return isNumberingReference(numPr.numId) ? numPr : void 0;
+		if (current.pPr?.numPr !== void 0) chain.push(current.pPr.numPr);
 		current = current.basedOn ? styleById.get(current.basedOn) : void 0;
 	}
+	let effective;
+	for (const stated of chain.toReversed()) effective = mergeParagraphNumbering(effective, stated);
+	return effective?.kind === "reference" ? effective : void 0;
 };
 const createNumberingCloner = ({ numbering, styleById, warnings }) => {
 	const abstractNums = numbering?.abstractNums ?? [];
@@ -301,7 +303,7 @@ const createNumberingCloner = ({ numbering, styleById, warnings }) => {
 		let current = abstract;
 		while (current.numStyleLink && !seen.has(current.abstractNumId)) {
 			seen.add(current.abstractNumId);
-			const linkedNumId = styleById.get(current.numStyleLink)?.pPr?.numPr?.numId;
+			const linkedNumId = paragraphNumberingReferenceId(styleById.get(current.numStyleLink)?.pPr?.numPr);
 			const linkedNum = linkedNumId === void 0 ? void 0 : numById.get(linkedNumId);
 			const linkedAbstract = linkedNum ? abstractById.get(linkedNum.abstractNumId) : void 0;
 			if (!linkedAbstract) {
@@ -355,7 +357,7 @@ const createStyleCloner = ({ styleById, suffix, cloner }) => {
 		const style = styleById.get(styleId);
 		if (!style || style.type !== "paragraph") return styleId;
 		const numPr = styleNumPr(style, styleById);
-		if (numPr?.numId === void 0) return styleId;
+		if (numPr === void 0) return styleId;
 		const cloneId = `${styleId}-${suffix}`;
 		if (styleById.has(cloneId)) return cloneId;
 		const clone = {
@@ -366,10 +368,10 @@ const createStyleCloner = ({ styleById, suffix, cloner }) => {
 			default: false,
 			pPr: {
 				...style.pPr,
-				numPr: {
-					...numPr,
-					numId: cloner.cloneNumId(numPr.numId)
-				}
+				numPr: paragraphNumberingReference({
+					numId: cloner.cloneNumId(numPr.numId),
+					ilvl: numPr.ilvl
+				})
 			}
 		};
 		clones.set(styleId, clone);
@@ -389,11 +391,11 @@ const cloneParagraphForTarget = (paragraph, targetParaId, styleCloner, cloner, b
 	const nextFormatting = formatting && {
 		...formatting,
 		...formatting.styleId !== void 0 && { styleId: styleCloner.styleIdFor(formatting.styleId) },
-		...formatting.numPr !== void 0 && isNumberingReference(formatting.numPr.numId) && { numPr: {
+		...formatting.numPr?.kind === "reference" && { numPr: {
 			...formatting.numPr,
 			numId: cloner.cloneNumId(formatting.numPr.numId)
 		} },
-		...formatting.numPrFromStyle !== void 0 && isNumberingReference(formatting.numPrFromStyle.numId) && { numPrFromStyle: {
+		...formatting.numPrFromStyle?.kind === "reference" && { numPrFromStyle: {
 			...formatting.numPrFromStyle,
 			numId: cloner.cloneNumId(formatting.numPrFromStyle.numId)
 		} }

package/dist/docx/server/migrateYjsAttrSchema.js

@@ -72,12 +72,12 @@ const migrateFolioYjsSnapshot = (update) => {
 		}));
 	}
 	const fromVersion = read.value;
-	if (fromVersion === 3) {
+	if (fromVersion === 11) {
 		ydoc.destroy();
 		return Result.ok({
 			fromVersion,
 			paragraphsRewritten: 0,
-			toVersion: 3,
+			toVersion: 11,
 			update
 		});
 	}
@@ -87,7 +87,7 @@ const migrateFolioYjsSnapshot = (update) => {
 	return Result.ok({
 		fromVersion,
 		paragraphsRewritten,
-		toVersion: 3,
+		toVersion: 11,
 		update: migrated
 	});
 };

package/dist/docx/settingsParser.js

@@ -28,11 +28,14 @@ function parseSettings(xml) {
 	const settings = { defaultTabStop: parseDefaultTabStop(root) };
 	const wordprocessingFlag = (localName) => {
 		const element = findChildByNamespaceUri(root, WORDPROCESSINGML_NAMESPACE_URIS, localName);
-		return element !== null && parseBooleanElement(element);
+		return element === null ? void 0 : parseBooleanElement(element);
 	};
-	if (wordprocessingFlag("evenAndOddHeaders")) settings.evenAndOddHeaders = true;
-	if (wordprocessingFlag("mirrorMargins")) settings.mirrorMargins = true;
-	if (wordprocessingFlag("updateFields")) settings.updateFields = true;
+	const evenAndOddHeaders = wordprocessingFlag("evenAndOddHeaders");
+	if (evenAndOddHeaders !== void 0) settings.evenAndOddHeaders = evenAndOddHeaders;
+	const mirrorMargins = wordprocessingFlag("mirrorMargins");
+	if (mirrorMargins !== void 0) settings.mirrorMargins = mirrorMargins;
+	const updateFields = wordprocessingFlag("updateFields");
+	if (updateFields !== void 0) settings.updateFields = updateFields;
 	const themeFontLangEl = root ? findChild(root, "w", "themeFontLang") : null;
 	const eastAsiaLang = themeFontLangEl ? getAttribute(themeFontLangEl, "w", "eastAsia") || void 0 : void 0;
 	const bidiLang = themeFontLangEl ? getAttribute(themeFontLangEl, "w", "bidi") || void 0 : void 0;

package/dist/docx/shadingParser.d.ts

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

package/dist/docx/shadingParser.js

@@ -1,5 +1,8 @@
 import { isValidHexColor } from "../utils/colorResolver.js";
-import { ShadingPatternSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
+import { readAttributeBag } from "./attributeRemainder.js";
+import { ShadingPatternSchema, narrowEnum } from "./parserEnums.js";
+import { SHADING_ATTRIBUTES } from "./propertyElementAttributes.js";
+import { parseThemeColorAttribute } from "./themeColorAttribute.js";
 import { getAttribute } from "./xmlParser.js";
 //#region src/docx/shadingParser.ts
 /** `ST_HexColor`'s reserved "let the consumer decide" token. */
@@ -8,25 +11,58 @@ const parseHexColor = (value) => {
 	if (value === AUTOMATIC_COLOR) return { auto: true };
 	if (value && isValidHexColor(value)) return { rgb: value };
 };
-function parseShading(shd) {
+function parseShading(shd, context) {
 	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) {
+	const element = shd.name ?? "w:shd";
+	const themeColor = parseThemeColorAttribute({
+		raw: getAttribute(shd, "w", "themeColor"),
+		element,
+		context
+	});
+	if (themeColor !== void 0) {
+		props.color ??= {};
+		props.color.themeColor = themeColor;
+	}
+	const themeTint = getAttribute(shd, "w", "themeTint");
+	if (themeTint) {
+		props.color ??= {};
+		props.color.themeTint = themeTint;
+	}
+	const themeShade = getAttribute(shd, "w", "themeShade");
+	if (themeShade) {
+		props.color ??= {};
+		props.color.themeShade = themeShade;
+	}
+	const themeFill = parseThemeColorAttribute({
+		raw: getAttribute(shd, "w", "themeFill"),
+		element,
+		context
+	});
+	if (themeFill !== void 0) {
 		props.fill ??= {};
 		props.fill.themeColor = themeFill;
 	}
 	const themeFillTint = getAttribute(shd, "w", "themeFillTint");
-	if (themeFillTint && props.fill) props.fill.themeTint = themeFillTint;
+	if (themeFillTint) {
+		props.fill ??= {};
+		props.fill.themeTint = themeFillTint;
+	}
 	const themeFillShade = getAttribute(shd, "w", "themeFillShade");
-	if (themeFillShade && props.fill) props.fill.themeShade = 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;
+	if (Object.keys(props).length === 0) return;
+	const preservedAttributes = readAttributeBag(shd, SHADING_ATTRIBUTES);
+	if (preservedAttributes) props.preservedAttributes = preservedAttributes;
+	return props;
 }
 //#endregion
 export { parseShading };

package/dist/docx/shapeParser.js

@@ -1,4 +1,5 @@
-import { parseAnchorPosition, parseAnchorWrap, parseFill, parseOutline } from "./drawingUtils.js";
+import { parseDrawingAnchor } from "./drawingAnchor.js";
+import { parseAnchorPosition, parseAnchorWrap, parseFill, parseInlineWrap, parseOutline } from "./drawingUtils.js";
 import { parseNonVisualDrawingNames } from "./nonVisualDrawingProps.js";
 import { ShapeTypeSchema, narrowEnum } from "./parserEnums.js";
 import { findAllDeep, findChildByLocalName, findChildren, getAttribute, getChildElements, parseNumericAttribute, parseOnOffAttribute } from "./xmlParser.js";
@@ -140,11 +141,13 @@ function parseShape(node) {
 	const fill = parseShapeFill(spPr);
 	const outline = parseOutline(spPr);
 	const id = cNvPr ? getAttribute(cNvPr, null, "id") ?? void 0 : void 0;
+	const names = parseNonVisualDrawingNames(cNvPr);
 	const shape = {
 		type: "shape",
 		shapeType,
 		size,
-		...parseNonVisualDrawingNames(cNvPr)
+		...names,
+		...Object.keys(names).length > 0 ? { shapeNames: names } : {}
 	};
 	const geometryAdjustments = parseGeometryAdjustments(spPr);
 	if (geometryAdjustments !== void 0) shape.geometryAdjustments = geometryAdjustments;
@@ -189,7 +192,9 @@ function parseShapeFromDrawing(drawingEl) {
 		if (position) shape.position = position;
 		const wrap = parseAnchorWrap(container);
 		if (wrap) shape.wrap = wrap;
-	} else shape.wrap = { type: "inline" };
+		const drawingAnchor = parseDrawingAnchor(container);
+		if (drawingAnchor) shape.anchor = drawingAnchor;
+	} else shape.wrap = parseInlineWrap(container);
 	const docPr = findChildByLocalName(container, "docPr");
 	if (docPr) {
 		const id = getAttribute(docPr, null, "id");

package/dist/docx/strictNames.d.ts

@@ -0,0 +1,11 @@
+import { XmlElement } from "./xmlParser.js";
+import { RenamedSlot } from "./strictNames.gen.js";
+//#region src/docx/strictNames.d.ts
+/** A renamed child of `parent`, in whichever spelling the document used. */
+declare const findChildAnySpelling: (parent: XmlElement | null | undefined, slot: RenamedSlot) => XmlElement | null;
+/** A renamed attribute's number, in whichever spelling the document used. */
+declare const numericAttributeAnySpelling: (element: XmlElement | null | undefined, slot: RenamedSlot) => number | undefined;
+/** Whether the element carries a renamed attribute under either spelling. */
+declare const hasAttributeAnySpelling: (element: XmlElement | null | undefined, slot: RenamedSlot) => boolean;
+//#endregion
+export { findChildAnySpelling, hasAttributeAnySpelling, numericAttributeAnySpelling };

package/dist/docx/strictNames.gen.d.ts

@@ -0,0 +1,45 @@
+//#region src/docx/strictNames.gen.d.ts
+/**
+ * GENERATED FILE — do not edit.
+ *
+ * The WordprocessingML names ECMA-376 Part 1 spells by writing direction and
+ * Part 4 spells by physical side, derived from the cited list in
+ * `specifications/strict-names/renames.ts` and the committed schema graph by
+ * `scripts/generate-strict-names.ts`. Regenerate with:
+ *
+ *   bun run generate:strict-names
+ *
+ * A key is the complex type the name belongs to — the element's own type, or
+ * the attribute's owner — then the local name, marked `@` for an attribute.
+ * The comment above each entry names the types that declare the pair.
+ */
+/** What folio writes for a name a Strict producer spelled by writing direction. */
+declare const TRANSITIONAL_NAME_BY_STRICT_NAME: {
+  readonly "CT_Border end": "right";
+  readonly "CT_Border start": "left";
+  readonly "CT_Ind @end": "right";
+  readonly "CT_Ind @endChars": "rightChars";
+  readonly "CT_Ind @start": "left";
+  readonly "CT_Ind @startChars": "leftChars";
+  readonly "CT_TblWidth end": "right";
+  readonly "CT_TblWidth start": "left";
+};
+/** A name Part 1 renamed, keyed by the complex type it belongs to. */
+type StrictName = keyof typeof TRANSITIONAL_NAME_BY_STRICT_NAME;
+/** The same keys as a list, so a consumer can walk them without widening them. */
+declare const STRICT_NAMES: readonly ["CT_Border end", "CT_Border start", "CT_Ind @end", "CT_Ind @endChars", "CT_Ind @start", "CT_Ind @startChars", "CT_TblWidth end", "CT_TblWidth start"];
+/** What a Strict producer may have written where folio writes the Transitional name. */
+declare const STRICT_NAMES_BY_TRANSITIONAL_NAME: {
+  readonly "CT_Border left": readonly ["start"];
+  readonly "CT_Border right": readonly ["end"];
+  readonly "CT_Ind @left": readonly ["start"];
+  readonly "CT_Ind @leftChars": readonly ["startChars"];
+  readonly "CT_Ind @right": readonly ["end"];
+  readonly "CT_Ind @rightChars": readonly ["endChars"];
+  readonly "CT_TblWidth left": readonly ["start"];
+  readonly "CT_TblWidth right": readonly ["end"];
+};
+/** A slot a reader must take in either spelling, keyed the same way. */
+type RenamedSlot = keyof typeof STRICT_NAMES_BY_TRANSITIONAL_NAME;
+//#endregion
+export { RenamedSlot, STRICT_NAMES, STRICT_NAMES_BY_TRANSITIONAL_NAME, StrictName, TRANSITIONAL_NAME_BY_STRICT_NAME };