@allurereport/plugin-awesome 3.0.0-beta.3 → 3.0.0-beta.5

package/dist/charts.d.ts

@@ -1,5 +1,5 @@
 import type { Statistic, TestStatus } from "@allurereport/core-api";
-import { PieArcDatum } from "d3-shape";
+import type { PieArcDatum } from "d3-shape";
 export type TestResultSlice = {
     status: TestStatus;
     count: number;
@@ -10,5 +10,5 @@ export type TestResultChartData = {
 };
 export declare const d3Arc: import("d3-shape").Arc<any, PieArcDatum<TestResultSlice>>;
 export declare const d3Pie: import("d3-shape").Pie<any, TestResultSlice>;
-export declare function getPercentage(value: number, total: number): number;
+export declare const getPercentage: (value: number, total: number) => number;
 export declare const getChartData: (stats: Statistic) => TestResultChartData;

package/dist/charts.js

@@ -5,9 +5,7 @@ export const d3Pie = pie()
     .value((d) => d.count)
     .padAngle(0.03)
     .sortValues((a, b) => a - b);
-export function getPercentage(value, total) {
-    return Math.floor((value / total) * 10000) / 100;
-}
+export const getPercentage = (value, total) => Math.floor((value / total) * 10000) / 100;
 export const getChartData = (stats) => {
     const convertedStatuses = statusesList
         .filter((status) => !!stats?.[status])
@@ -16,9 +14,9 @@ export const getChartData = (stats) => {
         count: stats[status],
     }));
     const arcsData = d3Pie(convertedStatuses);
