@json-to-office/core-docx 0.1.1 → 0.3.0

package/dist/plugin/createComponent.d.ts

@@ -1,113 +1,15 @@
-import { type TSchema, type Static } from '@sinclair/typebox';
+import type { TSchema } from '@sinclair/typebox';
 import type { ComponentDefinition } from '@json-to-office/shared-docx';
-import type { AddWarningFunction } from '@json-to-office/shared-docx';
 import type { ThemeConfig } from '../styles';
+import type { RenderContext as SharedRenderContext, RenderFunction as SharedRenderFunction, ComponentVersion as SharedComponentVersion, ComponentVersionMap as SharedComponentVersionMap, CustomComponent as SharedCustomComponent } from '@json-to-office/shared/plugin';
 /**
- * Render function context - parameters passed to render
- */
-export interface RenderContext<T> {
-    /** The validated props for this component */
-    props: T;
-    /** The resolved theme configuration */
-    theme: ThemeConfig;
-    /** Function to add warnings during processing */
-    addWarning: AddWarningFunction;
-    /** For container components: processed nested children */
-    children?: unknown[];
-}
-/**
- * Render function that transforms custom component props into standard components.
- */
-export type RenderFunction<TProps, TComponentDefinition = ComponentDefinition> = (context: RenderContext<TProps>) => Promise<TComponentDefinition[]>;
-/**
- * A single version entry within a versioned component.
- * Each version is self-contained with its own schema, render, and metadata.
- */
-export interface ComponentVersion<TComponentDefinition = ComponentDefinition, TPropsSchema extends TSchema = TSchema> {
-    /** TypeBox schema for props validation */
-    propsSchema: TPropsSchema;
-    /** Async render function to transform props into standard components */
-    render: RenderFunction<Static<TPropsSchema>, TComponentDefinition>;
-    /** Whether this version supports nested children */
-    hasChildren?: boolean;
-    /** Optional description for this version */
-    description?: string;
-}
-/**
- * Map of semver version strings to their version definitions.
- */
-export type ComponentVersionMap<TComponentDefinition = ComponentDefinition> = Record<string, ComponentVersion<TComponentDefinition, any>>;
-/**
- * Custom component definition with multiple semver-keyed versions.
- * Each version is self-contained with its own schema + render.
- *
- * @typeParam TComponentDefinition - The component definition type for render return
- * @typeParam TVersions - The versions map type
- * @typeParam TName - The literal string type for the component name
- */
-export interface CustomComponent<TComponentDefinition = ComponentDefinition, TVersions extends ComponentVersionMap<TComponentDefinition> = ComponentVersionMap<TComponentDefinition>, TName extends string = string> {
-    /** Unique name for the component type */
-    name: TName;
-    /** Map of semver version strings to version definitions */
-    versions: TVersions;
-}
-/**
- * Create a single version entry with full type inference for props.
- *
- * Wrapping each version with `createVersion` lets TypeScript infer the
- * props type from `propsSchema` and propagate it to the `render` function,
- * so `props` is fully typed instead of `any`.
- *
- * @example
- * ```typescript
- * createVersion({
- *   propsSchema: Type.Object({ city: Type.String() }),
- *   render: async ({ props }) => {
- *     // props.city is inferred as string
- *     return [{ name: 'paragraph', props: { text: props.city } }];
- *   },
- * })
- * ```
+ * DOCX render context with ThemeConfig baked in
  */
+export type RenderContext<T> = SharedRenderContext<T, ThemeConfig>;
+export type RenderFunction<TProps, TComponentDefinition = ComponentDefinition> = SharedRenderFunction<TProps, TComponentDefinition, ThemeConfig>;
+export type ComponentVersion<TComponentDefinition = ComponentDefinition, TPropsSchema extends TSchema = TSchema> = SharedComponentVersion<TComponentDefinition, TPropsSchema, ThemeConfig>;
+export type ComponentVersionMap<TComponentDefinition = ComponentDefinition> = SharedComponentVersionMap<TComponentDefinition, ThemeConfig>;
+export type CustomComponent<TComponentDefinition = ComponentDefinition, TVersions extends ComponentVersionMap<TComponentDefinition> = ComponentVersionMap<TComponentDefinition>, TName extends string = string> = SharedCustomComponent<TComponentDefinition, TVersions, TName>;
 export declare function createVersion<TPropsSchema extends TSchema, TComponentDefinition = ComponentDefinition>(version: ComponentVersion<TComponentDefinition, TPropsSchema>): ComponentVersion<TComponentDefinition, TPropsSchema>;
