@json-to-office/core-pptx 0.25.0 → 0.26.0

package/dist/core/generationContext.d.ts

@@ -0,0 +1,56 @@
+/**
+ * Shared generation prologue.
+ *
+ * Both entry points — `generateBufferWithWarnings` (core) and
+ * `createPresentationGenerator` (plugin) — must resolve the same theme, run
+ * the same export-mode pre-pass, and derive the same cache key before slide
+ * processing runs. Keeping two copies of that is how DOCX silently dropped a
+ * root-level prop from one path (#133); this module is the single definition
+ * so the next root-level prop cannot diverge (#134). Mirrors
+ * core-docx/src/core/generationContext.ts.
+ *
+ * The prologue deliberately stops before font resolution: the core path
+ * resolves fonts straight after this, while the plugin path must first expand
+ * custom components (which can introduce new families). The export-mode
+ * pre-pass runs here, BEFORE expansion, so custom components reading
+ * `theme.fonts.*` during render see substituted names, not the original
+ * non-safe ones.
+ */
+import type { PresentationComponentDefinition, PptxThemeConfig, PipelineWarning } from '../types';
+import type { FontRuntimeOpts } from '@json-to-office/shared';
+export interface ThemeContextOptions {
+    customThemes?: Record<string, PptxThemeConfig>;
+    fonts?: FontRuntimeOpts;
+    warnings?: PipelineWarning[];
+    /**
+     * Base theme name when the document doesn't name one. The plugin builder
+     * passes its constructor-supplied string theme; defaults to 'default'.
+     */
+    defaultThemeName?: string;
+    /**
+     * Theme lookup for the base `props.theme` name. The plugin builder passes
+     * its own (customThemes → constructor theme object → built-in); omit it to
+     * use customThemes → built-in.
+     */
+    resolveNamedTheme?: (name: string) => PptxThemeConfig;
+}
+export interface GenerationThemeContext {
+    /**
+     * The document after the export-mode pre-pass rewrote font references.
+     * `props.theme` stays as authored (name or inline object) — callers hand
+     * `theme` to `processPresentation` by value instead of round-tripping it
+     * through a name lookup (#135).
+     */
+    document: PresentationComponentDefinition;
+    theme: PptxThemeConfig;
+    /**
+     * Cache key: base theme name + export-mode scope. Nothing in PPTX consumes
+     * a theme by name after the prologue today; this is the key a future
+     * theme-keyed cache must use (a substitute-mode run rewrites the theme in
+     * place, so it must never share a slot with a custom-mode run of the same
+     * base name — the DOCX layout cache is keyed exactly this way).
+     */
+    themeName: string;
+}
+export declare function resolveThemeContext(documentIn: PresentationComponentDefinition, options?: ThemeContextOptions): GenerationThemeContext;
+//# sourceMappingURL=generationContext.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generationContext.d.ts","sourceRoot":"","sources":["../../src/core/generationContext.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EACV,+BAA+B,EAC/B,eAAe,EACf,eAAe,EAChB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,MAAM,WAAW,mBAAmB;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC/C,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,eAAe,CAAC;CACvD;AAED,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,QAAQ,EAAE,+BAA+B,CAAC;IAC1C,KAAK,EAAE,eAAe,CAAC;IACvB;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,+BAA+B,EAC3C,OAAO,GAAE,mBAAwB,GAChC,sBAAsB,CA6DxB"}

package/dist/core/generator.d.ts

