@allurereport/plugin-awesome 3.0.0-beta.14 → 3.0.0-beta.16

package/dist/charts.d.ts

@@ -1,5 +1,6 @@
 import type { HistoryDataPoint, SeverityLevel, Statistic, TestResult, TestStatus } from "@allurereport/core-api";
 import type { AllureStore, PluginContext } from "@allurereport/plugin-api";
+import { ChartDataType, ChartMode, ChartType } from "@allurereport/web-commons";
 import type { PieArcDatum } from "d3-shape";
 import type { AwesomeOptions } from "./model.js";
 import type { AwesomeDataWriter } from "./writer.js";
@@ -7,15 +8,6 @@ export type BasePieSlice = Pick<PieSlice, "status" | "count">;
 export declare const d3Arc: import("d3-shape").Arc<any, PieArcDatum<BasePieSlice>>;
 export declare const d3Pie: import("d3-shape").Pie<any, BasePieSlice>;
 export declare const getPercentage: (value: number, total: number) => number;
-export declare enum ChartType {
-    Trend = "trend",
-    Pie = "pie"
-}
-export declare enum ChartData {
-    Status = "status",
-    Severity = "severity"
-}
-export type ChartMode = "raw" | "percent";
 export type ChartId = string;
 export type ExecutionIdFn = (executionOrder: number) => string;
 export type ExecutionNameFn = (executionOrder: number) => string;
