@vint.tri/report_gen_mcp 1.5.24 → 1.5.26

package/dist/index.js

@@ -40,12 +40,10 @@ app.use(express.json());
 app.post('/generate-report', async (req, res) => {
     // For HTTP API mode, use the REPORTS_DIR environment variable
     // This endpoint only runs in non-stdio mode where reportsDir is guaranteed to be defined
-    const { document, elements, charts, outputFile = 'report.html' } = req.body;
-    // Поддержка обратной совместимости: если переданы charts, используем их как elements
-    const reportElements = elements || charts || {};
+    const { document, outputFile = 'report.html' } = req.body;
     const outputPath = path.resolve(reportsDir, outputFile);
     try {
-        const result = await generateReport(document, reportElements, outputPath);
+        const result = await generateReport(document, outputPath);
         // Send the file content back to the client
         const fileContent = await fs.readFile(outputPath, 'utf8');
         res.json({
@@ -69,21 +67,16 @@ program
 program
     .command('generate')
     .option('--document <md>', 'Markdown document with placeholders [[chart:id]] or [[image:id]]')
-    .option('--elements <json>', 'JSON string of elements (charts and images) {id: {type: "bar", config: {...}}}')
-    .option('--charts <json>', 'JSON string of charts (deprecated, use --elements instead)')
     .option('--output <file>', 'Output HTML file', 'report.html')
     .description('Generate a report in the directory specified by REPORTS_DIR environment variable')
     .action(async (opts) => {
-    // Поддержка обратной совместимости: если переданы charts, используем их как elements
-    const elements = opts.elements ? JSON.parse(opts.elements) :
-        opts.charts ? JSON.parse(opts.charts) : {};
     // Read the document file content if a file path is provided
     let documentContent = opts.document;
     if (opts.document && fs.existsSync(opts.document)) {
         documentContent = await fs.readFile(opts.document, 'utf8');
     }
     // This command only runs in non-stdio mode where reportsDir is guaranteed to be defined
-    const result = await generateReport(documentContent, elements, path.resolve(reportsDir, opts.output));
+    const result = await generateReport(documentContent, path.resolve(reportsDir, opts.output));
     // Generate proper file URL for CLI mode
     const fileUrl = pathToFileURL(result.filePath).href;
     // Read the file content
@@ -116,7 +109,7 @@ if (process.argv.length === 2) {
     // No command specified, run in stdio mode using MCP SDK
     const mcpServer = new McpServer({
         name: "report_gen_mcp",
-        version: "1.5.24"
+        version: "1.5.26"
     }, {
         // Disable health check to prevent automatic calls
         capabilities: {

package/dist/tools/createReportFromText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createReportFromText.d.ts","sourceRoot":"","sources":["../../src/tools/createReportFromText.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,wBAAwB;;;;;;;qBAOZ,GAAG;;;;CAO3B,CAAC"}
+{"version":3,"file":"createReportFromText.d.ts","sourceRoot":"","sources":["../../src/tools/createReportFromText.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,wBAAwB;;;;;;;qBAOZ,GAAG;;;;CAM3B,CAAC"}

package/dist/tools/createReportFromText.js

@@ -9,9 +9,8 @@ export const createReportFromTextTool = {
     },
     action: async (params) => {
         const { reportContent, outputFile } = params;
-        const elements = {}; // No elements to parse from here
         // The reportContent is already in the final format, so we just need to pass it to the report generator.
-        const result = await generateReport(reportContent, elements, outputFile);
+        const result = await generateReport(reportContent, outputFile);
         return result;
     },
 };

package/dist/tools/simpleReport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simpleReport.d.ts","sourceRoot":"","sources":["../../src/tools/simpleReport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,gBAAgB;;;;;;;mBAON;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;iBAiDjC;YAAE,IAAI,EAAE,UAAU,CAAC;YAAC,QAAQ,EAAE;gBAAE,GAAG,EAAE,MAAM,CAAC;gBAAC,IAAI,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,EAAE;;CAa7F,CAAC"}
+{"version":3,"file":"simpleReport.d.ts","sourceRoot":"","sources":["../../src/tools/simpleReport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,gBAAgB;;;;;;;mBAON;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;iBAajC;YAAE,IAAI,EAAE,UAAU,CAAC;YAAC,QAAQ,EAAE;gBAAE,GAAG,EAAE,MAAM,CAAC;gBAAC,IAAI,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,EAAE;;CAa7F,CAAC"}

package/dist/tools/simpleReport.js

@@ -13,48 +13,12 @@ export const simpleReportTool = {
     },
     action: async (args) => {
         let { document, outputFile } = args;
-        const elements = {};
-        let chartCount = 0;
-        // Regex to find canvas tags and extract their content
-        const canvasRegex = /<canvas[^>]*>([\s\S]*?)<\/canvas>/g;
-        document = document.replace(canvasRegex, (match, chartConfigString) => {
-            const id = `chart${++chartCount}`;
-            try {
-                // Using Function constructor as a safer alternative to eval
-                const chartConfig = new Function(`return ${chartConfigString.trim()}`)();
-                elements[id] = chartConfig;
-                return `[[chart:${id}]]`;
-            }
-            catch (error) {
-                console.error(`Error parsing chart config for id ${id}:`, error);
-                // Keep the original tag if parsing fails to avoid losing content
-                return match;
-            }
-        });
-        let imageCount = 0;
-        // Regex to find img tags and extract their content
-        const imgRegex = /<img[^>]*data-image='([^']*)'[^>]*>/g;
-        document = document.replace(imgRegex, (match, imageConfigString) => {
-            const idMatch = match.match(/id="([^"]+)"/);
-            const id = idMatch ? idMatch[1] : `image${++imageCount}`;
-            try {
-                // Using Function constructor as a safer alternative to eval
-                const imageConfig = new Function(`return ${imageConfigString.trim()}`)();
-                elements[id] = imageConfig;
-                return `[[image:${id}]]`;
-            }
-            catch (error) {
-                console.error(`Error parsing image config for id ${id}:`, error);
-                // Keep the original tag if parsing fails
-                return match;
-            }
-        });
         const reportsDir = process.env.REPORTS_DIR || os.tmpdir();
         if (!outputFile) {
             outputFile = `report-${Date.now()}.html`;
         }
         const outputPath = path.resolve(reportsDir, outputFile);
-        const result = await generateReport(document, elements, outputPath);
+        const result = await generateReport(document, outputPath);
         const fileUrl = pathToFileURL(result.filePath).href;
         const fileContent = await fs.readFile(result.filePath, 'utf8');
         const response = {

package/dist/tools/testReport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testReport.d.ts","sourceRoot":"","sources":["../../src/tools/testReport.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc;;;;;;;;;;CAyE1B,CAAC"}
+{"version":3,"file":"testReport.d.ts","sourceRoot":"","sources":["../../src/tools/testReport.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc;;;;;;;;;;CAsC1B,CAAC"}

package/dist/tools/testReport.js

@@ -1,6 +1,8 @@
 import { generateReport } from '../utils/reportGenerator.js';
 import { pathToFileURL } from 'url';
 import fs from 'fs-extra';
+import path from 'path';
+import os from 'os';
 export const testReportTool = {
     name: "test-report",
     description: "Generate a hardcoded test report to verify that the MCP server is working correctly.",
@@ -16,46 +18,11 @@ This is a test report.
 
 ## Chart
 
-<canvas id="myChart"></canvas>
-<script>
-  const ctx = document.getElementById('myChart').getContext('2d');
-  new Chart(ctx, {
-    type: 'bar',
-    data: {
-      labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
-      datasets: [{
-        label: '# of Votes',
-        data: [12, 19, 3, 5, 2, 3],
-        backgroundColor: [
-          'rgba(255, 99, 132, 0.2)',
-          'rgba(54, 162, 235, 0.2)',
-          'rgba(255, 206, 86, 0.2)',
-          'rgba(75, 192, 192, 0.2)',
-          'rgba(153, 102, 255, 0.2)',
-          'rgba(255, 159, 64, 0.2)'
-        ],
-        borderColor: [
-          'rgba(255, 99, 132, 1)',
-          'rgba(54, 162, 235, 1)',
-          'rgba(255, 206, 86, 1)',
-          'rgba(75, 192, 192, 1)',
-          'rgba(153, 102, 255, 1)',
-          'rgba(255, 159, 64, 1)'
-        ],
-        borderWidth: 1
-      }]
-    },
-    options: {
-      scales: {
-        y: {
-          beginAtZero: true
-        }
-      }
-    }
-  });
-</script>
+<canvas data-chart='{"type":"bar","data":{"labels":["Red","Blue","Yellow","Green","Purple","Orange"],"datasets":[{"label":"# of Votes","data":[12,19,3,5,2,3],"backgroundColor":["rgba(255, 99, 132, 0.2)","rgba(54, 162, 235, 0.2)","rgba(255, 206, 86, 0.2)","rgba(75, 192, 192, 0.2)","rgba(153, 102, 255, 0.2)","rgba(255, 159, 64, 0.2)"],"borderColor":["rgba(255, 99, 132, 1)","rgba(54, 162, 235, 1)","rgba(255, 206, 86, 1)","rgba(75, 192, 192, 1)","rgba(153, 102, 255, 1)","rgba(255, 159, 64, 1)"],"borderWidth":1}]},"options":{"scales":{"y":{"beginAtZero":true}}}}'></canvas>
 `;
-        const result = await generateReport(reportContent, {}, "test-report.html");
+        const tempDir = path.join(os.tmpdir(), 'report_gen_mcp_temp');
+        await fs.ensureDir(tempDir);
+        const result = await generateReport(reportContent, path.join(tempDir, "test-report.html"));
         const fileUrl = pathToFileURL(result.filePath).href;
         const fileContent = await fs.readFile(result.filePath, 'utf8');
         return {

package/dist/utils/reportGenerator.d.ts

@@ -1,19 +1,5 @@
-import { z } from 'zod';
-import { urlImageSchema } from '../images/urlImages.js';
-type ChartType = 'bar' | 'line' | 'pie' | 'doughnut' | 'radar' | 'polarArea';
-interface ChartElement {
-    type: ChartType;
-    config: any;
-}
-interface UrlImageElement {
-    type: 'url' | 'image';
-    config: z.infer<typeof urlImageSchema>;
-}
-type ImageElement = UrlImageElement;
-type ReportElement = ChartElement | ImageElement;
-export declare function generateReport(document: string, elements: Record<string, ReportElement>, outputFile: string): Promise<{
+export declare function generateReport(document: string, outputFile: string): Promise<{
     success: boolean;
     filePath: string;
 }>;
-export {};
 //# sourceMappingURL=reportGenerator.d.ts.map

package/dist/utils/reportGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reportGenerator.d.ts","sourceRoot":"","sources":["../../src/utils/reportGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,OAAO,EAAE,cAAc,EAAkB,MAAM,wBAAwB,CAAC;AAGxE,KAAK,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,UAAU,GAAG,OAAO,GAAG,WAAW,CAAC;AAI7E,UAAU,YAAY;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,GAAG,CAAC;CACb;AAED,UAAU,eAAe;IACvB,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IACtB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;CACxC;AAED,KAAK,YAAY,GAAG,eAAe,CAAC;AACpC,KAAK,aAAa,GAAG,YAAY,GAAG,YAAY,CAAC;AAiDjD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,EACvC,UAAU,EAAE,MAAM;;;GAiInB"}
+{"version":3,"file":"reportGenerator.d.ts","sourceRoot":"","sources":["../../src/utils/reportGenerator.ts"],"names":[],"mappings":"AAuHA,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM;;;GA4InB"}

package/dist/utils/reportGenerator.js

@@ -9,6 +9,45 @@ import { doughnutSchema, renderDoughnutChart } from '../charts/doughnut.js';
 import { radarSchema, renderRadarChart } from '../charts/radar.js';
 import { polarAreaSchema, renderPolarAreaChart } from '../charts/polarArea.js';
 import { urlImageSchema, renderUrlImage } from '../images/urlImages.js';
+async function extractElementsFromMarkdown(markdown) {
+    console.log("Starting extractElementsFromMarkdown...");
+    const elements = {};
+    let elementCount = 0;
+    // Regex to find <canvas data-chart="...">
+    const chartRegex = /<canvas\s+data-chart="([^"]*)"[^>]*>/g;
+    let chartMatch;
+    while ((chartMatch = chartRegex.exec(markdown)) !== null) {
+        const chartConfigJson = chartMatch[1];
+        try {
+            const config = JSON.parse(chartConfigJson);
+            if (config && typeof config === 'object' && config.type) {
+                const id = `chart-${elementCount++}`;
+                elements[id] = { type: config.type, config: config };
+                console.log(`Extracted chart: ${id}, type: ${config.type}`);
+                // Replace the original canvas tag with a placeholder
+                markdown = markdown.replace(chartMatch[0], `[[chart:${id}]]`);
+            }
+        }
+        catch (e) {
+            console.error(`Error parsing chart config: ${chartConfigJson}`, e);
+            // Continue without adding this chart if parsing fails
+        }
+    }
+    // Regex to find <img src="..." alt="...">
+    const imageRegex = /<img\s+src="([^"]*)"(?:\s+alt="([^"]*)")?[^>]*>/g;
+    let imageMatch;
+    while ((imageMatch = imageRegex.exec(markdown)) !== null) {
+        const src = imageMatch[1];
+        const alt = imageMatch[2] || '';
+        const id = `image-${elementCount++}`;
+        elements[id] = { type: 'url', config: { url: src, alt: alt } };
+        console.log(`Extracted image: ${id}, src: ${src}`);
+        // Replace the original img tag with a placeholder
+        markdown = markdown.replace(imageMatch[0], `[[image:${id}]]`);
+    }
+    console.log("Finished extractElementsFromMarkdown. Extracted elements:", Object.keys(elements));
+    return elements;
+}
 const chartRenderers = {
     bar: { schema: barSchema, renderer: renderBarChart },
     line: { schema: lineSchema, renderer: renderLineChart },
@@ -47,9 +86,14 @@ function normalizeChartConfig(config) {
     }
     return normalizedConfig;
 }
-export async function generateReport(document, elements, outputFile) {
+export async function generateReport(document, outputFile) {
+    console.log("Starting generateReport...");
+    const extractedElements = await extractElementsFromMarkdown(document);
+    const elements = extractedElements; // Use the extracted elements
+    console.log("Elements after extraction:", Object.keys(elements));
     // Validate elements
     for (const [id, element] of Object.entries(elements)) {
+        console.log(`Validating element: ${id}, type: ${element.type}`);
         if (element.type in chartRenderers) {
             // Это диаграмма
             const chartElement = element;
@@ -61,6 +105,7 @@ export async function generateReport(document, elements, outputFile) {
             schema.parse(normalizedConfig);
             // Update the element with normalized config for rendering
             element.config = normalizedConfig;
+            console.log(`Validated chart: ${id}`);
         }
         else if (element.type in imageRenderers) {
             // Это изображение
@@ -69,6 +114,7 @@ export async function generateReport(document, elements, outputFile) {
             if (!schema)
                 throw new Error(`Unsupported image type: ${imageElement.type}`);
             schema.parse(imageElement.config);
+            console.log(`Validated image: ${id}`);
         }
         else {
             throw new Error(`Unsupported element type: ${element.type}`);
@@ -77,17 +123,20 @@ export async function generateReport(document, elements, outputFile) {
     // Render elements to interactive HTML
     const renderedElements = {};
     for (const [id, element] of Object.entries(elements)) {
+        console.log(`Rendering element: ${id}, type: ${element.type}`);
         if (element.type in chartRenderers) {
             // Это диаграмма
             const chartElement = element;
             const htmlChart = await chartRenderers[chartElement.type].renderer(chartElement.config);
             renderedElements[id] = htmlChart;
+            console.log(`Rendered chart: ${id}`);
         }
         else if (element.type in imageRenderers) {
             // Это изображение
             const imageElement = element;
             const htmlImage = await imageRenderers[imageElement.type].renderer(imageElement.config);
             renderedElements[id] = htmlImage;
+            console.log(`Rendered image: ${id}`);
         }
     }
     // Replace placeholders in Markdown, e.g., [[chart:id]] or [[image:id]]

package/package.json

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