@@ -19,6 +19,12 @@ export interface GenerationValidationOptions {
  */
 export interface GenerationOptions extends PresentationPackagingOptions {
     customThemes?: Record<string, PptxThemeConfig>;
+    /**
+     * Fully resolved theme, set by the generation prologue after the
+     * export-mode pre-pass. Wins over the `props.theme` name/inline lookup in
+     * `processPresentation` — omit it (direct callers) to fall back to that.
+     */
+    theme?: PptxThemeConfig;
     services?: ServicesConfig;
     fonts?: FontRuntimeOpts;
     validation?: GenerationValidationOptions;
@@ -35,6 +41,19 @@ export declare class PresentationValidationError extends Error {
     readonly errors: ValidationError[];
     constructor(errors: ValidationError[]);
 }
+/**
+ * Structural rules the per-component schema can't express: image sources
+ * (path/base64/svg) are mutually exclusive, and text components carry
+ * exactly one of text/runs. Reject conflicting payloads before rendering so
+ * they can't be silently resolved by runtime precedence. Matches core-docx,
+ * which fails generation on the same image conflict.
+ *
+ * Runs unconditionally — the validators also collect these conflicts, so this
+ * is the net for `validation: { enabled: false }`. Shared with the plugin
+ * path, which checks the expanded tree (custom components can emit
+ * conflicting payloads too).
+ */
+export declare function assertNoContentConflicts(document: unknown): void;
 /**
  * Type guard for presentation component
  */

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

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/core/generator.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,KAAK,EACV,+BAA+B,EAC/B,eAAe,EACf,eAAe,EACf,cAAc,EACf,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9E,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,uBAAuB,CAAC;AAE/B,MAAM,WAAW,2BAA2B;IAC1C,+EAA+E;IAC/E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,4EAA4E;IAC5E,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,4BAA4B;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC/C,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,UAAU,CAAC,EAAE,2BAA2B,CAAC;CAC1C;AAID;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAED,6EAA6E;AAC7E,qBAAa,2BAA4B,SAAQ,KAAK;IACpD,SAAgB,MAAM,EAAE,eAAe,EAAE,CAAC;gBAE9B,MAAM,EAAE,eAAe,EAAE;CAStC;AAqBD;;GAEG;AACH,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,OAAO,GAClB,UAAU,IAAI,+BAA+B,CAI/C;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,+BAA+B,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,QAAQ,CAAC,EAAE,eAAe,EAAE,EAC5B,YAAY,CAAC,EAAE,cAAc,EAAE,GAC9B,OAAO,CAAC,SAAS,CAAC,CA0BpB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,MAAM,GAAG,+BAA+B,EACpD,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,GAAG,+BAA+B,EACpD,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CAqG3B;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,MAAM,GAAG,+BAA+B,EACpD,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,4BAA4B,GACrC,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;CAQjC,CAAC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/core/generator.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,KAAK,EACV,+BAA+B,EAC/B,eAAe,EACf,eAAe,EACf,cAAc,EACf,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9E,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,uBAAuB,CAAC;AAE/B,MAAM,WAAW,2BAA2B;IAC1C,+EAA+E;IAC/E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,4EAA4E;IAC5E,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,4BAA4B;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC/C;;;;OAIG;IACH,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,UAAU,CAAC,EAAE,2BAA2B,CAAC;CAC1C;AAID;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAED,6EAA6E;AAC7E,qBAAa,2BAA4B,SAAQ,KAAK;IACpD,SAAgB,MAAM,EAAE,eAAe,EAAE,CAAC;gBAE9B,MAAM,EAAE,eAAe,EAAE;CAStC;AAqBD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAYhE;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,OAAO,GAClB,UAAU,IAAI,+BAA+B,CAI/C;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,+BAA+B,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,QAAQ,CAAC,EAAE,eAAe,EAAE,EAC5B,YAAY,CAAC,EAAE,cAAc,EAAE,GAC9B,OAAO,CAAC,SAAS,CAAC,CAWpB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,MAAM,GAAG,+BAA+B,EACpD,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,GAAG,+BAA+B,EACpD,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CAwD3B;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,MAAM,GAAG,+BAA+B,EACpD,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,4BAA4B,GACrC,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;CAQjC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"structure.d.ts","sourceRoot":"","sources":["../../src/core/structure.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAGV,+BAA+B,EAC/B,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAQlB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAmCrD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,+BAA+B,EACzC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,qBAAqB,CAmJvB"}
+{"version":3,"file":"structure.d.ts","sourceRoot":"","sources":["../../src/core/structure.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAGV,+BAA+B,EAC/B,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAQlB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAmCrD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,+BAA+B,EACzC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,qBAAqB,CAuJvB"}

package/dist/index.js

@@ -387,7 +387,7 @@ function buildSlideIndexMap(children) {
 }
 function processPresentation(document, options) {
   const { props, children = [] } = document;
-  const baseTheme = typeof props.theme === "object" && props.theme !== null ? props.theme : options?.customThemes?.[props.theme ?? "default"] ?? getPptxTheme(props.theme ?? "default");
+  const baseTheme = options?.theme ?? (typeof props.theme === "object" && props.theme !== null ? props.theme : options?.customThemes?.[props.theme ?? "default"] ?? getPptxTheme(props.theme ?? "default"));
   const presDefaults = props.componentDefaults;
   const theme = presDefaults ? {
     ...baseTheme,
@@ -1913,8 +1913,40 @@ async function resolveDocumentFonts(document, theme, warnings, fonts) {
   return resolved;
 }
 
-// src/core/generator.ts
+// src/core/generationContext.ts
 import { applyExportMode, scopedThemeName } from "@json-to-office/shared";
+function resolveThemeContext(documentIn, options = {}) {
+  const { customThemes, fonts, warnings, defaultThemeName, resolveNamedTheme } = options;
+  if (documentIn.props === null) {
+    throw new Error(
+      "Document `props` is null. Omit it, or provide an object \u2014 a null props cannot carry a theme."
+    );
+  }
+  let document = documentIn.props === void 0 ? { ...documentIn, props: {} } : documentIn;
+  let inlineTheme;
+  if (typeof document.props.theme === "object" && document.props.theme !== null) {
+    inlineTheme = document.props.theme;
+  }
+  const baseThemeName = inlineTheme ? inlineTheme.name || "inline-theme" : document.props.theme ?? defaultThemeName ?? "default";
+  let theme = inlineTheme ?? (resolveNamedTheme ? resolveNamedTheme(baseThemeName) : customThemes?.[baseThemeName] ?? getPptxTheme(baseThemeName));
+  const mode = applyExportMode({ doc: document, theme, fonts });
+  document = mode.doc;
+  theme = mode.theme;
+  for (const w of mode.warnings) {
+    warnings?.push({
+      code: w.code,
+      message: w.message,
+      component: "fontRegistry"
+    });
+  }
+  return {
+    document,
+    theme,
+    themeName: scopedThemeName(baseThemeName, fonts?.mode)
+  };
+}
+
+// src/core/generator.ts
 import {
   collectImageSourceConflicts,
   collectTextContentConflicts,
@@ -2093,16 +2125,7 @@ function assertValidPresentation(input, validation) {
     throw new PresentationValidationError(result.errors);
   }
 }
-function isPresentationComponentDefinition(definition) {
-  if (typeof definition !== "object" || definition === null) return false;
-  const def = definition;
-  return def.name === "pptx" && "props" in def;
-}
-async function generatePresentation(document, options, warnings, pendingFills) {
-  assertValidPresentation(document, options?.validation);
-  if (!document || document.name !== "pptx") {
-    throw new Error("Top-level component must be a pptx component");
-  }
+function assertNoContentConflicts(document) {
   const sourceConflicts = [
     ...collectImageSourceConflicts(document),
     ...collectTextContentConflicts(document)
@@ -2113,6 +2136,18 @@ async function generatePresentation(document, options, warnings, pendingFills) {
 ${sourceConflicts.map((e) => `  - ${e.path}: ${e.message}`).join("\n")}`
     );
   }
+}
+function isPresentationComponentDefinition(definition) {
+  if (typeof definition !== "object" || definition === null) return false;
+  const def = definition;
+  return def.name === "pptx" && "props" in def;
+}
+async function generatePresentation(document, options, warnings, pendingFills) {
+  assertValidPresentation(document, options?.validation);
+  if (!document || document.name !== "pptx") {
+    throw new Error("Top-level component must be a pptx component");
+  }
+  assertNoContentConflicts(document);
   const processed = processPresentation(document, options);
   return await renderPresentation(processed, warnings, pendingFills);
 }
@@ -2133,56 +2168,21 @@ async function generateBufferWithWarnings(jsonConfig, options) {
     component = jsonConfig;
   }
   const warnings = [];
-  if (typeof component.props?.theme === "object" && component.props.theme !== null) {
-    const inlineTheme = component.props.theme;
-    const inlineName = inlineTheme.name || "inline-theme";
-    component = {
-      ...component,
-      props: { ...component.props, theme: inlineName }
-    };
-    options = {
-      ...options,
-      customThemes: {
-        ...options?.customThemes ?? {},
-        [inlineName]: inlineTheme
-      }
-    };
-  }
-  const baseThemeName = component.props?.theme ?? "default";
-  let resolvedTheme = options?.customThemes?.[baseThemeName] ?? getPptxTheme(baseThemeName);
-  const mode = applyExportMode({
-    doc: component,
-    theme: resolvedTheme,
-    fonts: options?.fonts
+  const context = resolveThemeContext(component, {
+    customThemes: options?.customThemes,
+    fonts: options?.fonts,
+    warnings
   });
-  component = mode.doc;
-  resolvedTheme = mode.theme;
-  for (const w of mode.warnings) {
-    warnings.push({
-      code: w.code,
-      message: w.message,
-      component: "fontRegistry"
-    });
-  }
+  component = context.document;
   await resolveDocumentFonts(
     component,
-    resolvedTheme,
+    context.theme,
     warnings,
     options?.fonts
   );
-  const themeName = scopedThemeName(baseThemeName, options?.fonts?.mode);
-  if (themeName !== baseThemeName) {
-    component = {
-      ...component,
-      props: { ...component.props, theme: themeName }
-    };
-  }
   const effectiveOptions = {
     ...options,
-    customThemes: {
-      ...options?.customThemes ?? {},
-      [themeName]: resolvedTheme
-    }
+    theme: context.theme
   };
   const pendingFills = [];
   const pptx = await generatePresentation(
@@ -2350,7 +2350,6 @@ async function exportPluginSchema(customComponents, outputPath, options = {}) {
 }
 
 // src/plugin/createPresentationGenerator.ts
-import { applyExportMode as applyExportMode2, scopedThemeName as scopedThemeName2 } from "@json-to-office/shared";
 function createBuilderImpl(state) {
   const componentMap = new Map(state.components.map((c) => [c.name, c]));
   async function processSlideComponents(components, warningsCollector, theme, validateEmitted, parentName, depth = 0) {
@@ -2494,41 +2493,23 @@ function createBuilderImpl(state) {
       } else if (!internalDocument || internalDocument.name !== "pptx") {
         throw new Error("Top-level component must be a pptx component");
       }
-      let inlineTheme;
-      if (typeof internalDocument.props.theme === "object" && internalDocument.props.theme !== null) {
-        inlineTheme = internalDocument.props.theme;
-        internalDocument = {
-          ...internalDocument,
-          props: {
-            ...internalDocument.props,
-            theme: inlineTheme.name || "inline-theme"
-          }
-        };
-      }
-      const docThemeName = internalDocument.props.theme;
-      const baseThemeName = docThemeName ?? (typeof state.theme === "string" ? state.theme : "default");
-      let resolvedTheme = inlineTheme ?? state.customThemes?.[baseThemeName] ?? (typeof state.theme === "object" && state.theme !== null ? state.theme : getPptxTheme(baseThemeName));
       const warnings = [];
-      const mode = applyExportMode2({
-        doc: internalDocument,
-        theme: resolvedTheme,
-        fonts: state.fonts
+      const context = resolveThemeContext(internalDocument, {
+        customThemes: state.customThemes,
+        fonts: state.fonts,
+        warnings,
+        defaultThemeName: typeof state.theme === "string" ? state.theme : void 0,
+        resolveNamedTheme: (name) => state.customThemes?.[name] ?? (typeof state.theme === "object" && state.theme !== null ? state.theme : getPptxTheme(name))
       });
-      resolvedTheme = mode.theme;
-      for (const w of mode.warnings) {
-        warnings.push({
-          code: w.code,
-          message: w.message,
-          component: "fontRegistry"
-        });
-      }
+      const modedRoot = context.document;
+      const resolvedTheme = context.theme;
       const validateEmitted = validationOptions.enabled === false ? void 0 : (emitted, componentLabel, parentName) => {
         let validationDocument;
         if (parentName === "pptx") {
-          validationDocument = { ...mode.doc, children: emitted };
+          validationDocument = { ...modedRoot, children: emitted };
         } else if (parentName === "slide") {
           validationDocument = {
-            ...mode.doc,
+            ...modedRoot,
             children: [{ name: "slide", props: {}, children: emitted }]
           };
         } else {
@@ -2549,19 +2530,16 @@ function createBuilderImpl(state) {
           );
         }
       };
-      const processedChildren = mode.doc.children ? await processAllSlides(
-        mode.doc.children,
+      const processedChildren = modedRoot.children ? await processAllSlides(
+        modedRoot.children,
         warnings,
         resolvedTheme,
         validateEmitted
       ) : [];
-      const themeName = scopedThemeName2(baseThemeName, state.fonts?.mode);
-      const docWithScopedTheme = themeName !== baseThemeName ? {
-        ...mode.doc,
-        props: { ...mode.doc.props, theme: themeName },
+      const processedDocument = {
+        ...modedRoot,
         children: processedChildren
-      } : { ...mode.doc, children: processedChildren };
-      const processedDocument = docWithScopedTheme;
+      };
       if (validationOptions.enabled !== false) {
         const result = validatePresentation(processedDocument, [], {
           allowUnknownFields: validationOptions.allowUnknownFields
@@ -2582,12 +2560,9 @@ function createBuilderImpl(state) {
         warnings,
         state.fonts
       );
-      const effectiveCustomThemes = {
-        ...state.customThemes ?? {},
-        [themeName]: resolvedTheme
-      };
+      assertNoContentConflicts(processedDocument);
       const processed = processPresentation(processedDocument, {
-        customThemes: effectiveCustomThemes,
+        theme: resolvedTheme,
         services: state.services
       });
       const pendingFills = [];