@json-to-office/core-docx 0.7.0 → 0.9.0

package/dist/index.js

@@ -1953,24 +1953,175 @@ var formatDate = (date, formatString = "MMMM d, yyyy") => {
   return format(date, formatString);
 };
 
+// src/styles/utils/componentDefaults.ts
+import { mergeWithDefaults } from "@json-to-office/shared";
+import { mergeWithDefaults as mergeWithDefaults2 } from "@json-to-office/shared";
+function getComponentDefaults(theme) {
+  return theme.componentDefaults || {};
+}
+function getHeadingDefaults(theme) {
+  const defaults = getComponentDefaults(theme);
+  return defaults?.heading || {};
+}
+function getHeadingDefaultsForLevel(theme, level) {
+  const defaults = {};
+  if (theme.styles) {
+    const styleKey = `heading${level}`;
+    const headingStyle = theme.styles[styleKey];
+    if (headingStyle?.alignment) {
+      defaults.alignment = headingStyle.alignment;
+    }
+  }
+  return defaults;
+}
+function getTextDefaults(theme) {
+  const defaults = getComponentDefaults(theme);
+  return defaults?.paragraph || {};
+}
+function getImageDefaults(theme) {
+  const defaults = getComponentDefaults(theme);
+  return defaults?.image || {};
+}
+function getStatisticDefaults(theme) {
+  const defaults = getComponentDefaults(theme);
+  return defaults?.statistic || {};
+}
+function getTableDefaults(theme) {
+  const defaults = getComponentDefaults(theme);
+  return defaults?.table || {};
+}
+function getSectionDefaults(theme) {
+  const defaults = getComponentDefaults(theme);
+  return defaults?.section || {};
+}
+function getColumnsDefaults(theme) {
+  const defaults = getComponentDefaults(theme);
+  return defaults?.columns || {};
+}
+function getListDefaults(theme) {
+  const defaults = getComponentDefaults(theme);
+  return defaults?.list || {};
+}
+function resolveHeadingProps(props, theme) {
+  const defaults = getHeadingDefaults(theme);
+  return mergeWithDefaults(props, defaults);
+}
+function resolveParagraphProps(props, theme) {
+  const defaults = getTextDefaults(theme);
+  return mergeWithDefaults(props, defaults);
+}
+function resolveImageProps(props, theme) {
+  const defaults = getImageDefaults(theme);
+  return mergeWithDefaults(props, defaults);
+}
+function resolveStatisticProps(props, theme) {
+  const defaults = getStatisticDefaults(theme);
+  return mergeWithDefaults(props, defaults);
+}
+function resolveTableProps(props, theme) {
+  const defaults = getTableDefaults(theme);
+  return mergeWithDefaults(props, defaults);
+}
+function resolveSectionProps(props, theme) {
+  const defaults = getSectionDefaults(theme);
+  return mergeWithDefaults(props, defaults);
+}
+function resolveColumnsProps(props, theme) {
+  const defaults = getColumnsDefaults(theme);
+  return mergeWithDefaults(props, defaults);
+}
+function resolveListProps(props, theme) {
+  const defaults = getListDefaults(theme);
+  return mergeWithDefaults(props, defaults);
+}
+function resolveHighchartsProps(props, _theme) {
+  return props;
+}
+function getCustomComponentDefaults(theme, componentName) {
+  const defaults = getComponentDefaults(theme);
+  return defaults?.[componentName] || {};
+}
+function resolveCustomComponentProps(props, theme, componentName) {
+  const defaults = getCustomComponentDefaults(theme, componentName);
+  return mergeWithDefaults(props, defaults);
+}
+
+// src/styles/utils/resolveComponentTree.ts
+function resolveHeadingWithLevelDefaults(props, theme) {
+  const resolved = resolveHeadingProps(props, theme);
+  const level = resolved.level || 1;
+  const levelDefaults = getHeadingDefaultsForLevel(theme, level);
+  return {
+    ...resolved,
+    // Only apply level-specific defaults if no explicit alignment in original props
+    ...props.alignment ? {} : levelDefaults
+  };
+}
+var RESOLVER_MAP = {
+  heading: resolveHeadingWithLevelDefaults,
+  paragraph: resolveParagraphProps,
+  image: resolveImageProps,
+  statistic: resolveStatisticProps,
+  table: resolveTableProps,
+  section: resolveSectionProps,
+  columns: resolveColumnsProps,
+  list: resolveListProps,
+  highcharts: resolveHighchartsProps
+};
+function resolveComponentDefaults(component, theme) {
+  if (!component.props) return component;
+  const resolver = RESOLVER_MAP[component.name];
+  const resolvedProps = resolver ? resolver(component.props, theme) : resolveCustomComponentProps(
+    component.props,
+    theme,
+    component.name
+  );
+  return { ...component, props: resolvedProps };
+}
+function resolveComponentTree(components, theme) {
+  return components.map((component) => {
+    const resolved = resolveComponentDefaults(component, theme);
+    const children = resolved.children;
+    if (children && children.length > 0) {
+      return {
+        ...resolved,
+        children: resolveComponentTree(children, theme)
+      };
+    }
+    return resolved;
+  });
+}
+
 // src/core/structure.ts
 async function processDocument(document, theme, themeName) {
   const metadata = createDocumentMetadata(document.props);
+  const docDefaults = document.props.componentDefaults;
+  const effectiveTheme = docDefaults ? {
+    ...theme,
+    componentDefaults: mergeWithDefaults2(
+      docDefaults,
+      theme.componentDefaults || {}
+    )
+  } : theme;
   const context = createRenderContext(
     {
       metadata,
       sections: [],
-      theme,
+      theme: effectiveTheme,
       themeName
     },
-    theme,
+    effectiveTheme,
     themeName
   );
-  const sections = await extractSections(document.children || [], context);
+  const resolvedChildren = resolveComponentTree(
+    document.children || [],
+    effectiveTheme
+  );
+  const sections = await extractSections(resolvedChildren, context);
   return {
     metadata,
     sections,
-    theme,
+    theme: effectiveTheme,
     themeName
   };
 }
