@json-to-office/shared-docx 0.33.0 → 0.34.0

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   generateUnifiedDocumentSchema
-} from "./chunk-R5UGQRFE.js";
+} from "./chunk-PSVJL2G3.js";
 import {
   ERROR_TEMPLATES,
   componentValidator,
@@ -31,19 +31,20 @@ import {
   validateTheme,
   validateThemeJson,
   validateThemeWithEnhancement
-} from "./chunk-XDMC32YP.js";
+} from "./chunk-VRGM2FUX.js";
 import {
   GenerateDocumentRequestSchema,
   GenerateDocumentResponseSchema,
   ValidateDocumentRequestSchema,
   ValidateDocumentResponseSchema
-} from "./chunk-QDBFYGOR.js";
+} from "./chunk-FG6SI4JG.js";
 import {
   JSON_SCHEMA_URLS,
   JsonComponentDefinitionSchema
-} from "./chunk-I7HBLM3U.js";
+} from "./chunk-SZCMTHGI.js";
 import {
   collectIndentConflicts,
+  collectNoteRevisionConflicts,
   comprehensiveValidateDocument,
   createDocumentValidator,
   createJsonValidator,
@@ -64,11 +65,11 @@ import {
   validateJsonComponent,
   validateJsonDocument,
   validateWithEnhancement
-} from "./chunk-BDVZALLE.js";
+} from "./chunk-NJN6UT3A.js";
 import {
   ComponentDefinitionSchema,
   StandardComponentDefinitionSchema
-} from "./chunk-UNNSBEER.js";
+} from "./chunk-K7PV4XUA.js";
 import {
   CustomComponentDefinitionSchema,
   TextSpaceAfterComponentSchema,
@@ -82,37 +83,47 @@ import {
   createComponentSchema,
   exportSchemaToFile,
   fixSchemaReferences
-} from "./chunk-WAKSQXQA.js";
+} from "./chunk-Y2ME2XH6.js";
 import {
   HighchartsPropsSchema,
   ReportPropsSchema,
+  STANDARD_COMPONENTS_REGISTRY,
   TextBoxPropsSchema,
   TocPropsSchema,
   VisualCanvasBackgroundSchema,
   VisualCanvasSchema,
-  VisualPropsSchema
-} from "./chunk-5QOQVYBJ.js";
+  VisualPropsSchema,
+  getAllStandardComponentNames,
+  getStandardComponent
+} from "./chunk-Z5WQPM4B.js";
 import {
   ThemeConfigSchema,
   createMinimalTheme,
   isValidThemeConfig
-} from "./chunk-LQGORQQI.js";
+} from "./chunk-CQHH44HX.js";
 import {
   AlignmentSchema,
   BaseComponentPropsSchema,
   BorderSchema,
   ColumnsPropsSchema,
+  CommentReplySchema,
+  CommentSchema,
+  EndnotesSchema,
+  FootnotesSchema,
   HeadingLevelSchema,
   HeadingPropsSchema,
   ImagePropsSchema,
   IndentSchema,
   JustifiedAlignmentSchema,
   LineSpacingSchema,
+  ListMarkerFontSchema,
   ListPropsSchema,
   MarginsSchema,
+  NoteSchema,
   NumberingSchema,
   ParagraphIndentSchema,
   ParagraphPropsSchema,
+  RevisionMarkSchema,
   RevisionSchema,
   RevisionSegmentSchema,
   SectionPropsSchema,
@@ -123,7 +134,7 @@ import {
   TabStopTypeSchema,
   TabStopsSchema,
   TablePropsSchema
-} from "./chunk-PVZMPANS.js";
+} from "./chunk-436TK3T4.js";
 import "./chunk-7TTAAYQ5.js";
 
 // src/diff/word-diff.ts