@@ -25,7 +17,7 @@ export type TrendMetadataFnOverrides = {
 };
 export type TrendChartOptions = {
     type: ChartType.Trend;
-    dataType: ChartData;
+    dataType: ChartDataType;
     mode?: ChartMode;
     title?: string;
     limit?: number;
@@ -50,7 +42,8 @@ export type TrendSlice<Metadata extends BaseMetadata> = {
 };
 export type GenericTrendChartData<Metadata extends BaseMetadata, SeriesType extends string> = {
     type: ChartType.Trend;
-    dataType: ChartData;
+    dataType: ChartDataType;
+    mode: ChartMode;
     title?: string;
     points: Record<TrendPointId, TrendPoint>;
     slices: Record<TrendSliceId, TrendSlice<Metadata>>;

package/dist/charts.js

@@ -1,4 +1,4 @@
-import { getPieChartDataDashboard, getSeverityTrendData, getStatusTrendData } from "@allurereport/web-commons";
+import { ChartDataType, ChartMode, ChartType, DEFAULT_CHART_HISTORY_LIMIT, getPieChartDataDashboard, getSeverityTrendData, getStatusTrendData, } from "@allurereport/web-commons";
 import { randomUUID } from "crypto";
 import { arc, pie } from "d3-shape";
 export const d3Arc = arc().innerRadius(40).outerRadius(50).cornerRadius(2).padAngle(0.03);
@@ -7,16 +7,6 @@ export const d3Pie = pie()
     .padAngle(0.03)
     .sortValues((a, b) => a - b);
 export const getPercentage = (value, total) => Math.floor((value / total) * 10000) / 100;
-export var ChartType;
-(function (ChartType) {
-    ChartType["Trend"] = "trend";
-    ChartType["Pie"] = "pie";
-})(ChartType || (ChartType = {}));
-export var ChartData;
-(function (ChartData) {
-    ChartData["Status"] = "status";
-    ChartData["Severity"] = "severity";
-})(ChartData || (ChartData = {}));
 export const createEmptyStats = (items) => items.reduce((acc, item) => ({ ...acc, [item]: 0 }), {});
 export const createEmptySeries = (items) => items.reduce((acc, item) => ({ ...acc, [item]: [] }), {});
 export const normalizeStatistic = (statistic, itemType) => {
@@ -52,7 +42,7 @@ const calculatePercentValues = (stats, executionId, itemType) => {
         const value = stats[item] ?? 0;
         points[pointId] = {
             x: executionId,
-            y: (value / total) * 100,
+            y: value / total,
         };
         series[item].push(pointId);
     });
@@ -83,10 +73,10 @@ export const mergeTrendDataGeneric = (trendData, trendDataPart, itemType) => {
     };
 };
 export const getTrendDataGeneric = (stats, reportName, executionOrder, itemType, chartOptions) => {
-    const { type, dataType, title, mode = "raw", metadata = {} } = chartOptions;
+    const { type, dataType, title, mode = ChartMode.Raw, metadata = {} } = chartOptions;
     const { executionIdAccessor, executionNameAccessor } = metadata;
     const executionId = executionIdAccessor ? executionIdAccessor(executionOrder) : `execution-${executionOrder}`;
-    const { points, series } = mode === "percent"
+    const { points, series } = mode === ChartMode.Percent
         ? calculatePercentValues(stats, executionId, itemType)
         : calculateRawValues(stats, executionId, itemType);
     const slices = {};
@@ -109,6 +99,7 @@ export const getTrendDataGeneric = (stats, reportName, executionOrder, itemType,
     return {
         type,
         dataType,
+        mode,
         title,
         points,
         slices,
@@ -149,13 +140,14 @@ export const generateCharts = async (options, store, context) => {
     }, {});
 };
 export const generateTrendChart = (options, stores, context) => {
-    const { dataType } = options;
+    const newOptions = { limit: DEFAULT_CHART_HISTORY_LIMIT, ...options };
+    const { dataType } = newOptions;
     const { statistic, historyDataPoints, testResults } = stores;
-    if (dataType === ChartData.Status) {
-        return getStatusTrendData(statistic, context.reportName, historyDataPoints, options);
+    if (dataType === ChartDataType.Status) {
+        return getStatusTrendData(statistic, context.reportName, historyDataPoints, newOptions);
     }
-    else if (dataType === ChartData.Severity) {
-        return getSeverityTrendData(testResults, context.reportName, historyDataPoints, options);
+    else if (dataType === ChartDataType.Severity) {
+        return getSeverityTrendData(testResults, context.reportName, historyDataPoints, newOptions);
     }
 };
 export const generateAllCharts = async (writer, store, options, context) => {

package/dist/converters.js

@@ -35,6 +35,7 @@ export const convertTestResult = (tr) => {
         retries: [],
         breadcrumbs: [],
         retry: false,
+        transition: tr.transition,
     };
 };
 export const convertTestStepResult = (tsr) => {

package/dist/generators.d.ts

@@ -17,6 +17,7 @@ export declare const generatePieChart: (writer: AwesomeDataWriter, store: Allure
 export declare const generateAttachmentsFiles: (writer: AwesomeDataWriter, attachmentLinks: AttachmentLink[], contentFunction: (id: string) => Promise<ResultFile | undefined>) => Promise<Map<string, string> | undefined>;
 export declare const generateHistoryDataPoints: (writer: AwesomeDataWriter, store: AllureStore) => Promise<Map<string, string>>;
 export declare const generateStaticFiles: (payload: AwesomeOptions & {
+    id: string;
     allureVersion: string;
     reportFiles: ReportFiles;
     reportDataFiles: ReportFile[];

package/dist/generators.js

@@ -14,7 +14,7 @@ const template = `<!DOCTYPE html>
 <head>
     <meta charset="utf-8">
     <title> {{ reportName }} </title>
-    <link rel="icon" href="favicon.ico">
+    <link rel="icon" href="data:image/svg+xml,%3Csvg width='32' height='32' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M22.232 4.662a3.6 3.6 0 0 1 5.09.035c2.855 2.894 4.662 6.885 4.662 11.295a3.6 3.6 0 0 1-7.2 0c0-2.406-.981-4.61-2.587-6.24a3.6 3.6 0 0 1 .035-5.09Z' fill='url(%23a)'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M12.392 3.6a3.6 3.6 0 0 1 3.6-3.6c4.41 0 8.401 1.807 11.296 4.662a3.6 3.6 0 1 1-5.056 5.126C20.602 8.18 18.398 7.2 15.992 7.2a3.6 3.6 0 0 1-3.6-3.6Z' fill='url(%23b)'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0 15.992C0 7.157 7.157 0 15.992 0a3.6 3.6 0 0 1 0 7.2A8.789 8.789 0 0 0 7.2 15.992c0 2.406.981 4.61 2.588 6.24a3.6 3.6 0 0 1-5.126 5.056C1.807 24.393 0 20.402 0 15.992Z' fill='url(%23c)'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M4.661 22.232a3.6 3.6 0 0 1 5.091-.035c1.63 1.606 3.834 2.587 6.24 2.587a3.6 3.6 0 0 1 0 7.2c-4.41 0-8.401-1.807-11.295-4.661a3.6 3.6 0 0 1-.036-5.091Z' fill='url(%23d)'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M28.384 12.392a3.6 3.6 0 0 1 3.6 3.6c0 8.835-7.157 15.992-15.992 15.992a3.6 3.6 0 0 1 0-7.2 8.789 8.789 0 0 0 8.792-8.792 3.6 3.6 0 0 1 3.6-3.6Z' fill='url(%23e)'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M28.385 12.392a3.6 3.6 0 0 1 3.6 3.6v12.392a3.6 3.6 0 0 1-7.2 0V15.992a3.6 3.6 0 0 1 3.6-3.6Z' fill='url(%23f)'/%3E%3Cg clip-path='url(%23g)'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M22.232 4.662a3.6 3.6 0 0 1 5.091.035c2.855 2.894 4.662 6.885 4.662 11.295a3.6 3.6 0 0 1-7.2 0c0-2.406-.982-4.61-2.588-6.24a3.6 3.6 0 0 1 .035-5.09Z' fill='url(%23h)'/%3E%3C/g%3E%3Cdefs%3E%3ClinearGradient id='a' x1='26.4' y1='9.6' x2='28.8' y2='15' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%237E22CE'/%3E%3Cstop offset='1' stop-color='%238B5CF6'/%3E%3C/linearGradient%3E%3ClinearGradient id='b' x1='26.8' y1='9.4' x2='17.8' y2='3.6' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%23EF4444'/%3E%3Cstop offset='1' stop-color='%23DC2626'/%3E%3C/linearGradient%3E%3ClinearGradient id='c' x1='3.6' y1='14' x2='5.4' y2='24.8' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%2322C55E'/%3E%3Cstop offset='1' stop-color='%2315803D'/%3E%3C/linearGradient%3E%3ClinearGradient id='d' x1='4.8' y1='22.2' x2='14.4' y2='29.2' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%2394A3B8'/%3E%3Cstop offset='.958' stop-color='%2364748B'/%3E%3Cstop offset='1' stop-color='%2364748B'/%3E%3C/linearGradient%3E%3ClinearGradient id='e' x1='28.4' y1='22.173' x2='22.188' y2='28.384' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%23D97706'/%3E%3Cstop offset='1' stop-color='%23FBBF24'/%3E%3C/linearGradient%3E%3ClinearGradient id='f' x1='29.2' y1='54.4' x2='30.626' y2='54.256' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%23FBBF24'/%3E%3Cstop offset='1' stop-color='%23FBBF24'/%3E%3C/linearGradient%3E%3ClinearGradient id='h' x1='26.4' y1='9.6' x2='28.8' y2='15' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%237E22CE'/%3E%3Cstop offset='1' stop-color='%238B5CF6'/%3E%3C/linearGradient%3E%3CclipPath id='g'%3E%3Cpath fill='%23fff' transform='translate(24.8 12)' d='M0 0h7.2v8H0z'/%3E%3C/clipPath%3E%3C/defs%3E%3C/svg%3E" />
     {{{ headTags }}}
 </head>
 <body>
@@ -82,7 +82,8 @@ export const generateTestResults = async (writer, store, filter) => {
         const convertedTr = convertTestResult(tr);
         convertedTr.history = await store.historyByTrId(tr.id);
         convertedTr.retries = await store.retriesByTrId(tr.id);
-        convertedTr.retry = convertedTr.retries.length > 0;
+        convertedTr.retriesCount = convertedTr.retries.length;
+        convertedTr.retry = convertedTr.retriesCount > 0;
         convertedTr.setup = convertedTrFixtures.filter((f) => f.type === "before");
         convertedTr.teardown = convertedTrFixtures.filter((f) => f.type === "after");
         convertedTr.attachments = (await store.attachmentsByTrId(tr.id)).map((attachment) => ({
@@ -118,19 +119,17 @@ export const generateNav = async (writer, trs, filename = "nav.json") => {
 };
 export const generateTree = async (writer, treeFilename, labels, tests) => {
     const visibleTests = tests.filter((test) => !test.hidden);
-    const tree = createTreeByLabels(visibleTests, labels, ({ id, name, status, duration, flaky, start, retries }) => {
-        const retriesCount = retries?.length;
-        return {
-            nodeId: id,
-            retry: Boolean(retriesCount),
-            retriesCount,
-            name,
-            status,
-            duration,
-            flaky,
-            start,
-        };
-    }, undefined, (group, leaf) => {
+    const tree = createTreeByLabels(visibleTests, labels, ({ id, name, status, duration, flaky, transition, start, retry, retriesCount }) => ({
+        nodeId: id,
+        retry,
+        retriesCount,
+        name,
+        status,
+        start,
+        duration,
+        flaky,
+        transition,
+    }), undefined, (group, leaf) => {
         incrementStatistic(group.statistic, leaf.status);
     });
     filterTree(tree, (leaf) => !leaf.hidden);
@@ -198,7 +197,7 @@ export const generateHistoryDataPoints = async (writer, store) => {
     return result;
 };
 export const generateStaticFiles = async (payload) => {
-    const { reportName = "Allure Report", reportLanguage = "en", singleFile, logo = "", theme = "light", groupBy, reportFiles, reportDataFiles, reportUuid, allureVersion, layout = "base", charts = [], defaultSection = "", } = payload;
+    const { id, reportName = "Allure Report", reportLanguage = "en", singleFile, logo = "", theme = "light", groupBy, reportFiles, reportDataFiles, reportUuid, allureVersion, layout = "base", charts = [], defaultSection = "", } = payload;
     const compile = Handlebars.compile(template);
     const manifest = await readTemplateManifest(payload.singleFile);
     const headTags = [];
@@ -230,17 +229,20 @@ export const generateStaticFiles = async (payload) => {
     else {
         const mainJs = manifest["main.js"];
         const mainJsSource = require.resolve(`@allurereport/web-awesome/dist/single/${mainJs}`);
-        const mainJsContentBuffer = await readFile(mainJsSource);
-        bodyTags.push(createScriptTag(`data:text/javascript;base64,${mainJsContentBuffer.toString("base64")}`));
+        const mainJsContent = await readFile(mainJsSource);
+        bodyTags.push(createScriptTag(`data:text/javascript;base64,${mainJsContent.toString("base64")}`));
     }
+    const now = Date.now();
     const reportOptions = {
+        id,
         reportName,
         logo,
         theme,
         reportLanguage,
-        createdAt: Date.now(),
+        createdAt: now,
         reportUuid,
         groupBy: groupBy?.length ? groupBy : ["parentSuite", "suite", "subSuite"],
+        cacheKey: now.toString(),
         layout,
         allureVersion,
         sections,

package/dist/index.d.ts

@@ -1,3 +1,2 @@
-import { AwesomePlugin } from "./plugin.js";
 export type { AwesomePluginOptions } from "./model.js";
-export default AwesomePlugin;
+export { AwesomePlugin as default } from "./plugin.js";

package/dist/index.js

@@ -1,2 +1 @@
-import { AwesomePlugin } from "./plugin.js";
-export default AwesomePlugin;
+export { AwesomePlugin as default } from "./plugin.js";

package/dist/model.d.ts

@@ -18,6 +18,7 @@ export type AwesomeOptions = {
     charts?: ChartOptions[];
     sections?: string[];
     defaultSection?: string;
+    publish?: boolean;
 };
 export type TemplateManifest = Record<string, string>;
 export type AwesomePluginOptions = AwesomeOptions;

package/dist/plugin.js

@@ -53,6 +53,7 @@ export class AwesomePlugin {
             const reportDataFiles = singleFile ? __classPrivateFieldGet(this, _AwesomePlugin_writer, "f").reportFiles() : [];
             await generateStaticFiles({
                 ...this.options,
+                id: context.id,
                 allureVersion: context.allureVersion,
                 reportFiles: context.reportFiles,
                 reportDataFiles,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-awesome",
-  "version": "3.0.0-beta.14",
+  "version": "3.0.0-beta.16",
   "description": "Allure Awesome Plugin – brand new HTML report with modern design and new features",
   "keywords": [
     "allure",
@@ -30,10 +30,10 @@
     "test": "rimraf ./out && vitest run"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.0.0-beta.14",
-    "@allurereport/plugin-api": "3.0.0-beta.14",
-    "@allurereport/web-awesome": "3.0.0-beta.14",
-    "@allurereport/web-commons": "3.0.0-beta.14",
+    "@allurereport/core-api": "3.0.0-beta.16",
+    "@allurereport/plugin-api": "3.0.0-beta.16",
+    "@allurereport/web-awesome": "3.0.0-beta.16",
+    "@allurereport/web-commons": "3.0.0-beta.16",
     "d3-shape": "^3.2.0",
     "handlebars": "^4.7.8"
   },
@@ -44,7 +44,7 @@
     "@types/node": "^20.17.9",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
-    "@vitest/runner": "^2.1.8",
+    "@vitest/runner": "^2.1.9",
     "allure-vitest": "^3.0.9",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
@@ -55,6 +55,6 @@
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "rimraf": "^6.0.1",
     "typescript": "^5.6.3",
-    "vitest": "^2.1.8"
+    "vitest": "^2.1.9"
   }
 }