@beyondwork/docx-react-component 1.0.101 → 1.0.103

package/src/runtime/surface-projection.ts

@@ -41,6 +41,7 @@ import type {
   ShapeContent,
   VmlShapeNode,
   WordArtNode,
+  Mutable,
 } from "../model/canonical-document.ts";
 import {
   describeOpaqueFragment,
@@ -575,7 +576,7 @@ function createSurfaceBlock(
 
 function createTableBlock(
   tableIndex: number,
-  table: TableNode,
+  table: Mutable<TableNode>,
   document: CanonicalDocumentEnvelope,
   cursor: number,
   counters: {
@@ -769,7 +770,7 @@ function createTableBlock(
   };
 }
 
-function computeTableRowSpans(table: TableNode): Map<string, number> {
+function computeTableRowSpans(table: Mutable<TableNode>): Map<string, number> {
   const positionedRows = table.rows.map((row) => {
     let startColumn = 0;
 
@@ -933,7 +934,7 @@ function toSurfaceFrameProperties(
 }
 
 function resolveSurfaceParagraphFormatting(
-  formatting: CanonicalParagraphFormatting,
+  formatting: Mutable<CanonicalParagraphFormatting>,
   themeResolver: ThemeColorResolver | undefined,
 ): CanonicalParagraphFormatting {
   if (!formatting.shading) {
@@ -1065,7 +1066,7 @@ function resolveCellBorderStyles(
 
 function createSdtBlock(
   sdtIndex: number,
-  block: SdtNode,
+  block: Mutable<SdtNode>,
   document: CanonicalDocumentEnvelope,
   cursor: number,
   counters: {
@@ -1123,7 +1124,7 @@ function createSdtBlock(
 
 function createParagraphBlock(
   paragraphIndex: number,
-  paragraph: ParagraphNode,
+  paragraph: Mutable<ParagraphNode>,
   document: CanonicalDocumentEnvelope,
   start: number,
   formattingContext: FormattingContext,
@@ -1757,13 +1758,7 @@ function appendInlineSegments(
         const fieldLabel =
           node.fieldFamily === "TOC"
             ? "Table of Contents"
-            : node.fieldFamily === "PAGE"
-              ? "Current page number"
-              : node.fieldFamily === "NUMPAGES"
-                ? "Total pages"
-                : node.fieldFamily === "SECTIONPAGES"
-                  ? "Section pages"
-                  : `${node.fieldFamily ?? "Field"}: ${node.fieldTarget ?? node.instruction.trim()}`;
+            : `${node.fieldFamily ?? "Field"}: ${node.fieldTarget ?? node.instruction.trim()}`;
         paragraph.segments.push({
           segmentId: `${paragraph.blockId}-segment-${paragraph.segments.length}`,
           kind: "field_ref",
@@ -1804,7 +1799,7 @@ function appendInlineSegments(
 }
 
 function registerParsedChartPreview(
-  node: ChartPreviewNode,
+  node: Mutable<ChartPreviewNode>,
   document: CanonicalDocumentEnvelope,
 ): string | undefined {
   if (!node.parsedData) return undefined;
@@ -1946,7 +1941,7 @@ function surfaceAnchorFromGeometry(
  * fast-path image rendering.
  */
 function surfacePictureEffectsFromContent(
-  content: PictureContent,
+  content: Mutable<PictureContent>,
   themeResolver?: ThemeColorResolver,
 ): SurfacePictureEffects | undefined {
   const outerShadow = resolveSurfacePictureShadow(content.outerShadow, themeResolver);
@@ -2159,7 +2154,7 @@ function appendTextBoxSegment(
   return { nextCursor: start + 1, lockedFragmentIds: [] };
 }
 
-function shouldRenderSecondaryStoryVmlTextBox(node: VmlShapeNode): boolean {
+function shouldRenderSecondaryStoryVmlTextBox(node: Mutable<VmlShapeNode>): boolean {
   return Boolean(node.text) && (!node.shapeType || /_x0000_t202$/iu.test(node.shapeType));
 }
 
@@ -2174,7 +2169,7 @@ function isMicrosoftSensitivityLabelShape(
     /"Placement"\s*:\s*"Footer"/iu.test(node.rawXml);
 }
 
-function createChartDetail(node: ChartPreviewNode): string {
+function createChartDetail(node: Mutable<ChartPreviewNode>): string {
   const parts = ["Embedded chart."];
   if (node.previewMediaId) {
     parts.push(`Preview available via fallback image (${node.previewMediaId}).`);
@@ -2185,7 +2180,7 @@ function createChartDetail(node: ChartPreviewNode): string {
   return parts.join(" ");
 }
 
-function createSmartArtDetail(node: SmartArtPreviewNode): string {
+function createSmartArtDetail(node: Mutable<SmartArtPreviewNode>): string {
   const parts = ["SmartArt diagram."];
   if (node.previewMediaId) {
     parts.push(`Preview available via fallback image (${node.previewMediaId}).`);
@@ -2196,7 +2191,7 @@ function createSmartArtDetail(node: SmartArtPreviewNode): string {
   return parts.join(" ");
 }
 
-function createShapeDetail(node: ShapeNode): string {
+function createShapeDetail(node: Mutable<ShapeNode>): string {
   if (node.isTextBox) {
     const parts = ["Text box."];
     if (node.text) parts.push(`Content: "${node.text}".`);
@@ -2210,7 +2205,7 @@ function createShapeDetail(node: ShapeNode): string {
   return parts.join(" ");
 }
 
-function createWordArtDetail(node: WordArtNode): string {
+function createWordArtDetail(node: Mutable<WordArtNode>): string {
   const parts = ["WordArt decorative text."];
   if (node.text) parts.push(`Text: "${node.text}".`);
   if (node.geometry) parts.push(`Effect: ${node.geometry}.`);
@@ -2218,7 +2213,7 @@ function createWordArtDetail(node: WordArtNode): string {
   return parts.join(" ");
 }
 
-function createVmlDetail(node: VmlShapeNode): string {
+function createVmlDetail(node: Mutable<VmlShapeNode>): string {
   const parts = ["Legacy VML drawing."];
   if (node.shapeType) parts.push(`Type: ${node.shapeType}.`);
   if (node.text) parts.push(`Text content: "${node.text}".`);
@@ -2587,22 +2582,22 @@ function toSurfaceTabStop(
 }
 
 function buildDirectParagraphFormattingFromNode(
-  paragraph: ParagraphNode,
+  paragraph: Mutable<ParagraphNode>,
 ): CanonicalParagraphFormatting | undefined {
-  const direct: CanonicalParagraphFormatting = {};
-  if (paragraph.spacing) direct.spacing = paragraph.spacing;
-  if (paragraph.indentation) direct.indentation = paragraph.indentation;
-  if (paragraph.alignment) direct.alignment = paragraph.alignment;
-  if (paragraph.borders) direct.borders = paragraph.borders;
-  if (paragraph.shading) direct.shading = paragraph.shading;
-  if (paragraph.tabStops && paragraph.tabStops.length > 0) direct.tabStops = [...paragraph.tabStops];
-  if (paragraph.contextualSpacing !== undefined) direct.contextualSpacing = paragraph.contextualSpacing;
-  if (paragraph.keepNext !== undefined) direct.keepNext = paragraph.keepNext;
-  if (paragraph.keepLines !== undefined) direct.keepLines = paragraph.keepLines;
-  if (paragraph.widowControl !== undefined) direct.widowControl = paragraph.widowControl;
-  if (paragraph.pageBreakBefore !== undefined) direct.pageBreakBefore = paragraph.pageBreakBefore;
-  if (paragraph.outlineLevel !== undefined) direct.outlineLevel = paragraph.outlineLevel;
-  if (paragraph.bidi !== undefined) direct.bidi = paragraph.bidi;
+  const direct: Mutable<CanonicalParagraphFormatting> = {};
+  if (paragraph.spacing) (direct as Mutable<typeof direct>).spacing = paragraph.spacing;
+  if (paragraph.indentation) (direct as Mutable<typeof direct>).indentation = paragraph.indentation;
+  if (paragraph.alignment) (direct as Mutable<typeof direct>).alignment = paragraph.alignment;
+  if (paragraph.borders) (direct as Mutable<typeof direct>).borders = paragraph.borders;
+  if (paragraph.shading) (direct as Mutable<typeof direct>).shading = paragraph.shading;
+  if (paragraph.tabStops && paragraph.tabStops.length > 0) (direct as Mutable<typeof direct>).tabStops = [...paragraph.tabStops];
+  if (paragraph.contextualSpacing !== undefined) (direct as Mutable<typeof direct>).contextualSpacing = paragraph.contextualSpacing;
+  if (paragraph.keepNext !== undefined) (direct as Mutable<typeof direct>).keepNext = paragraph.keepNext;
+  if (paragraph.keepLines !== undefined) (direct as Mutable<typeof direct>).keepLines = paragraph.keepLines;
+  if (paragraph.widowControl !== undefined) (direct as Mutable<typeof direct>).widowControl = paragraph.widowControl;
+  if (paragraph.pageBreakBefore !== undefined) (direct as Mutable<typeof direct>).pageBreakBefore = paragraph.pageBreakBefore;
+  if (paragraph.outlineLevel !== undefined) (direct as Mutable<typeof direct>).outlineLevel = paragraph.outlineLevel;
+  if (paragraph.bidi !== undefined) (direct as Mutable<typeof direct>).bidi = paragraph.bidi;
   if (paragraph.suppressLineNumbers !== undefined) direct.suppressLineNumbers = paragraph.suppressLineNumbers;
   return Object.keys(direct).length > 0 ? direct : undefined;
 }
@@ -2947,7 +2942,7 @@ function createFloatingImageDetail(
   return parts.join(" ");
 }
 
-function hasMediaItem(media: MediaCatalog, mediaId: string): boolean {
+function hasMediaItem(media: Mutable<MediaCatalog>, mediaId: string): boolean {
   return mediaId in media.items;
 }
 

package/src/session/export/stateful-export-pipeline.ts

@@ -136,7 +136,7 @@ export function ensureHostMetadataParts(
   if (!corePropertiesPart || corePropertiesPart.contentType !== CORE_PROPERTIES_CONTENT_TYPE) {
     exportSession.replaceOwnedPart({
       path: CORE_PROPERTIES_PART_PATH,
-      bytes: corePropertiesPart?.bytes ?? new TextEncoder().encode(buildCorePropertiesXml(document)),
+      bytes: new TextEncoder().encode(buildCorePropertiesXml(document)),
       contentType: CORE_PROPERTIES_CONTENT_TYPE,
       compression: corePropertiesPart?.compression,
     });
@@ -146,7 +146,7 @@ export function ensureHostMetadataParts(
   if (!appPropertiesPart || appPropertiesPart.contentType !== APP_PROPERTIES_CONTENT_TYPE) {
     exportSession.replaceOwnedPart({
       path: APP_PROPERTIES_PART_PATH,
-      bytes: appPropertiesPart?.bytes ?? new TextEncoder().encode(buildAppPropertiesXml()),
+      bytes: new TextEncoder().encode(buildAppPropertiesXml(document.metadata.appProperties)),
       contentType: APP_PROPERTIES_CONTENT_TYPE,
       compression: appPropertiesPart?.compression,
     });
@@ -305,11 +305,16 @@ export function buildCorePropertiesXml(document: CanonicalDocumentEnvelope): str
     xmlNode("dc:title", metadata.title),
     xmlNode("dc:subject", metadata.subject),
     xmlNode("dc:description", metadata.description),
+    xmlNode("dc:creator", metadata.creator),
     xmlNode("dc:language", metadata.language),
     xmlNode("cp:keywords", keywords),
     xmlNode("cp:category", metadata.category),
-    xmlNode('dcterms:created xsi:type="dcterms:W3CDTF"', document.createdAt),
-    xmlNode('dcterms:modified xsi:type="dcterms:W3CDTF"', document.updatedAt),
+    xmlNode("cp:lastModifiedBy", metadata.lastModifiedBy),
+    xmlNode("cp:contentStatus", metadata.contentStatus),
+    xmlNode("cp:revision", metadata.revision),
+    xmlNode("cp:version", metadata.version),
+    xmlNode('dcterms:created xsi:type="dcterms:W3CDTF"', metadata.createdUtc ?? document.createdAt),
+    xmlNode('dcterms:modified xsi:type="dcterms:W3CDTF"', metadata.modifiedUtc ?? document.updatedAt),
   ].filter((line): line is string => Boolean(line));
 
   return [

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

@@ -83,6 +83,7 @@ import {
 import { toEditorSessionState } from "../import/canonical-assembly.ts";
 import {
   serializeCanonicalDocumentForExport,
+  serializeNumberingCatalogForExport,
 } from "../shared/session-utils.ts";
 import { withDocumentRelatedParts } from "../import/package-parts.ts";
 import {
@@ -290,6 +291,14 @@ export async function runStatefulExport(
     state.sourcePeoplePartPath ?? PEOPLE_PART_PATH;
   const numberingPartPath =
     state.sourceNumberingPartPath ?? NUMBERING_PART_PATH;
+  const sourceNumberingPart = state.sourceNumberingPartPath
+    ? state.sourcePackage.parts.get(numberingPartPath)
+    : undefined;
+  const numberingSignatureMatch =
+    serializeNumberingCatalogForExport(currentDocument.numbering as NumberingCatalog) ===
+    state.initialNumberingSignature;
+  const canReuseSourceNumberingPart =
+    numberingSignatureMatch && sourceNumberingPart !== undefined;
   const serializedNumberingXml = hasSerializableNumberingEntries(
     currentDocument.numbering as NumberingCatalog,
   )
@@ -303,6 +312,7 @@ export async function runStatefulExport(
         partPath: numberingPartPath,
         existingRelationshipId: state.sourceNumberingRelationshipId,
         include:
+          canReuseSourceNumberingPart ||
           Boolean(serializedNumberingXml) ||
           Boolean(state.sourceNumberingPartPath),
       },
@@ -423,16 +433,22 @@ export async function runStatefulExport(
     relationships: nextRelationships,
   });
 
-  if (serializedNumberingXml || state.sourceNumberingPartPath) {
+  if (canReuseSourceNumberingPart || serializedNumberingXml || state.sourceNumberingPartPath) {
+    const numberingBytes =
+      canReuseSourceNumberingPart && sourceNumberingPart
+        ? sourceNumberingPart.bytes
+        : new TextEncoder().encode(
+          serializedNumberingXml ??
+            `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<w:numbering xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"></w:numbering>`,
+        );
+
     exportSession.replaceOwnedPart({
       path: numberingPartPath,
-      bytes: new TextEncoder().encode(
-        serializedNumberingXml ??
-          `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<w:numbering xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"></w:numbering>`,
-      ),
+      bytes: numberingBytes,
       contentType:
-        state.sourcePackage.parts.get(numberingPartPath)?.contentType ??
+        sourceNumberingPart?.contentType ??
         WORD_NUMBERING_CONTENT_TYPE,
+      compression: sourceNumberingPart?.compression,
     });
   }
 

package/src/session/import/canonical-assembly.ts

@@ -133,6 +133,7 @@ export function createImportedCanonicalDocument(input: {
   subParts?: SubPartsCatalog;
   parsedStyles?: ParseStylesResult;
   fontTable?: CanonicalDocument["fontTable"];
+  metadata?: CanonicalDocument["metadata"];
   preservation: CanonicalDocument["preservation"];
   diagnostics: CanonicalDocument["diagnostics"];
   review: CanonicalDocument["review"];
@@ -166,9 +167,7 @@ export function createImportedCanonicalDocument(input: {
     docId: createCanonicalDocumentId(input.documentId),
     createdAt: input.timestamp,
     updatedAt: input.timestamp,
-    metadata: {
-      customProperties: {},
-    },
+    metadata: input.metadata ?? { customProperties: {} },
     styles,
     numbering,
     media: input.media,

package/src/session/import/loader-types.ts

@@ -252,7 +252,8 @@ export interface LoadedDocxEditorSession {
  * State captured at import time that the export pipeline consumes to
  * round-trip the package. Carries source bytes, the OPC package
  * snapshot, per-part relationships, preserved-part manifest, and the
- * initial canonical signature used for fast-path byte reuse.
+ * initial canonical signatures used for fast-path byte reuse and
+ * preserve-first per-part export decisions.
  *
  * Load path builds this; `exportDocxEditorSession` consumes it via
  * the closure captured at open time.
@@ -299,6 +300,7 @@ export interface ImportedDocxState {
   preservedCommentDefinitions: readonly ImportedCommentDefinition[];
   blockingCommentDiagnostics: readonly CommentImportDiagnostic[];
   initialCanonicalSignature: string;
+  initialNumberingSignature: string;
   sourceSubPartPaths: {
     headers: Array<{ partPath: string; relationshipId: string }>;
     footers: Array<{ partPath: string; relationshipId: string }>;

package/src/session/import/loader.ts

@@ -97,6 +97,7 @@ import {
 } from "../../io/ooxml/parse-revisions.ts";
 import { parseCommentsFromOoxml } from "../../io/ooxml/parse-comments.ts";
 import { parseNumberingXml } from "../../io/ooxml/parse-numbering.ts";
+import { parseDocumentMetadataFromOpcParts } from "../../io/ooxml/docprops.ts";
 import {
   parseHeaderFooterReferences,
   parseHeaderXml,
@@ -131,6 +132,7 @@ import {
   decodeUtf8,
   extractDocumentRootAttributes,
   serializeCanonicalDocumentForExport,
+  serializeNumberingCatalogForExport,
   toUint8Array,
 } from "../shared/session-utils.ts";
 import {
@@ -285,6 +287,7 @@ export async function loadDocxSessionAsync(
       }),
     );
   }
+  const packageMetadata = parseDocumentMetadataFromOpcParts(sourcePackage.parts);
   stages.emit("opc");
   await scheduler.yield();
   const embeddedWorkflowPayload = parseWorkflowPayloadEnvelopeFromPackage(sourcePackage);
@@ -1018,6 +1021,7 @@ export async function loadDocxSessionAsync(
       subParts,
       parsedStyles,
       fontTable: parsedFontTable,
+      metadata: packageMetadata,
       preservation: buildImportPreservation(normalizedDocument.preservation, sourcePackage, [
         mainDocumentPath,
         numberingPartPath,
@@ -1152,6 +1156,9 @@ export async function loadDocxSessionAsync(
         BLOCKING_COMMENT_DIAGNOSTIC_CODES.has(diagnostic.code),
       ),
       initialCanonicalSignature: serializeCanonicalDocumentForExport(document),
+      initialNumberingSignature: serializeNumberingCatalogForExport(
+        document.numbering as _NumberingCatalog,
+      ),
       sourceSubPartPaths: {
         headers: sourceHeaderPaths,
         footers: sourceFooterPaths,
@@ -1229,6 +1236,7 @@ export function loadDocxSessionSync(
       }),
     );
   }
+  const packageMetadata = parseDocumentMetadataFromOpcParts(sourcePackage.parts);
   stages.emit("opc");
   const embeddedWorkflowPayload = parseWorkflowPayloadEnvelopeFromPackage(sourcePackage);
   const embeddedWorkflowMetadata = embeddedWorkflowPayload?.workflowMetadata;
@@ -1697,6 +1705,7 @@ export function loadDocxSessionSync(
       subParts,
       parsedStyles,
       fontTable: parsedFontTable,
+      metadata: packageMetadata,
       preservation: buildImportPreservation(normalizedDocument.preservation, sourcePackage, [
         mainDocumentPath,
         numberingPartPath,
@@ -1808,6 +1817,9 @@ export function loadDocxSessionSync(
         BLOCKING_COMMENT_DIAGNOSTIC_CODES.has(diagnostic.code),
       ),
       initialCanonicalSignature: serializeCanonicalDocumentForExport(document),
+      initialNumberingSignature: serializeNumberingCatalogForExport(
+        document.numbering as _NumberingCatalog,
+      ),
       sourceSubPartPaths: {
         headers: sourceHeaderPaths,
         footers: sourceFooterPaths,

package/src/session/import/normalize.ts

@@ -22,6 +22,7 @@ import type {
   CanonicalDocument,
   FootnoteCollection,
   OpaqueFragmentRecord,
+  Mutable,
 } from "../../model/canonical-document.ts";
 
 /** Warning shape carried on `CanonicalDocument.diagnostics.warnings`. */
@@ -130,7 +131,7 @@ export function normalizeFootnoteCollectionOpaqueBlocks(
   if (!collection) return;
   const notes = kind === "footnote" ? collection.footnotes : collection.endnotes;
   for (const definition of Object.values(notes)) {
-    definition.blocks = normalizeSubPartOpaqueBlocks(
+    (definition as Mutable<typeof definition>).blocks = normalizeSubPartOpaqueBlocks(
       definition.blocks,
       opaqueFragments,
       warnings,