@beyondwork/docx-react-component 1.0.10 → 1.0.12

package/src/io/export/export-session.ts

@@ -7,6 +7,7 @@ import {
   comparePartPaths,
   getRelationshipsPartPath,
   normalizePartPath,
+  resolveRelationshipTarget,
 } from "../ooxml/part-manifest.ts";
 import type { OpcPackage } from "../opc/package-reader.ts";
 import { writeOpcPackage } from "../opc/package-writer.ts";
@@ -71,6 +72,43 @@ export class ExportSession {
     return this;
   }
 
+  public ensurePackageRelationship(input: {
+    type: string;
+    target: string;
+    targetMode?: OpcRelationship["targetMode"];
+    preferredId?: string;
+  }): void {
+    const targetMode = input.targetMode ?? "internal";
+    const normalizedTarget =
+      targetMode === "internal" ? normalizePartPath(input.target) : input.target;
+    const existing = this.packageRelationships.find((relationship) => {
+      if (relationship.type !== input.type || relationship.targetMode !== targetMode) {
+        return false;
+      }
+
+      return targetMode === "internal"
+        ? resolveRelationshipTarget(null, relationship) === normalizedTarget
+        : relationship.target === normalizedTarget;
+    });
+    if (existing) {
+      return;
+    }
+
+    const relationshipId = createUniqueRelationshipId(
+      new Set(this.packageRelationships.map((relationship) => relationship.id)),
+      input.preferredId ?? "rIdPackage1",
+    );
+    this.packageRelationships.push({
+      id: relationshipId,
+      type: input.type,
+      target:
+        targetMode === "internal"
+          ? toPackageRelationshipTarget(normalizedTarget)
+          : normalizedTarget,
+      targetMode,
+    });
+  }
+
   public toPackage(): OpcPackage {
     reattachPreservedParts(
       this.sourcePackage,
@@ -162,4 +200,21 @@ function cloneRelationship(relationship: OpcRelationship): OpcRelationship {
   return { ...relationship };
 }
 
+function createUniqueRelationshipId(existingIds: ReadonlySet<string>, preferredId: string): string {
+  if (!existingIds.has(preferredId)) {
+    return preferredId;
+  }
+
+  let nextIndex = 2;
+  while (existingIds.has(`${preferredId}-${nextIndex}`)) {
+    nextIndex += 1;
+  }
+
+  return `${preferredId}-${nextIndex}`;
+}
+
+function toPackageRelationshipTarget(partPath: string): string {
+  return normalizePartPath(partPath).slice(1);
+}
+
 export { buildManifest };

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

@@ -71,8 +71,7 @@ function serializeNoteDefinition(
       if (block.type === "paragraph") {
         return serializeParagraph(block);
       }
-      // opaque_block: emit empty paragraph
-      return `<w:p/>`;
+      throw new Error(`Cannot safely serialize ${block.type} content in note sub-parts.`);
     })
     .join("");
 
@@ -135,24 +134,10 @@ function serializeInlineNode(node: InlineNode): string {
       return `<w:r><w:rPr><w:rStyle w:val="${styleVal}"/></w:rPr>${refElement}</w:r>`;
     }
     case "opaque_inline":
-      return "";
-    case "hyperlink": {
-      return node.children
-        .map((child) => {
-          if (child.type === "text") {
-            const preserve = requiresPreservedSpace(child.text)
-              ? ` xml:space="preserve"`
-              : "";
-            return `<w:r><w:t${preserve}>${escapeXml(child.text)}</w:t></w:r>`;
-          }
-          if (child.type === "tab") return "<w:r><w:tab/></w:r>";
-          if (child.type === "hard_break") return "<w:r><w:br/></w:r>";
-          return "";
-        })
-        .join("");
-    }
+      throw new Error(`Cannot safely serialize ${node.type} content in note sub-parts.`);
+    case "hyperlink":
     default:
-      return "";
+      throw new Error(`Cannot safely serialize ${node.type} content in note sub-parts.`);
   }
 }
 
@@ -180,7 +165,7 @@ function buildRunPropertiesXml(marks: TextMark[] | undefined): string {
         parts.push("<w:dstrike/>");
         break;
       default:
-        break;
+        throw new Error(`Cannot safely serialize ${mark.type} marks in note sub-parts.`);
     }
   }
 

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

