@json-to-office/core-docx 0.24.0 → 0.25.0

package/dist/index.js

@@ -1059,7 +1059,8 @@ function resolveFontProperties(theme, fontRef) {
     alignment: fontDef.alignment,
     lineSpacing: fontDef.lineSpacing,
     spacing: fontDef.spacing,
-    characterSpacing: fontDef.characterSpacing
+    characterSpacing: fontDef.characterSpacing,
+    scale: fontDef.scale
   };
 }
 function mergeFontAndStyleProperties(fontProps, styleOverrides) {
@@ -1941,6 +1942,9 @@ import {
   isVisualComponent
 } from "@json-to-office/shared-docx";
 
+// src/core/generationContext.ts
+import { applyExportMode, scopedThemeName } from "@json-to-office/shared";
+
 // src/styles/theme-resolver.ts
 init_themes();
 function resolveBuiltInTheme(themeName, options = {}) {
@@ -1959,6 +1963,81 @@ function resolveBuiltInTheme(themeName, options = {}) {
   return getThemeWithFallback(themeName);
 }
 
+// src/themes/overrides.ts
+import { createHash } from "crypto";
+function applyThemeOverrides(theme, overrides) {
+  if (!overrides) return theme;
+  const fonts = { ...theme.fonts };
+  for (const [role, def] of Object.entries(overrides.fonts ?? {})) {
+    const key = role;
+    fonts[key] = { ...theme.fonts[key], ...def };
+  }
+  const styles = { ...theme.styles ?? {} };
+  for (const [name, def] of Object.entries(overrides.styles ?? {})) {
+    styles[name] = { ...styles[name], ...def };
+  }
+  return {
+    ...theme,
+    colors: { ...theme.colors, ...overrides.colors ?? {} },
+    fonts,
+    ...Object.keys(styles).length > 0 && { styles }
+  };
+}
+function themeOverridesDigest(overrides) {
+  return createHash("sha256").update(JSON.stringify(overrides)).digest("hex").slice(0, 8);
+}
+
+// src/core/generationContext.ts
+function defaultNamedThemeLookup(themeName, customThemes, warnings) {
+  if (customThemes) {
+    if (customThemes[themeName]) return customThemes[themeName];
+    const themeNameLower = themeName.toLowerCase();
+    const matchingThemeKey = Object.keys(customThemes).find(
+      (key) => key.toLowerCase() === themeNameLower
+    );
+    if (matchingThemeKey) return customThemes[matchingThemeKey];
+    return resolveBuiltInTheme(themeName, { customThemes, warnings });
+  }
+  return resolveBuiltInTheme(themeName, { warnings });
+}
+function resolveThemeContext(documentIn, options = {}) {
+  const { customThemes, fonts, warnings, resolveNamedTheme } = options;
+  if (documentIn.props === null) {
+    throw new Error(
+      "Document `props` is null. Omit it, or provide an object \u2014 a null props cannot carry a theme."
+    );
+  }
+  const document = documentIn.props === void 0 ? { ...documentIn, props: {} } : documentIn;
+  const baseThemeName = document.props.theme || "minimal";
+  let theme = resolveNamedTheme ? resolveNamedTheme(baseThemeName, warnings) : defaultNamedThemeLookup(baseThemeName, customThemes, warnings);
+  const themeOverrides = document.props.themeOverrides;
+  let themeName = baseThemeName;
+  if (themeOverrides) {
+    theme = applyThemeOverrides(theme, themeOverrides);
+    themeName = `${themeName}+ov:${themeOverridesDigest(themeOverrides)}`;
+  }
+  const mode = applyExportMode({ doc: document, theme, fonts });
+  for (const w of mode.warnings) {
+    if (warnings) {
+      warnings.push({
+        component: "fontRegistry",
+        message: w.message,
+        severity: "warning",
+        context: { code: w.code }
+      });
+    } else {
+      console.warn(`[json-to-docx] [${w.code}] ${w.message}`);
+    }
+  }
+  return {
+    document: mode.doc,
+    theme: mode.theme,
+    // Scope by mode too: substitute rewrites the theme in place, so caches
+    // must not share slots with custom-mode runs keyed on the same name.
+    themeName: scopedThemeName(themeName, fonts?.mode)
+  };
+}
+
 // src/utils/formatters.ts
 import { format } from "date-fns";
 var formatDate = (date, formatString = "MMMM d, yyyy") => {
@@ -2955,7 +3034,8 @@ function convertRunProperties(merged, theme, defaultColor, defaultSize) {
     ...merged.underline !== void 0 && merged.underline && { underline: { type: "single" } },
     ...merged.characterSpacing && {
       characterSpacing: merged.characterSpacing.type === "condensed" ? -merged.characterSpacing.value : merged.characterSpacing.value
-    }
+    },
+    ...merged.scale && { scale: merged.scale }
   };
 }
 function convertParagraphProperties(merged, styleProps, theme) {
@@ -3029,7 +3109,8 @@ function createWordStyles(themeNameOrObject = "minimal", language) {
           bold: normalStyle?.bold,
           italic: normalStyle?.italic,
           underline: normalStyle?.underline,
-          characterSpacing: normalStyle?.characterSpacing
+          characterSpacing: normalStyle?.characterSpacing,
+          scale: normalStyle?.scale
         });
         return convertRunProperties(merged, theme, theme.colors.text);
       })(),
