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

package/dist/core/generationContext.d.ts

@@ -23,10 +23,13 @@ export interface ThemeContextOptions {
     warnings?: GenerationWarning[];
     /**
      * Theme lookup for the base `props.theme` name. The plugin builder passes
-     * its own (customThemes → constructor-supplied theme → built-in); omit it to
-     * use customThemes → built-in.
+     * its own (customThemes → doc-named built-in → constructor-supplied theme →
+     * built-in); omit it to use customThemes → built-in. `authored` is true when
+     * the name came from the document's own `props.theme` (not the 'minimal'
+     * fallback), so the lookup can honor an explicitly doc-named built-in
+     * without the constructor theme being shadowed for unnamed docs (#141).
      */
-    resolveNamedTheme?: (name: string, warnings?: GenerationWarning[]) => ThemeConfig;
+    resolveNamedTheme?: (name: string, warnings: GenerationWarning[] | undefined, authored: boolean) => ThemeConfig;
 }
 export interface GenerationThemeContext {
     /** The document after the export-mode pre-pass rewrote font references. */

package/dist/core/generationContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generationContext.d.ts","sourceRoot":"","sources":["../../src/core/generationContext.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,WAAW,mBAAmB;IAClC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAAC;IAC9C,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC/B;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,CAClB,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,iBAAiB,EAAE,KAC3B,WAAW,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,2EAA2E;IAC3E,QAAQ,EAAE,yBAAyB,CAAC;IACpC,KAAK,EAAE,WAAW,CAAC;IACnB,wEAAwE;IACxE,SAAS,EAAE,MAAM,CAAC;CACnB;AAoBD,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,yBAAyB,EACrC,OAAO,GAAE,mBAAwB,GAChC,sBAAsB,CA6DxB"}
+{"version":3,"file":"generationContext.d.ts","sourceRoot":"","sources":["../../src/core/generationContext.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,WAAW,mBAAmB;IAClC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAAC;IAC9C,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC/B;;;;;;;OAOG;IACH,iBAAiB,CAAC,EAAE,CAClB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,iBAAiB,EAAE,GAAG,SAAS,EACzC,QAAQ,EAAE,OAAO,KACd,WAAW,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,2EAA2E;IAC3E,QAAQ,EAAE,yBAAyB,CAAC;IACpC,KAAK,EAAE,WAAW,CAAC;IACnB,wEAAwE;IACxE,SAAS,EAAE,MAAM,CAAC;CACnB;AAoBD,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,yBAAyB,EACrC,OAAO,GAAE,mBAAwB,GAChC,sBAAsB,CAkExB"}

package/dist/index.js

@@ -2008,8 +2008,13 @@ function resolveThemeContext(documentIn, options = {}) {
     );
   }
   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 authoredThemeName = document.props.theme || void 0;
+  const baseThemeName = authoredThemeName ?? "minimal";
+  let theme = resolveNamedTheme ? resolveNamedTheme(
+    baseThemeName,
+    warnings,
+    authoredThemeName !== void 0
+  ) : defaultNamedThemeLookup(baseThemeName, customThemes, warnings);
   const themeOverrides = document.props.themeOverrides;
   let themeName = baseThemeName;
   if (themeOverrides) {
@@ -3686,8 +3691,7 @@ function normalizeUnicodeText(text) {
 // src/utils/placeholderProcessor.ts
 import {
   TextRun as TextRun2,
-  PageNumber,
-  Tab as Tab2
+  PageNumber
 } from "docx";
 
 // src/utils/textParser.ts
@@ -3794,74 +3798,90 @@ function parseTextWithDecorators(text, baseStyle = {}, options = {}) {
   }
   return runs;
 }
-function createTextRunsWithNewlines(text, baseStyle, options, overrideStyle) {
+function buildRunCommonProps(baseStyle, overrides) {
+  const bold = overrides?.bold ?? baseStyle.bold;
+  const italics = overrides?.italics ?? baseStyle.italics;
+  return {
+    ...baseStyle.font && { font: baseStyle.font },
+    ...baseStyle.size && { size: baseStyle.size },
+    ...baseStyle.color && {
+      color: bold && overrides?.boldColor ? overrides.boldColor : baseStyle.color
+    },
+    ...bold !== void 0 && { bold },
+    ...italics !== void 0 && { italics },
+    ...baseStyle.underline && { underline: baseStyle.underline },
+    ...baseStyle.scale && { scale: baseStyle.scale },
+    ...baseStyle.characterSpacing && {
+      characterSpacing: baseStyle.characterSpacing
+    },
+    ...baseStyle.language && { language: baseStyle.language }
+  };
+}
+function buildLineRuns(line, commonProps, opts) {
+  const { needsLineBreak, noProof } = opts;
+  const wholeRunNoProof = noProof === true;
+  const wordsForLine = wholeRunNoProof ? void 0 : opts.noProofWords;
+  let firstSegment = true;
+  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;
+    }
+    if (!tabSegment && tabSegments.length > 1) return;
+    lineRuns.push(
+      ...splitByNoProofWords(
+        tabSegment,
+        (segment, matched) => {
+          const run = new TextRun({
+            text: segment,
+            ...commonProps,
+            ...(matched || noProof !== void 0) && {
+              noProof: matched || wholeRunNoProof
+            },
+            ...needsLineBreak && firstSegment && { break: 1 }
+          });
+          firstSegment = false;
+          return run;
+        },
+        wordsForLine
+      )
+    );
+  });
+  return lineRuns;
+}
+function buildTextRuns(text, commonProps, opts = {}) {
   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) {
-      const runStyle = {
-        bold: overrideStyle?.bold ?? baseStyle.bold,
-        italics: overrideStyle?.italics ?? baseStyle.italics
-      };
-      const commonProps = {
-        ...baseStyle.font && { font: baseStyle.font },
-        ...baseStyle.size && { size: baseStyle.size },
-        ...baseStyle.color && {
-          color: runStyle.bold && options.boldColor ? options.boldColor : baseStyle.color
-        },
-        ...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 = [];
-      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;
-        }
-        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);
+      runs.push(
+        ...buildLineRuns(line, commonProps, { needsLineBreak, ...opts })
+      );
     }
   }
   return runs;
 }
