@json-to-office/core-docx 0.17.1 → 0.17.3

package/dist/index.js

@@ -3469,216 +3469,116 @@ function getStyleIdForLevel(level) {
   return styleMap[level] || "Heading1";
 }
 
-// src/utils/textParser.ts
-import { TextRun as TextRun2, ExternalHyperlink as ExternalHyperlink2, InternalHyperlink as InternalHyperlink2 } from "docx";
-
-// src/utils/placeholderProcessor.ts
-import {
-  TextRun,
-  PageNumber
-} from "docx";
+// src/core/render.ts
+init_styleHelpers();
+init_layoutUtils();
 
-// src/utils/unicode.ts
-function normalizeUnicodeText(text) {
-  return (text ?? "").normalize("NFC");
-}
+// src/cache/index.ts
+var cache_exports = {};
+__export(cache_exports, {
+  CacheKeyGenerator: () => CacheKeyGenerator
+});
+__reExport(cache_exports, cache_star);
+import * as cache_star from "@json-to-office/shared/cache";
 
-// src/utils/placeholderProcessor.ts
-var PlaceholderRegistry = class {
-  static handlers = /* @__PURE__ */ new Map();
-  /**
-   * Register a placeholder handler
-   */
-  static register(name, handler) {
-    this.handlers.set(name.toUpperCase(), handler);
+// src/cache/key-generator.ts
+import { createHash } from "crypto";
+var CacheKeyGenerator = class {
+  version;
+  constructor(version = "1.0") {
+    this.version = version;
   }
   /**
-   * Get a placeholder handler
+   * Generate cache key for a component
    */
-  static get(name) {
-    return this.handlers.get(name.toUpperCase());
+  generateKey(component, context, options = {}) {
+    const parts = [
+      this.version,
+      component.name,
+      this.hashProps(component.props)
+    ];
+    if (options.includeTheme !== false) {
+      parts.push(context.theme.name);
+    }
+    if (options.includeContext) {
+      parts.push(this.hashContext(context));
+    }
+    if (options.additionalKeys) {
+      parts.push(...options.additionalKeys);
+    }
+    if (options.version) {
+      parts.push(options.version);
+    }
+    return parts.join(":");
   }
   /**
-   * Check if a placeholder is registered
+   * Hash component props
    */
-  static has(name) {
-    return this.handlers.has(name.toUpperCase());
+  hashProps(props) {
+    if (!props) return "null";
+    const normalized = this.normalizeObject(props);
+    const json = JSON.stringify(normalized);
+    return this.hash(json);
   }
   /**
-   * Get all registered placeholder names
+   * Hash render context
    */
-  static getRegisteredNames() {
-    return Array.from(this.handlers.keys());
+  hashContext(context) {
+    const relevant = {
+      theme: context.theme.name,
+      document: context.document
+      // Exclude runtime properties like sectionIndex, componentIndex
+    };
+    return this.hash(JSON.stringify(relevant));
   }
   /**
-   * Clear all registered placeholders
+   * Normalize object for consistent hashing
    */
-  static clear() {
-    this.handlers.clear();
-  }
-};
-function processTextWithPlaceholders(text, baseStyle = {}, context = {}) {
-  const normalizedText = normalizeUnicodeText(text);
-  const combinedRegex = /(\*\*\*|___)([\s\S]*?)\1|(\*\*|__)([\s\S]*?)\3|(\*|_)([\s\S]*?)\5|\{([^}]+)\}/g;
-  const result = [];
-  let lastIndex = 0;
-  let match;
-  while ((match = combinedRegex.exec(normalizedText)) !== null) {
-    if (match.index > lastIndex) {
-      const beforeText = normalizedText.substring(lastIndex, match.index);
-      if (beforeText) {
-        result.push(...createTextRunsWithNewlines(beforeText, baseStyle));
-      }
+  normalizeObject(obj) {
+    if (obj === null || obj === void 0) return obj;
+    if (Array.isArray(obj)) {
+      return obj.map((item) => this.normalizeObject(item));
     }
-    if (match[7]) {
-      const placeholderName = match[7];
-      const handler = PlaceholderRegistry.get(placeholderName);
-      if (handler) {
-        const placeholderResult = handler({ ...context, style: baseStyle });
-        if (Array.isArray(placeholderResult)) {
-          result.push(...placeholderResult);
-        } else if (placeholderResult instanceof TextRun) {
-          result.push(placeholderResult);
-        } else if (typeof placeholderResult === "string") {
-          result.push(
-            ...createTextRunsWithNewlines(placeholderResult, baseStyle)
-          );
-        }
-      } else {
-        result.push(...createTextRunsWithNewlines(match[0], baseStyle));
-      }
-    } else {
-      let decoratedText;
-      let bold = baseStyle.bold || false;
-      let italics = baseStyle.italics || false;
-      if (match[1] === "***" || match[1] === "___") {
-        decoratedText = match[2];
-        bold = true;
-        italics = true;
-      } else if (match[3] === "**" || match[3] === "__") {
-        decoratedText = match[4];
-        bold = true;
-      } else if (match[5] === "*" || match[5] === "_") {
-        decoratedText = match[6];
-        italics = true;
-      } else {
-        decoratedText = match[0];
-      }
-      const decoratedTextRuns = processTextWithPlaceholders(
-        decoratedText,
-        {
-          ...baseStyle,
-          bold,
-          italics
-        },
-        context
-      );
-      result.push(...decoratedTextRuns);
+    if (obj instanceof Date) {
+      return obj.toISOString();
     }
-    lastIndex = match.index + match[0].length;
-  }
-  if (lastIndex < normalizedText.length) {
-    const remainingText = normalizedText.substring(lastIndex);
-    if (remainingText) {
-      result.push(...createTextRunsWithNewlines(remainingText, baseStyle));
+    if (typeof obj === "object") {
+      const sorted = {};
+      const keys = Object.keys(obj).sort();
+      for (const key of keys) {
+        sorted[key] = this.normalizeObject(obj[key]);
+      }
+      return sorted;
     }
+    return obj;
   }
-  if (result.length === 0 && normalizedText) {
-    result.push(...createTextRunsWithNewlines(normalizedText, baseStyle));
-  }
-  return result;
-}
-function createTextRunsWithNewlines(text, baseStyle) {
-  const runs = [];
-  const lines = text.split("\n");
-  for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
-    const line = lines[lineIndex];
-    const needsLineBreak = lineIndex > 0;
-    if (line || needsLineBreak) {
-      runs.push(
-        new TextRun({
-          text: line,
-          font: baseStyle.font,
-          size: baseStyle.size,
-          color: baseStyle.color,
-          bold: baseStyle.bold,
-          italics: baseStyle.italics,
-          underline: baseStyle.underline,
-          break: needsLineBreak ? 1 : void 0
-        })
-      );
-    }
+  /**
+   * Create hash
+   */
+  hash(input) {
+    return createHash("sha256").update(input).digest("hex").substring(0, 16);
   }
-  return runs;
-}
-function initializeBuiltinPlaceholders() {
-  PlaceholderRegistry.register("PAGE", (context) => {
-    return new TextRun({
-      children: [PageNumber.CURRENT],
-      font: context?.style?.font,
-      size: context?.style?.size,
-      color: context?.style?.color,
-      bold: context?.style?.bold,
-      italics: context?.style?.italics,
-      underline: context?.style?.underline
-    });
-  });
-  PlaceholderRegistry.register("TOTAL_PAGES", (context) => {
-    return new TextRun({
-      children: [PageNumber.TOTAL_PAGES],
-      font: context?.style?.font,
-      size: context?.style?.size,
-      color: context?.style?.color,
-      bold: context?.style?.bold,
-      italics: context?.style?.italics,
-      underline: context?.style?.underline
-    });
-  });
-  PlaceholderRegistry.register("DATE", (context) => {
-    const today = /* @__PURE__ */ new Date();
-    const dateString = today.toLocaleDateString();
-    return new TextRun({
-      text: dateString,
-      font: context?.style?.font,
-      size: context?.style?.size,
-      color: context?.style?.color,
-      bold: context?.style?.bold,
-      italics: context?.style?.italics,
-      underline: context?.style?.underline
-    });
-  });
-  PlaceholderRegistry.register("DATETIME", (context) => {
-    const now = /* @__PURE__ */ new Date();
-    const dateTimeString = now.toLocaleString();
-    return new TextRun({
-      text: dateTimeString,
-      font: context?.style?.font,
-      size: context?.style?.size,
-      color: context?.style?.color,
-      bold: context?.style?.bold,
-      italics: context?.style?.italics,
-      underline: context?.style?.underline
-    });
-  });
-  PlaceholderRegistry.register("YEAR", (context) => {
-    const year = (/* @__PURE__ */ new Date()).getFullYear().toString();
-    return new TextRun({
-      text: year,
-      font: context?.style?.font,
-      size: context?.style?.size,
-      color: context?.style?.color,
-      bold: context?.style?.bold,
-      italics: context?.style?.italics,
-      underline: context?.style?.underline
-    });
-  });
+};
+
+// src/utils/revisionUtils.ts
+import { TextRun as TextRun3, InsertedTextRun, DeletedTextRun } from "docx";
+
+// src/utils/unicode.ts
+function normalizeUnicodeText(text) {
+  return (text ?? "").normalize("NFC");
 }
-initializeBuiltinPlaceholders();
+
+// src/utils/placeholderProcessor.ts
+import {
+  TextRun as TextRun2,
+  PageNumber
+} from "docx";
 
 // src/utils/textParser.ts
+import { TextRun, ExternalHyperlink, InternalHyperlink } from "docx";
 function parseTextWithDecorators(text, baseStyle = {}, options = {}) {
   if (!text) {
-    return [new TextRun2({ text: "", ...baseStyle })];
+    return [new TextRun({ text: "", ...baseStyle })];
   }
   const normalizedText = normalizeUnicodeText(text);
   const hasPlaceholders = /\{[^}]+\}/.test(normalizedText);
@@ -3700,7 +3600,7 @@ function parseTextWithDecorators(text, baseStyle = {}, options = {}) {
     if (match.index > lastIndex) {
       const plainText = normalizedText.substring(lastIndex, match.index);
       if (plainText) {
-        runs.push(...createTextRunsWithNewlines2(plainText, baseStyle, options));
+        runs.push(...createTextRunsWithNewlines(plainText, baseStyle, options));
       }
     }
     let decoratedText;
@@ -3719,7 +3619,7 @@ function parseTextWithDecorators(text, baseStyle = {}, options = {}) {
     } else {
       decoratedText = match[0];
     }
-    const decoratedRuns = createTextRunsWithNewlines2(
+    const decoratedRuns = createTextRunsWithNewlines(
       decoratedText,
       baseStyle,
       options,
@@ -3735,18 +3635,18 @@ function parseTextWithDecorators(text, baseStyle = {}, options = {}) {
     const remainingText = normalizedText.substring(lastIndex);
     if (remainingText) {
       runs.push(
-        ...createTextRunsWithNewlines2(remainingText, baseStyle, options)
+        ...createTextRunsWithNewlines(remainingText, baseStyle, options)
       );
     }
   }
   if (runs.length === 0 && normalizedText) {
     runs.push(
-      ...createTextRunsWithNewlines2(normalizedText, baseStyle, options)
+      ...createTextRunsWithNewlines(normalizedText, baseStyle, options)
     );
   }
   return runs;
 }
-function createTextRunsWithNewlines2(text, baseStyle, options, overrideStyle) {
+function createTextRunsWithNewlines(text, baseStyle, options, overrideStyle) {
   const runs = [];
   const lines = text.split("\n");
   for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
@@ -3758,7 +3658,7 @@ function createTextRunsWithNewlines2(text, baseStyle, options, overrideStyle) {
         italics: overrideStyle?.italics ?? baseStyle.italics
       };
       runs.push(
-        new TextRun2({
+        new TextRun({
           text: line,
           ...baseStyle.font && { font: baseStyle.font },
           ...baseStyle.size && { size: baseStyle.size },
@@ -3804,7 +3704,7 @@ function parseTextWithHyperlinks(text, baseStyle = {}, options = {}) {
     if (isInternal) {
       const bookmarkId = linkUrl.substring(1);
       runs.push(
-        new InternalHyperlink2({
+        new InternalHyperlink({
           children: linkTextRuns,
           // Cast needed for docx types
           anchor: bookmarkId
@@ -3812,7 +3712,7 @@ function parseTextWithHyperlinks(text, baseStyle = {}, options = {}) {
       );
     } else {
       runs.push(
-        new ExternalHyperlink2({
+        new ExternalHyperlink({
           children: linkTextRuns,
           // Cast needed for docx types
           link: linkUrl
@@ -3841,100 +3741,199 @@ function parseTextWithHyperlinks(text, baseStyle = {}, options = {}) {
   return runs;
 }
 
-// src/core/render.ts
-init_colorUtils();
-init_styleHelpers();
-init_layoutUtils();
-
-// src/cache/index.ts
-var cache_exports = {};
-__export(cache_exports, {
-  CacheKeyGenerator: () => CacheKeyGenerator
-});
-__reExport(cache_exports, cache_star);
-import * as cache_star from "@json-to-office/shared/cache";
-
-// src/cache/key-generator.ts
-import { createHash } from "crypto";
-var CacheKeyGenerator = class {
-  version;
-  constructor(version = "1.0") {
-    this.version = version;
+// src/utils/placeholderProcessor.ts
+var PlaceholderRegistry = class {
+  static handlers = /* @__PURE__ */ new Map();
+  /**
+   * Register a placeholder handler
+   */
+  static register(name, handler) {
+    this.handlers.set(name.toUpperCase(), handler);
   }
   /**
-   * Generate cache key for a component
+   * Get a placeholder handler
    */
-  generateKey(component, context, options = {}) {
-    const parts = [
-      this.version,
-      component.name,
-      this.hashProps(component.props)
-    ];
-    if (options.includeTheme !== false) {
-      parts.push(context.theme.name);
-    }
-    if (options.includeContext) {
-      parts.push(this.hashContext(context));
-    }
-    if (options.additionalKeys) {
-      parts.push(...options.additionalKeys);
-    }
-    if (options.version) {
-      parts.push(options.version);
-    }
-    return parts.join(":");
+  static get(name) {
+    return this.handlers.get(name.toUpperCase());
   }
   /**
-   * Hash component props
+   * Check if a placeholder is registered
    */
-  hashProps(props) {
-    if (!props) return "null";
-    const normalized = this.normalizeObject(props);
-    const json = JSON.stringify(normalized);
-    return this.hash(json);
+  static has(name) {
+    return this.handlers.has(name.toUpperCase());
   }
   /**
-   * Hash render context
+   * Get all registered placeholder names
    */
-  hashContext(context) {
-    const relevant = {
-      theme: context.theme.name,
-      document: context.document
-      // Exclude runtime properties like sectionIndex, componentIndex
-    };
-    return this.hash(JSON.stringify(relevant));
+  static getRegisteredNames() {
+    return Array.from(this.handlers.keys());
   }
   /**
-   * Normalize object for consistent hashing
+   * Clear all registered placeholders
    */
-  normalizeObject(obj) {
-    if (obj === null || obj === void 0) return obj;
-    if (Array.isArray(obj)) {
-      return obj.map((item) => this.normalizeObject(item));
-    }
-    if (obj instanceof Date) {
-      return obj.toISOString();
+  static clear() {
+    this.handlers.clear();
+  }
+};
+function processTextWithPlaceholders(text, baseStyle = {}, context = {}) {
+  const normalizedText = normalizeUnicodeText(text);
+  const combinedRegex = /(\*\*\*|___)([\s\S]*?)\1|(\*\*|__)([\s\S]*?)\3|(\*|_)([\s\S]*?)\5|\{([^}]+)\}/g;
+  const result = [];
+  let lastIndex = 0;
+  let match;
+  while ((match = combinedRegex.exec(normalizedText)) !== null) {
+    if (match.index > lastIndex) {
+      const beforeText = normalizedText.substring(lastIndex, match.index);
+      if (beforeText) {
+        result.push(...createTextRunsWithNewlines2(beforeText, baseStyle));
+      }
     }
-    if (typeof obj === "object") {
-      const sorted = {};
-      const keys = Object.keys(obj).sort();
-      for (const key of keys) {
-        sorted[key] = this.normalizeObject(obj[key]);
+    if (match[7]) {
+      const placeholderName = match[7];
+      const handler = PlaceholderRegistry.get(placeholderName);
+      if (handler) {
+        const placeholderResult = handler({ ...context, style: baseStyle });
+        if (Array.isArray(placeholderResult)) {
+          result.push(...placeholderResult);
+        } else if (placeholderResult instanceof TextRun2) {
+          result.push(placeholderResult);
+        } else if (typeof placeholderResult === "string") {
+          result.push(
+            ...createTextRunsWithNewlines2(placeholderResult, baseStyle)
+          );
+        }
+      } else {
+        result.push(...createTextRunsWithNewlines2(match[0], baseStyle));
       }
-      return sorted;
+    } else {
+      let decoratedText;
+      let bold = baseStyle.bold || false;
+      let italics = baseStyle.italics || false;
+      if (match[1] === "***" || match[1] === "___") {
+        decoratedText = match[2];
+        bold = true;
+        italics = true;
+      } else if (match[3] === "**" || match[3] === "__") {
+        decoratedText = match[4];
+        bold = true;
+      } else if (match[5] === "*" || match[5] === "_") {
+        decoratedText = match[6];
+        italics = true;
+      } else {
+        decoratedText = match[0];
+      }
+      const decoratedTextRuns = processTextWithPlaceholders(
+        decoratedText,
+        {
+          ...baseStyle,
+          bold,
+          italics
+        },
+        context
+      );
+      result.push(...decoratedTextRuns);
     }
-    return obj;
+    lastIndex = match.index + match[0].length;
   }
-  /**
-   * Create hash
-   */
-  hash(input) {
-    return createHash("sha256").update(input).digest("hex").substring(0, 16);
+  if (lastIndex < normalizedText.length) {
+    const remainingText = normalizedText.substring(lastIndex);
+    if (remainingText) {
+      result.push(...createTextRunsWithNewlines2(remainingText, baseStyle));
+    }
   }
-};
+  if (result.length === 0 && normalizedText) {
+    result.push(...createTextRunsWithNewlines2(normalizedText, baseStyle));
+  }
+  return result;
+}
+function createTextRunsWithNewlines2(text, baseStyle) {
+  const runs = [];
+  const lines = text.split("\n");
+  for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+    const line = lines[lineIndex];
+    const needsLineBreak = lineIndex > 0;
+    if (line || needsLineBreak) {
+      runs.push(
+        new TextRun2({
+          text: line,
+          font: baseStyle.font,
+          size: baseStyle.size,
+          color: baseStyle.color,
+          bold: baseStyle.bold,
+          italics: baseStyle.italics,
+          underline: baseStyle.underline,
+          break: needsLineBreak ? 1 : void 0
+        })
+      );
+    }
+  }
+  return runs;
+}
+function initializeBuiltinPlaceholders() {
+  PlaceholderRegistry.register("PAGE", (context) => {
+    return new TextRun2({
+      children: [PageNumber.CURRENT],
+      font: context?.style?.font,
+      size: context?.style?.size,
+      color: context?.style?.color,
+      bold: context?.style?.bold,
+      italics: context?.style?.italics,
+      underline: context?.style?.underline
+    });
+  });
+  PlaceholderRegistry.register("TOTAL_PAGES", (context) => {
+    return new TextRun2({
+      children: [PageNumber.TOTAL_PAGES],
+      font: context?.style?.font,
+      size: context?.style?.size,
+      color: context?.style?.color,
+      bold: context?.style?.bold,
+      italics: context?.style?.italics,
+      underline: context?.style?.underline
+    });
+  });
+  PlaceholderRegistry.register("DATE", (context) => {
+    const today = /* @__PURE__ */ new Date();
+    const dateString = today.toLocaleDateString();
+    return new TextRun2({
+      text: dateString,
+      font: context?.style?.font,
+      size: context?.style?.size,
+      color: context?.style?.color,
+      bold: context?.style?.bold,
+      italics: context?.style?.italics,
+      underline: context?.style?.underline
+    });
+  });
+  PlaceholderRegistry.register("DATETIME", (context) => {
+    const now = /* @__PURE__ */ new Date();
+    const dateTimeString = now.toLocaleString();
+    return new TextRun2({
+      text: dateTimeString,
+      font: context?.style?.font,
+      size: context?.style?.size,
+      color: context?.style?.color,
+      bold: context?.style?.bold,
+      italics: context?.style?.italics,
+      underline: context?.style?.underline
+    });
+  });
+  PlaceholderRegistry.register("YEAR", (context) => {
+    const year = (/* @__PURE__ */ new Date()).getFullYear().toString();
+    return new TextRun2({
+      text: year,
+      font: context?.style?.font,
+      size: context?.style?.size,
+      color: context?.style?.color,
+      bold: context?.style?.bold,
+      italics: context?.style?.italics,
+      underline: context?.style?.underline
+    });
+  });
+}
+initializeBuiltinPlaceholders();
 
 // 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 {
@@ -6736,21 +6735,26 @@ async function renderHeaderFooterComponents(components, theme, themeName, contex
   for (const component of activeComponents) {
     if (isParagraphComponent(component)) {
       const textComp = component;
+      const font = textComp.props.font;
       const normalStyle = getNormalStyle(theme);
-      const textStyle = {
-        font: textComp.props.font?.family || resolveFontFamily(theme, normalStyle.font) || getThemeFonts(theme).body.family,
-        size: (textComp.props.font?.size ?? normalStyle.size ?? 11) * 2,
-        // Convert to half-points
-        bold: textComp.props.font?.bold ?? false,
-        italics: textComp.props.font?.italic ?? false,
-        color: textComp.props.font?.color && resolveColor(textComp.props.font.color, theme) || normalStyle.color && resolveColor(normalStyle.color, theme) || getThemeColors(theme).textPrimary
-      };
-      const textRuns = parseTextWithDecorators(textComp.props.text, textStyle);
       elements.push(
-        new Paragraph7({
-          children: textRuns,
-          alignment: textComp.props.alignment ? getAlignment3(textComp.props.alignment) : void 0,
-          style: "Normal"
+        createText(textComp.props.text, theme, themeName, {
+          style: "Normal",
+          alignment: textComp.props.alignment,
+          // Resolve explicit run styling against the Normal style, preserving
+          // prior header/footer rendering for these properties.
+          fontFamily: font?.family || resolveFontFamily(theme, normalStyle.font) || getThemeFonts(theme).body.family,
+          fontSize: font?.size ?? normalStyle.size ?? 11,
+          // Pass the raw color/token; createText resolves it. Fall back to the
+          // Normal style color, then the theme's primary text color.
+          fontColor: font?.color || normalStyle.color || "textPrimary",
+          bold: font?.bold ?? false,
+          italic: font?.italic ?? false,
+          underline: font?.underline,
+          fontWeight: font?.fontWeight,
+          boldColor: textComp.props.boldColor,
+          spacing: textComp.props.spacing,
+          lineSpacing: font?.lineSpacing
         })
       );
     } else if (isImageComponent(component)) {