@@ -3067,7 +3148,8 @@ function createWordStyles(themeNameOrObject = "minimal", language) {
             bold: headingStyle.bold,
             italic: headingStyle.italic,
             underline: headingStyle.underline,
-            characterSpacing: headingStyle.characterSpacing
+            characterSpacing: headingStyle.characterSpacing,
+            scale: headingStyle.scale
           });
           return convertRunProperties(merged, theme, theme.colors.primary, 20);
         })(),
@@ -3133,7 +3215,8 @@ function createWordStyles(themeNameOrObject = "minimal", language) {
             bold: headingStyle.bold,
             italic: headingStyle.italic,
             underline: headingStyle.underline,
-            characterSpacing: headingStyle.characterSpacing
+            characterSpacing: headingStyle.characterSpacing,
+            scale: headingStyle.scale
           });
           return convertRunProperties(merged, theme, theme.colors.primary, 20);
         })(),
@@ -3200,7 +3283,8 @@ function createWordStyles(themeNameOrObject = "minimal", language) {
           bold: titleStyle.bold,
           italic: titleStyle.italic,
           underline: titleStyle.underline,
-          characterSpacing: titleStyle.characterSpacing
+          characterSpacing: titleStyle.characterSpacing,
+          scale: titleStyle.scale
         });
         return convertRunProperties(merged, theme, theme.colors.primary, 20);
       })(),
@@ -3261,7 +3345,8 @@ function createWordStyles(themeNameOrObject = "minimal", language) {
           bold: subtitleStyle.bold,
           italic: subtitleStyle.italic,
           underline: subtitleStyle.underline,
-          characterSpacing: subtitleStyle.characterSpacing
+          characterSpacing: subtitleStyle.characterSpacing,
+          scale: subtitleStyle.scale
         });
         return convertRunProperties(merged, theme, theme.colors.secondary);
       })(),
@@ -3403,7 +3488,8 @@ function createWordStyles(themeNameOrObject = "minimal", language) {
             bold: customStyle.bold,
             italic: customStyle.italic,
             underline: customStyle.underline,
-            characterSpacing: customStyle.characterSpacing
+            characterSpacing: customStyle.characterSpacing,
+            scale: customStyle.scale
           });
           return convertRunProperties(merged, theme, theme.colors.text);
         })(),
@@ -3511,7 +3597,7 @@ __reExport(cache_exports, cache_star);
 import * as cache_star from "@json-to-office/shared/cache";
 
 // src/cache/key-generator.ts