@@ -51,8 +51,7 @@ function serializeBlocks(
       if (block.type === "paragraph") {
         return serializeParagraph(block);
       }
-      // opaque_block: emit empty paragraph to preserve structure
-      return `<w:p/>`;
+      throw new Error(`Cannot safely serialize ${block.type} content in header/footer sub-parts.`);
     })
     .join("");
 }
@@ -108,32 +107,8 @@ function serializeInlineNode(node: InlineNode): string {
       return `<w:r><w:rPr><w:rStyle w:val="${node.noteKind === "footnote" ? "FootnoteReference" : "EndnoteReference"}"/></w:rPr>${refElement}</w:r>`;
     }
     case "opaque_inline":
-      // Cannot reproduce opaque inline content without original XML; emit empty
-      return "";
-    case "hyperlink": {
-      const childrenXml = node.children
-        .map((child) => {
-          switch (child.type) {
-            case "text": {
-              const properties = buildRunPropertiesXml(undefined);
-              const preserve = requiresPreservedSpace(child.text)
-                ? ` xml:space="preserve"`
-                : "";
-              return `<w:r>${properties}<w:t${preserve}>${escapeXml(child.text)}</w:t></w:r>`;
-            }
-            case "tab":
-              return "<w:r><w:tab/></w:r>";
-            case "hard_break":
-              return "<w:r><w:br/></w:r>";
-            default:
-              return "";
-          }
-        })
-        .join("");
-      // Hyperlinks in headers/footers typically use bookmark anchors or external URLs.
-      // Emit as a plain run since we don't retain the relationship ID here.
-      return childrenXml;
-    }
+      throw new Error(`Cannot safely serialize ${node.type} content in header/footer sub-parts.`);
+    case "hyperlink":
     case "image":
     case "field":
     case "bookmark_start":
@@ -146,7 +121,7 @@ function serializeInlineNode(node: InlineNode): string {
     case "wordart":
     case "vml_shape":
     default:
-      return "";
+      throw new Error(`Cannot safely serialize ${node.type} content in header/footer sub-parts.`);
   }
 }
 
@@ -174,8 +149,7 @@ function buildRunPropertiesXml(marks: TextMark[] | undefined): string {
         parts.push("<w:dstrike/>");
         break;
       default:
-        // Other mark types not parsed from headers/footers
-        break;
+        throw new Error(`Cannot safely serialize ${mark.type} marks in header/footer sub-parts.`);
     }
   }
 

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

@@ -375,9 +375,25 @@ function serializeTableInlineNode(
       return `${hyperlinkOpen}${childrenXml}</w:hyperlink>`;
     }
     case "field":
+      return `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}"/>`;
     case "bookmark_start":
+      return (
+        `<w:bookmarkStart w:id="${escapeAttribute(node.bookmarkId)}"` +
+        ` w:name="${escapeAttribute(node.name)}"/>`
+      );
     case "bookmark_end":
-    case "footnote_ref":
+      return `<w:bookmarkEnd w:id="${escapeAttribute(node.bookmarkId)}"/>`;
+    case "footnote_ref": {
+      const refElement =
+        node.noteKind === "footnote"
+          ? `<w:footnoteReference w:id="${escapeAttribute(node.noteId)}"/>`
+          : `<w:endnoteReference w:id="${escapeAttribute(node.noteId)}"/>`;
+      const styleVal =
+        node.noteKind === "footnote"
+          ? "FootnoteReference"
+          : "EndnoteReference";
+      return `<w:r><w:rPr><w:rStyle w:val="${styleVal}"/></w:rPr>${refElement}</w:r>`;
+    }
     default:
       return "";
   }
@@ -787,10 +803,52 @@ function serializeInlineNode(
         boundaries,
       };
     }