-/**
- * Create a custom component with multiple semver-keyed versions.
- *
- * Use {@link createVersion} for each version entry to get full type inference
- * for `props` in render functions.
- *
- * @example Basic single-version usage
- * ```typescript
- * const weatherComponent = createComponent({
- *   name: 'weather' as const,
- *   versions: {
- *     '1.0.0': createVersion({
- *       propsSchema: Type.Object({ city: Type.String() }),
- *       render: async ({ props }) => [{
- *         name: 'paragraph',
- *         props: { text: `Weather in ${props.city}` }
- *       }]
- *     })
- *   }
- * });
- * ```
- *
- * @example Multi-version with breaking changes
- * ```typescript
- * const weatherComponent = createComponent({
- *   name: 'weather' as const,
- *   versions: {
- *     '1.0.0': createVersion({
- *       propsSchema: WeatherV1PropsSchema,
- *       render: async ({ props }) => [...],
- *     }),
- *     '2.0.0': createVersion({
- *       propsSchema: WeatherV2PropsSchema,
- *       render: async ({ props }) => [...],
- *     }),
- *   },
- * });
- * ```
- */
 export declare function createComponent<TComponentDefinition = ComponentDefinition, TVersions extends ComponentVersionMap<TComponentDefinition> = ComponentVersionMap<TComponentDefinition>, TName extends string = string>(component: CustomComponent<TComponentDefinition, TVersions, TName>): CustomComponent<TComponentDefinition, TVersions, TName>;
 //# sourceMappingURL=createComponent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../../src/plugin/createComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,6CAA6C;IAC7C,KAAK,EAAE,CAAC,CAAC;IACT,uCAAuC;IACvC,KAAK,EAAE,WAAW,CAAC;IACnB,iDAAiD;IACjD,UAAU,EAAE,kBAAkB,CAAC;IAC/B,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,CACxB,MAAM,EACN,oBAAoB,GAAG,mBAAmB,IACxC,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;AAExE;;;GAGG;AACH,MAAM,WAAW,gBAAgB,CAC/B,oBAAoB,GAAG,mBAAmB,EAC1C,YAAY,SAAS,OAAO,GAAG,OAAO;IAEtC,0CAA0C;IAC1C,WAAW,EAAE,YAAY,CAAC;IAC1B,wEAAwE;IACxE,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACnE,oDAAoD;IACpD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,4CAA4C;IAC5C,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAAC,oBAAoB,GAAG,mBAAmB,IACxE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC,CAAC;AAE9D;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe,CAC9B,oBAAoB,GAAG,mBAAmB,EAC1C,SAAS,SACP,mBAAmB,CAAC,oBAAoB,CAAC,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,EACvF,KAAK,SAAS,MAAM,GAAG,MAAM;IAE7B,yCAAyC;IACzC,IAAI,EAAE,KAAK,CAAC;IACZ,2DAA2D;IAC3D,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAC3B,YAAY,SAAS,OAAO,EAC5B,oBAAoB,GAAG,mBAAmB,EAE1C,OAAO,EAAE,gBAAgB,CAAC,oBAAoB,EAAE,YAAY,CAAC,GAC5D,gBAAgB,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAEtD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,wBAAgB,eAAe,CAC7B,oBAAoB,GAAG,mBAAmB,EAC1C,SAAS,SACP,mBAAmB,CAAC,oBAAoB,CAAC,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,EACvF,KAAK,SAAS,MAAM,GAAG,MAAM,EAE7B,SAAS,EAAE,eAAe,CAAC,oBAAoB,EAAE,SAAS,EAAE,KAAK,CAAC,GACjE,eAAe,CAAC,oBAAoB,EAAE,SAAS,EAAE,KAAK,CAAC,CAoCzD"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../../src/plugin/createComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAK7C,OAAO,KAAK,EACV,aAAa,IAAI,mBAAmB,EACpC,cAAc,IAAI,oBAAoB,EACtC,gBAAgB,IAAI,sBAAsB,EAC1C,mBAAmB,IAAI,yBAAyB,EAChD,eAAe,IAAI,qBAAqB,EACzC,MAAM,+BAA+B,CAAC;AAIvC;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,mBAAmB,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;AAEnE,MAAM,MAAM,cAAc,CACxB,MAAM,EACN,oBAAoB,GAAG,mBAAmB,IACxC,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,EAAE,WAAW,CAAC,CAAC;AAEpE,MAAM,MAAM,gBAAgB,CAC1B,oBAAoB,GAAG,mBAAmB,EAC1C,YAAY,SAAS,OAAO,GAAG,OAAO,IACpC,sBAAsB,CAAC,oBAAoB,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;AAE5E,MAAM,MAAM,mBAAmB,CAAC,oBAAoB,GAAG,mBAAmB,IACxE,yBAAyB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;AAE/D,MAAM,MAAM,eAAe,CACzB,oBAAoB,GAAG,mBAAmB,EAC1C,SAAS,SACP,mBAAmB,CAAC,oBAAoB,CAAC,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,EACvF,KAAK,SAAS,MAAM,GAAG,MAAM,IAC3B,qBAAqB,CAAC,oBAAoB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;AAIlE,wBAAgB,aAAa,CAC3B,YAAY,SAAS,OAAO,EAC5B,oBAAoB,GAAG,mBAAmB,EAE1C,OAAO,EAAE,gBAAgB,CAAC,oBAAoB,EAAE,YAAY,CAAC,GAC5D,gBAAgB,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAEtD;AAED,wBAAgB,eAAe,CAC7B,oBAAoB,GAAG,mBAAmB,EAC1C,SAAS,SACP,mBAAmB,CAAC,oBAAoB,CAAC,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,EACvF,KAAK,SAAS,MAAM,GAAG,MAAM,EAE7B,SAAS,EAAE,eAAe,CAAC,oBAAoB,EAAE,SAAS,EAAE,KAAK,CAAC,GACjE,eAAe,CAAC,oBAAoB,EAAE,SAAS,EAAE,KAAK,CAAC,CAEzD"}

