@beyondwork/docx-react-component 1.0.37 → 1.0.39

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

@@ -0,0 +1,212 @@
+/**
+ * Serialize a `StylesCatalog` to an OOXML `<w:styles>` document fragment.
+ *
+ * ⚠️ NOT YET WIRED INTO THE EXPORT PIPELINE. As of the Task 7 commit (bullet-list
+ * fidelity Phase 1), the real docx export path (`reattach-preserved-parts.ts`)
+ * copies `word/styles.xml` verbatim from the source package — this module is
+ * reachable only from tests. That is fine for Phases 2–3 (the cascade resolver
+ * reads the parsed catalog fields; it doesn't require re-emission).
+ *
+ * Before wiring this serializer into `docx-session.ts` / `ownedOutputPaths`, the
+ * following gaps MUST be closed — otherwise wiring it in will silently destroy
+ * user data:
+ *
+ *   1. `StylesCatalog.latentStyles` is not emitted. Add a `buildLatentStylesXml`
+ *      counterpart and call it inside `<w:styles>` after `<w:docDefaults>`.
+ *   2. `StylesCatalog.tables` is not emitted. Table styles round-trip through
+ *      the existing `serialize-table-styles` path today only because styles.xml
+ *      passes through verbatim; wiring this serializer would drop them.
+ *   3. The `<w:style>` metadata fields `<w:aliases>`, `<w:link>`, `<w:autoRedefine>`,
+ *      `<w:hidden>`, `<w:uiPriority>`, `<w:semiHidden>`, `<w:unhideWhenUsed>`,
+ *      `<w:qFormat>`, `<w:locked>`, `<w:personal>`, `<w:personal{Compose,Reply}>`,
+ *      `<w:rsid>`, plus the `<w:customStyle>` attribute, are not modeled on
+ *      `ParagraphStyleDefinition`/`CharacterStyleDefinition` yet. Extend the
+ *      canonical model first, parse them, and emit them here.
+ *   4. Root-level `<w:styles>` metadata (`<w:docId>`, `<w:rsids>`) is not
+ *      modeled or emitted.
+ *
+ * Until those are closed, wiring this in would be a regression.
+ */
+
+import type { StylesCatalog } from "../../model/canonical-document.ts";
+import { buildRunPropertiesXml } from "./serialize-run-formatting.ts";
+import { buildParagraphPropertiesXml } from "./serialize-paragraph-formatting.ts";
+
+export const WORD_STYLES_CONTENT_TYPE =
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml";
+
+function escXml(value: string): string {
+  return value
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;");
+}
+
+function buildDocDefaultsXml(catalog: StylesCatalog): string {
+  const { docDefaults } = catalog;
+  if (!docDefaults) return "";
+
+  const rPrXml = buildRunPropertiesXml(docDefaults.run);
+  const pPrXml = buildParagraphPropertiesXml(docDefaults.paragraph);
+
+  if (!rPrXml && !pPrXml) return "";
+
+  const rPrDefault = rPrXml
+    ? `<w:rPrDefault>${rPrXml}</w:rPrDefault>`
+    : "";
+  const pPrDefault = pPrXml
+    ? `<w:pPrDefault>${pPrXml}</w:pPrDefault>`
+    : "";
+
+  return `<w:docDefaults>${rPrDefault}${pPrDefault}</w:docDefaults>`;
+}
+
+function buildParagraphStyleXml(
+  style: StylesCatalog["paragraphs"][string],
+): string {
+  const defaultAttr = style.isDefault ? ` w:default="1"` : "";
+  const nameEl = `<w:name w:val="${escXml(style.displayName)}"/>`;
+  const basedOnEl = style.basedOn
+    ? `<w:basedOn w:val="${escXml(style.basedOn)}"/>`
+    : "";
+  const nextEl = style.nextStyle
+    ? `<w:next w:val="${escXml(style.nextStyle)}"/>`
+    : "";
+
+  // Build pPr: may contain numPr (from numbering) and any canonical formatting.
+  // We reconstruct the pPr children in canonical order:
+  // pStyle handled externally; numPr; then pPr formatting body (which includes
+  // outlineLvl at position 14 in the canonical order).
+  const numPrXml = style.numbering
+    ? buildStyleNumPrXml(style.numbering)
+    : "";
+
+  // Build pPr body — merge numPr into the formatting pPr.
+  // The canonical pPr formatter handles everything except numPr.
+  // We inject numPr after keepNext/keepLines/pageBreakBefore, before pBdr
+  // (position 3 in ECMA-376 pPr schema order).
+  const pPrBodyXml = buildParagraphPropertiesXmlWithNumPr(style.paragraphProperties, numPrXml);
+
+  const rPrXml = buildRunPropertiesXml(style.runProperties);
+
+  return (
+    `<w:style w:type="paragraph" w:styleId="${escXml(style.styleId)}"${defaultAttr}>` +
+    nameEl +
+    basedOnEl +
+    nextEl +
+    pPrBodyXml +
+    rPrXml +
+    `</w:style>`
+  );
+}
+
+function buildStyleNumPrXml(
+  numbering: NonNullable<StylesCatalog["paragraphs"][string]["numbering"]>,
+): string {
+  // Strip canonical "num:" prefix to get the raw numId value.
+  const rawId = numbering.numberingInstanceId.startsWith("num:")
+    ? numbering.numberingInstanceId.slice(4)
+    : numbering.numberingInstanceId;
+  const ilvlEl =
+    numbering.level !== undefined
+      ? `<w:ilvl w:val="${numbering.level}"/>`
+      : "";
+  return `<w:numPr>${ilvlEl}<w:numId w:val="${escXml(rawId)}"/></w:numPr>`;
+}
+
+/**
+ * Build a `<w:pPr>` that folds in an optional `<w:numPr>` at the canonical
+ * schema position (after keepNext/keepLines/pageBreakBefore, before pBdr).
+ *
+ * When there is no canonical paragraph formatting AND no numPr, returns "".
+ */
+function buildParagraphPropertiesXmlWithNumPr(
+  pPr: StylesCatalog["paragraphs"][string]["paragraphProperties"],
+  numPrXml: string,
+): string {
+  if (!numPrXml) {
+    // Delegate entirely to the shared formatter.
+    return buildParagraphPropertiesXml(pPr);
+  }
+
+  // We need to inject numPr into the correct position.
+  // Use the shared formatter's output if pPr exists, then splice numPr in
+  // after the toggle booleans (keepNext/keepLines/pageBreakBefore) and
+  // before pBdr. The simplest approach: re-build manually with full control.
+  if (!pPr) {
+    return `<w:pPr>${numPrXml}</w:pPr>`;
+  }
+
+  // Rebuild with the same order as buildParagraphPropertiesXml, inserting numPr
+  // after the first three toggles (positions 1-3) per ECMA-376 pPr schema.
+  const parts: string[] = [];
+  const fn = (tag: string, v: boolean | undefined) =>
+    v === undefined ? "" : v ? `<w:${tag}/>` : `<w:${tag} w:val="0"/>`;
+
+  parts.push(fn("keepNext", pPr.keepNext));
+  parts.push(fn("keepLines", pPr.keepLines));
+  parts.push(fn("pageBreakBefore", pPr.pageBreakBefore));
+  parts.push(numPrXml);
+  // Remaining fields delegated through the helper for pBdr, shd, tabs, etc.
+  // We do this by generating the full pPr body and stripping the outer <w:pPr> wrapper,
+  // then removing any duplicate keepNext/keepLines/pageBreakBefore already emitted.
+  const innerXml = buildParagraphPropertiesXml(pPr);
+  if (innerXml) {
+    // Strip outer <w:pPr>...</w:pPr> wrapper.
+    const inner = innerXml.replace(/^<w:pPr>/, "").replace(/<\/w:pPr>$/, "");
+    // Remove the three toggles we already emitted above to avoid duplication.
+    const deduped = inner
+      .replace(/<w:keepNext(?:\s[^>]*)?\/?>/g, "")
+      .replace(/<w:keepLines(?:\s[^>]*)?\/?>/g, "")
+      .replace(/<w:pageBreakBefore(?:\s[^>]*)?\/?>/g, "");
+    parts.push(deduped);
+  }
+
+  const body = parts.filter(Boolean).join("");
+  return body.length > 0 ? `<w:pPr>${body}</w:pPr>` : "";
+}
+
+function buildCharacterStyleXml(
+  style: StylesCatalog["characters"][string],
+): string {
+  const defaultAttr = style.isDefault ? ` w:default="1"` : "";
+  const nameEl = `<w:name w:val="${escXml(style.displayName)}"/>`;
+  const basedOnEl = style.basedOn
+    ? `<w:basedOn w:val="${escXml(style.basedOn)}"/>`
+    : "";
+  const rPrXml = buildRunPropertiesXml(style.runProperties);
+
+  return (
+    `<w:style w:type="character" w:styleId="${escXml(style.styleId)}"${defaultAttr}>` +
+    nameEl +
+    basedOnEl +
+    rPrXml +
+    `</w:style>`
+  );
+}
+
+/**
+ * Serialize a `StylesCatalog` to a `<w:styles>` XML string.
+ *
+ * Only paragraph and character styles are emitted. Table styles are skipped
+ * (they are preserved as opaque package fragments in round-trip workflows).
+ */
+export function serializeStylesXml(catalog: StylesCatalog): string {
+  const docDefaultsXml = buildDocDefaultsXml(catalog);
+
+  const paragraphStyles = Object.values(catalog.paragraphs)
+    .map((style) => buildParagraphStyleXml(style))
+    .join("");
+
+  const characterStyles = Object.values(catalog.characters)
+    .map((style) => buildCharacterStyleXml(style))
+    .join("");
+
+  const body = docDefaultsXml + paragraphStyles + characterStyles;
+
+  return [
+    `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>`,
+    `<w:styles xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">${body}</w:styles>`,
+  ].join("\n");
+}

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