-    case "field":
-    case "bookmark_start":
-    case "bookmark_end":
-    case "footnote_ref":
+    case "field": {
+      const xml = `<w:fldSimple w:instr="${escapeAttribute(node.instruction)}"/>`;
+      const boundaries = new Map<number, number>();
+      boundaries.set(cursor, xmlOffset);
+      boundaries.set(cursor + 1, xmlOffset + xml.length);
+      return {
+        xml,
+        cursor: cursor + 1,
+        boundaries,
+      };
+    }
+    case "bookmark_start": {
+      const xml =
+        `<w:bookmarkStart w:id="${escapeAttribute(node.bookmarkId)}"` +
+        ` w:name="${escapeAttribute(node.name)}"/>`;
+      const boundaries = new Map<number, number>();
+      boundaries.set(cursor, xmlOffset);
+      boundaries.set(cursor, xmlOffset + xml.length);
+      return { xml, cursor, boundaries };
+    }
+    case "bookmark_end": {
+      const xml = `<w:bookmarkEnd w:id="${escapeAttribute(node.bookmarkId)}"/>`;
+      const boundaries = new Map<number, number>();
+      boundaries.set(cursor, xmlOffset);
+      boundaries.set(cursor, xmlOffset + xml.length);
+      return { xml, cursor, boundaries };
+    }
+    case "footnote_ref": {
+      const refElement =
+        node.noteKind === "footnote"
+          ? `<w:footnoteReference w:id="${escapeAttribute(node.noteId)}"/>`
+          : `<w:endnoteReference w:id="${escapeAttribute(node.noteId)}"/>`;
+      const styleVal =
+        node.noteKind === "footnote"
+          ? "FootnoteReference"
+          : "EndnoteReference";
+      const xml = `<w:r><w:rPr><w:rStyle w:val="${styleVal}"/></w:rPr>${refElement}</w:r>`;
+      const boundaries = new Map<number, number>();
+      boundaries.set(cursor, xmlOffset);
+      boundaries.set(cursor + 1, xmlOffset + xml.length);
+      return {
+        xml,
+        cursor: cursor + 1,
+        boundaries,
+      };
+    }
     default: {
       const boundaries = new Map<number, number>();
       boundaries.set(cursor, xmlOffset);
@@ -882,6 +940,21 @@ function serializeRunProperties(marks: TextMark[] | undefined): string {
       case "textFill":
         markParts.push(mark.xml);
         break;
+      case "fontFamily":
+        markParts.push(`<w:rFonts w:ascii="${escapeAttribute(mark.val)}" w:hAnsi="${escapeAttribute(mark.val)}"/>`);
+        break;
+      case "fontSize":
+        markParts.push(`<w:sz w:val="${mark.val}"/>`);
+        break;
+      case "textColor":
+        markParts.push(`<w:color w:val="${escapeAttribute(mark.color)}"/>`);
+        break;
+      case "smallCaps":
+        markParts.push("<w:smallCaps/>");
+        break;
+      case "allCaps":
+        markParts.push("<w:caps/>");
+        break;
     }
   }
 

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

@@ -147,6 +147,9 @@ function normalizeParagraph(
     ...(paragraph.keepLines ? { keepLines: paragraph.keepLines } : {}),
     ...(paragraph.outlineLevel !== undefined ? { outlineLevel: paragraph.outlineLevel } : {}),
     ...(paragraph.pageBreakBefore ? { pageBreakBefore: paragraph.pageBreakBefore } : {}),
+    ...(paragraph.bidi ? { bidi: paragraph.bidi } : {}),
+    ...(paragraph.borders ? { borders: paragraph.borders } : {}),
+    ...(paragraph.shading ? { shading: paragraph.shading } : {}),
     children,
   };
 }
@@ -287,6 +290,84 @@ function normalizeInlineChildren(
         state.cursor += 1;
         break;
       }