package/dist/plugin/createDocumentGenerator.d.ts

@@ -1,4 +1,4 @@
-import type { ThemeConfig } from '../styles';
+import { type ThemeConfig } from '../styles';
 import type { DocumentGeneratorBuilder } from './types';
 /**
  * Options for creating a document generator
@@ -6,6 +6,8 @@ import type { DocumentGeneratorBuilder } from './types';
 export interface DocumentGeneratorOptions {
     /** Theme configuration */
     theme: ThemeConfig;
+    /** Custom themes keyed by name, resolved per-document via document.props.theme */
+    customThemes?: Record<string, ThemeConfig>;
     /** Enable caching for better performance */
     enableCache?: boolean;
     /** Enable debug logging */

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,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,KAAK,EAEV,wBAAwB,EAKzB,MAAM,SAAS,CAAC;AAgBjB;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,0BAA0B;IAC1B,KAAK,EAAE,WAAW,CAAC;IACnB,4CAA4C;IAC5C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAoZD;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,CAAC,SAAS,EAAE,CAAC,CAUvC"}
+{"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,EAEV,wBAAwB,EAKzB,MAAM,SAAS,CAAC;AAcjB;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,0BAA0B;IAC1B,KAAK,EAAE,WAAW,CAAC;IACnB,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;CACjB;AA2bD;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,CAAC,SAAS,EAAE,CAAC,CAWvC"}

package/dist/plugin/example/index.js

@@ -678,7 +678,7 @@ function loadThemesFromJson() {
   _themesCache = themes2;
   return themes2;
 }