-import { createHash } from "crypto";
+import { createHash as createHash2 } from "crypto";
 var CacheKeyGenerator = class {
   version;
   constructor(version = "1.0") {
@@ -3585,7 +3671,7 @@ var CacheKeyGenerator = class {
    * Create hash
    */
   hash(input) {
-    return createHash("sha256").update(input).digest("hex").substring(0, 16);
+    return createHash2("sha256").update(input).digest("hex").substring(0, 16);
   }
 };
 
@@ -3600,11 +3686,12 @@ function normalizeUnicodeText(text) {
 // src/utils/placeholderProcessor.ts
 import {
   TextRun as TextRun2,
-  PageNumber
+  PageNumber,
+  Tab as Tab2
 } from "docx";
 
 // src/utils/textParser.ts
-import { TextRun, ExternalHyperlink, InternalHyperlink } from "docx";
+import { TextRun, ExternalHyperlink, InternalHyperlink, Tab } from "docx";
 function escapeRegExp(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -3727,28 +3814,49 @@ function createTextRunsWithNewlines(text, baseStyle, options, overrideStyle) {
         ...runStyle.bold !== void 0 && { bold: runStyle.bold },
         ...runStyle.italics !== void 0 && { italics: runStyle.italics },
         ...baseStyle.underline && { underline: baseStyle.underline },
+        ...baseStyle.scale && { scale: baseStyle.scale },
+        ...baseStyle.characterSpacing && {
+          characterSpacing: baseStyle.characterSpacing
+        },
         ...baseStyle.language && { language: baseStyle.language }
       };
       const wholeRunNoProof = baseStyle.noProof === true;
       const wordsForLine = wholeRunNoProof ? void 0 : options.noProofWords;
       let firstSegment = true;
-      const lineRuns = splitByNoProofWords(
-        line,
-        (segment, matched) => {
-          const segNoProof = matched || wholeRunNoProof;
-          const run = new TextRun({
-            text: segment,
-            ...commonProps,
-            ...(matched || baseStyle.noProof !== void 0) && {
-              noProof: segNoProof
-            },
-            ...needsLineBreak && firstSegment && { break: 1 }
-          });
+      const lineRuns = [];
+      const tabSegments = line.split("	");
+      tabSegments.forEach((tabSegment, tabIndex) => {
+        if (tabIndex > 0) {
+          lineRuns.push(
+            new TextRun({
+              children: [new Tab()],
+              ...commonProps,
+              ...needsLineBreak && firstSegment && { break: 1 }
+            })
+          );
           firstSegment = false;
-          return run;
-        },
-        wordsForLine
-      );
+        }
+        if (!tabSegment && tabSegments.length > 1) return;
+        lineRuns.push(
+          ...splitByNoProofWords(
+            tabSegment,
+            (segment, matched) => {
+              const segNoProof = matched || wholeRunNoProof;
+              const run = new TextRun({
+                text: segment,
+                ...commonProps,
+                ...(matched || baseStyle.noProof !== void 0) && {
+                  noProof: segNoProof
+                },
+                ...needsLineBreak && firstSegment && { break: 1 }
+              });
+              firstSegment = false;
+              return run;
+            },
+            wordsForLine
+          )
+        );
+      });
       runs.push(...lineRuns);
     }
   }
@@ -3983,27 +4091,48 @@ function createTextRunsWithNewlines2(text, baseStyle, noProofWords) {
         bold: baseStyle.bold,
         italics: baseStyle.italics,
         underline: baseStyle.underline,
+        ...baseStyle.scale && { scale: baseStyle.scale },
+        ...baseStyle.characterSpacing && {
+          characterSpacing: baseStyle.characterSpacing
+        },
         ...baseStyle.language && { language: baseStyle.language }
       };
       const wholeRunNoProof = baseStyle.noProof === true;
       const wordsForLine = wholeRunNoProof ? void 0 : noProofWords;
       let firstSegment = true;
-      const lineRuns = splitByNoProofWords(
-        line,
-        (segment, matched) => {
-          const run = new TextRun2({
-            text: segment,
-            ...commonProps,
-            ...(matched || baseStyle.noProof !== void 0) && {
-              noProof: matched || wholeRunNoProof
-            },
-            break: needsLineBreak && firstSegment ? 1 : void 0
-          });
+      const lineRuns = [];
+      const tabSegments = line.split("	");
+      tabSegments.forEach((tabSegment, tabIndex) => {
+        if (tabIndex > 0) {
+          lineRuns.push(
+            new TextRun2({
+              children: [new Tab2()],
+              ...commonProps,
+              break: needsLineBreak && firstSegment ? 1 : void 0
+            })
+          );
           firstSegment = false;
-          return run;
-        },
-        wordsForLine
-      );
+        }
+        if (!tabSegment && tabSegments.length > 1) return;
+        lineRuns.push(
+          ...splitByNoProofWords(
+            tabSegment,
+            (segment, matched) => {
+              const run = new TextRun2({
+                text: segment,
+                ...commonProps,
+                ...(matched || baseStyle.noProof !== void 0) && {
+                  noProof: matched || wholeRunNoProof
+                },
+                break: needsLineBreak && firstSegment ? 1 : void 0
+              });
+              firstSegment = false;
+              return run;
+            },
+            wordsForLine
+          )
+        );
+      });
       runs.push(...lineRuns);
     }
   }