+      case "symbol":
+        normalized.push({
+          type: "symbol",
+          char: node.char,
+          font: node.font,
+          ...(node.marks && node.marks.length > 0 ? { marks: node.marks } : {}),
+        });
+        state.cursor += 1;
+        break;
+      case "column_break":
+        normalized.push({ type: "column_break" });
+        state.cursor += 1;
+        break;
+      case "chart_preview":
+        normalized.push({
+          type: "chart_preview",
+          ...(node.previewMediaId ? { previewMediaId: node.previewMediaId } : {}),
+          rawXml: node.rawXml,
+        });
+        state.cursor += 1;
+        break;
+      case "smartart_preview":
+        normalized.push({
+          type: "smartart_preview",
+          ...(node.previewMediaId ? { previewMediaId: node.previewMediaId } : {}),
+          rawXml: node.rawXml,
+        });
+        state.cursor += 1;
+        break;
+      case "shape":
+        normalized.push({
+          type: "shape",
+          ...(node.text ? { text: node.text } : {}),
+          ...(node.geometry ? { geometry: node.geometry } : {}),
+          rawXml: node.rawXml,
+        });
+        state.cursor += 1;
+        break;
+      case "wordart":
+        normalized.push({
+          type: "wordart",
+          text: node.text,
+          ...(node.geometry ? { geometry: node.geometry } : {}),
+          rawXml: node.rawXml,
+        });
+        state.cursor += 1;
+        break;
+      case "vml_shape":
+        normalized.push({
+          type: "vml_shape",
+          ...(node.text ? { text: node.text } : {}),
+          ...(node.shapeType ? { shapeType: node.shapeType } : {}),
+          rawXml: node.rawXml,
+        });
+        state.cursor += 1;
+        break;
+      case "bookmark_start":
+        normalized.push({
+          type: "bookmark_start",
+          bookmarkId: node.bookmarkId,
+          name: node.name,
+        });
+        break;
+      case "bookmark_end":
+        normalized.push({
+          type: "bookmark_end",
+          bookmarkId: node.bookmarkId,
+        });
+        break;
+      case "field":
+        normalized.push({
+          type: "field",
+          fieldType: node.fieldType,
+          instruction: node.instruction,
+          children: [],
+        });
+        state.cursor += 1;
+        break;
     }
   }
 
@@ -383,7 +464,15 @@ function sameMarks(left: TextMark[] | undefined, right: TextMark[] | undefined):
 }
 
 function normalizeMarks(marks: TextMark[] | undefined): string[] {
-  return [...(marks ?? []).map((mark) => mark.type)].sort();
+  return [...(marks ?? []).map(serializeMark)].sort();
+}
+
+function serializeMark(mark: TextMark): string {
+  return JSON.stringify(
+    Object.fromEntries(
+      Object.entries(mark).sort(([left], [right]) => left.localeCompare(right)),
+    ),
+  );
 }
 
 function recordOpaqueFragment(

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

@@ -171,11 +171,11 @@ function parseParagraphElement(pElement: XmlElementNode): ParagraphNode {
     } else if (name === "r") {
       children.push(...parseRunElement(child));
     } else if (name === "hyperlink") {
-      for (const hChild of child.children) {
-        if (hChild.type === "element" && localName(hChild.name) === "r") {
-          children.push(...parseRunElement(hChild));
-        }
-      }
+      children.push(parseHyperlinkElement(child));
+    } else if (name === "bookmarkStart" || name === "bookmarkEnd") {
+      children.push(parseBookmarkElement(child));
+    } else if (name === "fldSimple") {
+      children.push(parseFieldElement(child));
     }
   }
 
@@ -224,12 +224,75 @@ function parseRunElement(rElement: XmlElementNode): InlineNode[] {
       if (noteId) {
         nodes.push({ type: "footnote_ref", noteId, noteKind: "endnote" });
       }
+    } else if (name === "bookmarkStart" || name === "bookmarkEnd") {
+      nodes.push(parseBookmarkElement(child));
+    } else if (name === "fldChar" || name === "instrText") {
+      nodes.push(parseFieldElement(child));
     }
   }
 
   return nodes;
 }
 