-var _themesCache, themes, getTheme, minimalTheme, corporateTheme, modernTheme;
+var _themesCache, themes, getTheme, getThemeWithFallback, minimalTheme, corporateTheme, modernTheme;
 var init_themes = __esm({
   "src/templates/themes/index.ts"() {
     "use strict";
@@ -691,6 +691,15 @@ var init_themes = __esm({
     getTheme = (themeName) => {
       return themes[themeName];
     };
+    getThemeWithFallback = (themeName, fallbackTheme = "minimal") => {
+      const theme = getTheme(themeName) || getTheme(fallbackTheme);
+      if (!theme) {
+        throw new Error(
+          `Failed to load theme: ${themeName}. Fallback theme '${fallbackTheme}' also not found.`
+        );
+      }
+      return theme;
+    };
     minimalTheme = themes["minimal"];
     corporateTheme = themes["corporate"];
     modernTheme = themes["modern"];
@@ -2033,62 +2042,29 @@ var init_numberingConfig = __esm({
 import { Packer as Packer2 } from "docx";
 
 // src/plugin/createDocumentGenerator.ts
+init_styles();
 import { Packer } from "docx";
 
 // src/plugin/version-resolver.ts
-import { latestVersion } from "@json-to-office/shared-docx";
-function resolveComponentVersion(componentName, versions, requestedVersion) {
-  const versionKeys = Object.keys(versions);
-  if (requestedVersion) {
-    const entry = versions[requestedVersion];
-    if (!entry) {
-      throw new Error(
-        `Component "${componentName}" does not have version "${requestedVersion}". Available versions: ${versionKeys.join(", ")}`
-      );
-    }
-    return entry;
-  }
-  const latest = latestVersion(versionKeys);
-  return versions[latest];
-}
+import { resolveComponentVersion } from "@json-to-office/shared/plugin";
 
 // src/plugin/validation.ts
 import {
   validateCustomComponentProps,
+  ComponentValidationError
+} from "@json-to-office/shared/plugin";
+import {
   validateDocument as validateDocumentUnified
 } from "@json-to-office/shared-docx/validation/unified";
-var DuplicateComponentError = class _DuplicateComponentError extends Error {
-  componentName;
-  code = "DUPLICATE_COMPONENT";
-  constructor(componentName) {
-    super(
-      `Cannot register component "${componentName}": a component with this name is already registered. Component names must be unique within a document generator.`
-    );
-    this.name = "DuplicateComponentError";
-    this.componentName = componentName;
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, _DuplicateComponentError);
-    }
-  }
-};
-var ComponentValidationError = class extends Error {
-  errors;
-  props;
-  constructor(errors, props) {
-    const propsStr = props !== void 0 ? `
-Props: ${JSON.stringify(props, null, 2)}` : "";
-    const message = `Document validation failed:
-${errors.map((e) => `  ${e.path}: ${e.message}`).join("\n")}${propsStr}`;
-    super(message);
-    this.name = "ComponentValidationError";
-    this.errors = errors;
-    this.props = props;
-  }
-};
-function validateComponentProps(schema, props) {
+import {
+  DuplicateComponentError,
+  ComponentValidationError as ComponentValidationError2
+} from "@json-to-office/shared/plugin";
+function validateComponentProps(schema, props, componentName) {
   return validateCustomComponentProps(schema.propsSchema, props, {
     clean: true,
-    applyDefaults: true
+    applyDefaults: true,
+    componentName
   });
 }
 function validateDocument(document, customComponents) {
@@ -2115,7 +2091,8 @@ function validateDocument(document, customComponents) {
       );
       const validation = validateComponentProps(
         versionEntry,
-        componentData.props
+        componentData.props,
+        customComponent.name
       );
       if (!validation.valid && validation.errors) {
         const indexedErrors = validation.errors.map(
@@ -2150,7 +2127,7 @@ var cleanComponentProps = getValidatedProps;
 
 // src/plugin/schema.ts
 import { Type } from "@sinclair/typebox";
-import { latestVersion as latestVersion2 } from "@json-to-office/shared-docx";
+import { latestVersion } from "@json-to-office/shared-docx";
 import {
   ReportPropsSchema,
   SectionPropsSchema,
@@ -6185,42 +6162,15 @@ async function renderHighchartsComponent(component, theme, _themeName) {
 import { Type as Type2 } from "@sinclair/typebox";
 
 // src/plugin/createComponent.ts
-import { isValidSemver } from "@json-to-office/shared";
+import {
+  createVersion as sharedCreateVersion,
+  createComponent as sharedCreateComponent
+} from "@json-to-office/shared/plugin";
 function createVersion(version) {
-  return version;
+  return sharedCreateVersion(version);
 }
 function createComponent(component) {
-  if (!component.name) {
-    throw new Error("Component name is required");
-  }
-  if (!component.versions || typeof component.versions !== "object") {
-    throw new Error(`Component "${component.name}" requires a versions map`);
-  }
-  const versionKeys = Object.keys(component.versions);
-  if (versionKeys.length === 0) {
-    throw new Error(
-      `Component "${component.name}" must have at least one version`
-    );
-  }
-  for (const key of versionKeys) {
-    if (!isValidSemver(key)) {
-      throw new Error(
-        `Component "${component.name}": invalid semver key "${key}". Expected format: major.minor.patch`
-      );
-    }
-    const entry = component.versions[key];
-    if (!entry.propsSchema) {
-      throw new Error(
-        `Component "${component.name}" version "${key}" requires a propsSchema`
-      );
-    }
-    if (!entry.render || typeof entry.render !== "function") {
-      throw new Error(
-        `Component "${component.name}" version "${key}" requires a render function`
-      );
-    }
-  }
-  return component;
+  return sharedCreateComponent(component);
 }
 
 // src/components/text-space-after.ts
@@ -6694,45 +6644,29 @@ function normalizeDocument(document) {
   return [normalized];
 }
 
-// src/styles/theme-resolver.ts
-init_themes();
-function resolveTheme2(theme) {
-  if (typeof theme === "string") {
-    const resolvedTheme = getTheme(theme);
-    if (resolvedTheme) {
-      return resolvedTheme;
-    }
-    return getTheme("minimal");
-  }
-  if (theme) {
-    return theme;
-  }
-  return getTheme("minimal");
-}
-
-// src/styles/theme-validator.ts
-import { validateTheme as validateThemeUnified } from "@json-to-office/shared-docx/validation/unified";
-function validateTheme(theme) {
-  if (!theme) {
-    return void 0;
-  }
-  if (typeof theme === "string") {
-    return theme;
-  }
-  const result = validateThemeUnified(theme);
-  if (!result.valid) {
-    const errorSummary = result.errors?.map((e) => e.message).join(", ") || "Invalid theme";
-    throw new Error(`Invalid theme: ${errorSummary}`);
-  }
-  return result.data;
-}
-
 // src/plugin/createDocumentGenerator.ts
 function createBuilderImpl(state) {
-  const validatedTheme = validateTheme(state.theme);
-  const fullTheme = resolveTheme2(validatedTheme);
   const componentMap = new Map(state.components.map((c) => [c.name, c]));
-  async function processDocumentComponents(components, warningsCollector) {
+  function resolveDocumentTheme(themeName) {
+    if (state.customThemes) {
+      if (state.customThemes[themeName]) {
+        return state.customThemes[themeName];
+      }
+      const key = Object.keys(state.customThemes).find(
+        (k) => k.toLowerCase() === themeName.toLowerCase()
+      );
+      if (key) {
+        return state.customThemes[key];
+      }
+    }
+    return getThemeWithFallback(themeName);
+  }
+  async function processDocumentComponents(components, warningsCollector, resolvedTheme, depth = 0) {
+    if (depth > 20) {
+      throw new Error(
+        "Maximum component nesting depth exceeded (20). Check for circular component references."
+      );
+    }
     const processedComponents = [];
     for (const componentData of components) {
       const componentName = componentData?.name;
@@ -6762,7 +6696,9 @@ function createBuilderImpl(state) {
           if (componentWithName.children && Array.isArray(componentWithName.children)) {
             nestedChildren = await processDocumentComponents(
               componentWithName.children,
-              warningsCollector
+              warningsCollector,
+              resolvedTheme,
+              depth + 1
             );
           }
           const versionLabel = componentWithName.version ? `${customComponent.name}@${componentWithName.version}` : customComponent.name;
@@ -6776,14 +6712,16 @@ function createBuilderImpl(state) {
           };
           const result = await versionEntry.render({
             props: cleanedProps,
-            theme: fullTheme,
+            theme: resolvedTheme,
             addWarning,
             children: nestedChildren
           });
           const resultComponents = Array.isArray(result) ? result : [result];
           const processedResult = await processDocumentComponents(
             resultComponents,
-            warningsCollector
+            warningsCollector,
+            resolvedTheme,
+            depth + 1
           );
           processedComponents.push(...processedResult);
           if (state.debug) {
@@ -6793,7 +6731,7 @@ function createBuilderImpl(state) {
             );
           }
         } catch (error) {
-          if (error instanceof ComponentValidationError) {
+          if (error instanceof ComponentValidationError2) {
             throw error;
           }
           throw new Error(
@@ -6804,7 +6742,9 @@ function createBuilderImpl(state) {
         if ("children" in componentData && Array.isArray(componentData.children)) {
           const processedNested = await processDocumentComponents(
             componentData.children,
-            warningsCollector
+            warningsCollector,
+            resolvedTheme,
+            depth + 1
           );
           processedComponents.push({
             ...componentData,
@@ -6818,18 +6758,19 @@ function createBuilderImpl(state) {
     return processedComponents;
   }
   function addComponent(component) {
-    if (state.componentNames.has(component.name)) {
-      throw new DuplicateComponentError(component.name);
-    }
     if (!component.name) {
       throw new Error("Component name is required");
     }
+    if (state.componentNames.has(component.name)) {
+      throw new DuplicateComponentError(component.name);
+    }
     const newComponentNames = new Set(state.componentNames);
     newComponentNames.add(component.name);
     const newState = {
       components: [...state.components, component],
       componentNames: newComponentNames,
       theme: state.theme,
+      customThemes: state.customThemes,
       debug: state.debug,
       enableCache: state.enableCache
     };
@@ -6844,10 +6785,13 @@ function createBuilderImpl(state) {
         internalDocument,
         state.components
       );
+      const themeName = internalDocument.props.theme || "minimal";
+      const docTheme = resolveDocumentTheme(themeName);
       const warnings = [];
       const processedComponents = await processDocumentComponents(
         internalDocument.children || [],
-        warnings
+        warnings,
+        docTheme
       );
       const processedDocument = {
         ...internalDocument,
@@ -6856,10 +6800,10 @@ function createBuilderImpl(state) {
       const [finalReportComponent] = normalizeDocument(processedDocument);
       const structure = await processDocument(
         finalReportComponent,
-        fullTheme,
-        "custom"
+        docTheme,
+        themeName
       );
-      const layout = applyLayout(structure.sections, fullTheme, "custom");
+      const layout = applyLayout(structure.sections, docTheme, themeName);
       const generatedDocument = await renderDocument(structure, layout);
       return {
         document: generatedDocument,
@@ -6895,7 +6839,7 @@ function createBuilderImpl(state) {
       );
       return { valid: true };
     } catch (error) {
-      if (error instanceof ComponentValidationError) {
+      if (error instanceof ComponentValidationError2) {
         return {
           valid: false,
           errors: error.errors.map((e) => ({
@@ -6935,10 +6879,13 @@ function createBuilderImpl(state) {
         internalDocument,
         state.components
       );
+      const themeName = internalDocument.props.theme || "minimal";
+      const docTheme = resolveDocumentTheme(themeName);
       const warnings = [];
       const processedComponents = await processDocumentComponents(
         internalDocument.children || [],
-        warnings
+        warnings,
+        docTheme
       );
       const processedDocument = {
         ...internalDocument,
@@ -6970,6 +6917,7 @@ function createDocumentGenerator(options) {
     components: [],
     componentNames: /* @__PURE__ */ new Set(),
     theme: options.theme,
+    customThemes: options.customThemes,
     debug: options.debug ?? false,
     enableCache: options.enableCache ?? false
   };