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

package/dist/plugin/createDocumentGenerator.d.ts

@@ -1,5 +1,5 @@
 import { type ThemeConfig } from '../styles';
-import type { ServicesConfig } from '@json-to-office/shared';
+import type { ServicesConfig, FontRuntimeOpts } from '@json-to-office/shared';
 import type { DocumentGeneratorBuilder } from './types';
 /**
  * Options for creating a document generator
@@ -15,6 +15,8 @@ export interface DocumentGeneratorOptions {
     debug?: boolean;
     /** External service configuration (e.g. Highcharts export server) */
     services?: ServicesConfig;
+    /** Font resolution options — extraEntries, Google Fonts config, onResolved hook. */
+    fonts?: FontRuntimeOpts;
 }
 /**
  * Create a document generator with chainable component registration.

package/dist/plugin/createDocumentGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createDocumentGenerator.d.ts","sourceRoot":"","sources":["../../src/plugin/createDocumentGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,WAAW,EAAwB,MAAM,WAAW,CAAC;AAEnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAEV,wBAAwB,EAKzB,MAAM,SAAS,CAAC;AAcjB;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,kEAAkE;IAClE,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC3C,4CAA4C;IAC5C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B;AAkcD;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,CAAC,SAAS,EAAE,CAAC,CAYvC"}
+{"version":3,"file":"createDocumentGenerator.d.ts","sourceRoot":"","sources":["../../src/plugin/createDocumentGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,WAAW,EAAwB,MAAM,WAAW,CAAC;AAEnE,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9E,OAAO,KAAK,EAEV,wBAAwB,EAKzB,MAAM,SAAS,CAAC;AAcjB;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,kEAAkE;IAClE,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC3C,4CAA4C;IAC5C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,oFAAoF;IACpF,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAseD;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,CAAC,SAAS,EAAE,CAAC,CAavC"}

package/dist/plugin/example/index.js

@@ -1813,6 +1813,67 @@ import { Packer as Packer2 } from "docx";
 // src/plugin/createDocumentGenerator.ts
 init_styles();
 import { Packer } from "docx";
+import { applyExportMode, scopedThemeName } from "@json-to-office/shared";
+
+// 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/plugin/version-resolver.ts
 import { resolveComponentVersion } from "@json-to-office/shared/plugin";
@@ -4098,9 +4159,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";
@@ -4120,15 +4194,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
     }
@@ -4248,13 +4334,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
     }
@@ -4766,12 +4864,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
     };
@@ -4779,15 +4883,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
@@ -5235,6 +5345,7 @@ function renderHeadingComponent(component, theme, themeName) {
       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
@@ -5350,6 +5461,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
@@ -6148,9 +6260,10 @@ async function generateChart(config, servicesConfig) {
     b64: true,
     scale: config.scale
   };
+  const resolvedHeaders = typeof servicesConfig?.headers === "function" ? await servicesConfig.headers(requestBody) : servicesConfig?.headers;
   const headers = {
     "Content-Type": "application/json",
-    ...servicesConfig?.headers
+    ...resolvedHeaders
   };
   const response = await fetch(`${serverUrl}/export`, {
     method: "POST",
@@ -6828,7 +6941,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
@@ -6841,25 +6955,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 = applyExportMode({
+        doc: internalDocument,
+        theme: docTheme,
+        fonts: state.fonts
+      });
+      const modedTheme = mode.theme;
+      const themeName = scopedThemeName(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
       });
@@ -6940,13 +7066,19 @@ function createBuilderImpl(state) {
       const themeName = internalDocument.props.theme || "minimal";
       const docTheme = resolveDocumentTheme(themeName);
       const warnings = [];
+      const mode = applyExportMode({
+        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);
@@ -6978,7 +7110,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);
 }