@beyondwork/docx-react-component 1.0.19 → 1.0.21

package/src/io/export/serialize-footnotes.ts

@@ -3,6 +3,9 @@ import type {
   FootnoteDefinition,
   InlineNode,
   ParagraphNode,
+  TableCellNode,
+  TableNode,
+  TableRowNode,
   TextMark,
 } from "../../model/canonical-document.ts";
 
@@ -71,6 +74,12 @@ function serializeNoteDefinition(
       if (block.type === "paragraph") {
         return serializeParagraph(block);
       }
+      if (block.type === "table") {
+        return serializeTable(block);
+      }
+      if (block.type === "opaque_block" && typeof block.rawXml === "string") {
+        return block.rawXml;
+      }
       throw new Error(`Cannot safely serialize ${block.type} content in note sub-parts.`);
     })
     .join("");
@@ -96,6 +105,54 @@ function serializeParagraph(paragraph: ParagraphNode): string {
   return xml;
 }
 
+function serializeTable(table: TableNode): string {
+  let xml = "<w:tbl>";
+  if (table.propertiesXml) {
+    xml += table.propertiesXml;
+  }
+  if (table.gridColumns.length > 0) {
+    xml += "<w:tblGrid>";
+    for (const width of table.gridColumns) {
+      xml += `<w:gridCol w:w="${width}"/>`;
+    }
+    xml += "</w:tblGrid>";
+  }
+  for (const row of table.rows) {
+    xml += serializeTableRow(row);
+  }
+  xml += "</w:tbl>";
+  return xml;
+}
+
+function serializeTableRow(row: TableRowNode): string {
+  let xml = "<w:tr>";
+  if (row.propertiesXml) {
+    xml += wrapPropertiesXml("w:trPr", row.propertiesXml);
+  }
+  for (const cell of row.cells) {
+    xml += serializeTableCell(cell);
+  }
+  xml += "</w:tr>";
+  return xml;
+}
+
+function serializeTableCell(cell: TableCellNode): string {
+  let xml = "<w:tc>";
+  const propertiesXml = buildTableCellPropertiesXml(cell);
+  if (propertiesXml) {
+    xml += propertiesXml;
+  }
+  for (const child of cell.children) {
+    if (child.type === "paragraph") {
+      xml += serializeParagraph(child);
+    } else {
+      throw new Error(`Cannot safely serialize ${child.type} content in note table cells.`);
+    }
+  }
+  xml += "</w:tc>";
+  return xml;
+}
+
 function buildParagraphPropertiesXml(paragraph: ParagraphNode): string {
   const parts: string[] = [];
 
@@ -105,6 +162,26 @@ function buildParagraphPropertiesXml(paragraph: ParagraphNode): string {
   if (paragraph.alignment) {
     parts.push(`<w:jc w:val="${escapeAttribute(paragraph.alignment)}"/>`);
   }
+  if (paragraph.spacing) {
+    const attrs: string[] = [];
+    if (paragraph.spacing.before !== undefined) attrs.push(`w:before="${paragraph.spacing.before}"`);
+    if (paragraph.spacing.after !== undefined) attrs.push(`w:after="${paragraph.spacing.after}"`);
+    if (paragraph.spacing.line !== undefined) attrs.push(`w:line="${paragraph.spacing.line}"`);
+    if (paragraph.spacing.lineRule) attrs.push(`w:lineRule="${escapeAttribute(paragraph.spacing.lineRule)}"`);
+    if (attrs.length > 0) {
+      parts.push(`<w:spacing ${attrs.join(" ")}/>`);
+    }
+  }
+  if (paragraph.indentation) {
+    const attrs: string[] = [];
+    if (paragraph.indentation.left !== undefined) attrs.push(`w:left="${paragraph.indentation.left}"`);
+    if (paragraph.indentation.right !== undefined) attrs.push(`w:right="${paragraph.indentation.right}"`);
+    if (paragraph.indentation.firstLine !== undefined) attrs.push(`w:firstLine="${paragraph.indentation.firstLine}"`);
+    if (paragraph.indentation.hanging !== undefined) attrs.push(`w:hanging="${paragraph.indentation.hanging}"`);
+    if (attrs.length > 0) {
+      parts.push(`<w:ind ${attrs.join(" ")}/>`);
+    }
+  }
 
   return parts.length > 0 ? `<w:pPr>${parts.join("")}</w:pPr>` : "";
 }
@@ -133,9 +210,62 @@ function serializeInlineNode(node: InlineNode): string {
           : "EndnoteReference";
       return `<w:r><w:rPr><w:rStyle w:val="${styleVal}"/></w:rPr>${refElement}</w:r>`;
     }
+    case "bookmark_start":
+      return `<w:bookmarkStart w:id="${escapeAttribute(node.bookmarkId)}" w:name="${escapeAttribute(node.name)}"/>`;
+    case "bookmark_end":
+      return `<w:bookmarkEnd w:id="${escapeAttribute(node.bookmarkId)}"/>`;
+    case "field":
+      if (node.children && node.children.length > 0) {
+        const childrenXml = node.children.map((child) => serializeInlineNode(child)).join("");
+        if (node.fieldType === "complex") {
+          return (
+            `<w:r><w:fldChar w:fldCharType="begin"/></w:r>` +
+            `<w:r><w:instrText xml:space="preserve">${escapeXml(node.instruction)}</w:instrText></w:r>` +
+            `<w:r><w:fldChar w:fldCharType="separate"/></w:r>` +
+            childrenXml +
+            `<w:r><w:fldChar w:fldCharType="end"/></w:r>`
+          );
+        }
+        return `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}">${childrenXml}</w:fldSimple>`;
+      }
+      if (node.fieldType === "simple") {
+        return `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}"/>`;
+      }
+      return (
+        `<w:r><w:fldChar w:fldCharType="begin"/></w:r>` +
+        `<w:r><w:instrText xml:space="preserve">${escapeXml(node.instruction)}</w:instrText></w:r>` +
+        `<w:r><w:fldChar w:fldCharType="separate"/></w:r>` +
+        `<w:r><w:fldChar w:fldCharType="end"/></w:r>`
+      );
+    case "hyperlink":
+      return serializeHyperlinkNode(node);
+    case "field":
+      if (node.children && node.children.length > 0) {
+        const childrenXml = node.children.map((child) => serializeInlineNode(child)).join("");
+        if (node.fieldType === "complex") {
+          return (
+            `<w:r><w:fldChar w:fldCharType="begin"/></w:r>` +
+            `<w:r><w:instrText xml:space="preserve">${escapeXml(node.instruction)}</w:instrText></w:r>` +
+            `<w:r><w:fldChar w:fldCharType="separate"/></w:r>` +
+            childrenXml +
+            `<w:r><w:fldChar w:fldCharType="end"/></w:r>`
+          );
+        }
+        return `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}">${childrenXml}</w:fldSimple>`;
+      }
+      if (node.fieldType === "simple") {
+        return `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}"/>`;
+      }
+      return (
+        `<w:r><w:fldChar w:fldCharType="begin"/></w:r>` +
+        `<w:r><w:instrText xml:space="preserve">${escapeXml(node.instruction)}</w:instrText></w:r>` +
+        `<w:r><w:fldChar w:fldCharType="separate"/></w:r>` +
+        `<w:r><w:fldChar w:fldCharType="end"/></w:r>`
+      );
+    case "hyperlink":
+      return serializeHyperlinkNode(node);
     case "opaque_inline":
       throw new Error(`Cannot safely serialize ${node.type} content in note sub-parts.`);
-    case "hyperlink":
     default:
       throw new Error(`Cannot safely serialize ${node.type} content in note sub-parts.`);
   }
