@vint.tri/report_gen_mcp 1.2.1 → 1.2.2

package/dist/charts/bar.js

@@ -4,8 +4,8 @@ export const barSchema = z.object({
     datasets: z.array(z.object({
         label: z.string(),
         data: z.array(z.number()),
-        backgroundColor: z.array(z.string()).optional(),
-        borderColor: z.array(z.string()).optional(),
+        backgroundColor: z.union([z.string(), z.array(z.string())]).optional(),
+        borderColor: z.union([z.string(), z.array(z.string())]).optional(),
     })),
     options: z.object({
         title: z.string().optional(),

package/dist/charts/doughnut.js

@@ -3,8 +3,8 @@ export const doughnutSchema = z.object({
     labels: z.array(z.string()),
     datasets: z.array(z.object({
         data: z.array(z.number()),
-        backgroundColor: z.array(z.string()).optional(),
-        borderColor: z.array(z.string()).optional(),
+        backgroundColor: z.union([z.string(), z.array(z.string())]).optional(),
+        borderColor: z.union([z.string(), z.array(z.string())]).optional(),
     })),
     options: z.object({
         title: z.string().optional(),

package/dist/charts/line.js

@@ -4,7 +4,7 @@ export const lineSchema = z.object({
     datasets: z.array(z.object({
         label: z.string(),
         data: z.array(z.number()),
-        borderColor: z.array(z.string()).optional(),
+        borderColor: z.union([z.string(), z.array(z.string())]).optional(),
         fill: z.boolean().optional(),
     })),
     options: z.object({

package/dist/charts/pie.js

@@ -3,8 +3,8 @@ export const pieSchema = z.object({
     labels: z.array(z.string()),
     datasets: z.array(z.object({
         data: z.array(z.number()),
-        backgroundColor: z.array(z.string()).optional(),
-        borderColor: z.array(z.string()).optional(),
+        backgroundColor: z.union([z.string(), z.array(z.string())]).optional(),
+        borderColor: z.union([z.string(), z.array(z.string())]).optional(),
     })),
     options: z.object({
         title: z.string().optional(),

package/dist/charts/polarArea.js

@@ -3,8 +3,8 @@ export const polarAreaSchema = z.object({
     labels: z.array(z.string()),
     datasets: z.array(z.object({
         data: z.array(z.number()),
-        backgroundColor: z.array(z.string()).optional(),
-        borderColor: z.array(z.string()).optional(),
+        backgroundColor: z.union([z.string(), z.array(z.string())]).optional(),
+        borderColor: z.union([z.string(), z.array(z.string())]).optional(),
     })),
     options: z.object({
         title: z.string().optional(),

package/dist/charts/radar.js

@@ -4,8 +4,8 @@ export const radarSchema = z.object({
     datasets: z.array(z.object({
         label: z.string(),
         data: z.array(z.number()),
-        backgroundColor: z.array(z.string()).optional(),
-        borderColor: z.array(z.string()).optional(),
+        backgroundColor: z.union([z.string(), z.array(z.string())]).optional(),
+        borderColor: z.union([z.string(), z.array(z.string())]).optional(),
     })),
     options: z.object({
         title: z.string().optional(),

package/dist/index.js

@@ -109,6 +109,51 @@ if (process.argv.length === 2) {
             tools: {}
         }
     });
+    // Utility function to normalize chart configuration data for MCP tool
+    // Converts string values to arrays where the schema expects arrays
+    function normalizeChartConfigForMCP(config) {
+        if (!config || typeof config !== 'object') {
+            return config;
+        }
+        const normalizedConfig = { ...config };
+        // Normalize datasets
+        if (normalizedConfig.datasets && Array.isArray(normalizedConfig.datasets)) {
+            normalizedConfig.datasets = normalizedConfig.datasets.map((dataset) => {
+                if (!dataset || typeof dataset !== 'object') {
+                    return dataset;
+                }
+                const normalizedDataset = { ...dataset };
+                // Convert string values to arrays for color properties
+                const colorProperties = ['backgroundColor', 'borderColor'];
+                for (const prop of colorProperties) {
+                    if (normalizedDataset[prop] && typeof normalizedDataset[prop] === 'string') {
+                        normalizedDataset[prop] = [normalizedDataset[prop]];
+                    }
+                }
+                return normalizedDataset;
+            });
+        }
+        return normalizedConfig;
+    }
+    // Utility function to normalize elements before MCP schema validation
+    function normalizeElementsForMCP(elements) {
+        if (!elements || typeof elements !== 'object') {
+            return elements;
+        }
+        const normalizedElements = { ...elements };
+        for (const [id, element] of Object.entries(normalizedElements)) {
+            if (element && typeof element === 'object' && element.type) {
+                const elementType = element.type;
+                // Only normalize chart elements, not image elements
+                if (['bar', 'line', 'pie', 'doughnut', 'radar', 'polarArea'].includes(elementType)) {
+                    if (element.config) {
+                        element.config = normalizeChartConfigForMCP(element.config);
+                    }
+                }
+            }
+        }
+        return normalizedElements;
+    }
     // Register the generate-report tool
     mcpServer.registerTool("generate-report", {
         description: "Generate an HTML report with embedded charts",
@@ -122,8 +167,8 @@ if (process.argv.length === 2) {
                         datasets: z.array(z.object({
                             label: z.string().optional(),
                             data: z.array(z.number()),
-                            backgroundColor: z.array(z.string()).optional(),
-                            borderColor: z.array(z.string()).optional(),
+                            backgroundColor: z.union([z.string(), z.array(z.string())]).optional(),
+                            borderColor: z.union([z.string(), z.array(z.string())]).optional(),
                             fill: z.boolean().optional(),
                         })),
                         options: z.object({
@@ -170,6 +215,13 @@ if (process.argv.length === 2) {
         else if (params.arguments && typeof params.arguments === 'object') {
             processedParams = params.arguments;
         }
+        // Normalize elements before extracting them to fix string/array issues
+        if (processedParams.elements) {
+            processedParams.elements = normalizeElementsForMCP(processedParams.elements);
+        }
+        if (processedParams.charts) {
+            processedParams.charts = normalizeElementsForMCP(processedParams.charts);
+        }
         // Extract parameters correctly, ensuring outputFile is not nested within elements
         const { document, elements, charts, outputFile = 'report.html', tempDirectory } = processedParams;
         // Поддержка обратной совместимости: если переданы charts, используем их как elements

package/dist/utils/reportGenerator.js

@@ -20,6 +20,32 @@ const imageRenderers = {
     pollinations: { schema: pollinationsImageSchema, renderer: renderPollinationsImage },
     url: { schema: urlImageSchema, renderer: renderUrlImage },
 };
+// Utility function to normalize chart configuration data
+// Converts string values to arrays where the schema expects arrays
+function normalizeChartConfig(config) {
+    if (!config || typeof config !== 'object') {
+        return config;
+    }
+    const normalizedConfig = { ...config };
+    // Normalize datasets
+    if (normalizedConfig.datasets && Array.isArray(normalizedConfig.datasets)) {
+        normalizedConfig.datasets = normalizedConfig.datasets.map((dataset) => {
+            if (!dataset || typeof dataset !== 'object') {
+                return dataset;
+            }
+            const normalizedDataset = { ...dataset };
+            // Convert string values to arrays for color properties
+            const colorProperties = ['backgroundColor', 'borderColor'];
+            for (const prop of colorProperties) {
+                if (normalizedDataset[prop] && typeof normalizedDataset[prop] === 'string') {
+                    normalizedDataset[prop] = [normalizedDataset[prop]];
+                }
+            }
+            return normalizedDataset;
+        });
+    }
+    return normalizedConfig;
+}
 export async function generateReport(document, elements, outputFile) {
     // Validate elements
     for (const [id, element] of Object.entries(elements)) {
@@ -29,7 +55,11 @@ export async function generateReport(document, elements, outputFile) {
             const { schema } = chartRenderers[chartElement.type];
             if (!schema)
                 throw new Error(`Unsupported chart type: ${chartElement.type}`);
-            schema.parse(chartElement.config);
+            // Normalize the chart configuration before validation
+            const normalizedConfig = normalizeChartConfig(chartElement.config);
+            schema.parse(normalizedConfig);
+            // Update the element with normalized config for rendering
+            element.config = normalizedConfig;
         }
         else if (element.type in imageRenderers) {
             // Это изображение

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vint.tri/report_gen_mcp",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "CLI tool for generating HTML reports with embedded charts",
   "main": "dist/index.js",
   "bin": {