npm - @vint.tri/report_gen_mcp - Versions diffs - 1.5.30 → 1.5.32 - Mend

@vint.tri/report_gen_mcp 1.5.30 → 1.5.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/debug_generator.js +50 -0
package/dist/charts/bar.d.ts +4 -4
package/dist/charts/line.d.ts +4 -4
package/dist/charts/radar.d.ts +4 -4
package/dist/images/localImages.d.ts +2 -2
package/dist/images/pollinations.d.ts +4 -4
package/dist/images/urlImages.d.ts +2 -2
package/dist/index.js +1 -1
package/dist/tools/simpleReport.js +2 -2
package/dist/utils/reportGenerator.d.ts +1 -2
package/dist/utils/reportGenerator.d.ts.map +1 -1
package/dist/utils/reportGenerator.js +41 -247
package/force_rebuild_and_generate.sh +27 -0
package/package.json +1 -1
package/dist/tools/reportWizard.d.ts +0 -17
package/dist/tools/reportWizard.d.ts.map +0 -1
package/dist/tools/reportWizard.js +0 -69

package/debug_generator.js ADDED Viewed

@@ -0,0 +1,50 @@
+import { generateReport } from './dist/utils/reportGenerator.js';
+import fs from 'fs-extra';
+async function runTest() {
+  console.log("Starting isolated test of generateReport function...");
+  // The exact problematic content from the input file.
+  const badHtmlContent = `
+  <!DOCTYPE html>
+  <html lang="ru">
+  <head>
+    <meta charset="UTF-8">
+    <title>Отчет</title>
+  </head>
+  <body>
+    <div class="container">
+      <h1>Тестовый отчет</h1>
+      <p><canvas data-chart="{"type": "pie", "data": {"labels": ["A", "B"], "datasets": [{"data": [5, 11], "label": "Тест"] "></canvas></p>
+      <p><canvas data-chart="{"type": "bar", "data": {"labels": ["C", "D"], "datasets": [{"label": "Еще один тест", "data": [2, 7]] "></canvas></p>
+    </div>
+  </body>
+  </html>
+  `;
+  const outputFile = 'debug_report_output.html';
+  try {
+    await generateReport(badHtmlContent, outputFile);
+    console.log(`Test finished. Checking content of ${outputFile}...`);
+    const generatedContent = await fs.readFile(outputFile, 'utf8');
+    if (generatedContent.includes('<div class="chart-container"><canvas data-chart=\'{"type":"pie"')) {
+      console.log("SUCCESS: Pie chart was correctly transformed.");
+    } else {
+      console.error("FAILURE: Pie chart was not transformed.");
+    }
+    if (generatedContent.includes('<div class="chart-container"><canvas data-chart=\'{"type":"bar"')) {
+      console.log("SUCCESS: Bar chart was correctly transformed.");
+    } else {
+      console.error("FAILURE: Bar chart was not transformed.");
+    }
+  } catch (error) {
+    console.error("An error occurred during the test:", error);
+  }
+}
+runTest();

package/dist/charts/bar.d.ts CHANGED Viewed

@@ -7,13 +7,13 @@ export declare const barSchema: z.ZodObject<{
         backgroundColor: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         borderColor: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
     }, "strip", z.ZodTypeAny, {
-        label: string;
         data: number[];
+        label: string;
         backgroundColor?: string | string[] | undefined;
         borderColor?: string | string[] | undefined;
     }, {
-        label: string;
         data: number[];
+        label: string;
         backgroundColor?: string | string[] | undefined;
         borderColor?: string | string[] | undefined;
     }>, "many">;
@@ -27,8 +27,8 @@ export declare const barSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     labels: string[];
     datasets: {
-        label: string;
         data: number[];
+        label: string;
         backgroundColor?: string | string[] | undefined;
         borderColor?: string | string[] | undefined;
     }[];