@@ -394,8 +405,8 @@ function diffTextComponent(oldNode, newNode, path, ctx) {
   const oldText = plainText(oldNode);
   const newText = plainText(newNode);
   const propsChanged = !deepEqual(
-    propsWithout(oldNode.props, "text", "revision"),
-    propsWithout(newNode.props, "text", "revision")
+    propsWithout(oldNode.props, "text", "revision", "comment"),
+    propsWithout(newNode.props, "text", "revision", "comment")
   );
   if (propsChanged) {
     ctx.summary.untracked.push({
@@ -432,12 +443,28 @@ function diffTextComponent(oldNode, newNode, path, ctx) {
   return {
     ...newNode,
     props: {
-      ...newNode.props,
+      ...revisedTextProps(newNode, path, ctx),
       text: newText,
       revision: makeRevision(ctx, segments)
     }
   };
 }
+function revisedTextProps(node, path, ctx) {
+  const props = { ...node.props ?? {} };
+  const dropped = ["footnotes", "endnotes"].filter((kind) => {
+    const notes = props[kind];
+    return Array.isArray(notes) && notes.length > 0;
+  });
+  if (dropped.length === 0) return props;
+  for (const kind of dropped) delete props[kind];
+  ctx.summary.untracked.push({
+    path,
+    kind: "modified",
+    component: node.name,
+    detail: `${dropped.join(" and ")} dropped from a tracked-change paragraph (note markers do not resolve inside revision text); the note bodies are not in the redline`
+  });
+  return props;
+}
 function insertedTextComponent(node, path, ctx) {
   ctx.summary.tracked.inserted++;
   const text = plainText(node);
@@ -446,7 +473,7 @@ function insertedTextComponent(node, path, ctx) {
   return {
     ...node,
     props: {
-      ...node.props,
+      ...revisedTextProps(node, path, ctx),
       text,
       revision: makeRevision(ctx, segments)
     }
@@ -460,7 +487,7 @@ function deletedTextComponent(node, path, ctx) {
   return {
     ...node,
     props: {
-      ...node.props,
+      ...revisedTextProps(node, path, ctx),
       text: "",
       revision: makeRevision(ctx, segments)
     }
@@ -579,6 +606,238 @@ function listWithAllItems(node, type, ctx) {
   }));
   return { ...node, props: { ...node.props, items } };
 }
+function cellText(cell) {
+  if (!cell) return "";
+  const content = cell.content;
+  if (typeof content === "string")
+    return stripMarkdown(content.normalize("NFC"));
+  if (content && typeof content === "object") {
+    const props = content.props;
+    const text = props?.text;
+    if (typeof text === "string") return stripMarkdown(text.normalize("NFC"));
+  }
+  return "";
+}
+function cellRawText(cell) {
+  if (!cell) return "";
+  const content = cell.content;
+  if (typeof content === "string") return content.normalize("NFC");
+  if (content && typeof content === "object") {
+    const text = content.props?.text;
+    if (typeof text === "string") return text.normalize("NFC");
+  }
+  return "";
+}
+function isTextCell(cell) {
+  if (!cell) return true;
+  const content = cell.content;
+  if (content === void 0 || typeof content === "string") return true;
+  return typeof content === "object" && content.name === "paragraph";
+}
+function toRowView(node) {
+  const columns = node.props?.columns ?? [];
+  const rowCount = columns.reduce(
+    (max, column) => Math.max(max, column.cells?.length ?? 0),
+    0
+  );
+  const authoredRows = node.props?.rows ?? [];
+  return Array.from({ length: rowCount }, (_, rowIndex) => {
+    const cells = columns.map((column) => column.cells?.[rowIndex]);
+    return {
+      cells,
+      key: cells.map(cellText).join("\0"),
+      rawKey: cells.map(cellRawText).join("\0"),
+      rowProps: authoredRows[rowIndex]
+    };
+  });
+}
+function withRows(node, rows, rowProps) {
+  const columns = node.props?.columns ?? [];
+  const merged = rows.map((row, index) => ({
+    ...row.rowProps ?? {},
+    ...rowProps[index]
+  }));
+  return {
+    ...node,
+    props: {
+      ...node.props,
+      columns: columns.map((column, colIndex) => ({
+        ...column,
+        cells: rows.map((row) => row.cells[colIndex] ?? { content: "" })
+      })),
+      ...merged.some((props) => Object.keys(props).length > 0) && {
+        rows: merged
+      }
+    }
+  };
+}
+function isColumnTable(node) {
+  return Array.isArray(node.props?.columns) && !node.props?.headers;
+}
+function revisedCell(cell, oldCell, oldText, newText, path, ctx) {
+  const segments = diffWords(oldText, newText);
+  notePlaceholdersInChanges(segments, path, "table", ctx);
+  if (cellRawText(oldCell) !== oldText || cellRawText(cell) !== newText) {
+    ctx.summary.untracked.push({
+      path,
+      kind: "modified",
+      component: "table",
+      detail: "inline formatting or links flattened to plain text in a table cell (revision segments render literally)"
+    });
+  }
+  const base = cell ?? { content: "" };
+  return {
+    ...base,
+    // The revision carries the text, so `content` keeps the new version for
+    // readers that ignore tracked changes. A component cell keeps being a
+    // component — replacing it with a bare string would silently discard the
+    // paragraph's font, alignment and the rest.
+    content: revisedCellContent(base.content, newText, path, ctx),
+    revision: makeRevision(ctx, segments)
+  };
+}
+function revisedCellContent(content, newText, path, ctx) {
+  if (!content || typeof content !== "object") return newText;
+  const component = content;
+  return {
+    ...component,
+    props: {
+      ...revisedTextProps(component, path, ctx),
+      text: newText
+    }
+  };
+}
+function diffTableComponent(oldNode, newNode, path, ctx) {
+  const oldRows = toRowView(oldNode);
+  const newRows = toRowView(newNode);
+  const oldColumns = oldNode.props?.columns ?? [];
+  const newColumns = newNode.props?.columns ?? [];
+  if (oldColumns.length !== newColumns.length) {
+    ctx.summary.untracked.push({
+      path,
+      kind: "modified",
+      component: "table",
+      detail: "table column count changed (columns are not expressible as a tracked change); new version rendered"
+    });
+    return newNode;
+  }
+  const propsChanged = !deepEqual(
+    propsWithout(oldNode.props, "columns", "rows"),
+    propsWithout(newNode.props, "columns", "rows")
+  );
+  if (propsChanged) {
+    ctx.summary.untracked.push({
+      path,
+      kind: "modified",
+      component: "table",
+      detail: "table configuration changed (borders/widths/defaults); new version rendered"
+    });
+  }
+  const headersChanged = !deepEqual(
+    oldColumns.map((column) => column.header),
+    newColumns.map((column) => column.header)
+  );
+  if (headersChanged) {
+    ctx.summary.untracked.push({
+      path,
+      kind: "modified",
+      component: "table",
+      detail: "table header row changed (headers are not row content); new version rendered"
+    });
+  }
+  if (deepEqual(
+    oldRows.map((row) => row.key),
+    newRows.map((row) => row.key)
+  )) {
+    if (!deepEqual(
+      oldRows.map((row) => row.rawKey),
+      newRows.map((row) => row.rawKey)
+    )) {
+      ctx.summary.untracked.push({
+        path,
+        kind: "modified",
+        component: "table",
+        detail: "inline formatting or link target changed in table cells (markdown-only); new version rendered without a tracked change"
+      });
+    } else if (!propsChanged && !headersChanged && deepEqual(oldRows, newRows)) {
+      ctx.summary.unchangedBlocks++;
+    }
+    return newNode;
+  }
+  const ops = alignByLcs(oldRows, newRows, (row) => row.key);
+  const outRows = [];
+  const outProps = [];
+  let changed = false;
+  const push = (row, props) => {
+    outRows.push(row);
+    outProps.push(props);
+  };
+  let k = 0;
+  while (k < ops.length) {
+    const op = ops[k];
+    if (op.op === "equal") {
+      push(op.newItem, {});
+      k++;
+      continue;
+    }
+    const deleted = [];
+    const inserted = [];
+    while (k < ops.length && ops[k].op !== "equal") {
+      const gapOp = ops[k];
+      if (gapOp.op === "delete") deleted.push(gapOp.oldItem);
+      else if (gapOp.op === "insert") inserted.push(gapOp.newItem);
+      k++;
+    }
+    const { plan } = pairGap(
+      deleted,
+      inserted,
+      (oldRow, newRow) => oldRow.cells.length === newRow.cells.length && oldRow.cells.every(isTextCell) && newRow.cells.every(isTextCell)
+    );
+    for (const step of plan) {
+      changed = true;
+      if (step.kind === "paired") {
+        const cells = step.newItem.cells.map((cell, index) => {
+          const oldText = cellText(step.oldItem.cells[index]);
+          const newText = cellText(cell);
+          return oldText === newText ? cell ?? { content: "" } : revisedCell(
+            cell,
+            step.oldItem.cells[index],
+            oldText,
+            newText,
+            path,
+            ctx
+          );
+        });
+        push({ ...step.newItem, cells }, {});
+      } else if (step.kind === "inserted") {
+        ctx.summary.tracked.inserted++;
+        push(step.newItem, { revision: rowRevision(ctx, "insert") });
+      } else {
+        ctx.summary.tracked.deleted++;
+        push(step.oldItem, { revision: rowRevision(ctx, "delete") });
+      }
+    }
+  }
+  if (changed) ctx.summary.tracked.modified++;
+  return withRows(newNode, outRows, outProps);
+}
+function tableWithAllRows(node, type, ctx) {
+  if (type === "insert") ctx.summary.tracked.inserted++;
+  else ctx.summary.tracked.deleted++;
+  const rows = toRowView(node);
+  return withRows(
+    node,
+    rows,
+    rows.map(() => ({ revision: rowRevision(ctx, type) }))
+  );
+}
+function rowRevision(ctx, type) {
+  return {
+    type,
+    ...ctx.author && { author: ctx.author },
+    ...ctx.date && { date: ctx.date }
+  };
+}
 function isContainer(node) {
   return Array.isArray(node.children);
 }
@@ -605,6 +864,9 @@ function diffPairedNode(oldNode, newNode, path, ctx) {
   if (newNode.name === "list") {
     return diffListComponent(oldNode, newNode, path, ctx);
   }
+  if (newNode.name === "table" && isColumnTable(oldNode) && isColumnTable(newNode)) {
+    return diffTableComponent(oldNode, newNode, path, ctx);
+  }
   if (isContainer(newNode) || isContainer(oldNode)) {
     const propsChanged = !deepEqual(oldNode.props, newNode.props);
     if (propsChanged) {
@@ -643,6 +905,9 @@ function emitInserted(node, path, ctx) {
   if (node.name === "list") {
     return listWithAllItems(node, "insert", ctx);
   }
+  if (node.name === "table" && isColumnTable(node)) {
+    return tableWithAllRows(node, "insert", ctx);
+  }
   if (isContainer(node)) {
     if (typeof node.props?.title === "string") {
       ctx.summary.untracked.push({
@@ -675,6 +940,9 @@ function emitDeleted(node, path, ctx) {
   if (node.name === "list") {
     return listWithAllItems(node, "delete", ctx);
   }
+  if (node.name === "table" && isColumnTable(node)) {
+    return tableWithAllRows(node, "delete", ctx);
+  }
   if (isContainer(node)) {
     if (typeof node.props?.title === "string") {
       ctx.summary.untracked.push({
@@ -1644,11 +1912,15 @@ export {
   BorderSchema,
   COMPONENT_METADATA,
   ColumnsPropsSchema,
+  CommentReplySchema,
+  CommentSchema,
   ComponentDefinitionSchema,
   CustomComponentDefinitionSchema,
   DEFAULT_ERROR_CONFIG,
   ERROR_EMOJIS,
   ERROR_TEMPLATES,
+  EndnotesSchema,
+  FootnotesSchema,
   GenerateDocumentRequestSchema,
   GenerateDocumentResponseSchema,
   HeadingLevelSchema,
@@ -1663,16 +1935,20 @@ export {
   JsonValidationError,
   JustifiedAlignmentSchema,
   LineSpacingSchema,
+  ListMarkerFontSchema,
   ListPropsSchema,
   MarginsSchema,
+  NoteSchema,
   NumberingSchema,
   ParagraphIndentSchema,
   ParagraphPropsSchema,
   ReportPropsSchema,
+  RevisionMarkSchema,
   RevisionSchema,
   RevisionSegmentSchema,
   SHARED_DOCX_VERSION,
   STANDARD_COMPONENTS,
+  STANDARD_COMPONENTS_REGISTRY,
   STANDARD_COMPONENTS_SET,
   SectionPropsSchema,
   SpacingSchema,
@@ -1697,6 +1973,7 @@ export {
   calculatePosition,
   clearComponentNamesCache,
   collectIndentConflicts,
+  collectNoteRevisionConflicts,
   compareSemver,
   componentValidator,
   comprehensiveValidateDocument,
@@ -1729,10 +2006,12 @@ export {
   formatValidationErrorStrings,
   formatValidationErrors,
   generateUnifiedDocumentSchema,
+  getAllStandardComponentNames,
   getErrorSummary,
   getLiteralValue,
   getObjectSchemaPropertyNames,
   getSchemaMetadata,
+  getStandardComponent,
   getThemeName,
   getValidationContext,
   getValidationErrors,