@json-to-office/jto 0.1.1 → 0.2.0

package/dist/index.js

@@ -17,7 +17,9 @@ var DocxFormatAdapter = class {
     const core = await import("@json-to-office/core-docx");
     const docDefinition = typeof json === "string" ? JSON.parse(json) : json;
     const customThemes = await this.loadCustomThemes(options);
-    return await core.generateBufferFromJson(docDefinition, { customThemes });
+    return await core.generateBufferFromJson(docDefinition, {
+      customThemes
+    });
   }
   async createGenerator(plugins, options) {
     const core = await import("@json-to-office/core-docx");
@@ -27,16 +29,20 @@ var DocxFormatAdapter = class {
       return {
         generateBuffer: async (document) => {
           const docDefinition = typeof document === "string" ? JSON.parse(document) : document;
-          const customThemes = await this.loadCustomThemes(options);
-          return await core.generateBufferFromJson(docDefinition, { customThemes });
+          const customThemes2 = await this.loadCustomThemes(options);
+          return await core.generateBufferFromJson(docDefinition, {
+            customThemes: customThemes2
+          });
         },
         hasPlugins: false,
         pluginNames: []
       };
     }
     const theme = await this.resolveTheme(options);
+    const customThemes = await this.loadCustomThemes(options);
     let generator = core.createDocumentGenerator({
       theme,
+      customThemes,
       debug: process.env.DEBUG === "true"
     });
     for (const plugin of plugins) {
@@ -222,19 +228,52 @@ var PptxFormatAdapter = class {
     const core = await import("@json-to-office/core-pptx");
     const docDefinition = typeof json === "string" ? JSON.parse(json) : json;
     const customThemes = await this.loadCustomThemes(options);
-    return await core.generateBufferFromJson(docDefinition, { customThemes });
+    return await core.generateBufferFromJson(docDefinition, {
+      customThemes
+    });
   }
   async createGenerator(plugins, options) {
     const core = await import("@json-to-office/core-pptx");
     const hasPlugins = plugins.length > 0;
     const pluginNames = plugins.map((p) => p.name);
+    if (!hasPlugins) {
+      return {
+        generateBuffer: async (document) => {
+          const docDefinition = typeof document === "string" ? JSON.parse(document) : document;
+          const customThemes2 = await this.loadCustomThemes(options);
+          return await core.generateBufferFromJson(docDefinition, {
+            customThemes: customThemes2
+          });
+        },
+        hasPlugins: false,
+        pluginNames: []
+      };
+    }
+    const theme = await this.resolveTheme(options);
+    const customThemes = await this.loadCustomThemes(options);
+    let generator = core.createPresentationGenerator({
+      theme,
+      customThemes,
+      debug: process.env.DEBUG === "true"
+    });
+    for (const plugin of plugins) {
+      generator = generator.addComponent(plugin);
+    }
     return {
       generateBuffer: async (document) => {
         const docDefinition = typeof document === "string" ? JSON.parse(document) : document;
-        const customThemes = await this.loadCustomThemes(options);
-        return await core.generateBufferFromJson(docDefinition, { customThemes });
+        const validationResult = generator.validate(docDefinition);
+        if (!validationResult.valid) {
+          const errors = validationResult.errors || [];
+          throw new Error(
+            `Presentation validation failed:
+${errors.map((e) => `  - ${e.path}: ${e.message}`).join("\n")}`
+          );
+        }
+        const result = await generator.generateBuffer(docDefinition);
+        return result.buffer;
       },
-      hasPlugins,
+      hasPlugins: true,
       pluginNames
     };
   }
@@ -635,10 +674,21 @@ var PluginMetadataExtractor = class {
     const versionKeys = Object.keys(versions);
     const latestVer = versionKeys.length > 0 ? latestVersion(versionKeys) : void 0;
     const latestEntry = latestVer ? versions[latestVer] : void 0;
+    let format;
+    try {
+      const source = await fs3.readFile(filePath, "utf-8");
+      format = this.detectFormat(source);
+    } catch (err) {
+      console.warn(
+        `Failed to read plugin source for format detection: ${filePath}`,
+        err
+      );
+    }
     const metadata = {
       name: component.name,
       description: latestEntry?.description,
       version: latestVer,
+      format,
       filePath,
       relativePath,
       location,
@@ -676,6 +726,27 @@ var PluginMetadataExtractor = class {
     }
     return "upstream";
   }
+  detectFormat(source) {
+    const docxSignals = [
+      "@json-to-office/shared-docx",
+      "@json-to-office/core-docx",
+      "@json-to-office/json-to-docx",
+      "ComponentDefinition",
+      "ReportComponentDefinition"
+    ];
+    const pptxSignals = [
+      "@json-to-office/shared-pptx",
+      "@json-to-office/core-pptx",
+      "@json-to-office/json-to-pptx",
+      "PptxComponentInput",
+      "PresentationComponentDefinition"
+    ];
+    const hasDocx = docxSignals.some((s) => source.includes(s));
+    const hasPptx = pptxSignals.some((s) => source.includes(s));
+    if (hasDocx && !hasPptx) return "docx";
+    if (hasPptx && !hasDocx) return "pptx";
+    return void 0;
+  }
   typeboxToJsonSchema(schema) {
     try {
       const jsonSchema = JSON.parse(JSON.stringify(schema));
@@ -898,10 +969,10 @@ var PluginDiscoveryService = class {
     }
     this.metadataExtractor = new PluginMetadataExtractor(this.searchPath);
   }
-  async discover() {
-    return this.discoverPlugins();
+  async discover(format) {
+    return this.discoverPlugins(format);
   }
-  async discoverPlugins() {
+  async discoverPlugins(format) {
     const startPath = this.searchPath;
     try {
       await this.loader.initialize();
@@ -925,6 +996,9 @@ var PluginDiscoveryService = class {
         if (locationDiff !== 0) return locationDiff;
         return a.name.localeCompare(b.name);
       });
+      if (format) {
+        return metadata.filter((p) => !p.format || p.format === format);
+      }
       return metadata;
     } finally {
       this.loader.cleanup();
@@ -934,7 +1008,10 @@ var PluginDiscoveryService = class {
     const startPath = this.searchPath;
     const discoveryType = format === "pptx" ? "pptx-document" : "docx-document";
     const ext = format === "pptx" ? ".pptx.json" : ".docx.json";
-    const allDocumentPaths = await this.searchDownstream(startPath, discoveryType);
+    const allDocumentPaths = await this.searchDownstream(
+      startPath,
+      discoveryType
+    );
     const uniquePaths = this.scanner.deduplicatePaths(allDocumentPaths);
     const metadata = [];
     for (const docPath of uniquePaths) {
@@ -955,7 +1032,11 @@ var PluginDiscoveryService = class {
       }
     }
     metadata.sort((a, b) => {
-      const locationOrder = { current: 0, downstream: 1, upstream: 2 };
+      const locationOrder = {
+        current: 0,
+        downstream: 1,
+        upstream: 2
+      };
       const locationDiff = locationOrder[a.location] - locationOrder[b.location];
       if (locationDiff !== 0) return locationDiff;
       return a.name.localeCompare(b.name);
@@ -984,7 +1065,11 @@ var PluginDiscoveryService = class {
       }
     }
     metadata.sort((a, b) => {
-      const locationOrder = { current: 0, downstream: 1, upstream: 2 };
+      const locationOrder = {
+        current: 0,
+        downstream: 1,
+        upstream: 2
+      };
       const locationDiff = locationOrder[a.location] - locationOrder[b.location];
       if (locationDiff !== 0) return locationDiff;
       return a.name.localeCompare(b.name);
@@ -1005,7 +1090,7 @@ var PluginDiscoveryService = class {
   }
   async discoverAll(format) {
     const [plugins, documents, themes] = await Promise.all([
-      this.discoverPlugins(),
+      this.discoverPlugins(format),
       this.discoverDocuments(format),
       this.discoverThemes(format)
     ]);
@@ -1081,6 +1166,7 @@ var PluginRegistry = class _PluginRegistry {
   pluginMetadata = /* @__PURE__ */ new Map();
   loader;
   discoveryService;
+  _format;
   constructor() {
     this.loader = new PluginLoader();
     this.discoveryService = new PluginDiscoveryService();
@@ -1091,6 +1177,9 @@ var PluginRegistry = class _PluginRegistry {
     }
     return _PluginRegistry.instance;
   }
+  setFormat(format) {
+    this._format = format;
+  }
   notifyCacheInvalidation() {
     try {
       invalidateAllCaches();
@@ -1162,7 +1251,7 @@ var PluginRegistry = class _PluginRegistry {
         scope: dir,
         maxDepth: 5
       });
-      const pluginMetadata = await discovery.discover();
+      const pluginMetadata = await discovery.discover(this._format);
       return await this.loadPluginsFromMetadata(pluginMetadata);
     } catch (error) {
       throw new Error(
@@ -1175,7 +1264,7 @@ var PluginRegistry = class _PluginRegistry {
   async discoverAndLoad() {
     try {
       await this.loader.initialize();
-      const pluginMetadata = await this.discoveryService.discover();
+      const pluginMetadata = await this.discoveryService.discover(this._format);
       const discovered = pluginMetadata.length;
       if (discovered === 0) {
         return { discovered: 0, loaded: 0 };
@@ -1193,7 +1282,7 @@ var PluginRegistry = class _PluginRegistry {
       return this.pluginPaths.get(name);
     }
     try {
-      const pluginMetadata = await this.discoveryService.discover();
+      const pluginMetadata = await this.discoveryService.discover(this._format);
       const metadata = pluginMetadata.find((p) => p.name === name);
       if (metadata) return metadata.filePath;
     } catch {
@@ -1274,8 +1363,10 @@ var PluginResolver = class {
   discoveredPlugins = /* @__PURE__ */ new Map();
   lastDiscoveryTime = 0;
   CACHE_DURATION = 5 * 60 * 1e3;
-  constructor() {
+  format;
+  constructor(format) {
     this.discoveryService = new PluginDiscoveryService();
+    this.format = format;
   }
   async resolve(input) {
     const pathResult = await this.resolveAsPath(input);
@@ -1328,7 +1419,7 @@ ${errors.join("\n")}`);
   }
   async refreshDiscoveryCache() {
     try {
-      const plugins = await this.discoveryService.discover();
+      const plugins = await this.discoveryService.discover(this.format);
       this.discoveredPlugins.clear();
       for (const plugin of plugins) {
         this.discoveredPlugins.set(plugin.name, plugin);