@json-to-office/core-docx 0.26.1 → 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) {
@@ -8292,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";
 
@@ -8534,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];
@@ -8546,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;
     }