@@ -4158,12 +4287,12 @@ function componentHasRevision(component) {
 }
 
 // src/core/cached-render.ts
-import { createHash as createHash2 } from "crypto";
+import { createHash as createHash3 } from "crypto";
 var componentCache = null;
 var cacheKeyGen = null;
 function createThemeHash(theme) {
   const themeString = JSON.stringify(theme);
-  return createHash2("sha256").update(themeString).digest("hex").substring(0, 8);
+  return createHash3("sha256").update(themeString).digest("hex").substring(0, 8);
 }
 function initializeComponentCache(cache) {
   if (cache) {
@@ -4431,6 +4560,12 @@ function createText(content, theme, themeName, options = {}) {
     ...options.underline !== void 0 && {
       underline: options.underline ? { type: "single" } : void 0
     },
+    // Character width scaling in percent (w:w)
+    ...options.scale && { scale: options.scale },
+    // Letter tracking (w:spacing, twentieths of a point; negative = condensed)
+    ...options.characterSpacing && {
+      characterSpacing: options.characterSpacing.type === "condensed" ? -options.characterSpacing.value : options.characterSpacing.value
+    },
     // Proofing: per-run language and/or no-proof. Omitting language lets the
     // run inherit the document default set on docDefaults.
     ...options.language && { language: { value: options.language } },
@@ -4455,7 +4590,7 @@ function createText(content, theme, themeName, options = {}) {
     }
   } else {
     const textRuns = parseTextWithDecorators(normalizedContent, baseTextStyle, {
-      boldColor: options.boldColor,
+      boldColor: options.boldColor ? resolveColor(options.boldColor, theme) : void 0,
       enableHyperlinks: true,
       noProofWords: resolveNoProofWords(theme, options.noProofWords)
     });
@@ -4487,7 +4622,9 @@ function createText(content, theme, themeName, options = {}) {
     },
     ...frameOptions && { frame: frameOptions },
     ...options.keepNext !== void 0 && { keepNext: options.keepNext },
-    ...options.keepLines !== void 0 && { keepLines: options.keepLines }
+    ...options.keepLines !== void 0 && { keepLines: options.keepLines },
+    ...options.indent && { indent: options.indent },
+    ...options.tabStops && options.tabStops.length > 0 && { tabStops: options.tabStops }
   });
 }
 function mapFrameOptions(floating, theme, themeName) {
@@ -4593,6 +4730,12 @@ function createHeading(text, level, theme, _themeName, options = {}) {
     ...options.underline !== void 0 && {
       underline: options.underline ? { type: "single" } : void 0
     },
+    // Character width scaling in percent (w:w)
+    ...options.scale && { scale: options.scale },
+    // Letter tracking (w:spacing, twentieths of a point; negative = condensed)
+    ...options.characterSpacing && {
+      characterSpacing: options.characterSpacing.type === "condensed" ? -options.characterSpacing.value : options.characterSpacing.value
+    },
     // Proofing: per-run language and/or no-proof (see createText).
     ...options.language && { language: { value: options.language } },
     ...options.noProof !== void 0 && { noProof: options.noProof }
@@ -4633,7 +4776,7 @@ function createHeading(text, level, theme, _themeName, options = {}) {
     const headingTextChildren = [];
     if (hasDecorators) {
       const textRuns = parseTextWithDecorators(normalizedText, baseTextStyle, {
-        boldColor: options.boldColor,
+        boldColor: options.boldColor ? resolveColor(options.boldColor, theme) : void 0,
         enableHyperlinks: true,
         noProofWords: headingNoProofWords
       });
@@ -4650,7 +4793,7 @@ function createHeading(text, level, theme, _themeName, options = {}) {
   } else {
     if (hasDecorators) {
       const textRuns = parseTextWithDecorators(normalizedText, baseTextStyle, {
-        boldColor: options.boldColor,
+        boldColor: options.boldColor ? resolveColor(options.boldColor, theme) : void 0,
         enableHyperlinks: true,
         noProofWords: headingNoProofWords
       });
@@ -4666,7 +4809,8 @@ function createHeading(text, level, theme, _themeName, options = {}) {
     // Only override spacing if explicitly provided
     spacing: hasExplicitSpacing ? spacing : void 0,
     ...options.keepNext !== void 0 && { keepNext: options.keepNext },
-    ...options.keepLines !== void 0 && { keepLines: options.keepLines }
+    ...options.keepLines !== void 0 && { keepLines: options.keepLines },
+    ...options.indent && { indent: options.indent }
   });
 }
 async function createImage(path4, theme, themeName, options = {}) {
@@ -5658,6 +5802,8 @@ function renderHeadingComponent(component, theme, themeName) {
       fontWeight: config.font?.fontWeight,
       italic: config.font?.italic,
       underline: config.font?.underline,
+      scale: config.font?.scale,
+      characterSpacing: config.font?.characterSpacing,
       // Proofing: local language override + no-proof toggle + known-words list
       language: config.language,
       noProof: config.noProof,
@@ -5665,6 +5811,8 @@ function renderHeadingComponent(component, theme, themeName) {
       // Pagination control
       keepNext: config.keepNext,
       keepLines: config.keepLines,
+      // Paragraph indentation (w:ind) in twips
+      indent: config.indent,
       // Bookmark ID for internal linking
       bookmarkId,
       // Tracked-change segments (rendered as native Word revisions)
@@ -5945,6 +6093,8 @@ function renderParagraphComponent(component, theme, themeName) {
     fontWeight: resolvedConfig.font?.fontWeight,
     italic: resolvedConfig.font?.italic,
     underline: resolvedConfig.font?.underline,
+    scale: resolvedConfig.font?.scale,
+    characterSpacing: resolvedConfig.font?.characterSpacing,
     // Proofing: local language override + no-proof toggle + known-words list
     language: resolvedConfig.language,
     noProof: resolvedConfig.noProof,
@@ -5957,6 +6107,10 @@ function renderParagraphComponent(component, theme, themeName) {
     keepNext: resolvedConfig.keepNext,
     // Pass keepLines property
     keepLines: resolvedConfig.keepLines,
+    // Paragraph indentation (w:ind) in twips
+    indent: resolvedConfig.indent,
+    // Tab stops (w:tabs); \t characters in text jump to these positions
+    tabStops: resolvedConfig.tabStops,
     // Pass bookmark ID for internal linking
     bookmarkId: resolvedConfig.id,
     // Tracked-change segments (rendered as native Word revisions)
@@ -7505,9 +7659,6 @@ async function resolveDocumentFonts(document, theme, fonts, warnings) {
   return resolved;
 }
 
-// src/core/generator.ts
-import { applyExportMode, scopedThemeName } from "@json-to-office/shared";
-
 // src/utils/packageDocument.ts
 import AdmZip2 from "adm-zip";
 import { Packer } from "docx";
@@ -7761,42 +7912,11 @@ async function generateFromConfig(props, components, options) {
   return await generateDocument(reportComponent, options);
 }
 async function generateDocumentWithCustomThemes(documentIn, customThemes, services, fonts, warnings, generationDate) {
-  let document = documentIn.props === void 0 ? { ...documentIn, props: {} } : documentIn;
-  let themeName = document.props.theme || "minimal";
-  let theme;
-  if (customThemes) {
-    if (customThemes[themeName]) {
-      theme = customThemes[themeName];
-    } else {
-      const themeNameLower = themeName.toLowerCase();
-      const matchingThemeKey = Object.keys(customThemes).find(
-        (key) => key.toLowerCase() === themeNameLower
-      );
-      if (matchingThemeKey) {
-        theme = customThemes[matchingThemeKey];
-      } else {
-        theme = resolveBuiltInTheme(themeName, { customThemes, warnings });
-      }
-    }
-  } else {
-    theme = resolveBuiltInTheme(themeName, { warnings });
-  }
-  const mode = applyExportMode({ doc: document, theme, fonts });
-  document = mode.doc;
-  theme = mode.theme;
-  themeName = scopedThemeName(themeName, fonts?.mode);
-  for (const w of mode.warnings) {
-    if (warnings) {
-      warnings.push({
-        component: "fontRegistry",
-        message: w.message,
-        severity: "warning",
-        context: { code: w.code }
-      });
-    } else {
-      console.warn(`[json-to-docx] [${w.code}] ${w.message}`);
-    }
-  }
+  const { document, theme, themeName } = resolveThemeContext(documentIn, {
+    customThemes,
+    fonts,
+    warnings
+  });
   await resolveDocumentFonts(document, theme, fonts, warnings);
   const structure = await processDocument(
     document,
@@ -8212,9 +8332,6 @@ async function runExample(example, options = {}) {
   }
 }
 
-// src/plugin/createDocumentGenerator.ts
-import { applyExportMode as applyExportMode2, scopedThemeName as scopedThemeName2 } from "@json-to-office/shared";
-
 // src/plugin/version-resolver.ts
 import { resolveComponentVersion } from "@json-to-office/shared/plugin";
 
@@ -8678,32 +8795,25 @@ function createBuilderImpl(state) {
         }
       };
       const warnings = [];
-      const baseThemeName = internalDocument.props.theme || "minimal";
-      const docTheme = resolveDocumentTheme(baseThemeName, warnings);
-      const mode = applyExportMode2({
-        doc: internalDocument,
-        theme: docTheme,
-        fonts: state.fonts
+      const {
+        document: modedRoot,
+        theme: modedTheme,
+        themeName
+      } = resolveThemeContext(internalDocument, {
+        customThemes: state.customThemes,
+        fonts: state.fonts,
+        warnings,
+        resolveNamedTheme: resolveDocumentTheme
       });
-      const modedTheme = mode.theme;
-      const themeName = scopedThemeName2(baseThemeName, state.fonts?.mode);
-      for (const w of mode.warnings) {
-        warnings.push({
-          component: "fontRegistry",
-          message: w.message,
-          severity: "warning",
-          context: { code: w.code }
-        });
-      }
       const processed = await processDocumentComponents(
-        mode.doc.children || [],
+        modedRoot.children || [],
         preserveSet,
         warnings,
         modedTheme,
         validateEmitted
       );
       const processedDocument = {
-        ...mode.doc,
+        ...modedRoot,
         children: processed.standard
       };
       const [modedDoc] = normalizeDocument(processedDocument);
@@ -8724,7 +8834,7 @@ function createBuilderImpl(state) {
         bypassCache: !state.enableCache
       });
       const preservedDefinition = preserveSet ? {
-        ...mode.doc,
+        ...modedRoot,
         children: processed.preserved
       } : void 0;
       return {