@beyondwork/docx-react-component 1.0.102 → 1.0.104

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

@@ -2,7 +2,12 @@ import type { OpcRelationship } from "./part-manifest.ts";
 import { normalizePartPath, resolveRelationshipTarget } from "./part-manifest.ts";
 import type { InlineMediaPart } from "./parse-inline-media.ts";
 import type { ChartPartLookup } from "./parse-complex-content.ts";
-import type { DrawingFrameNode, AnchorGeometry } from "../../model/canonical-document.ts";
+import type {
+  AnchorGeometry,
+  DrawingFrameNode,
+  Mutable,
+  PreserveOnlyObjectSizing,
+} from "../../model/canonical-document.ts";
 import { parseAnchorGeometry } from "./parse-anchor.ts";
 import { parsePicture } from "./parse-picture.ts";
 import { parseShapeContent, type TxbxBlockParser } from "./parse-shapes.ts";
@@ -144,6 +149,13 @@ function resolveFromBranch(
   if (uri === WPS_SHAPE_GRAPHIC_URI && isWordArtGraphicData(graphicData)) return null;
 
   const content = resolveContent(uri, graphicData, outerRawXml, opts);
+  attachPreserveOnlyObjectSizing(content, {
+    anchor: geometry,
+    container,
+    fallbackHint: fallbackHintForContent(content, geometry),
+    rawXml: outerRawXml,
+    sourcePartPath: opts.sourcePartPath,
+  });
   return { type: "drawing_frame", anchor: geometry, content };
 }
 
@@ -190,14 +202,14 @@ function resolveContent(
             resolveRelationshipTarget(opts.sourcePartPath ?? "/word/document.xml", rel),
           );
           const mediaPart = opts.mediaParts?.get(partPath);
-          pic.packagePartName = partPath;
-          pic.mediaId = `media:${partPath.slice(1)}`;
+          (pic as Mutable<typeof pic>).packagePartName = partPath;
+          (pic as Mutable<typeof pic>).mediaId = `media:${partPath.slice(1)}`;
           if (mediaPart?.contentType) {
-            pic.contentType = mediaPart.contentType;
+            (pic as Mutable<typeof pic>).contentType = mediaPart.contentType;
           }
         }
         // F4.1 — preserve outer drawing XML for lossless round-trip serialization
-        pic.rawXml = rawXml;
+        (pic as Mutable<typeof pic>).rawXml = rawXml;
         return pic;
       }
     }
@@ -231,6 +243,92 @@ function resolveContent(
   return { type: "opaque", rawXml };
 }
 
