@json-to-office/core-docx 0.12.0 → 0.14.0

package/dist/index.js

@@ -231,7 +231,7 @@ var init_minimal_docx_theme = __esm({
           size: 11
         },
         mono: {
-          family: "SF Mono",
+          family: "Menlo",
           size: 10
         },
         light: {
@@ -549,7 +549,7 @@ var init_modern_docx_theme = __esm({
       fonts: {
         heading: { family: "Helvetica", size: 28 },
         body: { family: "Helvetica", size: 11 },
-        mono: { family: "SF Mono", size: 10 },
+        mono: { family: "Menlo", size: 10 },
         light: { family: "Helvetica", size: 28 }
       },
       page: {
@@ -2122,7 +2122,8 @@ async function processDocument(document, theme, themeName) {
     metadata,
     sections,
     theme: effectiveTheme,
-    themeName
+    themeName,
+    trackRevisions: document.props.trackRevisions
   };
 }
 function createDocumentMetadata(props) {
@@ -2581,7 +2582,7 @@ Suggestion: ${suggestion}`
 import {
   Document,
   Paragraph as Paragraph7,
-  TextRun as TextRun5,
+  TextRun as TextRun6,
   AlignmentType as AlignmentType5,
   BookmarkStart as BookmarkStart2,
   BookmarkEnd as BookmarkEnd2
@@ -3914,6 +3915,99 @@ var CacheKeyGenerator = class {
   }
 };
 
+// src/utils/revisionUtils.ts
+import { TextRun as TextRun3, InsertedTextRun, DeletedTextRun } from "docx";
+var DEFAULT_REVISION_AUTHOR = "json-to-office";
+var DEFAULT_REVISION_DATE = "1970-01-01T00:00:00Z";
+var RevisionIdRegistry = class {
+  counter = 0;
+  next() {
+    this.counter += 1;
+    return this.counter;
+  }
+  /** Test-only: deterministic ids for snapshot assertions. */
+  clear() {
+    this.counter = 0;
+  }
+};
+var globalRevisionIdRegistry = new RevisionIdRegistry();
+var PLACEHOLDER_PATTERN = /\{[^}]+\}/;
+function segmentRuns(text, makeRun) {
+  const lines = text.split("\n");
+  return lines.map(
+    (line, index) => makeRun(index === 0 ? { text: line } : { text: line, break: 1 })
+  );
+}
+function createRevisionRuns(revision, baseStyle) {
+  const author = revision.author || DEFAULT_REVISION_AUTHOR;
+  const date = revision.date || DEFAULT_REVISION_DATE;
+  const runs = [];
+  for (const segment of revision.segments) {
+    if (!segment.text) continue;
+    const text = normalizeUnicodeText(segment.text);
+    if (segment.type === "insert") {
+      runs.push(
+        ...segmentRuns(
+          text,
+          (options) => new InsertedTextRun({
+            ...options,
+            ...baseStyle,
+            id: globalRevisionIdRegistry.next(),
+            author,
+            date
+          })
+        )
+      );
+    } else if (segment.type === "delete") {
+      runs.push(
+        ...segmentRuns(
+          text,
+          (options) => new DeletedTextRun({
+            ...options,
+            ...baseStyle,
+            id: globalRevisionIdRegistry.next(),
+            author,
+            date
+          })
+        )
+      );
+    } else if (PLACEHOLDER_PATTERN.test(text)) {
+      runs.push(
+        ...processTextWithPlaceholders(text, baseStyle, {})
+      );
+    } else {
+      runs.push(
+        ...segmentRuns(
+          text,
+          (options) => new TextRun3({ ...options, ...baseStyle })
+        )
+      );
+    }
+  }
+  return runs;
+}
+function componentHasRevision(component) {
+  const props = component.props;
+  if (props) {
+    if (props.revision) return true;
+    const items = props.items;
+    if (Array.isArray(items)) {
+      if (items.some(
+        (item) => typeof item === "object" && item !== null && "revision" in item && item.revision
+      )) {
+        return true;
+      }
+    }
+  }
+  const children = component.children;
+  if (Array.isArray(children)) {
+    return children.some(
+      (child) => typeof child === "object" && child !== null && componentHasRevision(child)
+    );
+  }
+  return false;
+}
+
 // src/core/cached-render.ts
 import { createHash as createHash2 } from "crypto";
 var componentCache = null;
@@ -3961,7 +4055,7 @@ async function clearComponentCache() {
   }
 }
 async function renderComponentWithCache(component, theme, themeName, context, bypassCache = false) {
-  const forceBypassForType = component.name === "toc" || component.name === "section";
+  const forceBypassForType = component.name === "toc" || component.name === "section" || componentHasRevision(component);
   if (!componentCache) {
     initializeComponentCache();
   }
@@ -4002,7 +4096,13 @@ async function warmComponentCache(components) {
   }
   const warmingPromises = components.map(
     async ({ component, theme, themeName, context }) => {
-      await renderComponentWithCache(component, theme, themeName, context, false);
+      await renderComponentWithCache(
+        component,
+        theme,
+        themeName,
+        context,
+        false
+      );
     }
   );
   await Promise.all(warmingPromises);
@@ -4017,7 +4117,7 @@ function getComponentCacheStats() {
 // src/core/content.ts
 import {
   Paragraph,
-  TextRun as TextRun3,
+  TextRun as TextRun4,
   Table,
   TableRow,
   TableCell,
@@ -4167,24 +4267,43 @@ function createText(content, theme, themeName, options = {}) {
       underline: options.underline ? { type: "single" } : void 0
     }
   };
-  const textRuns = parseTextWithDecorators(normalizedContent, baseTextStyle, {
-    boldColor: options.boldColor,
-    enableHyperlinks: true
-  });
-  if (options.bookmarkId) {
-    globalBookmarkRegistry.register(
-      options.bookmarkId,
-      normalizedContent,
-      "paragraph"
-    );
-    children.push(
-      new Bookmark({
-        id: options.bookmarkId,
-        children: textRuns
-      })
-    );
+  if (options.revision) {
+    const revisionRuns = createRevisionRuns(options.revision, baseTextStyle);
+    if (options.bookmarkId) {
+      globalBookmarkRegistry.register(
+        options.bookmarkId,
+        normalizedContent,
+        "paragraph"
+      );
+      children.push(
+        new Bookmark({
+          id: options.bookmarkId,
+          children: revisionRuns
+        })
+      );
+    } else {
+      children.push(...revisionRuns);
+    }
   } else {
-    children.push(...textRuns);
+    const textRuns = parseTextWithDecorators(normalizedContent, baseTextStyle, {
+      boldColor: options.boldColor,
+      enableHyperlinks: true
+    });
+    if (options.bookmarkId) {
+      globalBookmarkRegistry.register(
+        options.bookmarkId,
+        normalizedContent,
+        "paragraph"
+      );
+      children.push(
+        new Bookmark({
+          id: options.bookmarkId,
+          children: textRuns
+        })
+      );
+    } else {
+      children.push(...textRuns);
+    }
   }
   const isFloating = !!options.floating;
   const frameOptions = isFloating && options.floating ? mapFrameOptions(options.floating, theme, themeName) : void 0;
@@ -4305,7 +4424,24 @@ function createHeading(text, level, theme, _themeName, options = {}) {
       underline: options.underline ? { type: "single" } : void 0
     }
   };
-  if (options.bookmarkId) {
+  if (options.revision) {
+    const revisionRuns = createRevisionRuns(options.revision, baseTextStyle);
+    if (options.bookmarkId) {
+      globalBookmarkRegistry.register(
+        options.bookmarkId,
+        normalizedText,
+        "heading"
+      );
+      children.push(
+        new Bookmark({
+          id: options.bookmarkId,
+          children: revisionRuns
+        })
+      );
+    } else {
+      children.push(...revisionRuns);
+    }
+  } else if (options.bookmarkId) {
     globalBookmarkRegistry.register(
       options.bookmarkId,
       normalizedText,
@@ -4320,7 +4456,7 @@ function createHeading(text, level, theme, _themeName, options = {}) {
       headingTextChildren.push(...textRuns);
     } else {
       headingTextChildren.push(
-        new TextRun3({ text: normalizedText, ...baseTextStyle })
+        new TextRun4({ text: normalizedText, ...baseTextStyle })
       );
     }
     children.push(
@@ -4337,7 +4473,7 @@ function createHeading(text, level, theme, _themeName, options = {}) {
       });
       children.push(...textRuns);
     } else {
-      children.push(new TextRun3({ text: normalizedText, ...baseTextStyle }));
+      children.push(new TextRun4({ text: normalizedText, ...baseTextStyle }));
     }
   }
   return new Paragraph({
@@ -4477,10 +4613,11 @@ function createList(items, _theme, _themeName, options = {}) {
   items.forEach((item, index) => {
     const itemText = typeof item === "string" ? item : item.text;
     const itemLevel = typeof item === "object" ? item.level || 0 : 0;
-    if (!itemText.trim()) {
+    const itemRevision = typeof item === "object" ? item.revision : void 0;
+    if (!itemText.trim() && !itemRevision) {
       return;
     }
-    const textRuns = parseTextWithDecorators(
+    const textRuns = itemRevision ? createRevisionRuns(itemRevision, {}) : parseTextWithDecorators(
       itemText,
       {},
       {
@@ -4893,7 +5030,7 @@ async function createTable(columns, tableConfig, theme, themeName, _options = {}
         } catch (error) {
           const imageSource = imageComp.props.base64 || imageComp.props.path || "unknown";
           cellChildren = [
-            new TextRun3({
+            new TextRun4({
               text: `[IMAGE: ${imageSource.substring(0, 50)}${imageSource.length > 50 ? "..." : ""}]`,
               font: mergedStyle.font,
               size: mergedStyle.size,
@@ -4903,7 +5040,7 @@ async function createTable(columns, tableConfig, theme, themeName, _options = {}
         }
       } else {
         cellChildren = [
-          new TextRun3({
+          new TextRun4({
             text: `[Unsupported component type: ${cell.name}]`,
             font: mergedStyle.font,
             size: mergedStyle.size,
@@ -5300,7 +5437,9 @@ function renderHeadingComponent(component, theme, themeName) {
       keepNext: config.keepNext,
       keepLines: config.keepLines,
       // Bookmark ID for internal linking
-      bookmarkId
+      bookmarkId,
+      // Tracked-change segments (rendered as native Word revisions)
+      revision: config.revision
     }
   );
   return [header];
@@ -5344,7 +5483,7 @@ function parseMarkdownList(text) {
 function renderParagraphComponent(component, theme, themeName) {
   if (!isParagraphComponent(component)) return [];
   const resolvedConfig = component.props;
-  const listData = parseMarkdownList(resolvedConfig.text);
+  const listData = resolvedConfig.revision ? null : parseMarkdownList(resolvedConfig.text);
   if (listData) {
     const reference = globalNumberingRegistry.generateReference("markdown-list");
     const levels = [];
@@ -5421,7 +5560,9 @@ function renderParagraphComponent(component, theme, themeName) {
     // Pass keepLines property
     keepLines: resolvedConfig.keepLines,
     // Pass bookmark ID for internal linking
-    bookmarkId: resolvedConfig.id
+    bookmarkId: resolvedConfig.id,
+    // Tracked-change segments (rendered as native Word revisions)
+    revision: resolvedConfig.revision
   });
   return [text];
 }
@@ -6051,7 +6192,7 @@ import {
   Paragraph as Paragraph6,
   TableOfContents,
   AlignmentType as AlignmentType4,
-  TextRun as TextRun4,
+  TextRun as TextRun5,
   StyleLevel
 } from "docx";
 function parseDepthRange(rawDepth, fieldName, defaultFrom = 1, defaultTo = 3) {
@@ -6106,7 +6247,7 @@ function renderTocComponent(component, theme, context) {
     paragraphs.push(
       new Paragraph6({
         children: [
-          new TextRun4({
+          new TextRun5({
             text: componentProps.title,
             bold: true,
             size: 28
@@ -6411,8 +6552,10 @@ async function renderDocument(structure, layout, options) {
     styles: createWordStyles(structure.theme),
     sections,
     features: {
-      updateFields: true
+      updateFields: true,
       // Required for TOC fields to update correctly
+      // Word opens the document in review mode (further edits are tracked)
+      ...structure.trackRevisions && { trackRevisions: true }
     },
     // Add numbering configurations if any lists were rendered
     ...numberingConfigs.length > 0 && {
@@ -6457,7 +6600,7 @@ async function renderHeaderFooterComponents(components, theme, themeName, _conte
         elements.push(
           new Paragraph7({
             children: [
-              new TextRun5({
+              new TextRun6({
                 text: "[IMAGE: Missing path or base64 property]",
                 font: getThemeFonts(theme).body.family,
                 size: 20,
@@ -6539,7 +6682,7 @@ async function renderHeaderFooterComponents(components, theme, themeName, _conte
         elements.push(
           new Paragraph7({
             children: [
-              new TextRun5({
+              new TextRun6({
                 text: `[IMAGE: ${imageComp.props.path}]`,
                 font: getThemeFonts(theme).body.family,
                 size: 20,
@@ -7268,7 +7411,8 @@ import {
 } from "@json-to-office/shared-docx/validation/unified";
 import {
   DuplicateComponentError,
-  ComponentValidationError as ComponentValidationError2
+  ComponentValidationError as ComponentValidationError2,
+  UnknownPreservedComponentError
 } from "@json-to-office/shared/plugin";
 function validateComponentProps(schema, props, componentName) {
   return validateCustomComponentProps(schema.propsSchema, props, {
@@ -7335,6 +7479,9 @@ function getValidatedProps(schema, props) {
 }
 var cleanComponentProps = getValidatedProps;
 
+// src/plugin/createDocumentGenerator.ts
+import { UnknownPreservedComponentError as UnknownPreservedComponentError2 } from "@json-to-office/shared/plugin";
+
 // src/plugin/schema.ts
 import { Type as Type2 } from "@sinclair/typebox";
 import { latestVersion } from "@json-to-office/shared-docx";
@@ -7510,17 +7657,19 @@ function createBuilderImpl(state) {
     }
     return getThemeWithFallback(themeName);
   }
-  async function processDocumentComponents(components, warningsCollector, resolvedTheme, depth = 0) {
+  async function processDocumentComponents(components, preserveSet, warningsCollector, resolvedTheme, depth = 0) {
     if (depth > 20) {
       throw new Error(
         "Maximum component nesting depth exceeded (20). Check for circular component references."
       );
     }
-    const processedComponents = [];
+    const standardOut = [];
+    const preservedOut = [];
     for (const componentData of components) {
       const componentName = componentData?.name;
       if (!componentName) {
-        processedComponents.push(componentData);
+        standardOut.push(componentData);
+        preservedOut.push(componentData);
         continue;
       }
       const customComponent = componentMap.get(componentName);
@@ -7543,12 +7692,14 @@ function createBuilderImpl(state) {
           );
           let nestedChildren;
           if (componentWithName.children && Array.isArray(componentWithName.children)) {
-            nestedChildren = await processDocumentComponents(
+            const nested = await processDocumentComponents(
               componentWithName.children,
+              preserveSet,
               warningsCollector,
               resolvedTheme,
               depth + 1
             );
+            nestedChildren = nested.standard;
           }
           const versionLabel = componentWithName.version ? `${customComponent.name}@${componentWithName.version}` : customComponent.name;
           const addWarning = (message, context) => {
@@ -7568,15 +7719,21 @@ function createBuilderImpl(state) {
           const resultComponents = Array.isArray(result) ? result : [result];
           const processedResult = await processDocumentComponents(
             resultComponents,
+            preserveSet,
             warningsCollector,
             resolvedTheme,
             depth + 1
           );
-          processedComponents.push(...processedResult);
+          standardOut.push(...processedResult.standard);
+          if (preserveSet && preserveSet.has(componentName)) {
+            preservedOut.push(componentData);
+          } else {
+            preservedOut.push(...processedResult.preserved);
+          }
           if (state.debug) {
             console.log(
               `Processed custom component '${versionLabel}':`,
-              processedResult
+              processedResult.standard
             );
           }
         } catch (error) {
@@ -7591,20 +7748,26 @@ function createBuilderImpl(state) {
         if ("children" in componentData && Array.isArray(componentData.children)) {
           const processedNested = await processDocumentComponents(
             componentData.children,
+            preserveSet,
             warningsCollector,
             resolvedTheme,
             depth + 1
           );
-          processedComponents.push({
+          standardOut.push({
+            ...componentData,
+            children: processedNested.standard
+          });
+          preservedOut.push({
             ...componentData,
-            children: processedNested
+            children: processedNested.preserved
           });
         } else {
-          processedComponents.push(componentData);
+          standardOut.push(componentData);
+          preservedOut.push(componentData);
         }
       }
     }
-    return processedComponents;
+    return { standard: standardOut, preserved: preservedOut };
   }
   function addComponent(component) {
     if (!component.name) {
@@ -7629,8 +7792,24 @@ function createBuilderImpl(state) {
       newState
     );
   }
-  async function generate(document) {
+  function resolvePreserveSet(options) {
+    const list = options?.preserveCustomComponents;
+    if (!list || list.length === 0) {
+      return void 0;
+    }
+    const registered = new Set(state.componentNames);
+    const unknown = list.filter((n) => !registered.has(n));
+    if (unknown.length > 0) {
+      throw new UnknownPreservedComponentError2(
+        unknown,
+        Array.from(state.componentNames)
+      );
+    }
+    return new Set(list);
+  }
+  async function generate(document, options) {
     try {
+      const preserveSet = resolvePreserveSet(options);
       const internalDocument = document;
       validateDocument(
         internalDocument,
@@ -7654,14 +7833,15 @@ function createBuilderImpl(state) {
           context: { code: w.code }
         });
       }
-      const processedComponents = await processDocumentComponents(
+      const processed = await processDocumentComponents(
         mode.doc.children || [],
+        preserveSet,
         warnings,
         modedTheme
       );
       const processedDocument = {
         ...mode.doc,
-        children: processedComponents
+        children: processed.standard
       };
       const [modedDoc] = normalizeDocument(processedDocument);
       await resolveDocumentFonts(modedDoc, modedTheme, state.fonts, warnings);
@@ -7670,9 +7850,15 @@ function createBuilderImpl(state) {
       const generatedDocument = await renderDocument(structure, layout, {
         services: state.services
       });
+      const preservedDefinition = preserveSet ? {
+        ...mode.doc,
+        children: processed.preserved
+      } : void 0;
       return {
         document: generatedDocument,
-        warnings: warnings.length > 0 ? warnings : null
+        warnings: warnings.length > 0 ? warnings : null,
+        standardDefinition: modedDoc,
+        preservedDefinition
       };
     } catch (error) {
       if (state.debug) {
@@ -7681,16 +7867,40 @@ function createBuilderImpl(state) {
       throw error;
     }
   }
-  async function generateBuffer(document) {
-    const { document: doc, warnings } = await generate(document);
+  async function generateBuffer(document, options) {
+    const {
+      document: doc,
+      warnings,
+      standardDefinition,
+      preservedDefinition
+    } = await generate(document, options);
     const buffer = await Packer2.toBuffer(doc);
-    return { buffer, warnings };
+    return { buffer, warnings, standardDefinition, preservedDefinition };
   }
-  async function generateFile(document, outputPath) {
-    const { buffer, warnings } = await generateBuffer(document);
+  async function generateFile(document, outputPath, options) {
+    const { buffer, warnings, standardDefinition, preservedDefinition } = await generateBuffer(document, options);
     const fs6 = await import("fs/promises");
     await fs6.writeFile(outputPath, new Uint8Array(buffer));
-    return { warnings };
+    let preservedOutputPath;
+    if (preservedDefinition !== void 0) {
+      const path4 = await import("path");
+      preservedOutputPath = options?.preservedOutputPath ?? (() => {
+        const ext = path4.extname(outputPath);
+        const base = ext ? outputPath.slice(0, -ext.length) : outputPath;
+        return `${base}-preserved.json`;
+      })();
+      await fs6.writeFile(
+        preservedOutputPath,
+        JSON.stringify(preservedDefinition, null, 2),
+        "utf8"
+      );
+    }
+    return {
+      warnings,
+      standardDefinition,
+      preservedDefinition,
+      preservedOutputPath
+    };
   }
   function getComponentNames() {
     return Array.from(state.componentNames);
@@ -7724,6 +7934,10 @@ function createBuilderImpl(state) {
       };
     }
   }
+  async function getStandardComponentsDefinition(document) {
+    const { standardDefinition } = await generate(document);
+    return standardDefinition;
+  }
   function generateSchema(includeStandardComponents = true) {
     return generatePluginDocumentSchema(
       state.components,
@@ -7737,40 +7951,6 @@ function createBuilderImpl(state) {
       options
     );
   }
-  async function getStandardComponentsDefinition(document) {
-    try {
-      const internalDocument = document;
-      validateDocument(
-        internalDocument,
-        state.components
-      );
-      const themeName = internalDocument.props.theme || "minimal";
-      const docTheme = resolveDocumentTheme(themeName);
-      const warnings = [];
-      const mode = applyExportMode2({
-        doc: internalDocument,
-        theme: docTheme,
-        fonts: state.fonts
-      });
-      const modedTheme = mode.theme;
-      const processedComponents = await processDocumentComponents(
-        mode.doc.children || [],
-        warnings,
-        modedTheme
-      );
-      const processedDocument = {
-        ...mode.doc,
-        children: processedComponents
-      };
-      const [finalReportComponent] = normalizeDocument(processedDocument);
-      return finalReportComponent;
-    } catch (error) {
-      if (state.debug) {
-        console.error("Error getting standard components definition:", error);
-      }
-      throw error;
-    }
-  }
   return Object.freeze({
     addComponent,
     generate,
@@ -7816,6 +7996,7 @@ export {
   ThemeFileError,
   ThemeParseError,
   ThemeValidationError,
+  UnknownPreservedComponentError,
   cleanComponentProps,
   clearComponentCache,
   corporateTheme,