-    const slices = arcsData.map((arc) => ({
-        d: d3Arc(arc),
-        ...arc.data,
+    const slices = arcsData.map((arcData) => ({
+        d: d3Arc(arcData),
+        ...arcData.data,
     }));
     const percentage = getPercentage(stats.passed ?? 0, stats.total);
     return {

package/dist/converters.js

@@ -11,6 +11,8 @@ export const convertTestResult = (tr) => {
     return {
         id: tr.id,
         name: tr.name,
+        start: tr.start,
+        stop: tr.stop,
         duration: tr.duration,
         status: tr.status,
         fullName: tr.fullName,
@@ -31,6 +33,7 @@ export const convertTestResult = (tr) => {
         history: [],
         retries: [],
         breadcrumbs: [],
+        retry: false,
     };
 };
 export const convertTestStepResult = (tsr) => {

package/dist/generators.d.ts

@@ -1,10 +1,11 @@
-import type { AttachmentLink, EnvironmentItem, Statistic, TestResult } from "@allurereport/core-api";
-import type { AllureStore, ReportFiles, ResultFile } from "@allurereport/plugin-api";
+import { type AttachmentLink, type EnvironmentItem, type Statistic } from "@allurereport/core-api";
+import { type AllureStore, type ReportFiles, type ResultFile } from "@allurereport/plugin-api";
+import type { AllureAwesomeTestResult } from "@allurereport/web-awesome";
 import type { AllureAwesomeOptions, TemplateManifest } from "./model.js";
 import type { AllureAwesomeDataWriter, ReportFile } from "./writer.js";
 export declare const readTemplateManifest: (singleFileMode?: boolean) => Promise<TemplateManifest>;
-export declare const generateTestResults: (writer: AllureAwesomeDataWriter, store: AllureStore) => Promise<void>;
-export declare const generateTree: (writer: AllureAwesomeDataWriter, treeName: string, labels: string[], tests: TestResult[]) => Promise<void>;
+export declare const generateTestResults: (writer: AllureAwesomeDataWriter, store: AllureStore) => Promise<AllureAwesomeTestResult[]>;
+export declare const generateTree: (writer: AllureAwesomeDataWriter, treeName: string, labels: string[], tests: AllureAwesomeTestResult[]) => Promise<void>;
 export declare const generateEnvironmentJson: (writer: AllureAwesomeDataWriter, env: EnvironmentItem[]) => Promise<void>;
 export declare const generateStatistic: (writer: AllureAwesomeDataWriter, statistic: Statistic) => Promise<void>;
 export declare const generatePieChart: (writer: AllureAwesomeDataWriter, statistic: Statistic) => Promise<void>;

package/dist/generators.js

@@ -1,4 +1,6 @@
-import { createTreeByLabels } from "@allurereport/plugin-api";
+import { compareBy, incrementStatistic, nullsLast, ordinal, } from "@allurereport/core-api";
+import { filterTree } from "@allurereport/plugin-api";
+import { createTreeByLabels, 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";
@@ -35,7 +37,7 @@ const template = `<!DOCTYPE html>
           "single_file": "{{singleFile}}"
         });
     </script>
-    {{/if}} 
+    {{/if}}
     <script>
       window.allureReportOptions = {{{ reportOptions }}}
     </script>
@@ -73,13 +75,14 @@ const createBreadcrumbs = (convertedTr) => {
 };
 export const generateTestResults = async (writer, store) => {
     const allTr = await store.allTestResults({ includeHidden: true });
-    const convertedTrs = [];
+    let convertedTrs = [];
     for (const tr of allTr) {
         const trFixtures = await store.fixturesByTrId(tr.id);
         const convertedTrFixtures = trFixtures.map(convertFixtureResult);
         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.setup = convertedTrFixtures.filter((f) => f.type === "before");
         convertedTr.teardown = convertedTrFixtures.filter((f) => f.type === "after");
         convertedTr.attachments = (await store.attachmentsByTrId(tr.id)).map((attachment) => ({
@@ -89,13 +92,34 @@ export const generateTestResults = async (writer, store) => {
         convertedTr.breadcrumbs = createBreadcrumbs(convertedTr);
         convertedTrs.push(convertedTr);
     }
+    convertedTrs = convertedTrs.sort(nullsLast(compareBy("start", ordinal()))).map((tr, idx) => ({
+        ...tr,
+        order: idx + 1,
+    }));
     for (const convertedTr of convertedTrs) {
         await writer.writeTestCase(convertedTr);
     }
+    await writer.writeWidget("nav.json", convertedTrs.filter(({ hidden }) => !hidden).map(({ id }) => id));
+    return convertedTrs;
 };
 export const generateTree = async (writer, treeName, labels, tests) => {
     const visibleTests = tests.filter((test) => !test.hidden);
-    const tree = createTreeByLabels(visibleTests, labels);
+    const tree = createTreeByLabels(visibleTests, labels, ({ id, name, status, duration, flaky, start, retries }) => {
+        return {
+            nodeId: id,
+            retry: !!retries?.length,
+            name,
+            status,
+            duration,
+            flaky,
+            start,
+        };
+    }, undefined, (group, leaf) => {
+        incrementStatistic(group.statistic, leaf.status);
+    });
+    filterTree(tree, (leaf) => !leaf.hidden);
+    sortTree(tree, nullsLast(compareBy("start", ordinal())));
+    transformTree(tree, (leaf, idx) => ({ ...leaf, groupOrder: idx + 1 }));
     await writer.writeWidget(`${treeName}.json`, tree);
 };
 export const generateEnvironmentJson = async (writer, env) => {
@@ -127,15 +151,14 @@ export const generateAttachmentsFiles = async (writer, attachmentLinks, contentF
 export const generateHistoryDataPoints = async (writer, store) => {
     const result = new Map();
     const allHistoryPoints = await store.allHistoryDataPoints();
-    allHistoryPoints.sort((a, b) => b.timestamp - a.timestamp);
-    for (const historyPoint of allHistoryPoints?.slice(0, 6)) {
+    for (const historyPoint of allHistoryPoints.slice(0, 6)) {
         const src = `history/${historyPoint.uuid}.json`;
         await writer.writeData(src, historyPoint);
     }
     return result;
 };
 export const generateStaticFiles = async (payload) => {
-    const { reportName = "Allure Report", reportLanguage = "en", singleFile, logo = "", theme = "light", reportFiles, reportDataFiles, reportUuid, allureVersion, } = payload;
+    const { reportName = "Allure Report", reportLanguage = "en", singleFile, logo = "", theme = "light", groupBy, reportFiles, reportDataFiles, reportUuid, allureVersion, } = payload;
     const compile = Handlebars.compile(template);
     const manifest = await readTemplateManifest(payload.singleFile);
     const headTags = [];
@@ -173,6 +196,7 @@ export const generateStaticFiles = async (payload) => {
         reportLanguage,
         createdAt: Date.now(),
         reportUuid,
+        groupBy: groupBy?.length ? groupBy : ["parentSuite", "suite", "subSuite"],
     };
     const html = compile({
         headTags: headTags.join("\n"),

package/dist/model.d.ts

@@ -4,6 +4,7 @@ export type AllureAwesomeOptions = {
     logo?: string;
     theme?: "light" | "dark";
     reportLanguage?: "en" | "ru";
+    groupBy?: string[];
     ci?: {
         type: "github" | "jenkins";
         url: string;

package/dist/plugin.js

@@ -10,7 +10,6 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
 var _AllureAwesomePlugin_writer, _AllureAwesomePlugin_generate;
-import { findByLabelName } from "@allurereport/core-api";
 import { generateAttachmentsFiles, generateEnvironmentJson, generateHistoryDataPoints, generatePieChart, generateStaticFiles, generateStatistic, generateTestResults, generateTree, } from "./generators.js";
 import { InMemoryReportDataWriter, ReportFileDataWriter } from "./writer.js";
 export class AllureAwesomePlugin {
@@ -18,16 +17,14 @@ export class AllureAwesomePlugin {
         this.options = options;
         _AllureAwesomePlugin_writer.set(this, void 0);
         _AllureAwesomePlugin_generate.set(this, async (context, store) => {
-            const { singleFile } = this.options ?? {};
+            const { singleFile, groupBy } = this.options ?? {};
             const environmentItems = await store.metadataByKey("allure_environment");
             const statistic = await store.testsStatistic();
-            const allTr = await store.allTestResults({ includeHidden: true });
             const attachments = await store.allAttachments();
             await generateStatistic(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), statistic);
             await generatePieChart(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), statistic);
-            const noParentSuite = allTr.find((tr) => findByLabelName(tr.labels, "parentSuite")) === undefined;
-            await generateTree(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), "suites", noParentSuite ? ["suite", "subSuite"] : ["parentSuite", "suite", "subSuite"], allTr);
-            await generateTestResults(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), store);
+            const convertedTrs = await generateTestResults(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), store);
+            await generateTree(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), "tree", groupBy?.length ? groupBy : ["parentSuite", "suite", "subSuite"], convertedTrs);
             await generateHistoryDataPoints(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), store);
             if (environmentItems?.length) {
                 await generateEnvironmentJson(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), environmentItems);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-awesome",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.5",
   "description": "Allure Awesome Plugin – brand new HTML report with modern design and new features",
   "keywords": [
     "allure",
@@ -25,13 +25,15 @@
   "scripts": {
     "build": "run clean && tsc --project ./tsconfig.json",
     "clean": "rimraf ./dist",
+    "eslint": "eslint ./src/**/*.{js,jsx,ts,tsx}",
+    "eslint:format": "eslint --fix ./src/**/*.{js,jsx,ts,tsx}",
     "test": "rimraf ./out && vitest run"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.0.0-beta.3",
-    "@allurereport/plugin-api": "3.0.0-beta.3",
-    "@allurereport/web-awesome": "3.0.0-beta.3",
-    "@allurereport/web-commons": "3.0.0-beta.3",
+    "@allurereport/core-api": "3.0.0-beta.5",
+    "@allurereport/plugin-api": "3.0.0-beta.5",
+    "@allurereport/web-awesome": "3.0.0-beta.5",
+    "@allurereport/web-commons": "3.0.0-beta.5",
     "d3-shape": "^3.2.0",
     "handlebars": "^4.7.8"
   },