+function attachPreserveOnlyObjectSizing(
+  content: DrawingFrameNode["content"],
+  context: {
+    anchor: AnchorGeometry;
+    container: XmlElementNode;
+    fallbackHint: PreserveOnlyObjectSizing["fallbackHint"] | null;
+    rawXml: string;
+    sourcePartPath: string | undefined;
+  },
+): void {
+  if (content.type === "picture" || context.fallbackHint === null) {
+    return;
+  }
+
+  (content as Mutable<typeof content>).preserveOnlyObject = {
+    sourceId: createPreserveOnlyObjectSourceId(
+      context.sourcePartPath,
+      context.anchor,
+      context.rawXml,
+    ),
+    display: context.anchor.display,
+    extentEmu: {
+      widthEmu: context.anchor.extent.widthEmu,
+      heightEmu: context.anchor.extent.heightEmu,
+    },
+    fallbackHint: context.fallbackHint,
+    relationshipIds: collectRelationshipIds(context.container),
+  };
+}
+
+function fallbackHintForContent(
+  content: DrawingFrameNode["content"],
+  anchor: AnchorGeometry,
+): PreserveOnlyObjectSizing["fallbackHint"] | null {
+  switch (content.type) {
+    case "picture":
+      return null;
+    case "chart_preview":
+      return "chart";
+    case "smartart_preview":
+      return "smartart";
+    case "shape":
+      return "shape";
+    case "opaque":
+      return anchor.display === "floating" ? "drawing-floating" : "drawing-inline";
+  }
+}
+
+function createPreserveOnlyObjectSourceId(
+  sourcePartPath: string | undefined,
+  anchor: AnchorGeometry,
+  rawXml: string,
+): string {
+  const part = sourcePartPath ?? "/word/document.xml";
+  const docPrId = anchor.docPr?.id;
+  if (docPrId) return `part:${part}#drawing-docPr:${docPrId}`;
+  return `part:${part}#drawing:${hashString(rawXml)}`;
+}
+
+function collectRelationshipIds(node: XmlElementNode): string[] {
+  const ids = new Set<string>();
+  const visit = (current: XmlElementNode): void => {
+    const id =
+      current.attributes["r:id"] ??
+      current.attributes["r:embed"] ??
+      current.attributes.embed ??
+      current.attributes["r:link"] ??
+      current.attributes.link;
+    if (id) ids.add(id);
+    for (const child of current.children) {
+      if (child.type === "element") visit(child);
+    }
+  };
+  visit(node);
+  return [...ids].sort();
+}
+
+function hashString(value: string): string {
+  let hash = 2166136261;
+  for (let index = 0; index < value.length; index += 1) {
+    hash ^= value.charCodeAt(index);
+    hash = Math.imul(hash, 16777619);
+  }
+  return (hash >>> 0).toString(16).padStart(8, "0");
+}
+
 function extractChartRelId(graphicData: XmlElementNode | undefined): string | null {
   if (!graphicData) return null;
   const chart = findFirstDescendant(graphicData, "chart");

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

@@ -328,7 +328,13 @@ import type {
   TocInstructionModel,
   TocRegion,
   TocStructure,
+  Mutable,
 } from "../../model/canonical-document.ts";
+import {
+  MAIN_STORY_KEY,
+  createHeaderFooterStoryKey,
+  createNoteStoryKey,
+} from "../../model/canonical-layout-inputs.ts";
 import { parseFieldSwitches } from "./parse-field-switches.ts";
 
 const FIELD_FAMILY_PATTERN =
@@ -379,14 +385,14 @@ export function classifyFieldInstruction(instruction: string): {
   let switches: FieldNode["switches"] | undefined;
   if (family === "REF" || family === "PAGEREF" || family === "NOTEREF" || family === "TOC") {
     const raw = parseFieldSwitches(trimmed);
-    const sw: FieldNode["switches"] = {};
-    if (raw.hyperlink) sw.hyperlink = true;
-    if (raw.relativePosition) sw.relativePosition = true;
-    if (raw.numericRef) sw.numericRef = true;
-    if (raw.recursive) sw.recursive = true;
-    if (raw.suppressNonDelimiter) sw.suppressNonDelimiter = true;
-    if (raw.includeNumbering) sw.includeNumbering = true;
-    if (raw.includeLevel) sw.includeLevel = true;
+    const sw: Mutable<NonNullable<FieldNode["switches"]>> = {};
+    if (raw.hyperlink) (sw as Mutable<typeof sw>).hyperlink = true;
+    if (raw.relativePosition) (sw as Mutable<typeof sw>).relativePosition = true;
+    if (raw.numericRef) (sw as Mutable<typeof sw>).numericRef = true;
+    if (raw.recursive) (sw as Mutable<typeof sw>).recursive = true;
+    if (raw.suppressNonDelimiter) (sw as Mutable<typeof sw>).suppressNonDelimiter = true;
+    if (raw.includeNumbering) (sw as Mutable<typeof sw>).includeNumbering = true;
+    if (raw.includeLevel) (sw as Mutable<typeof sw>).includeLevel = true;
     if (Object.keys(sw).length > 0) {
       switches = sw;
     }
@@ -430,7 +436,7 @@ export function buildFieldRegistry(
         ? { family: node.fieldFamily, supported: isSupportedFieldFamily(node.fieldFamily), target: node.fieldTarget, switches: node.switches }
         : classifyFieldInstruction(node.instruction);
       const displayText = flattenFieldText(node.children);
-      const entry: FieldRegistryEntry = {
+      const entry: Mutable<FieldRegistryEntry> = {
         fieldIndex,
         fieldFamily: classification.family,
         supported: classification.supported,
@@ -438,6 +444,7 @@ export function buildFieldRegistry(
         ...(classification.target ? { fieldTarget: classification.target } : {}),
         displayText,
         paragraphIndex,
+        storyKey: MAIN_STORY_KEY,
         refreshStatus: node.refreshStatus ?? (classification.supported ? "stale" : "preserve-only"),
         ...(classification.switches ? { switches: classification.switches } : {}),
       };
@@ -453,14 +460,14 @@ export function buildFieldRegistry(
     }
   });
   if (document.subParts) {
-    walkSubPartFields(document.subParts, (node, pIdx) => {
+    walkSubPartFields(document.subParts, (node, pIdx, storyKey) => {
       paragraphIndex = pIdx;
       if (node.type === "field") {
         const classification = node.fieldFamily
           ? { family: node.fieldFamily, supported: isSupportedFieldFamily(node.fieldFamily), target: node.fieldTarget, switches: node.switches }
           : classifyFieldInstruction(node.instruction);
         const displayText = flattenFieldText(node.children);
-        const entry: FieldRegistryEntry = {
+        const entry: Mutable<FieldRegistryEntry> = {
           fieldIndex,
           fieldFamily: classification.family,
           supported: classification.supported,
@@ -468,6 +475,7 @@ export function buildFieldRegistry(
           ...(classification.target ? { fieldTarget: classification.target } : {}),
           displayText,
           paragraphIndex,
+          storyKey,
           refreshStatus: node.refreshStatus ?? (classification.supported ? "stale" : "preserve-only"),
           ...(classification.switches ? { switches: classification.switches } : {}),
         };
@@ -512,7 +520,7 @@ export function parseTocLevelRange(instruction: string): { from: number; to: num
 }
 
 export function parseTocInstruction(instruction: string): TocInstructionModel {
-  const model: TocInstructionModel = {
+  const model: Mutable<TocInstructionModel> = {
     raw: instruction,
     outlineRange: { from: 1, to: 9 },
   };
@@ -867,7 +875,7 @@ function tocLevelFromStyle(styleId: string | undefined): number {
 }
 
 function extractCachedTocEntry(
-  paragraph: ParagraphNode,
+  paragraph: Mutable<ParagraphNode>,
   paragraphIndexByNode: WeakMap<ParagraphNode, number>,
 ): TocCachedEntry | undefined {
   if (!isTocParagraphStyle(paragraph.styleId)) {
@@ -1004,7 +1012,7 @@ export function resolveRefFieldText(
  * applies these to the live document.
  */
 export function refreshFieldRegistry(
-  registry: FieldRegistry,
+  registry: Mutable<FieldRegistry>,
   bookmarkNameMap: Map<string, { bookmarkId: string; paragraphIndex: number }>,
 ): FieldRegistry {
   const refreshed: FieldRegistryEntry[] = registry.supported.map((entry) => {
@@ -1060,28 +1068,42 @@ function walkFieldDocument(
 }
 
 function walkSubPartFields(
-  subParts: SubPartsCatalog,
-  visit: (node: DocumentNode, paragraphIndex: number) => void,
+  subParts: Mutable<SubPartsCatalog>,
+  visit: (node: DocumentNode, paragraphIndex: number, storyKey: string) => void,
 ): void {
   for (const header of subParts.headers) {
+    const storyKey = createHeaderFooterStoryKey({
+      kind: "header",
+      relationshipId: header.relationshipId,
+      variant: header.variant,
+      ...(header.sectionIndex !== undefined ? { sectionIndex: header.sectionIndex } : {}),
+    });
     for (const block of header.blocks) {
-      walkFieldDocument(block, visit);
+      walkFieldDocument(block, (node, paragraphIndex) => visit(node, paragraphIndex, storyKey));
     }
   }
   for (const footer of subParts.footers) {
+    const storyKey = createHeaderFooterStoryKey({
+      kind: "footer",
+      relationshipId: footer.relationshipId,
+      variant: footer.variant,
+      ...(footer.sectionIndex !== undefined ? { sectionIndex: footer.sectionIndex } : {}),
+    });
     for (const block of footer.blocks) {
-      walkFieldDocument(block, visit);
+      walkFieldDocument(block, (node, paragraphIndex) => visit(node, paragraphIndex, storyKey));
     }
   }
   if (subParts.footnoteCollection) {
     for (const note of Object.values(subParts.footnoteCollection.footnotes)) {
+      const storyKey = createNoteStoryKey("footnote", note.noteId);
       for (const block of note.blocks) {
-        walkFieldDocument(block, visit);
+        walkFieldDocument(block, (node, paragraphIndex) => visit(node, paragraphIndex, storyKey));
       }
     }
     for (const note of Object.values(subParts.footnoteCollection.endnotes)) {
+      const storyKey = createNoteStoryKey("endnote", note.noteId);
       for (const block of note.blocks) {
-        walkFieldDocument(block, visit);
+        walkFieldDocument(block, (node, paragraphIndex) => visit(node, paragraphIndex, storyKey));
       }
     }
   }
@@ -1112,7 +1134,7 @@ function flattenParagraphInlineText(children: InlineNode[]): string {
 }
 
 function flattenBookmarkContent(
-  paragraph: ParagraphNode,
+  paragraph: Mutable<ParagraphNode>,
   bookmarkId: string,
 ): string {
   let inside = false;

package/src/io/ooxml/parse-font-table.ts

@@ -13,6 +13,7 @@
 import type {
   CanonicalFontEntry,
   CanonicalFontTable,
+  Mutable,
 } from "../../model/canonical-document.ts";
 import type { XmlElementNode } from "./xml-element.ts";
 import { parseXml } from "./xml-parser.ts";
@@ -32,7 +33,7 @@ export function parseFontTable(xml: string): CanonicalFontTable {
     const name = child.attributes["w:name"] ?? child.attributes["name"];
     if (!name) continue;
 
-    const entry: CanonicalFontEntry = { name };
+    const entry: Mutable<CanonicalFontEntry> = { name };
 
     for (const sub of child.children) {
       if (sub.type !== "element") continue;

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

@@ -11,6 +11,7 @@ import type {
   TableNode,
   TableRowNode,
   TextMark,
+  Mutable,
 } from "../../model/canonical-document.ts";
 import { classifyFieldInstruction } from "./parse-fields.ts";
 import { isSafeTableFieldInstruction } from "./table-opaque-preservation.ts";
@@ -644,7 +645,7 @@ function parseRunProperties(rElement: XmlElementNode): TextMark[] {
 function readParagraphSpacing(pPr: XmlElementNode): ParagraphSpacing | undefined {
   const spacingNode = findChildElementOptional(pPr, "spacing");
   if (!spacingNode) return undefined;
-  const result: ParagraphSpacing = {};
+  const result: Mutable<ParagraphSpacing> = {};
   const before = readStringAttr(spacingNode, "w:before");
   if (before) result.before = Number.parseInt(before, 10);
   const after = readStringAttr(spacingNode, "w:after");
@@ -661,7 +662,7 @@ function readParagraphSpacing(pPr: XmlElementNode): ParagraphSpacing | undefined
 function readParagraphIndentation(pPr: XmlElementNode): ParagraphIndentation | undefined {
   const indNode = findChildElementOptional(pPr, "ind");
   if (!indNode) return undefined;
-  const result: ParagraphIndentation = {};
+  const result: Mutable<ParagraphIndentation> = {};
   const left = readStringAttr(indNode, "w:left");
   if (left) result.left = Number.parseInt(left, 10);
   const right = readStringAttr(indNode, "w:right");

package/src/io/ooxml/parse-headers-footers.ts

@@ -11,6 +11,7 @@ import type {
   TableNode,
   TableRowNode,
   TextMark,
+  Mutable,
 } from "../../model/canonical-document.ts";
 import type { LegacyFormFieldNode } from "../../model/canonical-document.ts";
 import { resolveHighlightColor } from "./highlight-colors.ts";
@@ -500,7 +501,7 @@ function parseRunElement(
       const noteId =
         readStringAttr(child, "w:id") ?? "";
       if (noteId) {
-        const ref: FootnoteRefNode = {
+        const ref: Mutable<FootnoteRefNode> = {
           type: "footnote_ref",
           noteId,
           noteKind: "footnote",
@@ -511,7 +512,7 @@ function parseRunElement(
       const noteId =
         readStringAttr(child, "w:id") ?? "";
       if (noteId) {
-        const ref: FootnoteRefNode = {
+        const ref: Mutable<FootnoteRefNode> = {
           type: "footnote_ref",
           noteId,
           noteKind: "endnote",
@@ -594,7 +595,7 @@ function parseRunChildNode(
     const noteId =
       readStringAttr(child, "w:id") ?? "";
     if (noteId) {
-      const ref: FootnoteRefNode = {
+      const ref: Mutable<FootnoteRefNode> = {
         type: "footnote_ref",
         noteId,
         noteKind: "footnote",
@@ -607,7 +608,7 @@ function parseRunChildNode(
     const noteId =
       readStringAttr(child, "w:id") ?? "";
     if (noteId) {
-      const ref: FootnoteRefNode = {
+      const ref: Mutable<FootnoteRefNode> = {
         type: "footnote_ref",
         noteId,
         noteKind: "endnote",
@@ -970,7 +971,7 @@ function parseRunProperties(rElement: XmlElementNode): TextMark[] {
 function readParagraphSpacing(pPr: XmlElementNode): ParagraphSpacing | undefined {
   const spacingNode = findChildElementOptional(pPr, "spacing");
   if (!spacingNode) return undefined;
-  const result: ParagraphSpacing = {};
+  const result: Mutable<ParagraphSpacing> = {};
   const before = readStringAttr(spacingNode, "w:before");
   if (before) result.before = Number.parseInt(before, 10);
   const after = readStringAttr(spacingNode, "w:after");
@@ -987,7 +988,7 @@ function readParagraphSpacing(pPr: XmlElementNode): ParagraphSpacing | undefined
 function readParagraphIndentation(pPr: XmlElementNode): ParagraphIndentation | undefined {
   const indNode = findChildElementOptional(pPr, "ind");
   if (!indNode) return undefined;
-  const result: ParagraphIndentation = {};
+  const result: Mutable<ParagraphIndentation> = {};
   const left = readStringAttr(indNode, "w:left");
   if (left) result.left = Number.parseInt(left, 10);
   const right = readStringAttr(indNode, "w:right");

package/src/io/ooxml/parse-main-document.ts

@@ -26,6 +26,7 @@ import type {
   SectionPageBorders,
   DrawingFrameNode,
   UnknownPropertyChild,
+  Mutable,
 } from "../../model/canonical-document.ts";
 import type { OpcRelationship } from "./part-manifest.ts";
 import { SCOPE_MARKER_BOOKMARK_PREFIX } from "./parse-scope-markers.ts";
@@ -2288,7 +2289,7 @@ function readParagraphSpacing(node: XmlElementNode): ParagraphSpacing | undefine
   );
   if (!spacingNode) return undefined;
 
-  const spacing: ParagraphSpacing = {};
+  const spacing: Mutable<ParagraphSpacing> = {};
   const before = spacingNode.attributes["w:before"] ?? spacingNode.attributes.before;
   const after = spacingNode.attributes["w:after"] ?? spacingNode.attributes.after;
   const line = spacingNode.attributes["w:line"] ?? spacingNode.attributes.line;
@@ -2332,7 +2333,7 @@ function readParagraphIndentation(node: XmlElementNode): ParagraphIndentation |
   );
   if (!indNode) return undefined;
 
-  const indentation: ParagraphIndentation = {};
+  const indentation: Mutable<ParagraphIndentation> = {};
   const left = indNode.attributes["w:left"] ?? indNode.attributes.left;
   const right = indNode.attributes["w:right"] ?? indNode.attributes.right;
   const firstLine = indNode.attributes["w:firstLine"] ?? indNode.attributes.firstLine;
@@ -2450,7 +2451,7 @@ function readParagraphBorders(node: XmlElementNode): ParagraphBorders | undefine
     return undefined;
   }
 
-  const borders: ParagraphBorders = {};
+  const borders: Mutable<ParagraphBorders> = {};
   for (const [name, key] of [
     ["top", "top"],
     ["left", "left"],
@@ -2481,7 +2482,7 @@ function readParagraphShading(node: XmlElementNode): ParagraphShading | undefine
     return undefined;
   }
 
-  const shading: ParagraphShading = {};
+  const shading: Mutable<ParagraphShading> = {};
   const fill = shadingNode.attributes["w:fill"] ?? shadingNode.attributes.fill;
   const color = shadingNode.attributes["w:color"] ?? shadingNode.attributes.color;
   const val = shadingNode.attributes["w:val"] ?? shadingNode.attributes.val;
@@ -2491,14 +2492,14 @@ function readParagraphShading(node: XmlElementNode): ParagraphShading | undefine
   const themeColor = shadingNode.attributes["w:themeColor"] ?? shadingNode.attributes.themeColor;
   const themeColorTint = shadingNode.attributes["w:themeColorTint"] ?? shadingNode.attributes.themeColorTint;
   const themeColorShade = shadingNode.attributes["w:themeColorShade"] ?? shadingNode.attributes.themeColorShade;
-  if (fill) shading.fill = fill;
-  if (color) shading.color = color;
-  if (val) shading.val = val;
-  if (themeFill) shading.themeFill = themeFill;
-  if (themeFillTint) shading.themeFillTint = themeFillTint;
-  if (themeFillShade) shading.themeFillShade = themeFillShade;
-  if (themeColor) shading.themeColor = themeColor;
-  if (themeColorTint) shading.themeColorTint = themeColorTint;
+  if (fill) (shading as Mutable<typeof shading>).fill = fill;
+  if (color) (shading as Mutable<typeof shading>).color = color;
+  if (val) (shading as Mutable<typeof shading>).val = val;
+  if (themeFill) (shading as Mutable<typeof shading>).themeFill = themeFill;
+  if (themeFillTint) (shading as Mutable<typeof shading>).themeFillTint = themeFillTint;
+  if (themeFillShade) (shading as Mutable<typeof shading>).themeFillShade = themeFillShade;
+  if (themeColor) (shading as Mutable<typeof shading>).themeColor = themeColor;
+  if (themeColorTint) (shading as Mutable<typeof shading>).themeColorTint = themeColorTint;
   if (themeColorShade) shading.themeColorShade = themeColorShade;
   return Object.keys(shading).length > 0 ? shading : undefined;
 }
@@ -2511,7 +2512,7 @@ function readParagraphCnfStyle(node: XmlElementNode): string | undefined {
 }
 
 function readBorder(node: XmlElementNode): ParagraphBorders[keyof ParagraphBorders] {
-  const border: NonNullable<ParagraphBorders[keyof ParagraphBorders]> = {};
+  const border: Mutable<NonNullable<ParagraphBorders[keyof ParagraphBorders]>> = {};
   const value = node.attributes["w:val"] ?? node.attributes.val;
   const size = node.attributes["w:sz"] ?? node.attributes.sz;
   const space = node.attributes["w:space"] ?? node.attributes.space;
@@ -3632,7 +3633,7 @@ function readSectionPropertiesXmlFromPPr(
 export function parseSectionPropertiesFromElement(
   node: XmlElementNode,
 ): SectionProperties {
-  const props: SectionProperties = {};
+  const props: Mutable<SectionProperties> = {};
 
   for (const child of node.children) {
     if (child.type !== "element") continue;
@@ -3643,7 +3644,7 @@ export function parseSectionPropertiesFromElement(
         const w = safeParseInt(child.attributes["w:w"]);
         const h = safeParseInt(child.attributes["w:h"]);
         if (w !== undefined && h !== undefined) {
-          const pageSize: PageSize = { width: w, height: h };
+          const pageSize: Mutable<PageSize> = { width: w, height: h };
           const orient = child.attributes["w:orient"];
           if (orient === "landscape" || orient === "portrait") {
             pageSize.orientation = orient;
@@ -3658,26 +3659,26 @@ export function parseSectionPropertiesFromElement(
         const bottom = safeParseInt(child.attributes["w:bottom"]);
         const left = safeParseInt(child.attributes["w:left"]);
         if (top !== undefined && right !== undefined && bottom !== undefined && left !== undefined) {
-          const margins: PageMargins = { top, right, bottom, left };
+          const margins: Mutable<PageMargins> = { top, right, bottom, left };
           const header = safeParseInt(child.attributes["w:header"]);
           const footer = safeParseInt(child.attributes["w:footer"]);
           const gutter = safeParseInt(child.attributes["w:gutter"]);
-          if (header !== undefined) margins.header = header;
-          if (footer !== undefined) margins.footer = footer;
-          if (gutter !== undefined) margins.gutter = gutter;
+          if (header !== undefined) (margins as Mutable<typeof margins>).header = header;
+          if (footer !== undefined) (margins as Mutable<typeof margins>).footer = footer;
+          if (gutter !== undefined) (margins as Mutable<typeof margins>).gutter = gutter;
           props.pageMargins = margins;
         }
         break;
       }
       case "cols": {
-        const columns: ColumnProperties = {};
+        const columns: Mutable<ColumnProperties> = {};
         const num = safeParseInt(child.attributes["w:num"]);
         const space = safeParseInt(child.attributes["w:space"]);
         const equalWidth = child.attributes["w:equalWidth"];
         const sep = child.attributes["w:sep"];
-        if (num !== undefined) columns.count = num;
-        if (space !== undefined) columns.space = space;
-        if (equalWidth !== undefined) columns.equalWidth = equalWidth !== "0" && equalWidth !== "false";
+        if (num !== undefined) (columns as Mutable<typeof columns>).count = num;
+        if (space !== undefined) (columns as Mutable<typeof columns>).space = space;
+        if (equalWidth !== undefined) (columns as Mutable<typeof columns>).equalWidth = equalWidth !== "0" && equalWidth !== "false";
         if (sep === "1" || sep === "true") columns.separator = true;
         const colDefs: Array<{ width: number; space?: number }> = [];
         for (const colChild of child.children) {
@@ -3689,31 +3690,31 @@ export function parseSectionPropertiesFromElement(
             }
           }
         }
-        if (colDefs.length > 0) columns.columns = colDefs;
+        if (colDefs.length > 0) (columns as Mutable<typeof columns>).columns = colDefs;
         if (Object.keys(columns).length > 0) props.columns = columns;
         break;
       }
       case "pgNumType": {
-        const numbering: PageNumbering = {};
+        const numbering: Mutable<PageNumbering> = {};
         const fmt = child.attributes["w:fmt"];
         const start = safeParseInt(child.attributes["w:start"]);
         const chapStyle = child.attributes["w:chapStyle"];
         const chapSep = child.attributes["w:chapSep"];
-        if (fmt) numbering.format = fmt;
-        if (start !== undefined) numbering.start = start;
-        if (chapStyle) numbering.chapStyle = chapStyle;
-        if (chapSep) numbering.chapSep = chapSep;
+        if (fmt) (numbering as Mutable<typeof numbering>).format = fmt;
+        if (start !== undefined) (numbering as Mutable<typeof numbering>).start = start;
+        if (chapStyle) (numbering as Mutable<typeof numbering>).chapStyle = chapStyle;
+        if (chapSep) (numbering as Mutable<typeof numbering>).chapSep = chapSep;
         if (Object.keys(numbering).length > 0) props.pageNumbering = numbering;
         break;
       }
       case "lnNumType": {
-        const lineNumbering: SectionLineNumbering = {};
+        const lineNumbering: Mutable<SectionLineNumbering> = {};
         const countBy = safeParseInt(child.attributes["w:countBy"]);
         const start = safeParseInt(child.attributes["w:start"]);
         const distance = safeParseInt(child.attributes["w:distance"]);
         const restart = child.attributes["w:restart"];
-        if (countBy !== undefined) lineNumbering.countBy = countBy;
-        if (start !== undefined) lineNumbering.start = start;
+        if (countBy !== undefined) (lineNumbering as Mutable<typeof lineNumbering>).countBy = countBy;
+        if (start !== undefined) (lineNumbering as Mutable<typeof lineNumbering>).start = start;
         if (distance !== undefined) lineNumbering.distance = distance;
         if (
           restart === "newPage" ||
@@ -3728,7 +3729,7 @@ export function parseSectionPropertiesFromElement(
         break;
       }
       case "pgBorders": {
-        const pageBorders: SectionPageBorders = {};
+        const pageBorders: Mutable<SectionPageBorders> = {};
         const offsetFrom = child.attributes["w:offsetFrom"];
         const display = child.attributes["w:display"];
         const zOrder = child.attributes["w:zOrder"];
@@ -3765,7 +3766,7 @@ export function parseSectionPropertiesFromElement(
         break;
       }
       case "docGrid": {
-        const documentGrid: SectionDocumentGrid = {};
+        const documentGrid: Mutable<SectionDocumentGrid> = {};
         const type = child.attributes["w:type"];
         const linePitch = safeParseInt(child.attributes["w:linePitch"]);
         const charSpace = safeParseInt(child.attributes["w:charSpace"]);
@@ -3777,7 +3778,7 @@ export function parseSectionPropertiesFromElement(
         ) {
           documentGrid.type = type;
         }
-        if (linePitch !== undefined) documentGrid.linePitch = linePitch;
+        if (linePitch !== undefined) (documentGrid as Mutable<typeof documentGrid>).linePitch = linePitch;
         if (charSpace !== undefined) documentGrid.charSpace = charSpace;
         if (Object.keys(documentGrid).length > 0) {
           props.documentGrid = documentGrid;
@@ -3856,7 +3857,7 @@ function safeParseInt(value: string | undefined): number | undefined {
 function readFootnoteLikeProperties(
   node: XmlElementNode,
 ): FootnoteProperties | undefined {
-  const result: FootnoteProperties = {};
+  const result: Mutable<FootnoteProperties> = {};
 
   for (const child of node.children) {
     if (child.type !== "element") continue;
@@ -3902,15 +3903,15 @@ function readFootnoteLikeProperties(
 }
 
 function parseBorderSpec(node: XmlElementNode): BorderSpec | undefined {
-  const border: BorderSpec = {};
+  const border: Mutable<BorderSpec> = {};
   const value = node.attributes["w:val"];
   const size = safeParseInt(node.attributes["w:sz"]);
   const space = safeParseInt(node.attributes["w:space"]);
   const color = node.attributes["w:color"];
 
-  if (value) border.value = value;
-  if (size !== undefined) border.size = size;
-  if (space !== undefined) border.space = space;
+  if (value) (border as Mutable<typeof border>).value = value;
+  if (size !== undefined) (border as Mutable<typeof border>).size = size;
+  if (space !== undefined) (border as Mutable<typeof border>).space = space;
   if (color) border.color = color;
 
   return Object.keys(border).length > 0 ? border : undefined;

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

@@ -8,6 +8,7 @@ import type {
   ParagraphSpacing,
   ParagraphIndentation,
   TabStop,
+  Mutable,
 } from "../../model/canonical-document.ts";
 import { readRunProperties } from "./parse-run-formatting.ts";
 import type { OpcRelationship } from "./part-manifest.ts";
@@ -519,7 +520,7 @@ function readParagraphIndentation(node: XmlElementNode): ParagraphIndentation |
     return undefined;
   }
 
-  const indentation: ParagraphIndentation = {};
+  const indentation: Mutable<ParagraphIndentation> = {};
   const left = readStringAttr(indNode, "w:start") ?? readStringAttr(indNode, "w:left");
   const right = readStringAttr(indNode, "w:end") ?? readStringAttr(indNode, "w:right");
   const firstLine = readStringAttr(indNode, "w:firstLine");
@@ -560,7 +561,7 @@ function readParagraphSpacing(node: XmlElementNode): ParagraphSpacing | undefine
     return undefined;
   }
 
-  const spacing: ParagraphSpacing = {};
+  const spacing: Mutable<ParagraphSpacing> = {};
   const before = readStringAttr(spacingNode, "w:before");
   const after = readStringAttr(spacingNode, "w:after");
   const line = readStringAttr(spacingNode, "w:line");