@json-to-office/jto 0.8.2 → 0.9.0

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import { FontRuntimeOpts } from '@json-to-office/shared';
 import * as _sinclair_typebox from '@sinclair/typebox';
 import { TSchema, Static } from '@sinclair/typebox';
 
@@ -10,6 +11,7 @@ interface GeneratorOptions {
         strict?: boolean;
         allowUnknownFields?: boolean;
     };
+    fonts?: FontRuntimeOpts;
 }
 interface GeneratorResult {
     generateBuffer: (document: any) => Promise<Buffer>;

package/dist/index.js

@@ -8,6 +8,10 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 // src/format-adapter.ts
 import * as path from "path";
 import * as fs from "fs";
+var UNSAFE_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
+function safeThemeKey(name) {
+  return name && !UNSAFE_KEYS.has(name) ? name : "custom";
+}
 function buildServicesFromEnv() {
   const serverUrl = process.env.HIGHCHARTS_SERVER_URL;
   const apiKey = process.env.HIGHCHARTS_API_KEY;
@@ -32,7 +36,8 @@ var DocxFormatAdapter = class {
     const services = buildServicesFromEnv();
     return await core.generateBufferFromJson(docDefinition, {
       customThemes,
-      services
+      services,
+      fonts: options.fonts
     });
   }
   async createGenerator(plugins, options) {
@@ -47,7 +52,8 @@ var DocxFormatAdapter = class {
           const customThemes2 = await this.loadCustomThemes(options);
           return await core.generateBufferFromJson(docDefinition, {
             customThemes: customThemes2,
-            services
+            services,
+            fonts: options.fonts
           });
         },
         hasPlugins: false,
@@ -60,7 +66,8 @@ var DocxFormatAdapter = class {
       theme,
       customThemes,
       debug: process.env.DEBUG === "true",
-      services
+      services,
+      fonts: options.fonts
     });
     for (const plugin of plugins) {
       generator = generator.addComponent(plugin);
@@ -144,16 +151,20 @@ ${errors.map((e) => `  - ${e.path}: ${e.message}`).join("\n")}`
       Object.assign(customThemes, options.customThemes);
     }
     if (typeof options.theme === "object" && options.theme !== null) {
-      customThemes.custom = options.theme;
+      customThemes[safeThemeKey(options.theme.name)] = options.theme;
     }
     if (options.themePath) {
       try {
+        let theme;
         if (options.themePath.endsWith(".json")) {
-          customThemes.custom = await core.loadThemeFromFile(options.themePath);
+          theme = await core.loadThemeFromFile(options.themePath);
         } else {
           const themePath = path.resolve(process.cwd(), options.themePath);
           const themeModule = await import(themePath);
-          customThemes.custom = themeModule.default || themeModule.theme;
+          theme = themeModule.default || themeModule.theme;
+        }
+        if (theme) {
+          customThemes[safeThemeKey(theme.name)] = theme;
         }
       } catch (error) {
         console.warn(
@@ -248,7 +259,8 @@ var PptxFormatAdapter = class {
     const services = buildServicesFromEnv();
     return await core.generateBufferFromJson(docDefinition, {
       customThemes,
-      services
+      services,
+      fonts: options.fonts
     });
   }
   async createGenerator(plugins, options) {
@@ -263,7 +275,8 @@ var PptxFormatAdapter = class {
           const customThemes2 = await this.loadCustomThemes(options);
           return await core.generateBufferFromJson(docDefinition, {
             customThemes: customThemes2,
-            services
+            services,
+            fonts: options.fonts
           });
         },
         hasPlugins: false,
@@ -276,7 +289,8 @@ var PptxFormatAdapter = class {
       theme,
       customThemes,
       debug: process.env.DEBUG === "true",
-      services
+      services,
+      fonts: options.fonts
     });
     for (const plugin of plugins) {
       generator = generator.addComponent(plugin);
@@ -363,20 +377,24 @@ ${errors.map((e) => `  - ${e.path}: ${e.message}`).join("\n")}`
       Object.assign(customThemes, options.customThemes);
     }
     if (typeof options.theme === "object" && options.theme !== null) {
-      customThemes.custom = options.theme;
+      customThemes[safeThemeKey(options.theme.name)] = options.theme;
     }
     if (options.themePath) {
       try {
+        let theme;
         if (options.themePath.endsWith(".json")) {
           const content = fs.readFileSync(
             path.resolve(process.cwd(), options.themePath),
             "utf-8"
           );
-          customThemes.custom = JSON.parse(content);
+          theme = JSON.parse(content);
         } else {
           const themePath = path.resolve(process.cwd(), options.themePath);
           const themeModule = await import(themePath);
-          customThemes.custom = themeModule.default || themeModule.theme;
+          theme = themeModule.default || themeModule.theme;
+        }
+        if (theme) {
+          customThemes[safeThemeKey(theme.name)] = theme;
         }
       } catch (error) {
         console.warn(