@@ -2000,19 +2151,24 @@ async function extractSections(components, context) {
           Math.max(component.props.level || 1, 1),
           6
         );
-        sectionComponents.unshift({
-          name: "heading",
-          props: {
-            text: component.props.title,
-            level: headingLevel,
-            pageBreak: shouldPageBreak,
-            // Apply zero-spacing to prevent unwanted initial line
-            spacing: {
-              before: 0,
-              after: 0
-            }
-          }
-        });
+        sectionComponents.unshift(
+          resolveComponentDefaults(
+            {
+              name: "heading",
+              props: {
+                text: component.props.title,
+                level: headingLevel,
+                pageBreak: shouldPageBreak,
+                // Apply zero-spacing to prevent unwanted initial line
+                spacing: {
+                  before: 0,
+                  after: 0
+                }
+              }
+            },
+            context.fullTheme
+          )
+        );
       }
       sections.push({
         title: component.props?.title,
@@ -2052,18 +2208,23 @@ async function flattenComponents(components, context) {
           Math.max(component.props.level || 1, 1),
           6
         );
-        flattened.push({
-          name: "heading",
-          props: {
-            text: component.props.title,
-            level: headingLevel,
-            // Apply zero-spacing to prevent unwanted initial line
-            spacing: {
-              before: 0,
-              after: 0
-            }
-          }
-        });
+        flattened.push(
+          resolveComponentDefaults(
+            {
+              name: "heading",
+              props: {
+                text: component.props.title,
+                level: headingLevel,
+                // Apply zero-spacing to prevent unwanted initial line
+                spacing: {
+                  before: 0,
+                  after: 0
+                }
+              }
+            },
+            context.fullTheme
+          )
+        );
       }
       flattened.push(...await flattenComponents(component.children, context));
     } else {
@@ -3853,93 +4014,6 @@ function getComponentCacheStats() {
   return componentCache.getStats();
 }
 
-// src/styles/utils/componentDefaults.ts
-function getComponentDefaults(theme) {
-  return theme.componentDefaults || {};
-}
-function getHeadingDefaults(theme) {
-  const defaults = getComponentDefaults(theme);
-  return defaults?.heading || {};
-}
-function getHeadingDefaultsForLevel(theme, level) {
-  const defaults = {};
-  if (theme.styles) {
-    const styleKey = `heading${level}`;
-    const headingStyle = theme.styles[styleKey];
-    if (headingStyle?.alignment) {
-      defaults.alignment = headingStyle.alignment;
-    }
-  }
-  return defaults;
-}
-function getTextDefaults(theme) {
-  const defaults = getComponentDefaults(theme);
-  return defaults?.paragraph || {};
-}
-function getImageDefaults(theme) {
-  const defaults = getComponentDefaults(theme);
-  return defaults?.image || {};
-}
-function getStatisticDefaults(theme) {
-  const defaults = getComponentDefaults(theme);
-  return defaults?.statistic || {};
-}
-function getColumnsDefaults(theme) {
-  const defaults = getComponentDefaults(theme);
-  return defaults?.columns || {};
-}
-function getListDefaults(theme) {
-  const defaults = getComponentDefaults(theme);
-  return defaults?.list || {};
-}
-function deepMerge(target, source) {
-  const output = { ...target };
-  if (isObject(target) && isObject(source)) {
-    Object.keys(source).forEach((key) => {
-      if (isObject(source[key])) {
-        if (!(key in target)) {
-          output[key] = source[key];
-        } else {
-          output[key] = deepMerge(target[key], source[key]);
-        }
-      } else {
-        output[key] = source[key];
-      }
-    });
-  }
-  return output;
-}
-function isObject(item) {
-  return item !== null && typeof item === "object" && !Array.isArray(item);
-}
-function mergeWithDefaults(userConfig, themeDefaults) {
-  return deepMerge(themeDefaults, userConfig);
-}
-function resolveHeadingProps(props, theme) {
-  const defaults = getHeadingDefaults(theme);
-  return mergeWithDefaults(props, defaults);
-}
-function resolveParagraphProps(props, theme) {
-  const defaults = getTextDefaults(theme);
-  return mergeWithDefaults(props, defaults);
-}
-function resolveImageProps(props, theme) {
-  const defaults = getImageDefaults(theme);
-  return mergeWithDefaults(props, defaults);
-}
-function resolveStatisticProps(props, theme) {
-  const defaults = getStatisticDefaults(theme);
-  return mergeWithDefaults(props, defaults);
-}
-function resolveColumnsProps(props, theme) {
-  const defaults = getColumnsDefaults(theme);
-  return mergeWithDefaults(props, defaults);
-}
-function resolveListProps(props, theme) {
-  const defaults = getListDefaults(theme);
-  return mergeWithDefaults(props, defaults);
-}
-
 // src/core/content.ts
 import {
   Paragraph,
@@ -4033,9 +4107,22 @@ var globalBookmarkRegistry = new BookmarkRegistry();
 
 // src/core/content.ts
 init_styleHelpers();
+import { synthesizeFamilyName } from "@json-to-office/shared";
 init_colorUtils();
 init_styleHelpers();
 init_widthUtils();
+function applyFontWeightAlias(opts) {
+  if (!opts.fontFamily) {
+    return { font: void 0, bold: opts.bold, italics: opts.italic };
+  }
+  const weight = opts.fontWeight ?? (opts.bold === true ? 700 : void 0);
+  const synth = synthesizeFamilyName(
+    opts.fontFamily,
+    weight,
+    opts.italic === true
+  );
+  return { font: synth.family, bold: synth.bold, italics: synth.italic };
+}
 function createText(content, theme, themeName, options = {}) {
   const normalizedContent = normalizeUnicodeText(content);
   const style = options.style || "Normal";
@@ -4055,15 +4142,27 @@ function createText(content, theme, themeName, options = {}) {
   if (options.columnBreak) {
     children.push(new ColumnBreak());
   }
+  const hasWeightRequest = options.fontWeight != null || options.bold === true;
+  const effectiveFamily = options.fontFamily ?? (hasWeightRequest ? resolveFontFamily(theme, "body") : void 0);
+  const weighted = applyFontWeightAlias({
+    fontFamily: effectiveFamily,
+    bold: options.bold,
+    italic: options.italic,
+    fontWeight: options.fontWeight
+  });
   const baseTextStyle = {
-    ...options.fontFamily && { font: options.fontFamily },
+    // Only emit `font` when it came from the caller or from an alias —
+    // emitting the theme body family on every run would be a behavior change.
+    ...(options.fontFamily || weighted.font && weighted.font !== effectiveFamily) && {
+      font: weighted.font
+    },
     ...options.fontSize && { size: options.fontSize * 2 },
     // Convert points to half-points
     ...options.fontColor && {
       color: resolveColor(options.fontColor, theme)
     },
-    ...options.bold !== void 0 && { bold: options.bold },
-    ...options.italic !== void 0 && { italics: options.italic },
+    ...weighted.bold !== void 0 && { bold: weighted.bold },
+    ...weighted.italics !== void 0 && { italics: weighted.italics },
     ...options.underline !== void 0 && {
       underline: options.underline ? { type: "single" } : void 0
     }
@@ -4183,13 +4282,25 @@ function createHeading(text, level, theme, _themeName, options = {}) {
     children.push(new ColumnBreak());
   }
   const hasDecorators = /(\*\*\*|___|(\*\*|__)|(\*|_))/.test(normalizedText);
+  const headingHasWeightRequest = options.fontWeight != null || options.bold === true;
+  const headingEffectiveFamily = options.fontFamily ?? (headingHasWeightRequest ? resolveFontFamily(theme, "heading") : void 0);
+  const headingWeighted = applyFontWeightAlias({
+    fontFamily: headingEffectiveFamily,
+    bold: options.bold,
+    italic: options.italic,
+    fontWeight: options.fontWeight
+  });
   const baseTextStyle = {
-    ...options.fontFamily && { font: options.fontFamily },
+    ...(options.fontFamily || headingWeighted.font && headingWeighted.font !== headingEffectiveFamily) && {
+      font: headingWeighted.font
+    },
     ...options.fontSize && { size: options.fontSize * 2 },
     // points to half-points
     ...options.fontColor && { color: resolveColor(options.fontColor, theme) },
-    ...options.bold !== void 0 && { bold: options.bold },
-    ...options.italic !== void 0 && { italics: options.italic },
+    ...headingWeighted.bold !== void 0 && { bold: headingWeighted.bold },
+    ...headingWeighted.italics !== void 0 && {
+      italics: headingWeighted.italics
+    },
     ...options.underline !== void 0 && {
       underline: options.underline ? { type: "single" } : void 0
     }
@@ -4701,12 +4812,18 @@ async function createTable(columns, tableConfig, theme, themeName, _options = {}
     if (!cell) {
       return cellChildren;
     }
+    const cellWeighted = applyFontWeightAlias({
+      fontFamily: cellDefaults.font?.family || baseCellStyle.font,
+      bold: cellDefaults.font?.bold ?? false,
+      italic: cellDefaults.font?.italic ?? false,
+      fontWeight: cellDefaults.font?.fontWeight
+    });
     const mergedStyle = {
-      font: cellDefaults.font?.family || baseCellStyle.font,
+      font: cellWeighted.font,
       size: cellDefaults.font?.size ? cellDefaults.font.size * 2 : baseCellStyle.size,
       // Convert to half-points
-      bold: cellDefaults.font?.bold ?? false,
-      italics: cellDefaults.font?.italic ?? false,
+      bold: cellWeighted.bold ?? false,
+      italics: cellWeighted.italics ?? false,
       underline: cellDefaults.font?.underline ? { type: "single" } : void 0,
       color: cellDefaults.color || baseCellStyle.color
     };
@@ -4714,15 +4831,21 @@ async function createTable(columns, tableConfig, theme, themeName, _options = {}
       if (isParagraphComponent(cell)) {
         const textComp = cell;
         const paragraphFont = textComp.props.font;
+        const paraWeighted = applyFontWeightAlias({
+          fontFamily: paragraphFont?.family ?? mergedStyle.font,
+          bold: paragraphFont?.bold,
+          italic: paragraphFont?.italic,
+          fontWeight: paragraphFont?.fontWeight
+        });
         const paragraphStyle = {
           ...mergedStyle,
-          ...paragraphFont?.family && { font: paragraphFont.family },
+          ...paraWeighted.font && { font: paraWeighted.font },
           ...paragraphFont?.size && { size: paragraphFont.size * 2 },
-          ...paragraphFont?.bold !== void 0 && {
-            bold: paragraphFont.bold
+          ...paraWeighted.bold !== void 0 && {
+            bold: paraWeighted.bold
           },
-          ...paragraphFont?.italic !== void 0 && {
-            italics: paragraphFont.italic
+          ...paraWeighted.italics !== void 0 && {
+            italics: paraWeighted.italics
           },
           ...paragraphFont?.underline !== void 0 && {
             underline: paragraphFont.underline ? { type: "single" } : void 0
@@ -5153,35 +5276,29 @@ function createFooterElement(children, _options) {
 // src/components/heading.ts
 function renderHeadingComponent(component, theme, themeName) {
   if (!isHeadingComponent(component)) return [];
-  const resolvedConfig = resolveHeadingProps(component.props, theme);
-  const level = resolvedConfig.level || 1;
-  const levelDefaults = getHeadingDefaultsForLevel(theme, level);
-  const finalConfig = {
-    ...resolvedConfig,
-    // Only apply level defaults if no explicit alignment was provided in the original props
-    ...component.props.alignment ? {} : levelDefaults
-  };
-  const bookmarkId = component.id || globalBookmarkRegistry.generateId(finalConfig.text, "heading");
+  const config = component.props;
+  const bookmarkId = component.id || globalBookmarkRegistry.generateId(config.text, "heading");
   const header = createHeading(
-    finalConfig.text,
-    finalConfig.level || 1,
+    config.text,
+    config.level || 1,
     theme,
     themeName,
     {
-      alignment: finalConfig.alignment,
-      spacing: finalConfig.spacing,
-      lineSpacing: finalConfig.lineSpacing,
-      columnBreak: finalConfig.columnBreak,
+      alignment: config.alignment,
+      spacing: config.spacing,
+      lineSpacing: config.lineSpacing,
+      columnBreak: config.columnBreak,
       // Local font overrides
-      fontFamily: finalConfig.font?.family,
-      fontSize: finalConfig.font?.size,
-      fontColor: finalConfig.font?.color,
-      bold: finalConfig.font?.bold,
-      italic: finalConfig.font?.italic,
-      underline: finalConfig.font?.underline,
+      fontFamily: config.font?.family,
+      fontSize: config.font?.size,
+      fontColor: config.font?.color,
+      bold: config.font?.bold,
+      fontWeight: config.font?.fontWeight,
+      italic: config.font?.italic,
+      underline: config.font?.underline,
       // Pagination control
-      keepNext: finalConfig.keepNext,
-      keepLines: finalConfig.keepLines,
+      keepNext: config.keepNext,
+      keepLines: config.keepLines,
       // Bookmark ID for internal linking
       bookmarkId
     }
@@ -5226,7 +5343,7 @@ function parseMarkdownList(text) {
 }
 function renderParagraphComponent(component, theme, themeName) {
   if (!isParagraphComponent(component)) return [];
-  const resolvedConfig = resolveParagraphProps(component.props, theme);
+  const resolvedConfig = component.props;
   const listData = parseMarkdownList(resolvedConfig.text);
   if (listData) {
     const reference = globalNumberingRegistry.generateReference("markdown-list");
@@ -5292,6 +5409,7 @@ function renderParagraphComponent(component, theme, themeName) {
     fontSize: resolvedConfig.font?.size,
     fontColor: resolvedConfig.font?.color,
     bold: resolvedConfig.font?.bold,
+    fontWeight: resolvedConfig.font?.fontWeight,
     italic: resolvedConfig.font?.italic,
     underline: resolvedConfig.font?.underline,
     // Pass outline level for TOC support
@@ -5411,7 +5529,7 @@ function fillMissingLevels(levels, maxLevel) {
 }
 function renderListComponent(component, theme, themeName) {
   if (!isListComponent(component)) return [];
-  const resolvedConfig = resolveListProps(component.props, theme);
+  const resolvedConfig = component.props;
   const maxLevel = getMaxLevelFromItems(resolvedConfig.items);
   const reference = resolvedConfig.reference || globalNumberingRegistry.generateReference("list");
   if (!globalNumberingRegistry.has(reference)) {
@@ -5442,7 +5560,7 @@ function renderListComponent(component, theme, themeName) {
 // src/components/image.ts
 async function renderImageComponent(component, theme, themeName) {
   if (!isImageComponent(component)) return [];
-  const resolvedConfig = resolveImageProps(component.props, theme);
+  const resolvedConfig = component.props;
   const imageSource = resolvedConfig.base64 || resolvedConfig.path;
   if (!imageSource) {
     throw new Error(
@@ -5802,7 +5920,6 @@ async function renderColumnsComponent(component, theme, themeName, context) {
   if (context.parent && isTextBoxComponent(context.parent)) {
     return await renderColumnsAsTable(component, theme, themeName, context);
   }
-  resolveColumnsProps(component.props, theme);
   const elements = [];
   if (component.children) {
     for (const child of component.children) {
@@ -5914,9 +6031,9 @@ async function renderColumnsAsTable(component, theme, themeName, context) {
 }
 
 // src/components/statistic.ts
-function renderStatisticComponent(component, theme) {
+function renderStatisticComponent(component, _theme) {
   if (!isStatisticComponent(component)) return [];
-  const resolvedConfig = resolveStatisticProps(component.props, theme);
+  const resolvedConfig = component.props;
   return createStatistic(
     {
       number: resolvedConfig.number,
@@ -6564,6 +6681,69 @@ async function renderComponent(component, theme, themeName, context) {
   );
 }
 
+// src/core/fontResolution.ts
+import {
+  collectFontNamesFromDocx,
+  validateFontReferences,
+  FontRegistry
+} from "@json-to-office/shared";
+import {
+  loadFileFontSource,
+  FontDiskCache,
+  fetchVariableFontSource
+} from "@json-to-office/shared/fonts/node";
+async function resolveDocumentFonts(document, theme, fonts, warnings) {
+  const emit = (code, message) => {
+    if (warnings) {
+      warnings.push({
+        component: "fontRegistry",
+        message,
+        severity: "warning",
+        context: { code }
+      });
+    } else {
+      console.warn(`[json-to-docx] ${code}: ${message}`);
+    }
+  };
+  const names = /* @__PURE__ */ new Set();
+  for (const n of collectFontNamesFromDocx(document)) names.add(n);
+  for (const n of collectFontNamesFromDocx(theme)) names.add(n);
+  if (names.size === 0) return [];
+  const validation = validateFontReferences({
+    referencedNames: names,
+    registeredEntries: fonts?.extraEntries
+  });
+  if (validation.warnings.length > 0) {
+    if (fonts?.strict) {
+      throw new Error(
+        `Unresolved font references (strict mode):
+` + validation.warnings.map((w) => `  - ${w.message}`).join("\n")
+      );
+    }
+    for (const w of validation.warnings) {
+      emit(w.code, w.message);
+    }
+  }
+  if (!fonts?.onResolved) return [];
+  const registry = new FontRegistry({
+    opts: fonts,
+    fileLoader: loadFileFontSource,
+    variableLoader: fetchVariableFontSource,
+    diskCache: fonts?.googleFonts?.cacheDir ? new FontDiskCache(fonts.googleFonts.cacheDir) : void 0
+  });
+  const resolved = await registry.resolveMany(names);
+  for (const r of resolved) {
+    for (const msg of r.warnings) {
+      emit("FONT_UNRESOLVED", msg);
+    }
+  }
+  fonts.onResolved(resolved);
+  return resolved;
+}
+
+// src/core/generator.ts
+import { applyExportMode, scopedThemeName } from "@json-to-office/shared";
+
 // src/json/parser.ts
 import {
   JsonDocumentParser,
@@ -6723,33 +6903,32 @@ function isReportComponentDefinition(definition) {
   const def = definition;
   return def.name === "docx" && "props" in def;
 }
-async function generateDocument(document) {
+async function generateDocument(document, options) {
   if (!document || document.name !== "docx") {
     throw new Error("Top-level component must be a docx component");
   }
   if ("$schema" in document) {
-    return await generateDocumentFromJson(document);
+    return await generateDocumentFromJson(document, options);
   }
-  const themeName = document.props.theme || "minimal";
-  const theme = getThemeWithFallback(themeName);
-  const structure = await processDocument(document, theme, themeName);
-  const layout = applyLayout(structure.sections, theme, themeName);
-  const renderedDocument = await renderDocument(structure, layout, {
-    bypassCache: false
-    // Enable component caching
-  });
-  return renderedDocument;
+  return await generateDocumentWithCustomThemes(
+    document,
+    options?.customThemes,
+    options?.services,
+    options?.fonts,
+    options?.warnings
+  );
 }
-async function generateFromConfig(props, components) {
+async function generateFromConfig(props, components, options) {
   const reportComponent = {
     name: "docx",
     props,
     children: components
   };
-  return await generateDocument(reportComponent);
+  return await generateDocument(reportComponent, options);
 }
-async function generateDocumentWithCustomThemes(document, customThemes, services) {
-  const themeName = document.props.theme || "minimal";
+async function generateDocumentWithCustomThemes(documentIn, customThemes, services, fonts, warnings) {
+  let document = documentIn;
+  let themeName = document.props.theme || "minimal";
   let theme;
   if (customThemes) {
     if (customThemes[themeName]) {
@@ -6768,6 +6947,23 @@ async function generateDocumentWithCustomThemes(document, customThemes, services
   } else {
     theme = getThemeWithFallback(themeName);
   }
+  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}`);
+    }
+  }
+  await resolveDocumentFonts(document, theme, fonts, warnings);
   const structure = await processDocument(document, theme, themeName);
   const layout = applyLayout(structure.sections, theme, themeName);
   const renderedDocument = await renderDocument(structure, layout, {
@@ -6791,7 +6987,9 @@ async function generateDocumentFromJson(jsonConfig, options) {
   return await generateDocumentWithCustomThemes(
     reportComponent,
     options?.customThemes,
-    options?.services
+    options?.services,
+    options?.fonts,
+    options?.warnings
   );
 }
 function validateJsonSchema(jsonConfig) {
@@ -7054,6 +7252,7 @@ async function runExample(example, options = {}) {
 // src/plugin/createDocumentGenerator.ts
 init_styles();
 import { Packer as Packer2 } from "docx";
+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";
@@ -7422,7 +7621,8 @@ function createBuilderImpl(state) {
       customThemes: state.customThemes,
       debug: state.debug,
       enableCache: state.enableCache,
-      services: state.services
+      services: state.services,
+      fonts: state.fonts
     };
     return createBuilderImpl(
       newState
@@ -7435,25 +7635,37 @@ function createBuilderImpl(state) {
         internalDocument,
         state.components
       );
-      const themeName = internalDocument.props.theme || "minimal";
-      const docTheme = resolveDocumentTheme(themeName);
+      const baseThemeName = internalDocument.props.theme || "minimal";
+      const docTheme = resolveDocumentTheme(baseThemeName);
       const warnings = [];
+      const mode = applyExportMode2({
+        doc: internalDocument,
+        theme: docTheme,
+        fonts: state.fonts
+      });
+      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 processedComponents = await processDocumentComponents(
-        internalDocument.children || [],
+        mode.doc.children || [],
         warnings,
-        docTheme
+        modedTheme
       );
       const processedDocument = {
-        ...internalDocument,
+        ...mode.doc,
         children: processedComponents
       };
-      const [finalReportComponent] = normalizeDocument(processedDocument);
-      const structure = await processDocument(
-        finalReportComponent,
-        docTheme,
-        themeName
-      );
-      const layout = applyLayout(structure.sections, docTheme, themeName);
+      const [modedDoc] = normalizeDocument(processedDocument);
+      await resolveDocumentFonts(modedDoc, modedTheme, state.fonts, warnings);
+      const structure = await processDocument(modedDoc, modedTheme, themeName);
+      const layout = applyLayout(structure.sections, modedTheme, themeName);
       const generatedDocument = await renderDocument(structure, layout, {
         services: state.services
       });
@@ -7534,13 +7746,19 @@ function createBuilderImpl(state) {
       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(
-        internalDocument.children || [],
+        mode.doc.children || [],
         warnings,
-        docTheme
+        modedTheme
       );
       const processedDocument = {
-        ...internalDocument,
+        ...mode.doc,
         children: processedComponents
       };
       const [finalReportComponent] = normalizeDocument(processedDocument);
@@ -7572,7 +7790,8 @@ function createDocumentGenerator(options) {
     customThemes: options.customThemes,
     debug: options.debug ?? false,
     enableCache: options.enableCache ?? false,
-    services: options.services
+    services: options.services,
+    fonts: options.fonts
   };
   return createBuilderImpl(initialState);
 }