+function createTextRunsWithNewlines(text, baseStyle, options, overrideStyle) {
+  return buildTextRuns(
+    text,
+    buildRunCommonProps(baseStyle, {
+      bold: overrideStyle?.bold,
+      italics: overrideStyle?.italics,
+      boldColor: options.boldColor
+    }),
+    { noProof: baseStyle.noProof, noProofWords: options.noProofWords }
+  );
+}
 function parseTextWithHyperlinks(text, baseStyle = {}, options = {}) {
   const normalizedText = normalizeUnicodeText(text);
   const runs = [];
@@ -4078,65 +4098,10 @@ function processTextWithPlaceholders(text, baseStyle = {}, context = {}, noProof
   return result;
 }
 function createTextRunsWithNewlines2(text, baseStyle, noProofWords) {
-  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) {
-      const commonProps = {
-        font: baseStyle.font,
-        size: baseStyle.size,
-        color: baseStyle.color,
-        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 = [];
-      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;
-        }
-        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);
-    }
-  }
-  return runs;
+  return buildTextRuns(text, buildRunCommonProps(baseStyle), {
+    noProof: baseStyle.noProof,
+    noProofWords
+  });
 }
 function initializeBuiltinPlaceholders() {
   PlaceholderRegistry.register("PAGE", (context) => {
@@ -8332,6 +8297,9 @@ async function runExample(example, options = {}) {
   }
 }
 
+// src/plugin/createDocumentGenerator.ts
+init_themes();
+
 // src/plugin/version-resolver.ts
 import { resolveComponentVersion } from "@json-to-office/shared/plugin";
 
@@ -8574,7 +8542,7 @@ function mergeSchemas(customComponents, standardSchemas) {
 // src/plugin/createDocumentGenerator.ts
 function createBuilderImpl(state) {
   const componentMap = new Map(state.components.map((c) => [c.name, c]));
-  function resolveDocumentTheme(themeName, warnings) {
+  function resolveDocumentTheme(themeName, warnings, authored) {
     if (state.customThemes) {
       if (state.customThemes[themeName]) {
         return state.customThemes[themeName];
@@ -8586,6 +8554,12 @@ function createBuilderImpl(state) {
         return state.customThemes[key];
       }
     }
+    if (authored && hasTheme(themeName)) {
+      return resolveBuiltInTheme(themeName, {
+        customThemes: state.customThemes,
+        warnings
+      });
+    }
     if (state.theme) {
       return state.theme;
     }