@@ -164,6 +294,23 @@ function buildRunPropertiesXml(marks: TextMark[] | undefined): string {
       case "doubleStrikethrough":
         parts.push("<w:dstrike/>");
         break;
+      case "fontFamily":
+        parts.push(
+          `<w:rFonts w:ascii="${escapeAttribute(mark.val)}" w:hAnsi="${escapeAttribute(mark.val)}"/>`,
+        );
+        break;
+      case "fontSize":
+        parts.push(`<w:sz w:val="${mark.val}"/>`);
+        break;
+      case "textColor":
+        parts.push(`<w:color w:val="${escapeAttribute(mark.color)}"/>`);
+        break;
+      case "smallCaps":
+        parts.push("<w:smallCaps/>");
+        break;
+      case "allCaps":
+        parts.push("<w:caps/>");
+        break;
       default:
         throw new Error(`Cannot safely serialize ${mark.type} marks in note sub-parts.`);
     }
@@ -200,3 +347,53 @@ function escapeAttribute(value: string): string {
     .replace(/>/g, "&gt;")
     .replace(/"/g, "&quot;");
 }
+
+function serializeHyperlinkNode(node: Extract<InlineNode, { type: "hyperlink" }>): string {
+  const childrenXml = node.children.map((child) => serializeInlineNode(child)).join("");
+  if (node.href.startsWith("#")) {
+    return `<w:hyperlink w:anchor="${escapeAttribute(node.href.slice(1))}">${childrenXml}</w:hyperlink>`;
+  }
+  if (!/^rId[A-Za-z0-9._-]+$/u.test(node.href)) {
+    throw new Error("Cannot safely serialize URL-backed note hyperlinks without relationship context.");
+  }
+  return `<w:hyperlink r:id="${escapeAttribute(node.href)}">${childrenXml}</w:hyperlink>`;
+}
+
+function wrapPropertiesXml(tagName: "w:trPr" | "w:tcPr", xml: string): string {
+  const trimmed = xml.trim();
+  if (trimmed.startsWith(`<${tagName}`)) {
+    return trimmed;
+  }
+  return `<${tagName}>${trimmed}</${tagName}>`;
+}
+
+function extractWrappedChildren(tagName: "w:tcPr", xml: string | undefined): string {
+  if (!xml) {
+    return "";
+  }
+  const trimmed = xml.trim();
+  const wrapped = new RegExp(`^<${tagName}\\b[^>]*>([\\s\\S]*)</${tagName}>$`, "u").exec(trimmed);
+  return wrapped?.[1] ?? trimmed;
+}
+
+function buildTableCellPropertiesXml(cell: TableCellNode): string {
+  const innerXml = extractWrappedChildren("w:tcPr", cell.propertiesXml)
+    .replace(/<w:gridSpan\b[^>]*\/>/gu, "")
+    .replace(/<w:vMerge\b[^>]*\/>/gu, "")
+    .trim();
+  const parts: string[] = [];
+  if (cell.gridSpan && cell.gridSpan > 1) {
+    parts.push(`<w:gridSpan w:val="${cell.gridSpan}"/>`);
+  }
+  if (cell.verticalMerge) {
+    parts.push(
+      cell.verticalMerge === "restart"
+        ? `<w:vMerge w:val="restart"/>`
+        : `<w:vMerge/>`,
+    );
+  }
+  if (innerXml.length > 0) {
+    parts.push(innerXml);
+  }
+  return parts.length > 0 ? `<w:tcPr>${parts.join("")}</w:tcPr>` : "";
+}

package/src/io/export/serialize-headers-footers.ts

@@ -1,8 +1,12 @@
 import type {
+  BlockNode,
   FooterDocument,
   HeaderDocument,
   InlineNode,
   ParagraphNode,
+  TableCellNode,
+  TableNode,
+  TableRowNode,
   TextMark,
 } from "../../model/canonical-document.ts";
 
@@ -13,6 +17,17 @@ export const WORD_FOOTER_CONTENT_TYPE =
 
 const W_NS = `xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"`;
 const R_NS = `xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"`;
+const MC_NS = `xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"`;
+const O_NS = `xmlns:o="urn:schemas-microsoft-com:office:office"`;
+const V_NS = `xmlns:v="urn:schemas-microsoft-com:vml"`;
+const WP_NS = `xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"`;
+const WPS_NS = `xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape"`;
+const A_NS = `xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"`;
+const W10_NS = `xmlns:w10="urn:schemas-microsoft-com:office:word"`;
+const W14_NS = `xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"`;
+const W15_NS = `xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml"`;
+const WP14_NS = `xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing"`;
+const EXTENDED_ROOT_ATTRS = `${MC_NS} ${O_NS} ${V_NS} ${WP_NS} ${WPS_NS} ${A_NS} ${W10_NS} ${W14_NS} ${W15_NS} ${WP14_NS} mc:Ignorable="wps wp14 w14 w15"`;
 
 /**
  * Serialize a HeaderDocument into a headerN.xml string.
@@ -21,7 +36,7 @@ export function serializeHeaderXml(header: HeaderDocument): string {
   const body = serializeBlocks(header.blocks);
   return [
     `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>`,
-    `<w:hdr ${W_NS} ${R_NS}>${body}</w:hdr>`,
+    `<w:hdr ${W_NS} ${R_NS} ${EXTENDED_ROOT_ATTRS}>${body}</w:hdr>`,
   ].join("\n");
 }
 
@@ -32,7 +47,7 @@ export function serializeFooterXml(footer: FooterDocument): string {
   const body = serializeBlocks(footer.blocks);
   return [
     `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>`,
-    `<w:ftr ${W_NS} ${R_NS}>${body}</w:ftr>`,
+    `<w:ftr ${W_NS} ${R_NS} ${EXTENDED_ROOT_ATTRS}>${body}</w:ftr>`,
   ].join("\n");
 }
 
@@ -51,6 +66,12 @@ function serializeBlocks(
       if (block.type === "paragraph") {
         return serializeParagraph(block);
       }
+      if (block.type === "table") {
+        return serializeTable(block);
+      }
+      if (block.type === "opaque_block" && typeof block.rawXml === "string") {
+        return block.rawXml;
+      }
       throw new Error(`Cannot safely serialize ${block.type} content in header/footer sub-parts.`);
     })
     .join("");
@@ -73,15 +94,88 @@ function serializeParagraph(paragraph: ParagraphNode): string {
   return xml;
 }
 
+function serializeTable(table: TableNode): string {
+  let xml = "<w:tbl>";
+  if (table.propertiesXml) {
+    xml += table.propertiesXml;
+  }
+  if (table.gridColumns.length > 0) {
+    xml += "<w:tblGrid>";
+    for (const width of table.gridColumns) {
+      xml += `<w:gridCol w:w="${width}"/>`;
+    }
+    xml += "</w:tblGrid>";
+  }
+  for (const row of table.rows) {
+    xml += serializeTableRow(row);
+  }
+  xml += "</w:tbl>";
+  return xml;
+}
+
+function serializeTableRow(row: TableRowNode): string {
+  let xml = "<w:tr>";
+  if (row.propertiesXml) {
+    xml += wrapPropertiesXml("w:trPr", row.propertiesXml);
+  }
+  for (const cell of row.cells) {
+    xml += serializeTableCell(cell);
+  }
+  xml += "</w:tr>";
+  return xml;
+}
+
+function serializeTableCell(cell: TableCellNode): string {
+  let xml = "<w:tc>";
+  const propertiesXml = buildTableCellPropertiesXml(cell);
+  if (propertiesXml) {
+    xml += propertiesXml;
+  }
+  for (const child of cell.children) {
+    if (child.type === "paragraph") {
+      xml += serializeParagraph(child);
+    } else {
+      throw new Error(`Cannot safely serialize ${child.type} content in header/footer table cells.`);
+    }
+  }
+  xml += "</w:tc>";
+  return xml;
+}
+
 function buildParagraphPropertiesXml(paragraph: ParagraphNode): string {
   const parts: string[] = [];
 
   if (paragraph.styleId) {
     parts.push(`<w:pStyle w:val="${escapeAttribute(paragraph.styleId)}"/>`);
   }
+  if (paragraph.spacing) {
+    const s = paragraph.spacing;
+    const attrs: string[] = [];
+    if (s.before !== undefined) attrs.push(`w:before="${s.before}"`);
+    if (s.after !== undefined) attrs.push(`w:after="${s.after}"`);
+    if (s.line !== undefined) attrs.push(`w:line="${s.line}"`);
+    if (s.lineRule) attrs.push(`w:lineRule="${escapeAttribute(s.lineRule)}"`);
+    if (attrs.length > 0) parts.push(`<w:spacing ${attrs.join(" ")}/>`);
+  }
+  if (paragraph.indentation) {
+    const ind = paragraph.indentation;
+    const attrs: string[] = [];
+    if (ind.left !== undefined) attrs.push(`w:left="${ind.left}"`);
+    if (ind.right !== undefined) attrs.push(`w:right="${ind.right}"`);
+    if (ind.firstLine !== undefined) attrs.push(`w:firstLine="${ind.firstLine}"`);
+    if (ind.hanging !== undefined) attrs.push(`w:hanging="${ind.hanging}"`);
+    if (attrs.length > 0) parts.push(`<w:ind ${attrs.join(" ")}/>`);
+  }
   if (paragraph.alignment) {
     parts.push(`<w:jc w:val="${escapeAttribute(paragraph.alignment)}"/>`);
   }
+  if (paragraph.tabStops && paragraph.tabStops.length > 0) {
+    const tabsXml = paragraph.tabStops.map((tab) => {
+      const leaderAttr = tab.leader ? ` w:leader="${escapeAttribute(tab.leader)}"` : "";
+      return `<w:tab w:val="${tab.align}" w:pos="${tab.position}"${leaderAttr}/>`;
+    }).join("");
+    parts.push(`<w:tabs>${tabsXml}</w:tabs>`);
+  }
 
   return parts.length > 0 ? `<w:pPr>${parts.join("")}</w:pPr>` : "";
 }
@@ -106,25 +200,51 @@ function serializeInlineNode(node: InlineNode): string {
           : `<w:endnoteReference w:id="${escapeAttribute(node.noteId)}"/>`;
       return `<w:r><w:rPr><w:rStyle w:val="${node.noteKind === "footnote" ? "FootnoteReference" : "EndnoteReference"}"/></w:rPr>${refElement}</w:r>`;
     }
-    case "opaque_inline":
-      throw new Error(`Cannot safely serialize ${node.type} content in header/footer sub-parts.`);
-    case "hyperlink":
-    case "image":
-    case "field":
     case "bookmark_start":
+      return `<w:bookmarkStart w:id="${escapeAttribute(node.bookmarkId)}" w:name="${escapeAttribute(node.name)}"/>`;
     case "bookmark_end":
-    case "column_break":
-    case "symbol":
+      return `<w:bookmarkEnd w:id="${escapeAttribute(node.bookmarkId)}"/>`;
+    case "field":
+      if (node.children && node.children.length > 0) {
+        const childrenXml = node.children.map((child) => serializeInlineNode(child)).join("");
+        if (node.fieldType === "complex") {
+          return (
+            `<w:r><w:fldChar w:fldCharType="begin"/></w:r>` +
+            `<w:r><w:instrText xml:space="preserve">${escapeXml(node.instruction)}</w:instrText></w:r>` +
+            `<w:r><w:fldChar w:fldCharType="separate"/></w:r>` +
+            childrenXml +
+            `<w:r><w:fldChar w:fldCharType="end"/></w:r>`
+          );
+        }
+        return `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}">${childrenXml}</w:fldSimple>`;
+      }
+      if (node.fieldType === "simple") {
+        return `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}"/>`;
+      }
+      return `<w:r><w:fldChar w:fldCharType="begin"/></w:r><w:r><w:instrText xml:space="preserve">${escapeXml(node.instruction)}</w:instrText></w:r><w:r><w:fldChar w:fldCharType="separate"/></w:r><w:r><w:fldChar w:fldCharType="end"/></w:r>`;
+    case "hyperlink":
+      return serializeHyperlinkNode(node);
     case "chart_preview":
     case "smartart_preview":
     case "shape":
     case "wordart":
     case "vml_shape":
+      return wrapInlineRawXml(node.rawXml);
+    case "opaque_inline":
+      throw new Error(`Cannot safely serialize ${node.type} content in header/footer sub-parts.`);
+    case "image":
+    case "column_break":
+    case "symbol":
     default:
       throw new Error(`Cannot safely serialize ${node.type} content in header/footer sub-parts.`);
   }
 }
 
+function wrapInlineRawXml(rawXml: string): string {
+  const trimmed = rawXml.trimStart();
+  return trimmed.startsWith("<w:r") ? rawXml : `<w:r>${rawXml}</w:r>`;
+}
+
 function buildRunPropertiesXml(marks: TextMark[] | undefined): string {
   if (!marks || marks.length === 0) {
     return "";
@@ -148,8 +268,31 @@ function buildRunPropertiesXml(marks: TextMark[] | undefined): string {
       case "doubleStrikethrough":
         parts.push("<w:dstrike/>");
         break;
+      case "fontFamily":
+        parts.push(`<w:rFonts w:ascii="${escapeAttribute(mark.val)}" w:hAnsi="${escapeAttribute(mark.val)}"/>`);
+        break;
+      case "fontSize":
+        parts.push(`<w:sz w:val="${mark.val}"/>`);
+        break;
+      case "textColor":
+        parts.push(`<w:color w:val="${escapeAttribute(mark.color)}"/>`);
+        break;
+      case "highlight":
+        parts.push(`<w:highlight w:val="${escapeAttribute(mark.val)}"/>`);
+        break;
+      case "backgroundColor":
+        parts.push(`<w:shd w:val="clear" w:color="auto" w:fill="${escapeAttribute(mark.color)}"/>`);
+        break;
+      case "smallCaps":
+        parts.push("<w:smallCaps/>");
+        break;
+      case "allCaps":
+        parts.push("<w:caps/>");
+        break;
       default:
-        throw new Error(`Cannot safely serialize ${mark.type} marks in header/footer sub-parts.`);
+        // Marks outside the secondary-story contract are silently dropped
+        // to avoid export failure on content the parser extracted safely.
+        break;
     }
   }
 
@@ -177,3 +320,53 @@ function escapeAttribute(value: string): string {
     .replace(/>/g, "&gt;")
     .replace(/"/g, "&quot;");
 }
+
+function serializeHyperlinkNode(node: Extract<InlineNode, { type: "hyperlink" }>): string {
+  const childrenXml = node.children.map((child) => serializeInlineNode(child)).join("");
+  if (node.href.startsWith("#")) {
+    return `<w:hyperlink w:anchor="${escapeAttribute(node.href.slice(1))}">${childrenXml}</w:hyperlink>`;
+  }
+  if (!/^rId[A-Za-z0-9._-]+$/u.test(node.href)) {
+    throw new Error("Cannot safely serialize URL-backed header/footer hyperlinks without relationship context.");
+  }
+  return `<w:hyperlink r:id="${escapeAttribute(node.href)}">${childrenXml}</w:hyperlink>`;
+}
+
+function wrapPropertiesXml(tagName: "w:trPr" | "w:tcPr", xml: string): string {
+  const trimmed = xml.trim();
+  if (trimmed.startsWith(`<${tagName}`)) {
+    return trimmed;
+  }
+  return `<${tagName}>${trimmed}</${tagName}>`;
+}
+
+function extractWrappedChildren(tagName: "w:tcPr", xml: string | undefined): string {
+  if (!xml) {
+    return "";
+  }
+  const trimmed = xml.trim();
+  const wrapped = new RegExp(`^<${tagName}\\b[^>]*>([\\s\\S]*)</${tagName}>$`, "u").exec(trimmed);
+  return wrapped?.[1] ?? trimmed;
+}
+
+function buildTableCellPropertiesXml(cell: TableCellNode): string {
+  const innerXml = extractWrappedChildren("w:tcPr", cell.propertiesXml)
+    .replace(/<w:gridSpan\b[^>]*\/>/gu, "")
+    .replace(/<w:vMerge\b[^>]*\/>/gu, "")
+    .trim();
+  const parts: string[] = [];
+  if (cell.gridSpan && cell.gridSpan > 1) {
+    parts.push(`<w:gridSpan w:val="${cell.gridSpan}"/>`);
+  }
+  if (cell.verticalMerge) {
+    parts.push(
+      cell.verticalMerge === "restart"
+        ? `<w:vMerge w:val="restart"/>`
+        : `<w:vMerge/>`,
+    );
+  }
+  if (innerXml.length > 0) {
+    parts.push(innerXml);
+  }
+  return parts.length > 0 ? `<w:tcPr>${parts.join("")}</w:tcPr>` : "";
+}

package/src/io/export/serialize-main-document.ts

@@ -407,7 +407,7 @@ function serializeTableInlineNode(
     case "shape":
     case "wordart":
     case "vml_shape":
-      return node.rawXml;
+      return wrapInlineRawXml(node.rawXml);
     case "hyperlink": {
       const hyperlinkOpen = node.href.startsWith("#")
         ? `<w:hyperlink w:anchor="${escapeAttribute(node.href.slice(1))}">`
@@ -426,8 +426,24 @@ function serializeTableInlineNode(
       const childrenXml = node.children.map((child) => serializeTableInlineNode(child, state)).join("");
       return `${hyperlinkOpen}${childrenXml}</w:hyperlink>`;
     }
-    case "field":
+    case "field": {
+      if (node.children && node.children.length > 0) {
+        const childrenXml = node.children
+          .map((child) => serializeTableInlineNode(child, state))
+          .join("");
+        if (node.fieldType === "complex") {
+          return (
+            `<w:r><w:fldChar w:fldCharType="begin"/></w:r>` +
+            `<w:r><w:instrText xml:space="preserve"> ${escapeXml(node.instruction)} </w:instrText></w:r>` +
+            `<w:r><w:fldChar w:fldCharType="separate"/></w:r>` +
+            childrenXml +
+            `<w:r><w:fldChar w:fldCharType="end"/></w:r>`
+          );
+        }
+        return `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}">${childrenXml}</w:fldSimple>`;
+      }
       return `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}"/>`;
+    }
     case "bookmark_start":
       return (
         `<w:bookmarkStart w:id="${escapeAttribute(node.bookmarkId)}"` +
@@ -484,6 +500,13 @@ function buildParagraphPropertiesXml(paragraph: ParagraphNode): string {
     if (s.lineRule !== undefined) attrs.push(`w:lineRule="${s.lineRule}"`);
     if (attrs.length > 0) children.push(`<w:spacing ${attrs.join(" ")}/>`);
   }
+  if (paragraph.contextualSpacing !== undefined) {
+    children.push(
+      paragraph.contextualSpacing
+        ? "<w:contextualSpacing/>"
+        : `<w:contextualSpacing w:val="0"/>`,
+    );
+  }
   if (paragraph.indentation) {
     const ind = paragraph.indentation;
     const attrs: string[] = [];
@@ -806,7 +829,7 @@ function serializeInlineNode(
     case "wordart":
     case "vml_shape": {
       // Reattach original XML unchanged for lossless round-trip.
-      const xml = node.rawXml;
+      const xml = wrapInlineRawXml(node.rawXml);
       const boundaries = new Map<number, number>();
       boundaries.set(cursor, xmlOffset);
       boundaries.set(cursor + 1, xmlOffset + xml.length);
@@ -856,6 +879,55 @@ function serializeInlineNode(
       };
     }
     case "field": {
+      if (node.children && node.children.length > 0) {
+        const boundaries = new Map<number, number>();
+        boundaries.set(cursor, xmlOffset);
+        let nextCursor = cursor;
+        let nextOffset = xmlOffset;
+
+        if (node.fieldType === "complex") {
+          const beginXml =
+            `<w:r><w:fldChar w:fldCharType="begin"/></w:r>` +
+            `<w:r><w:instrText xml:space="preserve"> ${escapeXml(node.instruction)} </w:instrText></w:r>` +
+            `<w:r><w:fldChar w:fldCharType="separate"/></w:r>`;
+          nextOffset += beginXml.length;
+
+          const children: string[] = [beginXml];
+          for (const child of node.children) {
+            const result = serializeInlineNode(child, state, nextCursor, nextOffset);
+            children.push(result.xml);
+            for (const [position, index] of result.boundaries) {
+              boundaries.set(position, index);
+            }
+            nextCursor = result.cursor;
+            nextOffset += result.xml.length;
+          }
+          const endXml = `<w:r><w:fldChar w:fldCharType="end"/></w:r>`;
+          children.push(endXml);
+          nextOffset += endXml.length;
+          boundaries.set(nextCursor, nextOffset);
+          return { xml: children.join(""), cursor: nextCursor, boundaries };
+        }
+
+        // Simple field with children
+        const openXml = `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}">`;
+        nextOffset += openXml.length;
+        const children: string[] = [openXml];
+        for (const child of node.children) {
+          const result = serializeInlineNode(child, state, nextCursor, nextOffset);
+          children.push(result.xml);
+          for (const [position, index] of result.boundaries) {
+            boundaries.set(position, index);
+          }
+          nextCursor = result.cursor;
+          nextOffset += result.xml.length;
+        }
+        children.push("</w:fldSimple>");
+        nextOffset += "</w:fldSimple>".length;
+        boundaries.set(nextCursor, nextOffset);
+        return { xml: children.join(""), cursor: nextCursor, boundaries };
+      }
+
       const xml = `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}"/>`;
       const boundaries = new Map<number, number>();
       boundaries.set(cursor, xmlOffset);
@@ -966,6 +1038,9 @@ function serializeRunProperties(marks: TextMark[] | undefined): string {
       case "lang":
         markParts.push(`<w:lang w:val="${escapeAttribute(mark.val)}"/>`);
         break;
+      case "highlight":
+        markParts.push(`<w:highlight w:val="${escapeAttribute(mark.val)}"/>`);
+        break;
       case "backgroundColor":
         markParts.push(
           `<w:shd w:val="clear" w:color="auto" w:fill="${escapeAttribute(mark.color)}"/>`,
@@ -1246,6 +1321,11 @@ export function serializeSectionPropertiesXml(props: SectionProperties): string
   return `<w:sectPr>${children.join("")}</w:sectPr>`;
 }
 
+function wrapInlineRawXml(rawXml: string): string {
+  const trimmed = rawXml.trimStart();
+  return trimmed.startsWith("<w:r") ? rawXml : `<w:r>${rawXml}</w:r>`;
+}
+
 function documentNeedsW14Namespace(content: DocumentRootNode): boolean {
   const blockQueue = [...content.children];
   while (blockQueue.length > 0) {