@allurereport/plugin-awesome 3.0.0-beta.18 → 3.0.0-beta.19

package/dist/charts.d.ts

@@ -1,14 +1,5 @@
-import { type HistoryDataPoint, type Statistic, type TestResult } from "@allurereport/core-api";
-import { type GeneratedChartsData, type PluginContext } from "@allurereport/plugin-api";
+import { type AllureStore, type GeneratedChartsData, type PluginContext } from "@allurereport/plugin-api";
 import type { AwesomeOptions } from "./model.js";
 import type { AwesomeDataWriter } from "./writer.js";
-export declare const generateCharts: (options: AwesomeOptions, context: PluginContext, stores: {
-    trs: TestResult[];
-    statistic: Statistic;
-    history: HistoryDataPoint[];
-}) => Promise<GeneratedChartsData | undefined>;
-export declare const generateAllCharts: (writer: AwesomeDataWriter, options: AwesomeOptions, context: PluginContext, stores: {
-    trs: TestResult[];
-    statistic: Statistic;
-    history: HistoryDataPoint[];
-}) => Promise<void>;
+export declare const generateCharts: (options: AwesomeOptions, store: AllureStore, context: PluginContext) => Promise<GeneratedChartsData | undefined>;
+export declare const generateAllCharts: (writer: AwesomeDataWriter, store: AllureStore, options: AwesomeOptions, context: PluginContext) => Promise<void>;

package/dist/charts.js

@@ -1,31 +1,50 @@
 import { ChartType } from "@allurereport/core-api";
-import { generateComingSoonChart, generatePieChart, generateTrendChart, } from "@allurereport/plugin-api";
+import { generateBarChart, generateComingSoonChart, generateHeatMapChart, generatePieChart, generateTreeMapChart, generateTrendChart, } from "@allurereport/plugin-api";
 import { randomUUID } from "crypto";
-export const generateCharts = async (options, context, stores) => {
+export const generateCharts = async (options, store, context) => {
     const { charts } = options;
     if (!charts) {
         return undefined;
     }
-    return charts.reduce((acc, chartOptions) => {
+    const storeData = await Promise.all([
+        store.allHistoryDataPoints(),
+        store.allTestResults(),
+        store.testsStatistic(),
+    ]).then(([historyDataPoints, testResults, statistic]) => ({
+        historyDataPoints,
+        testResults,
+        statistic,
+    }));
+    const chartsData = {};
+    for (const chartOptions of charts) {
         const chartId = randomUUID();
         let chart;
         if (chartOptions.type === ChartType.Trend) {
-            chart = generateTrendChart(chartOptions, stores, context);
+            chart = generateTrendChart(chartOptions, storeData, context);
         }
         else if (chartOptions.type === ChartType.Pie) {
-            chart = generatePieChart(chartOptions, stores);
+            chart = generatePieChart(chartOptions, storeData);
         }
-        else if ([ChartType.HeatMap, ChartType.Bar, ChartType.Funnel, ChartType.TreeMap].includes(chartOptions.type)) {
-            chart = generateComingSoonChart(chartOptions);
+        else if (chartOptions.type === ChartType.Bar) {
+            chart = generateBarChart(chartOptions, storeData);
+        }
+        else if (chartOptions.type === ChartType.TreeMap) {
+            chart = generateTreeMapChart(chartOptions, storeData);
+        }
+        else if (chartOptions.type === ChartType.HeatMap) {
+            chart = generateHeatMapChart(chartOptions, storeData);
         }
         if (chart) {
-            acc[chartId] = chart;
+            chartsData[chartId] = chart;
         }
-        return acc;
-    }, {});
+        else {
+            chartsData[chartId] = generateComingSoonChart(chartOptions);
+        }
+    }
+    return chartsData;
 };
-export const generateAllCharts = async (writer, options, context, stores) => {
-    const charts = await generateCharts(options, context, stores);
+export const generateAllCharts = async (writer, store, options, context) => {
+    const charts = await generateCharts(options, store, context);
     if (charts && Object.keys(charts).length > 0) {
         await writer.writeWidget("charts.json", charts);
     }

package/dist/generators.js

@@ -1,6 +1,5 @@
-import { compareBy, getPieChartValues, incrementStatistic, nullsLast, ordinal, } from "@allurereport/core-api";
+import { compareBy, createBaseUrlScript, createFontLinkTag, createReportDataScript, createScriptTag, createStylesLinkTag, getPieChartValues, incrementStatistic, nullsLast, ordinal, } from "@allurereport/core-api";
 import { createTreeByLabels, createTreeByTitlePath, filterTree, preciseTreeLabels, sortTree, transformTree, } from "@allurereport/plugin-api";
-import { createBaseUrlScript, createFontLinkTag, createReportDataScript, createScriptTag, createStylesLinkTag, } from "@allurereport/web-commons";
 import Handlebars from "handlebars";
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";

package/dist/plugin.js

@@ -32,7 +32,6 @@ export class AwesomePlugin {
             const environments = await store.allEnvironments();
             const envStatistics = new Map();
             const allTestEnvGroups = await store.allTestEnvGroups();
-            const allHistoryDataPoints = await store.allHistoryDataPoints();
             const globalAttachments = await store.allGlobalAttachments();
             const globalExitCode = await store.globalExitCode();
             const globalErrors = await store.allGlobalErrors();
@@ -44,11 +43,7 @@ export class AwesomePlugin {
                 statsByEnv: envStatistics,
                 envs: environments,
             });
-            await generateAllCharts(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), this.options, context, {
-                trs: allTrs,
-                statistic: statistics,
-                history: allHistoryDataPoints,
-            });
+            await generateAllCharts(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), store, this.options, context);
             const convertedTrs = await generateTestResults(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), store, allTrs, this.options.filter);
             const hasGroupBy = groupBy.length > 0;
             const treeLabels = hasGroupBy
@@ -84,9 +79,10 @@ export class AwesomePlugin {
                 id: context.id,
                 allureVersion: context.allureVersion,
                 reportFiles: context.reportFiles,
-                reportDataFiles,
                 reportUuid: context.reportUuid,
                 reportName: context.reportName,
+                ci: context.ci,
+                reportDataFiles,
             });
         });
         this.start = async (context) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-awesome",
-  "version": "3.0.0-beta.18",
+  "version": "3.0.0-beta.19",
   "description": "Allure Awesome Plugin – brand new HTML report with modern design and new features",
   "keywords": [
     "allure",
@@ -30,10 +30,9 @@
     "test": "rimraf ./out && vitest run"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.0.0-beta.18",
-    "@allurereport/plugin-api": "3.0.0-beta.18",
-    "@allurereport/web-awesome": "3.0.0-beta.18",
-    "@allurereport/web-commons": "3.0.0-beta.18",
+    "@allurereport/core-api": "3.0.0-beta.19",
+    "@allurereport/plugin-api": "3.0.0-beta.19",
+    "@allurereport/web-awesome": "3.0.0-beta.19",
     "d3-shape": "^3.2.0",
     "handlebars": "^4.7.8"
   },