+function parseHyperlinkElement(element: XmlElementNode): Extract<InlineNode, { type: "hyperlink" }> {
+  const href = element.attributes["w:anchor"]
+    ? `#${element.attributes["w:anchor"]}`
+    : element.attributes["r:id"] ?? "relationship:unknown";
+  const children: Array<Extract<InlineNode, { type: "text" | "hard_break" | "tab" }>> = [];
+
+  for (const child of element.children) {
+    if (child.type === "element" && localName(child.name) === "r") {
+      for (const runChild of parseRunElement(child)) {
+        if (runChild.type === "text" || runChild.type === "hard_break" || runChild.type === "tab") {
+          children.push(runChild);
+        }
+      }
+    }
+  }
+
+  return {
+    type: "hyperlink",
+    href,
+    children,
+  };
+}
+
+function parseBookmarkElement(
+  element: XmlElementNode,
+): Extract<InlineNode, { type: "bookmark_start" | "bookmark_end" }> {
+  const bookmarkId = element.attributes["w:id"] ?? element.attributes.id ?? "0";
+  if (localName(element.name) === "bookmarkStart") {
+    return {
+      type: "bookmark_start",
+      bookmarkId,
+      name: element.attributes["w:name"] ?? element.attributes.name ?? "",
+    };
+  }
+
+  return {
+    type: "bookmark_end",
+    bookmarkId,
+  };
+}
+
+function parseFieldElement(element: XmlElementNode): Extract<InlineNode, { type: "field" }> {
+  const rawFieldType =
+    element.attributes["w:fldCharType"] ??
+    element.attributes.fldCharType ??
+    localName(element.name);
+  const fieldType: "simple" | "complex" = rawFieldType === "complex" ? "complex" : "simple";
+  const instruction =
+    element.attributes["w:instr"] ??
+    element.attributes.instr ??
+    extractTextContent(element);
+  return {
+    type: "field",
+    fieldType,
+    instruction,
+    children: [],
+  };
+}
+
 function parseRunProperties(rElement: XmlElementNode): TextMark[] {
   const rPr = findChildElementOptional(rElement, "rPr");
   if (!rPr) {

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

@@ -214,16 +214,11 @@ function parseParagraphElement(pElement: XmlElementNode): ParagraphNode {
     } else if (name === "r") {
       children.push(...parseRunElement(child));
     } else if (name === "hyperlink") {
-      // Simplified: collect text children from hyperlink runs
-      for (const hChild of child.children) {
-        if (hChild.type === "element" && localName(hChild.name) === "r") {
-          children.push(...parseRunElement(hChild));
-        }
-      }
+      children.push(parseHyperlinkElement(child));
     } else if (name === "bookmarkStart" || name === "bookmarkEnd") {
-      // Skip bookmark nodes in headers/footers
-    } else if (name === "fldChar" || name === "instrText") {
-      // Skip field chars, handled via run parsing
+      children.push(parseBookmarkElement(child));
+    } else if (name === "fldSimple") {
+      children.push(parseFieldElement(child));
     }
   }
 
@@ -281,12 +276,75 @@ function parseRunElement(rElement: XmlElementNode): InlineNode[] {
         };
         nodes.push(ref);
       }
+    } else if (name === "bookmarkStart" || name === "bookmarkEnd") {
+      nodes.push(parseBookmarkElement(child));
+    } else if (name === "fldChar" || name === "instrText") {
+      nodes.push(parseFieldElement(child));
     }
   }
 
   return nodes;
 }
 
+function parseHyperlinkElement(element: XmlElementNode): Extract<InlineNode, { type: "hyperlink" }> {
+  const href = element.attributes["w:anchor"]
+    ? `#${element.attributes["w:anchor"]}`
+    : element.attributes["r:id"] ?? "relationship:unknown";
+  const children: Array<Extract<InlineNode, { type: "text" | "hard_break" | "tab" }>> = [];
+
+  for (const child of element.children) {
+    if (child.type === "element" && localName(child.name) === "r") {
+      for (const runChild of parseRunElement(child)) {
+        if (runChild.type === "text" || runChild.type === "hard_break" || runChild.type === "tab") {
+          children.push(runChild);
+        }
+      }
+    }
+  }
+
+  return {
+    type: "hyperlink",
+    href,
+    children,
+  };
+}
+
+function parseBookmarkElement(
+  element: XmlElementNode,
+): Extract<InlineNode, { type: "bookmark_start" | "bookmark_end" }> {
+  const bookmarkId = element.attributes["w:id"] ?? element.attributes.id ?? "0";
+  if (localName(element.name) === "bookmarkStart") {
+    return {
+      type: "bookmark_start",
+      bookmarkId,
+      name: element.attributes["w:name"] ?? element.attributes.name ?? "",
+    };
+  }
+
+  return {
+    type: "bookmark_end",
+    bookmarkId,
+  };
+}
+
+function parseFieldElement(element: XmlElementNode): Extract<InlineNode, { type: "field" }> {
+  const rawFieldType =
+    element.attributes["w:fldCharType"] ??
+    element.attributes.fldCharType ??
+    localName(element.name);
+  const fieldType: "simple" | "complex" = rawFieldType === "complex" ? "complex" : "simple";
+  const instruction =
+    element.attributes["w:instr"] ??
+    element.attributes.instr ??
+    extractTextContent(element);
+  return {
+    type: "field",
+    fieldType,
+    instruction,
+    children: [],
+  };
+}
+
 function parseRunProperties(rElement: XmlElementNode): TextMark[] {
   const rPr = findChildElementOptional(rElement, "rPr");
   if (!rPr) {