@stll/folio-core 0.43.0 → 0.44.0

package/dist/docx/serializer/noteSerializer.js

@@ -1,3 +1,4 @@
+import { withBlockRangeMarkers } from "../blockRangeMarkers.js";
 import { serializeBlockSdt } from "./blockSdtSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
 import { serializePartElement } from "./partNamespaces.js";
@@ -38,6 +39,10 @@ const serializeNotePart = (elementName, body) => "<?xml version=\"1.0\" encoding
 * note body.
 */
 function serializeBlock(block) {
+	return withBlockRangeMarkers(block, serializeBlockBody(block));
+}
+/** The block itself, without the range markers that stood around it. */
+function serializeBlockBody(block) {
 	if (block.type === "paragraph") return serializeParagraph(block);
 	if (block.type === "table") return serializeTable(block, serializeParagraph);
 	return serializeBlockSdt(block, serializeBlock);

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

@@ -23,10 +23,6 @@ declare function hasParagraphContent(paragraph: document_d_exports.Paragraph): b
  * Check if a paragraph has formatting
  */
 declare function hasParagraphFormatting(paragraph: document_d_exports.Paragraph): boolean;
-/**
- * Get plain text from a paragraph (for comparison/debugging)
- */
-declare function getParagraphPlainText(paragraph: document_d_exports.Paragraph): string;
 /**
  * Create an empty paragraph
  */
@@ -44,4 +40,4 @@ declare function isListParagraph(paragraph: document_d_exports.Paragraph): boole
  */
 declare function getListLevel(paragraph: document_d_exports.Paragraph): number;
 //#endregion
-export { createEmptyParagraph, createTextParagraph, getListLevel, getParagraphPlainText, hasParagraphContent, hasParagraphFormatting, isListParagraph, serializeParagraph, serializeParagraphFormatting, serializeParagraphs };
+export { createEmptyParagraph, createTextParagraph, getListLevel, hasParagraphContent, hasParagraphFormatting, isListParagraph, serializeParagraph, serializeParagraphFormatting, serializeParagraphs };

package/dist/docx/serializer/paragraphSerializer.js

@@ -5,6 +5,7 @@ import { DATE_UTC_ATTRIBUTE } from "../trackedChangeInfo.js";
 import { toTransitionalNamespaceUri } from "../transitionalSpelling.js";
 import { captureVerbatimXml, sanitizeCapturedXmlElement } from "../verbatimCapture.js";
 import { NAMESPACES, OOXML_NAMESPACE_SCOPE, cloneElement, getChildElements, getLocalName, parseXml } from "../xmlParser.js";
+import { bookmarkRangeAttributes, markupRangeAttributes, moveBookmarkAttributes } from "./markupRangeAttributes.js";
 import { serializeRun } from "./runSerializer.js";
 import { serializeSectionProperties } from "./sectionPropertiesSerializer.js";
 import { serializeTextFormatting } from "./textFormattingSerializer.js";
@@ -21,13 +22,20 @@ function serializeParagraphMarkChange(mark) {
 	return `<w:${mark.kind} ${attrs}/>`;
 }
 const RESERVED_PARAGRAPH_PROPERTY_CHILDREN = /* @__PURE__ */ new Set(["pPrChange", "sectPr"]);
+/**
+* Revision records a captured `w:pPr` may not carry into a replay.
+*
+* `w:numberingChange` is not among them: the model holds it
+* (`ParagraphFormatting.numberingChangeXml`) and the serializer writes it
+* back, so both paths keep it. Refusing the capture used to force a rebuild
+* that could not write it, which turned a replay gate into a lost revision.
+*/
 const RESERVED_PARAGRAPH_CAPTURE_CHILDREN = /* @__PURE__ */ new Set([
 	...RESERVED_PARAGRAPH_PROPERTY_CHILDREN,
 	...PARAGRAPH_MARK_CHANGE_KINDS,
 	"cellDel",
 	"cellIns",
 	"cellMerge",
-	"numberingChange",
 	"rPrChange",
 	"tblGridChange",
 	"tblPrChange",
@@ -119,7 +127,11 @@ const PARAGRAPH_MARK_BASE_CHILDREN = /* @__PURE__ */ new Set([
 	"oMath"
 ]);
 const PARAGRAPH_NESTED_PROPERTY_CHILDREN = /* @__PURE__ */ new Map([
-	["numPr", /* @__PURE__ */ new Set(["ilvl", "numId"])],
+	["numPr", /* @__PURE__ */ new Set([
+		"ilvl",
+		"numId",
+		"numberingChange"
+	])],
 	["pBdr", /* @__PURE__ */ new Set([
 		"top",
 		"left",
@@ -344,16 +356,13 @@ function serializeHyperlink(hyperlink) {
 * Serialize bookmark start (w:bookmarkStart)
 */
 function serializeBookmarkStart(bookmark) {
-	const attrs = [`w:id="${bookmark.id}"`, `w:name="${escapeXml(bookmark.name)}"`];
-	if (bookmark.colFirst !== void 0) attrs.push(`w:colFirst="${bookmark.colFirst}"`);
-	if (bookmark.colLast !== void 0) attrs.push(`w:colLast="${bookmark.colLast}"`);
-	return `<w:bookmarkStart ${attrs.join(" ")}/>`;
+	return `<w:bookmarkStart ${bookmarkRangeAttributes(bookmark).join(" ")}/>`;
 }
 /**
 * Serialize bookmark end (w:bookmarkEnd)
 */
 function serializeBookmarkEnd(bookmark) {
-	return `<w:bookmarkEnd w:id="${bookmark.id}"/>`;
+	return `<w:bookmarkEnd ${markupRangeAttributes(bookmark).join(" ")}/>`;
 }
 /** Serialize a simple field without changing its authored OOXML field form. */
 function serializeSimpleField(field) {
@@ -471,7 +480,7 @@ function serializeInlineSdt(sdt) {
 	})}${props.rawEndPropertiesXml && isSingleWellFormedElement(props.rawEndPropertiesXml, "sdtEndPr") ? props.rawEndPropertiesXml : ""}<w:sdtContent>${contentXml}</w:sdtContent></w:sdt>`;
 }
 function serializeMoveRangeStart(tag, marker) {
-	return `<w:${tag} ${[`w:id="${marker.id}"`, `w:name="${escapeXml(marker.name)}"`].join(" ")}/>`;
+	return `<w:${tag} ${moveBookmarkAttributes(marker).join(" ")}/>`;
 }
 /**
 * Serialize a tracked change wrapper (ins/del/moveFrom/moveTo)
@@ -560,17 +569,24 @@ function serializeParagraphContent(content, explicitCommentReferenceIds) {
 		case "simpleField": return serializeSimpleField(content);
 		case "complexField": return serializeComplexField(content);
 		case "inlineSdt": return serializeInlineSdt(content);
-		case "commentRangeStart": return `<w:commentRangeStart w:id="${content.id}"/>`;
-		case "commentRangeEnd": return explicitCommentReferenceIds.has(content.id) ? `<w:commentRangeEnd w:id="${content.id}"/>` : `<w:commentRangeEnd w:id="${content.id}"/>${serializeCommentReferenceRun(content.id)}`;
+		case "commentRangeStart": return `<w:commentRangeStart ${markupRangeAttributes(content).join(" ")}/>`;
+		case "commentRangeEnd": {
+			const end = `<w:commentRangeEnd ${markupRangeAttributes(content).join(" ")}/>`;
+			return explicitCommentReferenceIds.has(content.id) ? end : `${end}${serializeCommentReferenceRun(content.id)}`;
+		}
 		case "commentReference": return serializeCommentReferenceRun(content.id);
 		case "insertion": return serializeTrackedChange("ins", content);
 		case "deletion": return serializeTrackedChange("del", content);
 		case "moveFrom": return serializeTrackedChange("moveFrom", content);
 		case "moveTo": return serializeTrackedChange("moveTo", content);
 		case "moveFromRangeStart": return serializeMoveRangeStart("moveFromRangeStart", content);
-		case "moveFromRangeEnd": return `<w:moveFromRangeEnd w:id="${content.id}"/>`;
+		case "moveFromRangeEnd": return `<w:moveFromRangeEnd ${markupRangeAttributes(content).join(" ")}/>`;
 		case "moveToRangeStart": return serializeMoveRangeStart("moveToRangeStart", content);
-		case "moveToRangeEnd": return `<w:moveToRangeEnd w:id="${content.id}"/>`;
+		case "moveToRangeEnd": return `<w:moveToRangeEnd ${markupRangeAttributes(content).join(" ")}/>`;
+		case "bidiWrapper": {
+			const tag = content.control === "override" ? "bdo" : "dir";
+			return `<w:${tag}${content.direction === void 0 ? "" : ` w:val="${escapeXml(content.direction)}"`}>${content.content.map((child) => serializeParagraphContent(child, explicitCommentReferenceIds)).join("")}</w:${tag}>`;
+		}
 		case "mathEquation": return content.ommlXml || "";
 		default: return "";
 	}
@@ -657,28 +673,6 @@ function hasParagraphFormatting(paragraph) {
 	return paragraph.formatting !== void 0 && Object.keys(paragraph.formatting).length > 0;
 }
 /**
-* Get plain text from a paragraph (for comparison/debugging)
-*/
-function getParagraphPlainText(paragraph) {
-	const texts = [];
-	for (const content of paragraph.content) if (content.type === "run") {
-		for (const item of content.content) if (item.type === "text") texts.push(item.text);
-		else if (item.type === "tab") texts.push("	");
-		else if (item.type === "break") texts.push("\n");
-	} else if (content.type === "hyperlink") {
-		for (const child of content.children) if (child.type === "run") {
-			for (const item of child.content) if (item.type === "text") texts.push(item.text);
-		}
-	} else if (content.type === "simpleField" || content.type === "inlineSdt" || content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo") {
-		for (const item of content.content) if (item.type === "run") {
-			for (const subItem of item.content) if (subItem.type === "text") texts.push(subItem.text);
-		}
-	} else if (content.type === "complexField") {
-		for (const run of content.fieldResult) for (const item of run.content) if (item.type === "text") texts.push(item.text);
-	}
-	return texts.join("");
-}
-/**
 * Create an empty paragraph
 */
 function createEmptyParagraph(formatting) {
@@ -718,4 +712,4 @@ function getListLevel(paragraph) {
 	return paragraph.formatting?.numPr?.ilvl ?? -1;
 }
 //#endregion
-export { createEmptyParagraph, createTextParagraph, getListLevel, getParagraphPlainText, hasParagraphContent, hasParagraphFormatting, isListParagraph, serializeParagraph, serializeParagraphFormatting, serializeParagraphs };
+export { createEmptyParagraph, createTextParagraph, getListLevel, hasParagraphContent, hasParagraphFormatting, isListParagraph, serializeParagraph, serializeParagraphFormatting, serializeParagraphs };

package/dist/docx/serializer/runSerializer.js

@@ -2,13 +2,13 @@ import { isValidHexColor } from "../../utils/colorResolver.js";
 import { THEME_COLOR_TO_DRAWING_SCHEME } from "../drawingUtils.js";
 import { serializeGraphicFrameLocks } from "../graphicFrameLocks.js";
 import { canReplayEditableImageRawXml } from "../imageRawXml.js";
-import { requiresXmlSpacePreserve } from "../textWhitespace.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
 import { serializeTable } from "./tableSerializer.js";
 import { serializeTextFormatting } from "./textFormattingSerializer.js";
 import { getSingularRunPropertyChange, serializeTrackedChangeAttributes } from "./trackedChangeAttributes.js";
 import { escapeXml, intAttr } from "./xmlUtils.js";
 import { panic } from "better-result";
+import { requiresXmlSpacePreserve } from "@stll/docx-core";
 //#region src/docx/serializer/runSerializer.ts
 /**
 * Run Serializer - Serialize runs to OOXML XML
@@ -59,7 +59,7 @@ function serializeRunProperties(formatting, propertyChanges) {
 * Serialize text content (w:t)
 */
 function serializeTextContent(content) {
-	return `<w:t${content.preserveSpace || requiresXmlSpacePreserve(content.text) ? " xml:space=\"preserve\"" : ""}>${escapeXml(content.text)}</w:t>`;
+	return `<w:t${requiresXmlSpacePreserve(content.text) ? " xml:space=\"preserve\"" : ""}>${escapeXml(content.text)}</w:t>`;
 }
 /**
 * Serialize tab content (w:tab)
@@ -88,7 +88,7 @@ function serializeBreakContent(content) {
 * Serialize symbol content (w:sym)
 */
 function serializeSymbolContent(content) {
-	return `<w:sym w:font="${escapeXml(content.font)}" w:char="${escapeXml(content.char)}"/>`;
+	return `<w:sym${content.font === "" ? "" : ` w:font="${escapeXml(content.font)}"`}${content.char === "" ? "" : ` w:char="${escapeXml(content.char)}"`}/>`;
 }
 /**
 * Serialize footnote/endnote reference
@@ -206,11 +206,17 @@ function serializeWrap(wrap) {
 		case "inline": return "<wp:wrapNone/>";
 	}
 }
-/** Build the common a:graphic > pic:pic element for images */
-function serializePicGraphic(image, sharedId) {
+/**
+* Build the common a:graphic > pic:pic element for images.
+*
+* Takes the relationship id as a separate argument so the caller has to have
+* one. There is no default: a picture written against an invented id binds to
+* whichever relationship the part happens to hold under that name.
+*/
+function serializePicGraphic(image, imageRId, sharedId) {
 	const cx = image.size.width;
 	const cy = image.size.height;
-	const rId = escapeXml(image.rId || "rId1");
+	const rId = escapeXml(imageRId);
 	const id = sharedId;
 	const name = image.filename || `image${id}`;
 	let xfrmAttrs = "";
@@ -287,7 +293,7 @@ function serializeDrawingContent(content) {
 	const anchorDocPrAttrs = `id="${docPrId}" name="${escapeXml(docPrName)}"${docPrDescription}${docPrTitle}`;
 	const anchorDocPr = hlinkClick ? `<wp:docPr ${anchorDocPrAttrs}>${hlinkClick}</wp:docPr>` : `<wp:docPr ${anchorDocPrAttrs}/>`;
 	const graphicFramePr = serializeGraphicFrameLocks(image.frameLocks);
-	const graphic = serializePicGraphic(image, docPrId);
+	const graphic = image.rId === void 0 ? "" : serializePicGraphic(image, image.rId, docPrId);
 	if (!isFloating) return [
 		"<w:drawing>",
 		`<wp:inline${wrapDistanceAttrs}>`,

package/dist/docx/serializer/tableSerializer.js

@@ -1,7 +1,10 @@
 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";
@@ -140,17 +143,22 @@ function serializeShading(shading) {
 	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="${escapeXml(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(" ")}/>`;
 }
@@ -344,17 +352,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/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/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 };

package/dist/docx/shapeParser.js

@@ -1,6 +1,6 @@
 import { parseAnchorPosition, parseAnchorWrap, parseFill, parseOutline } from "./drawingUtils.js";
 import { ShapeTypeSchema, narrowEnum } from "./parserEnums.js";
-import { findAllDeep, findChildByLocalName, findChildren, getAttribute, getChildElements, parseNumericAttribute } from "./xmlParser.js";
+import { findAllDeep, findChildByLocalName, findChildren, getAttribute, getChildElements, parseNumericAttribute, parseOnOffAttribute } from "./xmlParser.js";
 //#region src/docx/shapeParser.ts
 /** Convert OOXML rotation (1/60000ths of a degree) to degrees. */
 function rotToDegrees(rot) {
@@ -26,8 +26,8 @@ function parseTransform(xfrm) {
 		height: parseNumericAttribute(ext, null, "cy") ?? 0
 	};
 	const rotation = rotToDegrees(getAttribute(xfrm, null, "rot"));
-	const flipH = getAttribute(xfrm, null, "flipH") === "1";
-	const flipV = getAttribute(xfrm, null, "flipV") === "1";
+	const flipH = parseOnOffAttribute(xfrm, null, "flipH") === true;
+	const flipV = parseOnOffAttribute(xfrm, null, "flipV") === true;
 	if (rotation === void 0 && !flipH && !flipV) return { size };
 	const transform = {};
 	if (rotation !== void 0) transform.rotation = rotation;