@@ -38,8 +38,8 @@ export declare const barSchema: z.ZodObject<{
 }, {
     labels: string[];
     datasets: {
-        label: string;
         data: number[];
+        label: string;
         backgroundColor?: string | string[] | undefined;
         borderColor?: string | string[] | undefined;
     }[];

package/dist/charts/line.d.ts CHANGED Viewed

@@ -7,13 +7,13 @@ export declare const lineSchema: z.ZodObject<{
         borderColor: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         fill: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
-        label: string;
         data: number[];
+        label: string;
         fill?: boolean | undefined;
         borderColor?: string | string[] | undefined;
     }, {
-        label: string;
         data: number[];
+        label: string;
         fill?: boolean | undefined;
         borderColor?: string | string[] | undefined;
     }>, "many">;
@@ -27,8 +27,8 @@ export declare const lineSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     labels: string[];
     datasets: {
-        label: string;
         data: number[];
+        label: string;
         fill?: boolean | undefined;
         borderColor?: string | string[] | undefined;
     }[];
@@ -38,8 +38,8 @@ export declare const lineSchema: z.ZodObject<{
 }, {
     labels: string[];
     datasets: {
-        label: string;
         data: number[];
+        label: string;
         fill?: boolean | undefined;
         borderColor?: string | string[] | undefined;
     }[];

package/dist/charts/radar.d.ts CHANGED Viewed

@@ -7,13 +7,13 @@ export declare const radarSchema: z.ZodObject<{
         backgroundColor: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         borderColor: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
     }, "strip", z.ZodTypeAny, {
-        label: string;
         data: number[];
+        label: string;
         backgroundColor?: string | string[] | undefined;
         borderColor?: string | string[] | undefined;
     }, {
-        label: string;
         data: number[];
+        label: string;
         backgroundColor?: string | string[] | undefined;
         borderColor?: string | string[] | undefined;
     }>, "many">;
@@ -27,8 +27,8 @@ export declare const radarSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     labels: string[];
     datasets: {
-        label: string;
         data: number[];
+        label: string;
         backgroundColor?: string | string[] | undefined;
         borderColor?: string | string[] | undefined;
     }[];
@@ -38,8 +38,8 @@ export declare const radarSchema: z.ZodObject<{
 }, {
     labels: string[];
     datasets: {
-        label: string;
         data: number[];
+        label: string;
         backgroundColor?: string | string[] | undefined;
         borderColor?: string | string[] | undefined;
     }[];

package/dist/images/localImages.d.ts CHANGED Viewed

@@ -6,14 +6,14 @@ export declare const localImageSchema: z.ZodObject<{
     height: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
     src: string;
-    alt?: string | undefined;
     width?: number | undefined;
     height?: number | undefined;
+    alt?: string | undefined;
 }, {
     src: string;
-    alt?: string | undefined;
     width?: number | undefined;
     height?: number | undefined;
+    alt?: string | undefined;
 }>;
 export declare function renderLocalImage(params: z.infer<typeof localImageSchema>): Promise<string>;
 //# sourceMappingURL=localImages.d.ts.map

package/dist/images/pollinations.d.ts CHANGED Viewed

@@ -8,18 +8,18 @@ export declare const generatedImageSchema: z.ZodObject<{
     nologo: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     enhance: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 }, "strip", z.ZodTypeAny, {
+    model: string;
     width: number;
     height: number;
-    model: string;
     prompt: string;
     nologo: boolean;
     enhance: boolean;
     seed?: number | undefined;
 }, {
     prompt: string;
+    model?: string | undefined;
     width?: number | undefined;
     height?: number | undefined;
-    model?: string | undefined;
     seed?: number | undefined;
     nologo?: boolean | undefined;
     enhance?: boolean | undefined;
@@ -31,14 +31,14 @@ export declare const imageUrlSchema: z.ZodObject<{
     height: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
     url: string;
-    alt?: string | undefined;
     width?: number | undefined;
     height?: number | undefined;
+    alt?: string | undefined;
 }, {
     url: string;
-    alt?: string | undefined;
     width?: number | undefined;
     height?: number | undefined;
+    alt?: string | undefined;
 }>;
 export declare function generateImageUrl(params: z.infer<typeof generatedImageSchema>): string;
 export declare function renderGeneratedImage(params: z.infer<typeof generatedImageSchema>): Promise<string>;

package/dist/images/urlImages.d.ts CHANGED Viewed

@@ -9,15 +9,15 @@ export declare const urlImageSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     url: string;
     embed: boolean;
-    alt?: string | undefined;
     width?: number | undefined;
     height?: number | undefined;
+    alt?: string | undefined;
     outputPath?: string | undefined;
 }, {
     url: string;
-    alt?: string | undefined;
     width?: number | undefined;
     height?: number | undefined;
+    alt?: string | undefined;
     embed?: boolean | undefined;
     outputPath?: string | undefined;
 }>;

package/dist/index.js CHANGED Viewed

@@ -109,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.30"
+        version: "1.5.32"
     }, {
         // Disable health check to prevent automatic calls
         capabilities: {

package/dist/tools/simpleReport.js CHANGED Viewed

@@ -6,9 +6,9 @@ import path from 'path';
 import os from 'os';
 export const simpleReportTool = {
     name: "generate-report",
-    description: "Generate an HTML report from a single string of Markdown content with embedded image and chart tags.",
+    description: "Generate an HTML report from a single string of HTML content with embedded image and chart tags.",
     inputSchema: {
-        document: z.string().describe("The full content of the report in Markdown format, with `<img>` and `<canvas>` tags for images and charts."),
+        document: z.string().describe("The full content of the report in HTML format, with `<img>` and `<canvas>` tags for images and charts."),
         outputFile: z.string().optional().describe("The name of the output HTML file."),
     },
     action: async (args) => {

package/dist/utils/reportGenerator.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
-export declare function generateReport(markdownDocument: string, // Renamed 'document' to 'markdownDocument' for clarity
-outputFile: string): Promise<{
+export declare function generateReport(htmlDocument: string, outputFile: string): Promise<{
     success: boolean;
     filePath: string;
 }>;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"reportGenerator.d.ts","sourceRoot":"","sources":["../../src/utils/reportGenerator.ts"],"names":[],"mappings":"~~AAmKA~~,wBAAsB,cAAc,CAClC,~~gBAAgB~~,EAAE,MAAM,~~EAAE~~,~~uDAAuD;AACjF,~~UAAU,EAAE,MAAM;;;~~GA4InB~~"}
1	+ {"version":3,"file":"reportGenerator.d.ts","sourceRoot":"","sources":["../../src/utils/reportGenerator.ts"],"names":[],"mappings":"AAGA,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM;;;GAsDnB"}

package/dist/utils/reportGenerator.js CHANGED Viewed

@@ -1,256 +1,50 @@
 import fs from 'fs-extra';
-import ejs from 'ejs';
-import { marked } from 'marked';
-import path from 'path'; // Added this line
-import { barSchema, renderBarChart } from '../charts/bar.js';
-import { lineSchema, renderLineChart } from '../charts/line.js';
-import { pieSchema, renderPieChart } from '../charts/pie.js';
-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';
-import { localImageSchema, renderLocalImage } from '../images/localImages.js'; // Added this line
-async function extractElementsFromMarkdown(markdown) {
-    console.log("Starting extractElementsFromMarkdown...");
-    const elements = {};
-    let elementCount = 0;
-    // Regex to find <canvas> and its corresponding chart script
-    const chartBlockRegex = /(<canvas\s+id="([^"]+)"[^>]*>[\s\S]*?<\/canvas>)\s*<script>([\s\S]*?)<\/script>/gs;
-    let chartBlockMatch;
-    while ((chartBlockMatch = chartBlockRegex.exec(markdown)) !== null) {
-        const canvasTag = chartBlockMatch[1];
-        const canvasId = chartBlockMatch[2];
-        const scriptContent = chartBlockMatch[3];
-        // Extract the 'new Chart' part
-        const newChartRegex = /new\s+Chart\((?:[^,]+),\s*({[\s\S]+})\s*\);/m;
-        const chartConfigMatch = newChartRegex.exec(scriptContent);
-        if (chartConfigMatch) {
-            const chartConfigStr = chartConfigMatch[1];
+import path from 'path';
+export async function generateReport(htmlDocument, outputFile) {
+    console.log("Applying definitive regex-based fix...");
+    // This regex is designed to find the specific broken pattern: an HTML-encoded
+    // <canvas> tag inside a <p> tag, and it captures the malformed chart data.
+    const brokenCanvasRegex = /<p><canvas data-chart="({.+?}) "><\/canvas><\/p>/g;
+    let fixedHtml = htmlDocument.replace(brokenCanvasRegex, (match, chartData) => {
+        // 1. The captured `chartData` has encoded quotes. Decode them to get a JSON-like string.
+        let decodedChartData = chartData.replace(/"/g, '"');
+        // 2. The decoded string is still a malformed JSON object. Append the missing closing brackets.
+        let fixedJson = decodedChartData + ']}]}}';
+        // 3. Return a clean, valid HTML structure for the chart, using single quotes for the attribute
+        //    to avoid conflicts with the double quotes in the JSON.
+        return `<div class="chart-container"><canvas data-chart='${fixedJson}'></canvas></div>`;
+    });
+    // 4. Inject the client-side chart rendering script right before the closing </body> tag.
+    const chartScript = `
+    <script>
+      document.addEventListener('DOMContentLoaded', () => {
+        const charts = document.querySelectorAll('canvas[data-chart]');
+        charts.forEach(canvas => {
+          const chartDataString = canvas.getAttribute('data-chart');
+          if (chartDataString) {
             try {
-                // A bit of a hack to make it valid JSON
-                const correctedConfigStr = chartConfigStr
-                    .replace(/(['"])?([a-zA-Z0-9_]+)(['"])?:/g, '"$2":') // Quote keys
-                    .replace(/'/g, '"'); // Replace single quotes with double quotes
-                // It's not perfect JSON, so we need to do some creative parsing
-                const typeMatch = /type:\s*"([^"]+)"/.exec(correctedConfigStr);
-                const dataMatch = /data:\s*({[\s\S]*?})/.exec(correctedConfigStr);
-                if (typeMatch && dataMatch) {
-                    const type = typeMatch[1];
-                    // This is still not perfect, we might need a proper JS parser.
-                    // For now, let's assume the data block is reasonably well-formed.
-                    // A safer approach would be to use a library that can parse JS objects.
-                    // Let's try to make it valid JSON before parsing.
-                    const dataObjStr = dataMatch[1].replace(/'/g, '"').replace(/([a-zA-Z0-9]+):/g, '"$1":');
-                    // This is a simplified extraction. A robust solution would need a more powerful parser.
-                    const data = JSON.parse(dataObjStr);
-                    const id = `chart-${elementCount++}`;
-                    elements[id] = { type: type, config: { ...data, type } };
-                    console.log(`Extracted chart: ${id}, type: ${type}`);
-                    // Replace the whole block (canvas + script) with a placeholder
-                    markdown = markdown.replace(chartBlockMatch[0], `[[chart:${id}]]`);
-                }
+              const chartConfig = JSON.parse(chartDataString);
+              new Chart(canvas, chartConfig);
+            } catch (e) {
+              console.error('Failed to parse chart data:', chartDataString, e);
             }
-            catch (e) {
-                console.error(`Error parsing chart config from script: ${scriptContent}`, e);
-            }
-        }
-    }
-    // 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++}`;
-        // Determine if it's a URL or local image
-        const isUrl = src.startsWith('http://') || src.startsWith('https://');
-        const imageType = isUrl ? 'url' : 'local';
-        if (isUrl) {
-            elements[id] = { type: imageType, config: { url: src, alt: alt } };
-        }
-        else {
-            elements[id] = { type: imageType, config: { src: src, alt: alt } };
-        }
-        console.log(`Extracted image: ${id}, type: ${imageType}, 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 { updatedMarkdown: markdown, elements: elements };
-}
-const chartRenderers = {
-    bar: { schema: barSchema, renderer: renderBarChart },
-    line: { schema: lineSchema, renderer: renderLineChart },
-    pie: { schema: pieSchema, renderer: renderPieChart },
-    doughnut: { schema: doughnutSchema, renderer: renderDoughnutChart },
-    radar: { schema: radarSchema, renderer: renderRadarChart },
-    polarArea: { schema: polarAreaSchema, renderer: renderPolarAreaChart },
-};
-const imageRenderers = {
-    url: { schema: urlImageSchema, renderer: renderUrlImage },
-    local: { schema: localImageSchema, renderer: renderLocalImage }, // Added this line
-};
-// 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(markdownDocument, // Renamed 'document' to 'markdownDocument' for clarity
-outputFile) {
-    console.log("Starting generateReport...");
-    // Extract elements and get the updated markdown
-    const { updatedMarkdown, elements } = await extractElementsFromMarkdown(markdownDocument); // Modified this line
-    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;
-            const { schema } = chartRenderers[chartElement.type];
-            if (!schema)
-                throw new Error(`Unsupported chart type: ${chartElement.type}`);
-            // 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;
-            console.log(`Validated chart: ${id}`);
-        }
-        else if (element.type in imageRenderers) {
-            // Это изображение
-            const imageElement = element;
-            const { schema } = imageRenderers[imageElement.type];
-            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}`);
-        }
-    }
-    // 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]]
-    let mdWithElements = updatedMarkdown; // Corrected this line
-    for (const [id, htmlElement] of Object.entries(renderedElements)) {
-        // Поддерживаем оба формата: [[chart:id]] и [[image:id]] для обратной совместимости
-        mdWithElements = mdWithElements.replace(new RegExp(`\\[\\[(chart|image):${id}\\]\\]`, 'g'), htmlElement);
-    }
-    // Convert Markdown to HTML
-    const htmlContent = await marked(mdWithElements); // Modified this line to use mdWithElements
-    // Wrap in full HTML template with Chart.js library
-    const template = `
-  <!DOCTYPE html>
-  <html lang="ru">
-  <head>
-    <meta charset="UTF-8">
-    <title>Отчет</title>
-    <style>
-      body {
-        font-family: Arial, sans-serif;
-        margin: 40px;
-        background-color: #f5f5f5;
-      }
-      .container {
-        max-width: 1200px;
-        margin: 0 auto;
-        background-color: white;
-        padding: 30px;
-        border-radius: 10px;
-        box-shadow: 0 0 10px rgba(0,0,0,0.1);
-      }
-      h1, h2, h3 {
-        color: #333;
-      }
-      h1 {
-        border-bottom: 2px solid #3498db;
-        padding-bottom: 10px;
-      }
-      h2 {
-        border-left: 4px solid #3498db;
-        padding-left: 15px;
-      }
-      .chart-container, .image-container {
-        margin: 30px 0;
-        text-align: center;
-      }
-      .chart-container canvas, .image-container img {
-        max-width: 100%;
-        height: auto;
-        border: 1px solid #ddd;
-        border-radius: 5px;
-      }
-      p {
-        line-height: 1.6;
-        text-align: justify;
-      }
-      ul, ol {
-        margin: 20px 0;
-        padding-left: 30px;
-      }
-      li {
-        margin: 10px 0;
-      }
-      strong {
-        color: #e74c3c;
-      }
-      em {
-        color: #2ecc71;
-      }
-    </style>
-    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-  </head>
-  <body>
-    <div class="container">
-      <%- htmlContent %>
-    </div>
+      });
+    </script>
   </body>
-  </html>
   `;
-    const fullHtml = ejs.render(template, { htmlContent }, { escape: (str) => str });
-    // Save to file
+    if (fixedHtml.includes('</body>')) {
+        fixedHtml = fixedHtml.replace('</body>', chartScript);
+    }
+    else {
+        // As a fallback, if no </body> tag is found, append it to the end of the file.
+        fixedHtml += chartScript.replace('</body>', '</html>');
+    }
+    // 5. Save the fully corrected and valid HTML to the specified output file.
     const outputDirPath = path.dirname(outputFile);
-    await fs.ensureDir(outputDirPath); // Ensure the directory exists
-    await fs.writeFile(outputFile, fullHtml);
+    await fs.ensureDir(outputDirPath);
+    await fs.writeFile(outputFile, fixedHtml);
+    console.log(`Report successfully generated at: ${outputFile}`);
     return { success: true, filePath: outputFile };
 }

package/force_rebuild_and_generate.sh ADDED Viewed

@@ -0,0 +1,27 @@
+#!/bin/bash
+# This script ensures a clean build and generation process.
+echo "--- Step 1: Forcibly removing old 'dist' directory ---"
+rm -rf dist
+if [ -d "dist" ]; then
+    echo "Error: Failed to remove 'dist' directory."
+    exit 1
+fi
+echo "Old 'dist' directory removed successfully."
+echo "--- Step 2: Recompiling TypeScript source code ---"
+npx tsc
+if [ ! -d "dist" ]; then
+    echo "Error: TypeScript compilation failed. 'dist' directory not created."
+    exit 1
+fi
+echo "TypeScript compiled successfully."
+echo "--- Step 3: Generating the report with the new build ---"
+REPORTS_DIR=. node dist/index.js generate --document apple_financial_report_2024.html --output apple_financial_report_2024_fixed.html
+if [ $? -ne 0 ]; then
+    echo "Error: Report generation command failed."
+    exit 1
+fi
+echo "--- Process completed successfully! ---"

package/package.json CHANGED Viewed

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

package/dist/tools/reportWizard.d.ts DELETED Viewed

@@ -1,17 +0,0 @@
-import { z } from 'zod';
-export declare const reportWizardTool: {
-    name: string;
-    description: string;
-    inputSchema: {
-        report_description: z.ZodString;
-        outputFile: z.ZodString;
-    };
-    execute: ({ report_description, outputFile }: {
-        report_description: string;
-        outputFile: string;
-    }) => Promise<{
-        success: boolean;
-        filePath: string;
-    }>;
-};
-//# sourceMappingURL=reportWizard.d.ts.map

package/dist/tools/reportWizard.d.ts.map DELETED Viewed

	@@ -1 +0,0 @@
1	- {"version":3,"file":"reportWizard.d.ts","sourceRoot":"","sources":["../../src/tools/reportWizard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA8DxB,eAAO,MAAM,gBAAgB;;;;;;;kDAOyB;QAAE,kBAAkB,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE;;;;CAIvG,CAAC"}

package/dist/tools/reportWizard.js DELETED Viewed

@@ -1,69 +0,0 @@
-import { generateReport } from '../utils/reportGenerator.js';
-import { z } from 'zod';
-// Эта функция будет извлекать данные из текста и генерировать элементы
-async function designReportFromDescription(description) {
-    const elements = {};
-    let newDocument = description;
-    // Извлечение данных по продуктам
-    const productMatches = [...description.matchAll(/-\s*\*\*(.*?)\*\*: \$([\d,.]+) (млрд|миллиарда)/gi)];
-    if (productMatches.length > 0) {
-        const labels = productMatches.map(match => match[1]);
-        const data = productMatches.map(match => parseFloat(match[2].replace(/,/g, '')));
-        elements['product_sales_chart'] = {
-            type: 'doughnut',
-            config: {
-                labels,
-                datasets: [{
-                        label: 'Выручка по продуктам (млрд $)',
-                        data,
-                        backgroundColor: ['#5A9E6F', '#E67E22', '#F1C40F', '#3498DB', '#9B59B6']
-                    }]
-            }
-        };
-        newDocument += '\n\n## Диаграмма: Продажи по продуктам\n\n[[chart:product_sales_chart]]';
-    }
-    // Извлечение данных по регионам
-    const regionMatches = [...description.matchAll(/Выручка в (.*?)\s*в 2024.*? \$([\d,.]+) (млрд|миллиарда)/gi)];
-    if (regionMatches.length > 0) {
-        const labels = regionMatches.map(match => match[1]);
-        const data = regionMatches.map(match => parseFloat(match[2].replace(/,/g, '')));
-        elements['region_sales_chart'] = {
-            type: 'bar',
-            config: {
-                labels,
-                datasets: [{
-                        label: 'Выручка по регионам (млрд $)',
-                        data,
-                        backgroundColor: ['#2ECC71', '#3498DB', '#E74C3C', '#F1C40F', '#9B59B6']
-                    }]
-            }
-        };
-        newDocument += '\n\n## Диаграмма: Выручка по регионам\n\n[[chart:region_sales_chart]]';
-    }
-    // Пример: добавляем изображение на основе контекста
-    let imagePrompt = "business report and data analysis";
-    if (/apple/i.test(description)) {
-        imagePrompt = "futuristic design representing apple inc innovation";
-    }
-    else if (/tesla/i.test(description)) {
-        imagePrompt = "electric cars and modern technology";
-    }
-    elements['context_image'] = {
-        type: 'pollinations',
-        config: { prompt: imagePrompt }
-    };
-    newDocument += '\n\n## Иллюстрация\n\n[[image:context_image]]';
-    return { document: newDocument, elements };
-}
-export const reportWizardTool = {
-    name: "create_report",
-    description: "Designs and generates a complete, visually rich HTML report from a simple text description.",
-    inputSchema: {
-        report_description: z.string().describe("A text description of the desired report (e.g., 'an apple financial report for 2024')."),
-        outputFile: z.string().describe("The desired output HTML file name (e.g., 'report.html').")
-    },
-    execute: async ({ report_description, outputFile }) => {
-        const { document, elements } = await designReportFromDescription(report_description);
-        return await generateReport(document, elements, outputFile);
-    }
-};