@@ -47,6 +47,28 @@ function buildTablePropertiesXml(table: ParsedTable): string {
   if (table.alignment) {
     children.push(`<w:jc w:val="${table.alignment}"/>`);
   }
+  if (table.indent) {
+    children.push(`<w:tblInd w:w="${table.indent.value}" w:type="${table.indent.type}"/>`);
+  }
+  if (table.layoutMode) {
+    children.push(`<w:tblLayout w:type="${table.layoutMode}"/>`);
+  }
+  if (table.cellSpacing) {
+    children.push(`<w:tblCellSpacing w:w="${table.cellSpacing.value}" w:type="${table.cellSpacing.type}"/>`);
+  }
+  if (table.bidiVisual !== undefined) {
+    children.push(table.bidiVisual ? `<w:bidiVisual/>` : `<w:bidiVisual w:val="0"/>`);
+  }
+  if (table.caption !== undefined) {
+    children.push(`<w:tblCaption w:val="${escapeAttribute(table.caption)}"/>`);
+  }
+  if (table.description !== undefined) {
+    children.push(`<w:tblDescription w:val="${escapeAttribute(table.description)}"/>`);
+  }
+  if (table.floating) {
+    const floatingXml = serializeTableFloating(table.floating);
+    if (floatingXml) children.push(floatingXml);
+  }
   if (table.borders) {
     const bordersXml = serializeTableBorders(table.borders);
     if (bordersXml) children.push(`<w:tblBorders>${bordersXml}</w:tblBorders>`);
@@ -62,8 +84,33 @@ function buildTablePropertiesXml(table: ParsedTable): string {
   return children.length > 0 ? `<w:tblPr>${children.join("")}</w:tblPr>` : "";
 }
 
+function serializeTableFloating(floating: NonNullable<ParsedTable["floating"]>): string {
+  const attrs: string[] = [];
+  if (floating.horizontalAnchor) attrs.push(`w:horzAnchor="${floating.horizontalAnchor}"`);
+  if (floating.verticalAnchor) attrs.push(`w:vertAnchor="${floating.verticalAnchor}"`);
+  if (floating.horizontalAlign) attrs.push(`w:tblpXSpec="${floating.horizontalAlign}"`);
+  if (floating.horizontalOffset !== undefined) attrs.push(`w:tblpX="${floating.horizontalOffset}"`);
+  if (floating.verticalAlign) attrs.push(`w:tblpYSpec="${floating.verticalAlign}"`);
+  if (floating.verticalOffset !== undefined) attrs.push(`w:tblpY="${floating.verticalOffset}"`);
+  if (floating.leftFromText !== undefined) attrs.push(`w:leftFromText="${floating.leftFromText}"`);
+  if (floating.rightFromText !== undefined) attrs.push(`w:rightFromText="${floating.rightFromText}"`);
+  if (floating.topFromText !== undefined) attrs.push(`w:topFromText="${floating.topFromText}"`);
+  if (floating.bottomFromText !== undefined) attrs.push(`w:bottomFromText="${floating.bottomFromText}"`);
+  const tblpPr = attrs.length > 0 ? `<w:tblpPr ${attrs.join(" ")}/>` : "";
+  const overlap = floating.overlap !== undefined
+    ? `<w:tblOverlap w:val="${floating.overlap ? "overlap" : "never"}"/>`
+    : "";
+  return `${tblpPr}${overlap}`;
+}
+
 function buildRowPropertiesXml(row: ParsedTableRow): string {
   const children: string[] = [];
+  if (row.cnfStyle) {
+    children.push(`<w:cnfStyle w:val="${escapeAttribute(row.cnfStyle)}"/>`);
+  }
+  if (row.cantSplit !== undefined) {
+    children.push(row.cantSplit ? `<w:cantSplit/>` : `<w:cantSplit w:val="0"/>`);
+  }
   if (row.height !== undefined) {
     const hRuleAttr = row.heightRule ? ` w:hRule="${row.heightRule}"` : "";
     children.push(`<w:trHeight w:val="${twip(row.height)}"${hRuleAttr}/>`);
@@ -71,6 +118,9 @@ function buildRowPropertiesXml(row: ParsedTableRow): string {
   if (row.isHeader) {
     children.push(`<w:tblHeader/>`);
   }
+  if (row.horizontalAlignment) {
+    children.push(`<w:jc w:val="${row.horizontalAlignment}"/>`);
+  }
   return children.length > 0 ? `<w:trPr>${children.join("")}</w:trPr>` : "";
 }
 
@@ -80,6 +130,9 @@ function ensureCellProperties(cell: ParsedTableCell): string {
   }
 
   const children: string[] = [];
+  if (cell.cnfStyle) {
+    children.push(`<w:cnfStyle w:val="${escapeAttribute(cell.cnfStyle)}"/>`);
+  }
   if (cell.width) {
     children.push(serializeWidth("tcW", cell.width));
   }
@@ -100,6 +153,19 @@ function ensureCellProperties(cell: ParsedTableCell): string {
   if (cell.shading) {
     children.push(serializeCellShading(cell.shading));
   }
+  if (cell.margins) {
+    const marginsXml = serializeTableCellMargins(cell.margins);
+    if (marginsXml) children.push(`<w:tcMar>${marginsXml}</w:tcMar>`);
+  }
+  if (cell.noWrap !== undefined) {
+    children.push(cell.noWrap ? `<w:noWrap/>` : `<w:noWrap w:val="0"/>`);
+  }
+  if (cell.fitText !== undefined) {
+    children.push(cell.fitText ? `<w:tcFitText/>` : `<w:tcFitText w:val="0"/>`);
+  }
+  if (cell.textDirection) {
+    children.push(`<w:textDirection w:val="${cell.textDirection}"/>`);
+  }
   if (cell.verticalAlign) {
     children.push(`<w:vAlign w:val="${cell.verticalAlign}"/>`);
   }
@@ -174,3 +240,11 @@ function serializeTableCellMargins(margins: ParsedCellMargins): string {
   if (margins.right !== undefined) parts.push(`<w:right w:w="${twip(margins.right)}" w:type="dxa"/>`);
   return parts.join("");
 }
+
+function escapeAttribute(value: string): string {
+  return value
+    .replace(/&/gu, "&amp;")
+    .replace(/"/gu, "&quot;")
+    .replace(/</gu, "&lt;")
+    .replace(/>/gu, "&gt;");
+}

package/src/io/export/table-properties-xml.ts

@@ -44,6 +44,25 @@ interface CellShadingLike {
   fill?: string;
 }
 
+interface TableIndentLike {
+  value: number;
+  type: string;
+}
+
+interface TableFloatingPropertiesLike {
+  horizontalAnchor?: string;
+  verticalAnchor?: string;
+  horizontalAlign?: string;
+  horizontalOffset?: number;
+  verticalAlign?: string;
+  verticalOffset?: number;
+  leftFromText?: number;
+  rightFromText?: number;
+  topFromText?: number;
+  bottomFromText?: number;
+  overlap?: boolean;
+}
+
 interface TablePropertiesLike {
   propertiesXml?: string;
   styleId?: string;
@@ -52,6 +71,13 @@ interface TablePropertiesLike {
   borders?: TableBordersLike;
   cellMargins?: TableCellMarginsLike;
   tblLook?: TableLookLike;
+  indent?: TableIndentLike;
+  layoutMode?: string;
+  cellSpacing?: TableWidthLike;
+  caption?: string;
+  description?: string;
+  bidiVisual?: boolean;
+  floating?: TableFloatingPropertiesLike;
 }
 
 interface TableRowPropertiesLike {
@@ -63,6 +89,9 @@ interface TableRowPropertiesLike {
   height?: number;
   heightRule?: string;
   isHeader?: boolean;
+  cantSplit?: boolean;
+  horizontalAlignment?: string;
+  cnfStyle?: string;
 }
 
 interface TableCellPropertiesLike {
@@ -73,6 +102,11 @@ interface TableCellPropertiesLike {
   borders?: TableBordersLike;
   shading?: CellShadingLike;
   verticalAlign?: string;
+  textDirection?: string;
+  noWrap?: boolean;
+  fitText?: boolean;
+  margins?: TableCellMarginsLike;
+  cnfStyle?: string;
 }
 
 interface PropertyStripSpec {
@@ -82,16 +116,49 @@ interface PropertyStripSpec {
 
 const TABLE_PROPERTY_STRIP_SPEC: PropertyStripSpec = {
   pairedTags: ["w:tblBorders", "w:tblCellMar"],
-  selfClosingTags: ["w:tblStyle", "w:tblW", "w:jc", "w:tblLook"],
+  selfClosingTags: [
+    "w:tblStyle",
+    "w:tblW",
+    "w:jc",
+    "w:tblLook",
+    "w:tblInd",
+    "w:tblLayout",
+    "w:tblCellSpacing",
+    "w:tblCaption",
+    "w:tblDescription",
+    "w:bidiVisual",
+    "w:tblpPr",
+    "w:tblOverlap",
+  ],
 };
 
 const ROW_PROPERTY_STRIP_SPEC: PropertyStripSpec = {
-  selfClosingTags: ["w:gridBefore", "w:wBefore", "w:gridAfter", "w:wAfter", "w:trHeight", "w:tblHeader"],
+  selfClosingTags: [
+    "w:gridBefore",
+    "w:wBefore",
+    "w:gridAfter",
+    "w:wAfter",
+    "w:trHeight",
+    "w:tblHeader",
+    "w:cantSplit",
+    "w:jc",
+    "w:cnfStyle",
+  ],
 };
 
 const CELL_PROPERTY_STRIP_SPEC: PropertyStripSpec = {
-  pairedTags: ["w:tcBorders"],
-  selfClosingTags: ["w:tcW", "w:gridSpan", "w:vMerge", "w:shd", "w:vAlign"],
+  pairedTags: ["w:tcBorders", "w:tcMar"],
+  selfClosingTags: [
+    "w:tcW",
+    "w:gridSpan",
+    "w:vMerge",
+    "w:shd",
+    "w:vAlign",
+    "w:textDirection",
+    "w:noWrap",
+    "w:tcFitText",
+    "w:cnfStyle",
+  ],
 };
 
 export function serializeTablePropertiesXml(table: TablePropertiesLike): string {
@@ -174,6 +241,28 @@ function buildTablePropertiesInnerXml(table: TablePropertiesLike): string {
   if (table.alignment) {
     children.push(`<w:jc w:val="${escapeAttribute(table.alignment)}"/>`);
   }
+  if (table.indent) {
+    children.push(`<w:tblInd w:w="${table.indent.value}" w:type="${escapeAttribute(table.indent.type)}"/>`);
+  }
+  if (table.layoutMode) {
+    children.push(`<w:tblLayout w:type="${escapeAttribute(table.layoutMode)}"/>`);
+  }
+  if (table.cellSpacing) {
+    children.push(`<w:tblCellSpacing w:w="${table.cellSpacing.value}" w:type="${escapeAttribute(table.cellSpacing.type)}"/>`);
+  }
+  if (table.bidiVisual !== undefined) {
+    children.push(table.bidiVisual ? `<w:bidiVisual/>` : `<w:bidiVisual w:val="0"/>`);
+  }
+  if (table.caption !== undefined) {
+    children.push(`<w:tblCaption w:val="${escapeAttribute(table.caption)}"/>`);
+  }
+  if (table.description !== undefined) {
+    children.push(`<w:tblDescription w:val="${escapeAttribute(table.description)}"/>`);
+  }
+  if (table.floating) {
+    const floatingXml = serializeTableFloating(table.floating);
+    if (floatingXml) children.push(floatingXml);
+  }
   if (table.borders) {
     const bordersXml = serializeBorders(table.borders);
     if (bordersXml) {
@@ -195,8 +284,30 @@ function buildTablePropertiesInnerXml(table: TablePropertiesLike): string {
   return children.join("");
 }
 
+function serializeTableFloating(floating: TableFloatingPropertiesLike): string {
+  const attrs: string[] = [];
+  if (floating.horizontalAnchor) attrs.push(`w:horzAnchor="${escapeAttribute(floating.horizontalAnchor)}"`);
+  if (floating.verticalAnchor) attrs.push(`w:vertAnchor="${escapeAttribute(floating.verticalAnchor)}"`);
+  if (floating.horizontalAlign) attrs.push(`w:tblpXSpec="${escapeAttribute(floating.horizontalAlign)}"`);
+  if (floating.horizontalOffset !== undefined) attrs.push(`w:tblpX="${floating.horizontalOffset}"`);
+  if (floating.verticalAlign) attrs.push(`w:tblpYSpec="${escapeAttribute(floating.verticalAlign)}"`);
+  if (floating.verticalOffset !== undefined) attrs.push(`w:tblpY="${floating.verticalOffset}"`);
+  if (floating.leftFromText !== undefined) attrs.push(`w:leftFromText="${floating.leftFromText}"`);
+  if (floating.rightFromText !== undefined) attrs.push(`w:rightFromText="${floating.rightFromText}"`);
+  if (floating.topFromText !== undefined) attrs.push(`w:topFromText="${floating.topFromText}"`);
+  if (floating.bottomFromText !== undefined) attrs.push(`w:bottomFromText="${floating.bottomFromText}"`);
+  const tblpPr = attrs.length > 0 ? `<w:tblpPr ${attrs.join(" ")}/>` : "";
+  const overlap = floating.overlap !== undefined
+    ? `<w:tblOverlap w:val="${floating.overlap ? "overlap" : "never"}"/>`
+    : "";
+  return `${tblpPr}${overlap}`;
+}
+
 function buildTableRowPropertiesInnerXml(row: TableRowPropertiesLike): string {
   const children: string[] = [];
+  if (row.cnfStyle) {
+    children.push(`<w:cnfStyle w:val="${escapeAttribute(row.cnfStyle)}"/>`);
+  }
   if (row.gridBefore !== undefined) {
     children.push(`<w:gridBefore w:val="${twip(row.gridBefore)}"/>`);
   }
@@ -213,6 +324,9 @@ function buildTableRowPropertiesInnerXml(row: TableRowPropertiesLike): string {
       `<w:wAfter w:w="${twip(row.widthAfter.value)}" w:type="${row.widthAfter.type}"/>`,
     );
   }
+  if (row.cantSplit !== undefined) {
+    children.push(row.cantSplit ? `<w:cantSplit/>` : `<w:cantSplit w:val="0"/>`);
+  }
   if (row.height !== undefined) {
     const hRuleAttr = row.heightRule ? ` w:hRule="${escapeAttribute(row.heightRule)}"` : "";
     children.push(`<w:trHeight w:val="${twip(row.height)}"${hRuleAttr}/>`);
@@ -228,11 +342,17 @@ function buildTableRowPropertiesInnerXml(row: TableRowPropertiesLike): string {
   } else if (row.isHeader === false) {
     children.push(`<w:tblHeader w:val="false"/>`);
   }
+  if (row.horizontalAlignment) {
+    children.push(`<w:jc w:val="${escapeAttribute(row.horizontalAlignment)}"/>`);
+  }
   return children.join("");
 }
 
 function buildTableCellPropertiesInnerXml(cell: TableCellPropertiesLike): string {
   const children: string[] = [];
+  if (cell.cnfStyle) {
+    children.push(`<w:cnfStyle w:val="${escapeAttribute(cell.cnfStyle)}"/>`);
+  }
   if (cell.width) {
     children.push(serializeWidth("tcW", cell.width));
   }
@@ -258,6 +378,21 @@ function buildTableCellPropertiesInnerXml(cell: TableCellPropertiesLike): string
       children.push(shadingXml);
     }
   }
+  if (cell.margins) {
+    const marginsXml = serializeTableCellMargins(cell.margins);
+    if (marginsXml) {
+      children.push(`<w:tcMar>${marginsXml}</w:tcMar>`);
+    }
+  }
+  if (cell.noWrap !== undefined) {
+    children.push(cell.noWrap ? `<w:noWrap/>` : `<w:noWrap w:val="0"/>`);
+  }
+  if (cell.fitText !== undefined) {
+    children.push(cell.fitText ? `<w:tcFitText/>` : `<w:tcFitText w:val="0"/>`);
+  }
+  if (cell.textDirection) {
+    children.push(`<w:textDirection w:val="${escapeAttribute(cell.textDirection)}"/>`);
+  }
   if (cell.verticalAlign) {
     children.push(`<w:vAlign w:val="${escapeAttribute(cell.verticalAlign)}"/>`);
   }

package/src/io/normalize/normalize-text.ts

@@ -209,6 +209,13 @@ function normalizeTable(
     ...(table.borders ? { borders: table.borders } : {}),
     ...(table.cellMargins ? { cellMargins: table.cellMargins } : {}),
     ...(table.tblLook ? { tblLook: table.tblLook } : {}),
+    ...(table.indent ? { indent: table.indent } : {}),
+    ...(table.layoutMode ? { layoutMode: table.layoutMode } : {}),
+    ...(table.cellSpacing ? { cellSpacing: table.cellSpacing } : {}),
+    ...(table.caption !== undefined ? { caption: table.caption } : {}),
+    ...(table.description !== undefined ? { description: table.description } : {}),
+    ...(table.bidiVisual !== undefined ? { bidiVisual: table.bidiVisual } : {}),
+    ...(table.floating ? { floating: table.floating } : {}),
   };
 }
 
@@ -228,6 +235,9 @@ function normalizeTableRow(
     ...(row.height !== undefined ? { height: row.height } : {}),
     ...(row.heightRule ? { heightRule: row.heightRule } : {}),
     ...(row.isHeader !== undefined ? { isHeader: row.isHeader } : {}),
+    ...(row.cantSplit !== undefined ? { cantSplit: row.cantSplit } : {}),
+    ...(row.horizontalAlignment ? { horizontalAlignment: row.horizontalAlignment } : {}),
+    ...(row.cnfStyle ? { cnfStyle: row.cnfStyle } : {}),
     cells,
   };
 }
@@ -254,6 +264,11 @@ function normalizeTableCell(
     ...(cell.borders ? { borders: cell.borders } : {}),
     ...(cell.shading ? { shading: cell.shading } : {}),
     ...(cell.verticalAlign ? { verticalAlign: cell.verticalAlign } : {}),
+    ...(cell.textDirection ? { textDirection: cell.textDirection } : {}),
+    ...(cell.noWrap !== undefined ? { noWrap: cell.noWrap } : {}),
+    ...(cell.fitText !== undefined ? { fitText: cell.fitText } : {}),
+    ...(cell.margins ? { margins: cell.margins } : {}),
+    ...(cell.cnfStyle ? { cnfStyle: cell.cnfStyle } : {}),
     children,
   };
 }

package/src/io/ooxml/parse-fields.ts

@@ -215,7 +215,14 @@ import type {
 const FIELD_FAMILY_PATTERN =
   /^\s*(REF|PAGEREF|NOTEREF|TOC|PAGE|NUMPAGES|DATE|TIME|AUTHOR|FILENAME|MERGEFIELD|IF|SEQ|INDEX|TC|STYLEREF)\b/i;
 
-const SUPPORTED_FAMILIES = new Set<string>(["REF", "PAGEREF", "NOTEREF", "TOC"]);
+const SUPPORTED_FAMILIES = new Set<string>([
+  "REF",
+  "PAGEREF",
+  "NOTEREF",
+  "TOC",
+  "PAGE",
+  "NUMPAGES",
+]);
 
 /**
  * Classify a field instruction into its field family.
@@ -257,8 +264,8 @@ export function isSupportedFieldFamily(family: FieldFamily): family is Supported
  * Build a field registry from a canonical document, cataloging every field
  * instance with its classification, dependency metadata, and refresh status.
  *
- * The registry partitions fields into `supported` (REF, PAGEREF, NOTEREF, TOC)
- * and `preserveOnly` (all others) slices.
+ * The registry partitions fields into `supported` (REF, PAGEREF, NOTEREF,
+ * TOC, PAGE, NUMPAGES) and `preserveOnly` (all others) slices.
  */
 export function buildFieldRegistry(
   document: Pick<CanonicalDocument, "content" | "styles"> & {