@stll/folio-core 0.15.0 → 0.15.1

package/dist/docx/sdtPropertiesPatch.d.ts

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../types/document.js";
-
 //#region src/docx/sdtPropertiesPatch.d.ts
 /**
  * Rewrite the relevant child elements of `<w:sdtPr>` so the modeled

package/dist/docx/sectionParser.d.ts

@@ -1,6 +1,5 @@
 import { document_d_exports } from "../types/document.js";
 import { XmlElement } from "./xmlParser.js";
-
 //#region src/docx/sectionParser.d.ts
 declare function getUnserializedSectionPropertyChildNames(props: document_d_exports.SectionProperties): readonly string[] | undefined;
 /**

package/dist/docx/selectiveSave.d.ts

@@ -1,9 +1,11 @@
 import { document_d_exports } from "../types/document.js";
-
 //#region src/docx/selectiveSave.d.ts
 type SelectiveSaveOptions = {
-  /** Changed paragraph IDs to selectively patch */changedParaIds: Set<string>; /** Whether structural changes occurred (paragraph add/delete) */
-  structuralChange: boolean; /** Whether any changes affected paragraphs without paraId */
+  /** Changed paragraph IDs to selectively patch */
+  changedParaIds: Set<string>;
+  /** Whether structural changes occurred (paragraph add/delete) */
+  structuralChange: boolean;
+  /** Whether any changes affected paragraphs without paraId */
   hasUntrackedChanges: boolean;
   /**
    * Maximum allowed `originalBuffer.byteLength` for the selective path. Above

package/dist/docx/selectiveSave.js

@@ -5,6 +5,7 @@ import { validateFolioDocumentModel } from "./modelValidation.js";
 import { isPreservableDocxEntry } from "./unzip.js";
 import { hasUnsynthesizedReplyRanges } from "./commentReplyMarkers.js";
 import { withoutOrphanCommentRanges } from "./commentRangeIntegrity.js";
+import { isNewDataUrlDrawing } from "./newImage.js";
 import { buildPatchedDocumentXml, buildPatchedNoteXml, buildPatchedNumberingXml, collectChangedNumberingDefs, collectParaIds } from "./selectiveXmlPatch.js";
 import { ensureThreadedCommentParaIds, serializeComments, serializeCommentsExtended } from "./serializer/commentSerializer.js";
 import { serializeDocument } from "./serializer/documentSerializer.js";
@@ -13,14 +14,13 @@ import { serializeNumberingXml } from "./serializer/numberingSerializer.js";
 import { COMMENTS_CONTENT_TYPE, COMMENTS_EXTENDED_PART_LOWER, addCommentsExtendedOverride, addCommentsExtendedRelationship, applyUpdatesToZip, collectHeaderFooterUpdates, findMaxRId, hasModelDrivenPictureWatermark, hasUnmaterializedHeaderFooter, updateCoreProperties } from "./rezip.js";
 import "./selectiveSaveFlags.js";
 //#region src/docx/selectiveSave.ts
-const SYNTHETIC_IMAGE_RID_PREFIX = "rId_img_";
 /**
 * Check if document content has new images (data: URL without rId) or
 * new hyperlinks (href without rId). Combined into a single traversal
 * to avoid walking the block tree twice.
 */
 function hasNewImagesOrHyperlinks(blocks) {
-	const runHasNewImage = (run) => run.content.some((c) => c.type === "drawing" && c.image?.src?.startsWith("data:") === true && (!c.image.rId || c.image.rId.startsWith(SYNTHETIC_IMAGE_RID_PREFIX)));
+	const runHasNewImage = (run) => run.content.some(isNewDataUrlDrawing);
 	for (const block of blocks) if (block.type === "paragraph") {
 		for (const item of block.content) if (item.type === "run") {
 			if (runHasNewImage(item)) return true;

package/dist/docx/selectiveSaveFlags.d.ts

@@ -13,13 +13,15 @@
  *   the dominant cost.
  */
 type FolioSelectiveSaveFlags = {
-  /** Enable the selective save path. Default: false (full repack only). */selectiveSave?: boolean;
+  /** Enable the selective save path. Default: false (full repack only). */
+  selectiveSave?: boolean;
   /**
    * Run selective save and full repack on every save, compare bytes, and emit
    * a `TripwireResult` via `onSelectiveSaveTripwire`. Independent of
    * `selectiveSave`: the tripwire always observes both paths.
    */
-  selectiveSaveTripwire?: boolean; /** Maximum original buffer size, in bytes, for which selective save is allowed. */
+  selectiveSaveTripwire?: boolean;
+  /** Maximum original buffer size, in bytes, for which selective save is allowed. */
   selectiveSaveMaxBytes?: number;
 };
 declare const DEFAULT_SELECTIVE_SAVE_MAX_BYTES: number;

package/dist/docx/selectiveXmlPatch.js

@@ -367,8 +367,20 @@ function findNumberingElementOffsets(xml, kind, id) {
 function extractNumberingElementXml(xml, kind, id) {
 	return extractElementByIdAttr(xml, NUMBERING_OPEN_LITERAL[kind], NUMBERING_CLOSE_TAG[kind], NUMBERING_ID_ATTR[kind], id);
 }
-function collectNumberingElementIds(xml, kind) {
-	return collectElementIds(xml, NUMBERING_OPEN_LITERAL[kind], NUMBERING_ID_ATTR[kind]);
+function buildNumberingElementOffsetIndex(xml, kind) {
+	const index = /* @__PURE__ */ new Map();
+	const openLiteral = NUMBERING_OPEN_LITERAL[kind];
+	const pattern = new RegExp(`${escapeRegExp(openLiteral)}[\\s][^>]*?${escapeRegExp(NUMBERING_ID_ATTR[kind])}="(?<id>[^"]+)"`, "gu");
+	let match;
+	while ((match = pattern.exec(xml)) !== null) {
+		const id = match.groups["id"];
+		if (index.has(id)) {
+			index.set(id, null);
+			continue;
+		}
+		index.set(id, scanElementRange(xml, match.index, openLiteral, NUMBERING_CLOSE_TAG[kind]));
+	}
+	return index;
 }
 const SYNTHETIC_NUM_FMT_PATTERN = /<w:numFmt w:val="decimalZero(?<width>[345])"\/>/u;
 /**
@@ -381,12 +393,12 @@ const SYNTHETIC_NUM_FMT_PATTERN = /<w:numFmt w:val="decimalZero(?<width>[345])"\
 function collectChangedNumberingDefs(baselineXml, currentXml) {
 	const changedForKind = (kind) => {
 		const changed = /* @__PURE__ */ new Set();
-		const baselineIds = collectNumberingElementIds(baselineXml, kind);
-		for (const [id, count] of collectNumberingElementIds(currentXml, kind)) {
-			if (count !== 1 || baselineIds.get(id) !== 1) continue;
-			const before = extractNumberingElementXml(baselineXml, kind, id);
-			const after = extractNumberingElementXml(currentXml, kind, id);
-			if (before !== null && after !== null && before !== after) changed.add(id);
+		const baselineIndex = buildNumberingElementOffsetIndex(baselineXml, kind);
+		const currentIndex = buildNumberingElementOffsetIndex(currentXml, kind);
+		for (const [id, afterRange] of currentIndex) {
+			const beforeRange = baselineIndex.get(id);
+			if (!beforeRange || !afterRange) continue;
+			if (baselineXml.slice(beforeRange.start, beforeRange.end) !== currentXml.slice(afterRange.start, afterRange.end)) changed.add(id);
 		}
 		return changed;
 	};

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/blockSdtSerializer.d.ts
 declare function serializeBlockSdt(blockSdt: document_d_exports.BlockSdt, serializeChild: (block: document_d_exports.BlockContent) => string): string;
 //#endregion

package/dist/docx/serializer/blockSdtSerializer.js

@@ -1,5 +1,5 @@
-import { isSingleWellFormedElement } from "./xmlUtils.js";
 import { reconcileRawSdtPr } from "../sdtPropertiesPatch.js";
+import { isSingleWellFormedElement } from "./xmlUtils.js";
 //#region src/docx/serializer/blockSdtSerializer.ts
 function escapeXmlAttr(value) {
 	return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;");
@@ -52,6 +52,7 @@ function extractDropdownLastValue(blockSdt) {
 	if (blockSdt.properties.sdtType !== "dropdown" && blockSdt.properties.sdtType !== "comboBox") return;
 	const modeled = blockSdt.properties.dropdownLastValue;
 	if (modeled !== void 0) return modeled;
+	if (blockSdt.properties.rawPropertiesXml !== void 0) return;
 	const firstBlock = blockSdt.content[0];
 	if (!firstBlock || firstBlock.type !== "paragraph") return;
 	const parts = [];

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/borderSerializer.d.ts
 /**
  * Serialize a single border element (`<w:top .../>`, `<w:left .../>`, ...).

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

@@ -1,5 +1,4 @@
 import { Comment } from "../../types/content.js";
-
 //#region src/docx/serializer/commentSerializer.d.ts
 /**
  * Serialize comments array to comments.xml content. Returns a valid empty

package/dist/docx/serializer/commentSerializer.js

@@ -1,49 +1,23 @@
 import { deterministicHexId } from "../../utils/hexId.js";
 import { escapeXml } from "./xmlUtils.js";
+import { serializeParagraph } from "./paragraphSerializer.js";
 //#region src/docx/serializer/commentSerializer.ts
 /**
 * Comment Serializer
 *
 * Serializes Comment[] to OOXML comments.xml format.
 */
-function serializeRunContent(run) {
-	let xml = "<w:r>";
-	const rPr = [];
-	if (run.formatting?.bold) rPr.push("<w:b/>");
-	if (run.formatting?.italic) rPr.push("<w:i/>");
-	if (rPr.length > 0) xml += `<w:rPr>${rPr.join("")}</w:rPr>`;
-	for (const c of run.content) if (c.type === "text") {
-		const preserveSpace = c.text !== c.text.trim() || c.text.includes("  ");
-		xml += preserveSpace ? `<w:t xml:space="preserve">${escapeXml(c.text)}</w:t>` : `<w:t>${escapeXml(c.text)}</w:t>`;
-	} else if (c.type === "break") xml += "<w:br/>";
-	xml += "</w:r>";
-	return xml;
-}
-/**
-* `w14:paraId` / `w14:textId` open tag for a comment paragraph. Word keys
-* commentsExtended.xml (reply threading) and commentsExtensible.xml (UTC
-* dates) on the paraId of a comment's LAST paragraph, so the id must survive
-* serialization; the parser stores it on `Paragraph.paraId`.
-*/
-function commentParagraphOpenTag(p) {
-	const attrs = [];
-	if (p.paraId) attrs.push(`w14:paraId="${escapeXml(p.paraId)}"`);
-	if (p.textId) attrs.push(`w14:textId="${escapeXml(p.textId)}"`);
-	return attrs.length > 0 ? `<w:p ${attrs.join(" ")}>` : "<w:p>";
-}
-function serializeParagraph(p) {
-	let xml = commentParagraphOpenTag(p);
-	for (const item of p.content) if (item.type === "run") xml += serializeRunContent(item);
-	xml += "</w:p>";
-	return xml;
-}
+const ANNOTATION_REFERENCE_XML = "<w:r><w:rPr><w:rStyle w:val=\"CommentReference\"/></w:rPr><w:annotationRef/></w:r>";
+const PARAGRAPH_PROPERTIES_END = "</w:pPr>";
 /** Serialize a paragraph, prepending an annotationRef run (required by Word in first paragraph of a comment) */
-function serializeParagraphWithAnnotationRef(p) {
-	let xml = commentParagraphOpenTag(p);
-	xml += "<w:r><w:rPr><w:rStyle w:val=\"CommentReference\"/></w:rPr><w:annotationRef/></w:r>";
-	for (const item of p.content) if (item.type === "run") xml += serializeRunContent(item);
-	xml += "</w:p>";
-	return xml;
+function serializeParagraphWithAnnotationRef(paragraph) {
+	const xml = serializeParagraph(paragraph);
+	const propertiesEnd = xml.indexOf(PARAGRAPH_PROPERTIES_END);
+	if (propertiesEnd !== -1) {
+		const contentStart = propertiesEnd + 8;
+		return `${xml.slice(0, contentStart)}${ANNOTATION_REFERENCE_XML}${xml.slice(contentStart)}`;
+	}
+	return xml.replace(/^<w:p(?=[\s>])[^>]*>/u, (openingTag) => `${openingTag}${ANNOTATION_REFERENCE_XML}`);
 }
 function serializeComment(comment) {
 	const attrs = [`w:id="${comment.id}"`, `w:author="${escapeXml(comment.author)}"`];

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/documentSerializer.d.ts
 /**
  * Serialize a DocumentBody to document.xml body content

package/dist/docx/serializer/documentSerializer.js

@@ -1,8 +1,8 @@
-import { serializeBlockSdt } from "./blockSdtSerializer.js";
 import { serializeTable } from "./tableSerializer.js";
 import { resetAutoIdCounter } from "./runSerializer.js";
 import { serializeSectionProperties } from "./sectionPropertiesSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
+import { serializeBlockSdt } from "./blockSdtSerializer.js";
 //#region src/docx/serializer/documentSerializer.ts
 /**
 * Standard OOXML namespaces for document.xml

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/fontTableSerializer.d.ts
 declare const serializeFontTableXml: (fontTable: document_d_exports.FontTable) => string;
 //#endregion

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/headerFooterSerializer.d.ts
 /**
  * Serialize a HeaderFooter object to valid OOXML XML

package/dist/docx/serializer/headerFooterSerializer.js

@@ -1,8 +1,8 @@
 import { canReplayHeaderFooterVerbatim, getHeaderFooterVerbatimXml } from "../headerFooterVerbatim.js";
 import { escapeXml } from "./xmlUtils.js";
-import { serializeBlockSdt } from "./blockSdtSerializer.js";
 import { serializeTable } from "./tableSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
+import { serializeBlockSdt } from "./blockSdtSerializer.js";
 //#region src/docx/serializer/headerFooterSerializer.ts
 const NAMESPACES = {
 	wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/noteSerializer.d.ts
 /**
  * Serialize footnotes to a complete word/footnotes.xml string.

package/dist/docx/serializer/noteSerializer.js

@@ -1,6 +1,6 @@
-import { serializeBlockSdt } from "./blockSdtSerializer.js";
 import { serializeTable } from "./tableSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
+import { serializeBlockSdt } from "./blockSdtSerializer.js";
 //#region src/docx/serializer/noteSerializer.ts
 const NAMESPACES = {
 	wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/numberingSerializer.d.ts
 /**
  * Serialize {@link NumberingDefinitions} to a complete `word/numbering.xml`

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/paragraphSerializer.d.ts
 declare function serializeParagraphFormatting(formatting: document_d_exports.ParagraphFormatting | undefined, propertyChanges?: document_d_exports.ParagraphPropertyChange[], pPrMark?: document_d_exports.ParagraphMarkChange): string;
 /**

package/dist/docx/serializer/paragraphSerializer.js

@@ -1,7 +1,7 @@
 import { numPrEqual } from "../numberingParser.js";
 import { isValidHexColor } from "../../utils/colorResolver.js";
-import { escapeXml, intAttr, isSingleWellFormedElement } from "./xmlUtils.js";
 import { reconcileRawSdtPr } from "../sdtPropertiesPatch.js";
+import { escapeXml, intAttr, isSingleWellFormedElement } from "./xmlUtils.js";
 import { serializeBorder } from "./borderSerializer.js";
 import { serializeRun, serializeTextFormatting } from "./runSerializer.js";
 import { serializeSectionProperties } from "./sectionPropertiesSerializer.js";
@@ -90,10 +90,8 @@ function serializeIndentation(formatting) {
 	const attrs = [];
 	if (formatting.indentLeft !== void 0) attrs.push(`w:left="${intAttr(formatting.indentLeft)}"`);
 	if (formatting.indentRight !== void 0) attrs.push(`w:right="${intAttr(formatting.indentRight)}"`);
-	if (formatting.indentFirstLine !== void 0) {
-		if (formatting.hangingIndent) attrs.push(`w:hanging="${intAttr(Math.abs(formatting.indentFirstLine))}"`);
-		else if (formatting.indentFirstLine !== 0) attrs.push(`w:firstLine="${intAttr(formatting.indentFirstLine)}"`);
-	}
+	if (formatting.indentFirstLine !== void 0) if (formatting.hangingIndent) attrs.push(`w:hanging="${intAttr(Math.abs(formatting.indentFirstLine))}"`);
+	else attrs.push(`w:firstLine="${intAttr(formatting.indentFirstLine)}"`);
 	if (attrs.length === 0) return "";
 	return `<w:ind ${attrs.join(" ")}/>`;
 }
@@ -246,24 +244,13 @@ function serializeBookmarkStart(bookmark) {
 function serializeBookmarkEnd(bookmark) {
 	return `<w:bookmarkEnd w:id="${bookmark.id}"/>`;
 }
-/**
-* Serialize a simple field as a complex field (fldChar begin/separate/end).
-* Complex field format is more widely supported by OOXML consumers
-* (Google Docs, Apple Pages) than w:fldSimple.
-*/
+/** Serialize a simple field without changing its authored OOXML field form. */
 function serializeSimpleField(field) {
-	const parts = [];
-	const firstRun = field.content.find((c) => c.type === "run");
-	const rPrXml = firstRun?.formatting ? serializeTextFormatting(firstRun.formatting) : "";
-	const beginAttrs = ["w:fldCharType=\"begin\""];
-	if (field.fldLock) beginAttrs.push("w:fldLock=\"true\"");
-	parts.push(`<w:r>${rPrXml}<w:fldChar ${beginAttrs.join(" ")}/></w:r>`);
-	const spaceAttr = field.instruction.startsWith(" ") || field.instruction.endsWith(" ") || field.instruction.includes("  ") ? " xml:space=\"preserve\"" : "";
-	parts.push(`<w:r>${rPrXml}<w:instrText${spaceAttr}>${escapeXml(field.instruction)}</w:instrText></w:r>`);
-	parts.push(`<w:r>${rPrXml}<w:fldChar w:fldCharType="separate"/></w:r>`);
-	for (const item of field.content) if (item.type === "run") parts.push(serializeRun(item));
-	parts.push(`<w:r>${rPrXml}<w:fldChar w:fldCharType="end"/></w:r>`);
-	return parts.join("");
+	const attrs = [`w:instr="${escapeXml(field.instruction)}"`];
+	if (field.fldLock) attrs.push("w:fldLock=\"true\"");
+	if (field.dirty) attrs.push("w:dirty=\"true\"");
+	const contentXml = field.content.map((item) => item.type === "run" ? serializeRun(item) : serializeHyperlink(item)).join("");
+	return `<w:fldSimple ${attrs.join(" ")}>${contentXml}</w:fldSimple>`;
 }
 /**
 * Serialize a complex field
@@ -278,7 +265,7 @@ function serializeComplexField(field) {
 	if (field.fldLock) beginAttrs.push("w:fldLock=\"true\"");
 	parts.push(`<w:r>${rPrXml}<w:fldChar ${beginAttrs.join(" ")}/></w:r>`);
 	if (field.fieldCode.length > 0) parts.push(...field.fieldCode.map((run) => serializeRun(run)));
-	else {
+	else if (field.instruction.length > 0) {
 		const spaceAttr = field.instruction.startsWith(" ") || field.instruction.endsWith(" ") || field.instruction.includes("  ") ? " xml:space=\"preserve\"" : "";
 		parts.push(`<w:r>${rPrXml}<w:instrText${spaceAttr}>${escapeXml(field.instruction)}</w:instrText></w:r>`);
 	}

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/runSerializer.d.ts
 /**
  * Reset the auto-incrementing ID counter. Call before each serialization pass

package/dist/docx/serializer/runSerializer.js

@@ -1,5 +1,7 @@
 import { HIGHLIGHT_COLOR_VALUES } from "../../types/documentEnumValues.js";
+import { THEME_COLOR_TO_DRAWING_SCHEME } from "../drawingUtils.js";
 import { isValidHexColor } from "../../utils/colorResolver.js";
+import { requiresXmlSpacePreserve } from "../textWhitespace.js";
 import { escapeXml, intAttr } from "./xmlUtils.js";
 import { serializeTable } from "./tableSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
@@ -82,6 +84,7 @@ function serializeTextFormatting(formatting) {
 		if (formatting.fontFamily.hAnsi) fontAttrs.push(`w:hAnsi="${escapeXml(formatting.fontFamily.hAnsi)}"`);
 		if (formatting.fontFamily.eastAsia) fontAttrs.push(`w:eastAsia="${escapeXml(formatting.fontFamily.eastAsia)}"`);
 		if (formatting.fontFamily.cs) fontAttrs.push(`w:cs="${escapeXml(formatting.fontFamily.cs)}"`);
+		if (formatting.fontFamily.hint) fontAttrs.push(`w:hint="${escapeXml(formatting.fontFamily.hint)}"`);
 		if (formatting.fontFamily.asciiTheme) fontAttrs.push(`w:asciiTheme="${formatting.fontFamily.asciiTheme}"`);
 		if (formatting.fontFamily.hAnsiTheme) fontAttrs.push(`w:hAnsiTheme="${formatting.fontFamily.hAnsiTheme}"`);
 		if (formatting.fontFamily.eastAsiaTheme) fontAttrs.push(`w:eastAsiaTheme="${formatting.fontFamily.eastAsiaTheme}"`);
@@ -183,7 +186,7 @@ function serializeRunProperties(formatting, propertyChanges) {
 * Serialize text content (w:t)
 */
 function serializeTextContent(content) {
-	return `<w:t${content.preserveSpace || content.text.startsWith(" ") || content.text.endsWith(" ") || content.text.includes("  ") ? " xml:space=\"preserve\"" : ""}>${escapeXml(content.text)}</w:t>`;
+	return `<w:t${content.preserveSpace || requiresXmlSpacePreserve(content.text) ? " xml:space=\"preserve\"" : ""}>${escapeXml(content.text)}</w:t>`;
 }
 /**
 * Serialize tab content (w:tab)
@@ -250,7 +253,7 @@ function serializeDrawingColor(color) {
 	if (!color) return "";
 	if (color.rgb && isValidHexColor(color.rgb)) return `<a:srgbClr val="${escapeXml(color.rgb.replace("#", ""))}"/>`;
 	if (color.themeColor) {
-		let clr = `<a:schemeClr val="${escapeXml(color.themeColor)}"`;
+		let clr = `<a:schemeClr val="${THEME_COLOR_TO_DRAWING_SCHEME[color.themeColor]}"`;
 		if (color.themeTint) clr += `><a:tint val="${escapeXml(color.themeTint)}"/></a:schemeClr>`;
 		else if (color.themeShade) clr += `><a:shade val="${escapeXml(color.themeShade)}"/></a:schemeClr>`;
 		else clr += `/>`;
@@ -260,7 +263,8 @@ function serializeDrawingColor(color) {
 }
 /** Serialize shape fill to DrawingML */
 function serializeFill(fill) {
-	if (!fill || fill.type === "none") return "<a:noFill/>";
+	if (!fill) return "";
+	if (fill.type === "none") return "<a:noFill/>";
 	if (fill.type === "solid" && fill.color) return `<a:solidFill>${serializeDrawingColor(fill.color)}</a:solidFill>`;
 	if (fill.type === "gradient" && fill.gradient) {
 		const g = fill.gradient;
@@ -287,7 +291,7 @@ function serializeOutline(outline) {
 	if (outline.cap) attrs.push(`cap="${serializeLineCap(outline.cap)}"`);
 	const parts = [];
 	if (outline.color) parts.push(`<a:solidFill>${serializeDrawingColor(outline.color)}</a:solidFill>`);
-	if (outline.style && outline.style !== "solid") parts.push(`<a:prstDash val="${outline.style}"/>`);
+	if (outline.style) parts.push(`<a:prstDash val="${outline.style}"/>`);
 	if (outline.join === "bevel") parts.push("<a:bevel/>");
 	else if (outline.join === "round") parts.push("<a:round/>");
 	else if (outline.join === "miter") parts.push("<a:miter/>");
@@ -370,6 +374,18 @@ function serializePicGraphic(image, sharedId) {
 	].join("");
 }
 /**
+* Serialize only authored wrap-distance attributes. OOXML defaults omitted
+* values to zero, but preserving absence keeps untouched models stable.
+*/
+function serializeWrapDistanceAttrs(wrap) {
+	const attrs = [];
+	if (wrap?.distT !== void 0) attrs.push(`distT="${intAttr(wrap.distT)}"`);
+	if (wrap?.distB !== void 0) attrs.push(`distB="${intAttr(wrap.distB)}"`);
+	if (wrap?.distL !== void 0) attrs.push(`distL="${intAttr(wrap.distL)}"`);
+	if (wrap?.distR !== void 0) attrs.push(`distR="${intAttr(wrap.distR)}"`);
+	return attrs.length > 0 ? ` ${attrs.join(" ")}` : "";
+}
+/**
 * Serialize drawing/image content (w:drawing) to full DrawingML XML
 */
 function serializeDrawingContent(content) {
@@ -377,24 +393,28 @@ function serializeDrawingContent(content) {
 	const isFloating = image.wrap.type !== "inline";
 	const cx = image.size.width;
 	const cy = image.size.height;
-	const distT = image.wrap.distT ?? 0;
-	const distB = image.wrap.distB ?? 0;
-	const distL = image.wrap.distL ?? 0;
-	const distR = image.wrap.distR ?? 0;
+	const wrapDistanceAttrs = serializeWrapDistanceAttrs(image.wrap);
 	const effL = image.padding?.left ?? 0;
 	const effT = image.padding?.top ?? 0;
 	const effR = image.padding?.right ?? 0;
 	const effB = image.padding?.bottom ?? 0;
 	const effectExtentEl = `<wp:effectExtent l="${intAttr(effL)}" t="${intAttr(effT)}" r="${intAttr(effR)}" b="${intAttr(effB)}"/>`;
 	const docPrId = getUniqueId(image.id);
-	const docPrName = image.title || image.filename || `Picture ${docPrId}`;
+	const docPrName = image.docPrName ?? image.filename ?? `Picture ${docPrId}`;
+	const docPrDescription = image.alt !== void 0 ? ` descr="${escapeXml(image.alt)}"` : "";
+	const docPrTitle = image.title !== void 0 ? ` title="${escapeXml(image.title)}"` : "";
+	const hlinkClick = image.hlinkRId ? `<a:hlinkClick r:id="${escapeXml(image.hlinkRId)}"/>` : "";
+	const inlineDocPrAttrs = `id="${docPrId}" name="${escapeXml(docPrName)}"${docPrDescription}${docPrTitle}${image.decorative ? " hidden=\"1\"" : ""}`;
+	const inlineDocPr = hlinkClick ? `<wp:docPr ${inlineDocPrAttrs}>${hlinkClick}</wp:docPr>` : `<wp:docPr ${inlineDocPrAttrs}/>`;
+	const anchorDocPrAttrs = `id="${docPrId}" name="${escapeXml(docPrName)}"${docPrDescription}${docPrTitle}`;
+	const anchorDocPr = hlinkClick ? `<wp:docPr ${anchorDocPrAttrs}>${hlinkClick}</wp:docPr>` : `<wp:docPr ${anchorDocPrAttrs}/>`;
 	const graphic = serializePicGraphic(image, docPrId);
 	if (!isFloating) return [
 		"<w:drawing>",
-		`<wp:inline distT="${intAttr(distT)}" distB="${intAttr(distB)}" distL="${intAttr(distL)}" distR="${intAttr(distR)}">`,
+		`<wp:inline${wrapDistanceAttrs}>`,
 		`<wp:extent cx="${intAttr(cx)}" cy="${intAttr(cy)}"/>`,
 		effectExtentEl,
-		`<wp:docPr id="${docPrId}" name="${escapeXml(docPrName)}"${image.alt ? ` descr="${escapeXml(image.alt)}"` : ""}${image.decorative ? " hidden=\"1\"" : ""}/>`,
+		inlineDocPr,
 		"<wp:cNvGraphicFramePr><a:graphicFrameLocks xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" noChangeAspect=\"1\"/></wp:cNvGraphicFramePr>",
 		graphic,
 		"</wp:inline>",
@@ -403,17 +423,15 @@ function serializeDrawingContent(content) {
 	const behindDoc = image.wrap.type === "behind" ? "1" : "0";
 	const position = image.position ? serializePosition(image.position) : "<wp:positionH relativeFrom=\"column\"><wp:posOffset>0</wp:posOffset></wp:positionH><wp:positionV relativeFrom=\"paragraph\"><wp:posOffset>0</wp:posOffset></wp:positionV>";
 	const wrap = serializeWrap(image.wrap);
-	const layoutInCellAttr = image.layoutInCell === false ? "0" : "1";
-	const allowOverlapAttr = image.allowOverlap === false ? "0" : "1";
 	return [
 		"<w:drawing>",
-		`<wp:anchor distT="${intAttr(distT)}" distB="${intAttr(distB)}" distL="${intAttr(distL)}" distR="${intAttr(distR)}" simplePos="0" relativeHeight="251658240" behindDoc="${behindDoc}" locked="0" layoutInCell="${layoutInCellAttr}" allowOverlap="${allowOverlapAttr}">`,
+		`<wp:anchor${wrapDistanceAttrs} simplePos="0" relativeHeight="251658240" behindDoc="${behindDoc}" locked="0" layoutInCell="${image.layoutInCell === false ? "0" : "1"}" allowOverlap="${image.allowOverlap === false ? "0" : "1"}">`,
 		"<wp:simplePos x=\"0\" y=\"0\"/>",
 		position,
 		`<wp:extent cx="${intAttr(cx)}" cy="${intAttr(cy)}"/>`,
 		effectExtentEl,
 		wrap,
-		`<wp:docPr id="${docPrId}" name="${escapeXml(docPrName)}"${image.alt ? ` descr="${escapeXml(image.alt)}"` : ""}/>`,
+		anchorDocPr,
 		"<wp:cNvGraphicFramePr><a:graphicFrameLocks xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" noChangeAspect=\"1\"/></wp:cNvGraphicFramePr>",
 		graphic,
 		"</wp:anchor>",
@@ -433,12 +451,9 @@ function serializeShapeContent(content) {
 	const cy = shape.size.height;
 	const isTextBox = shape.shapeType === "textBox";
 	const isFloating = shape.wrap && shape.wrap.type !== "inline";
-	const distT = shape.wrap?.distT ?? 0;
-	const distB = shape.wrap?.distB ?? 0;
-	const distL = shape.wrap?.distL ?? 0;
-	const distR = shape.wrap?.distR ?? 0;
+	const wrapDistances = serializeWrapDistanceAttrs(shape.wrap);
 	const docPrId = getUniqueId(shape.id);
-	const docPrName = shape.name || (isTextBox ? `TextBox ${docPrId}` : `Shape ${docPrId}`);
+	const docPrName = shape.name ?? (isTextBox ? `TextBox ${docPrId}` : `Shape ${docPrId}`);
 	let xfrmAttrs = "";
 	if (shape.transform?.rotation) xfrmAttrs += ` rot="${Math.round(shape.transform.rotation * 6e4)}"`;
 	if (shape.transform?.flipH) xfrmAttrs += " flipH=\"1\"";
@@ -494,7 +509,7 @@ function serializeShapeContent(content) {
 	].join("");
 	if (!isFloating) return [
 		"<w:drawing>",
-		`<wp:inline distT="${intAttr(distT)}" distB="${intAttr(distB)}" distL="${intAttr(distL)}" distR="${intAttr(distR)}">`,
+		`<wp:inline${wrapDistances}>`,
 		`<wp:extent cx="${intAttr(cx)}" cy="${intAttr(cy)}"/>`,
 		"<wp:effectExtent l=\"0\" t=\"0\" r=\"0\" b=\"0\"/>",
 		`<wp:docPr id="${docPrId}" name="${escapeXml(docPrName)}"/>`,
@@ -509,7 +524,7 @@ function serializeShapeContent(content) {
 	const wrap = serializeWrap(shape.wrap);
 	return [
 		"<w:drawing>",
-		`<wp:anchor distT="${intAttr(distT)}" distB="${intAttr(distB)}" distL="${intAttr(distL)}" distR="${intAttr(distR)}" simplePos="0" relativeHeight="251658240" behindDoc="${behindDoc}" locked="0" layoutInCell="1" allowOverlap="1">`,
+		`<wp:anchor${wrapDistances} simplePos="0" relativeHeight="251658240" behindDoc="${behindDoc}" locked="0" layoutInCell="1" allowOverlap="1">`,
 		"<wp:simplePos x=\"0\" y=\"0\"/>",
 		position,
 		`<wp:extent cx="${intAttr(cx)}" cy="${intAttr(cy)}"/>`,

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/sectionPropertiesSerializer.d.ts
 declare function serializeSectionProperties(props: document_d_exports.SectionProperties | undefined): string;
 //#endregion

package/dist/docx/serializer/sectionPropertiesSerializer.js

@@ -30,7 +30,7 @@ function serializePageSize(props) {
 	const attrs = [];
 	if (props.pageWidth !== void 0) attrs.push(`w:w="${intAttr(props.pageWidth)}"`);
 	if (props.pageHeight !== void 0) attrs.push(`w:h="${intAttr(props.pageHeight)}"`);
-	if (props.orientation === "landscape") attrs.push("w:orient=\"landscape\"");
+	if (props.orientation !== void 0) attrs.push(`w:orient="${props.orientation}"`);
 	return attrs.length > 0 ? `<w:pgSz ${attrs.join(" ")}/>` : "";
 }
 function serializePageMargins(props) {
@@ -51,9 +51,9 @@ function serializePaperSource(props) {
 	return attrs.length > 0 ? `<w:paperSrc ${attrs.join(" ")}/>` : "";
 }
 function serializeColumns(props) {
-	if (!props.columnCount && !props.columns?.length && props.columnSpace === void 0) return "";
+	if (props.columnCount === void 0 && !props.columns?.length && props.columnSpace === void 0) return "";
 	const attrs = [];
-	if (props.columnCount !== void 0 && props.columnCount > 1) attrs.push(`w:num="${intAttr(props.columnCount)}"`);
+	if (props.columnCount !== void 0 && props.columnCount >= 1) attrs.push(`w:num="${intAttr(props.columnCount)}"`);
 	if (props.columnSpace !== void 0) attrs.push(`w:space="${intAttr(props.columnSpace)}"`);
 	if (props.equalWidth !== void 0) attrs.push(`w:equalWidth="${props.equalWidth ? "1" : "0"}"`);
 	if (props.separator) attrs.push("w:sep=\"1\"");
@@ -170,7 +170,8 @@ function serializeSectionProperties(props) {
 	if (props.verticalAlign) parts.push(`<w:vAlign w:val="${props.verticalAlign}"/>`);
 	if (props.textDirection) parts.push(`<w:textDirection w:val="${props.textDirection}"/>`);
 	if (props.titlePg) parts.push("<w:titlePg/>");
-	if (props.bidi) parts.push("<w:bidi/>");
+	const bidiXml = serializeOnOffElement(props.bidi, "bidi");
+	if (bidiXml) parts.push(bidiXml);
 	for (const xml of [
 		serializeOnOffElement(props.formProtection, "formProt"),
 		serializeOnOffElement(props.noEndnote, "noEndnote"),

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/settingsSerializer.d.ts
 declare const serializeSettingsXml: (settings: document_d_exports.DocumentSettings) => string;
 //#endregion

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/stylesSerializer.d.ts
 declare const serializeStylesXml: (definitions: document_d_exports.StyleDefinitions) => string;
 //#endregion

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/tableSerializer.d.ts
 type ParagraphSerializer = (paragraph: document_d_exports.Paragraph) => string;
 /**

package/dist/docx/serializer/tableSerializer.js

@@ -172,6 +172,8 @@ function serializeTablePropertyChange(change) {
 function serializeTableRowFormatting(formatting, propertyChanges, structuralChange) {
 	const parts = [];
 	if (formatting) {
+		const cnfStyleXml = serializeConditionalFormatStyle(formatting.conditionalFormat);
+		if (cnfStyleXml) parts.push(cnfStyleXml);
 		if (formatting.gridBefore) parts.push(`<w:gridBefore w:val="${intAttr(formatting.gridBefore)}"/>`);
 		if (formatting.widthBefore) parts.push(`<w:wBefore w:w="${intAttr(formatting.widthBefore.value)}" w:type="${formatting.widthBefore.type}"/>`);
 		if (formatting.gridAfter) parts.push(`<w:gridAfter w:val="${intAttr(formatting.gridAfter)}"/>`);

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

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-
 //#region src/docx/serializer/themeSerializer.d.ts
 declare const serializeThemeXml: (theme: document_d_exports.Theme) => string;
 //#endregion

package/dist/docx/serializer/xmlUtils.js

@@ -3,8 +3,17 @@ 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) {
-	return text.replace(/&/gu, "&amp;").replace(/</gu, "&lt;").replace(/>/gu, "&gt;").replace(/"/gu, "&quot;").replace(/'/gu, "&apos;");
+	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.