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

package/dist/categories.d.ts

@@ -1,8 +1,8 @@
 import type { TestStatus } from "@allurereport/core-api";
-import type { AwesomeCategory } from "./model.js";
-export declare const matchCategories: (categories: AwesomeCategory[], result: {
+import type { ClassicCategory } from "./model.js";
+export declare const matchCategories: (categories: ClassicCategory[], result: {
     message?: string;
     trace?: string;
     status: TestStatus;
     flaky: boolean;
-}) => AwesomeCategory[];
+}) => ClassicCategory[];

package/dist/converters.js

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

package/dist/generators.d.ts

@@ -1,21 +1,21 @@
 import { type AttachmentLink, type EnvironmentItem, type Statistic } from "@allurereport/core-api";
 import { type AllureStore, type ReportFiles, type ResultFile } from "@allurereport/plugin-api";
 import type { AwesomeTestResult } from "@allurereport/web-awesome";
-import type { AwesomeOptions, TemplateManifest } from "./model.js";
-import type { AwesomeDataWriter, ReportFile } from "./writer.js";
+import type { ClassicOptions, TemplateManifest } from "./model.js";
+import type { ClassicDataWriter, ReportFile } from "./writer.js";
 export declare const readTemplateManifest: (singleFileMode?: boolean) => Promise<TemplateManifest>;
-export declare const generateTestResults: (writer: AwesomeDataWriter, store: AllureStore) => Promise<AwesomeTestResult[]>;
-export declare const generateTree: (writer: AwesomeDataWriter, treeName: string, labels: string[], tests: AwesomeTestResult[]) => Promise<void>;
-export declare const generateEnvironmentJson: (writer: AwesomeDataWriter, env: EnvironmentItem[]) => Promise<void>;
-export declare const generateStatistic: (writer: AwesomeDataWriter, statistic: Statistic) => Promise<void>;
-export declare const generatePieChart: (writer: AwesomeDataWriter, statistic: Statistic) => Promise<void>;
-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 & {
+export declare const generateTestResults: (writer: ClassicDataWriter, store: AllureStore) => Promise<AwesomeTestResult[]>;
+export declare const generateTree: (writer: ClassicDataWriter, treeName: string, labels: string[], tests: AwesomeTestResult[]) => Promise<void>;
+export declare const generateEnvironmentJson: (writer: ClassicDataWriter, env: EnvironmentItem[]) => Promise<void>;
+export declare const generateStatistic: (writer: ClassicDataWriter, statistic: Statistic) => Promise<void>;
+export declare const generatePieChart: (writer: ClassicDataWriter, statistic: Statistic) => Promise<void>;
+export declare const generateAttachmentsFiles: (writer: ClassicDataWriter, attachmentLinks: AttachmentLink[], contentFunction: (id: string) => Promise<ResultFile | undefined>) => Promise<Map<string, string> | undefined>;
+export declare const generateHistoryDataPoints: (writer: ClassicDataWriter, store: AllureStore) => Promise<Map<string, string>>;
+export declare const generateStaticFiles: (payload: ClassicOptions & {
     allureVersion: string;
     reportFiles: ReportFiles;
     reportDataFiles: ReportFile[];
     reportUuid: string;
     reportName: string;
 }) => Promise<void>;
-export declare const generateTreeByCategories: (writer: AwesomeDataWriter, treeName: string, tests: AwesomeTestResult[]) => Promise<void>;
+export declare const generateTreeByCategories: (writer: ClassicDataWriter, treeName: string, tests: AwesomeTestResult[]) => Promise<void>;

package/dist/generators.js

@@ -113,14 +113,17 @@ export const generateTestResults = async (writer, store) => {
 };
 export const generateTree = async (writer, treeName, labels, tests) => {
     const visibleTests = tests.filter((test) => !test.hidden);
-    const tree = createTreeByLabels(visibleTests, labels, ({ id, name, status, duration, flaky, start, retries }) => {
+    const tree = createTreeByLabels(visibleTests, labels, ({ id, name, status, duration, flaky, transition, start, retries }) => {
+        const retriesCount = retries?.length ?? 0;
         return {
             nodeId: id,
-            retry: !!retries?.length,
+            retry: Boolean(retriesCount),
+            retriesCount,
             name,
             status,
             duration,
             flaky,
+            transition,
             start,
         };
     }, undefined, (group, leaf) => {
@@ -198,15 +201,17 @@ export const generateStaticFiles = async (payload) => {
         const mainJsContentBuffer = await readFile(mainJsSource);
         bodyTags.push(createScriptTag(`data:text/javascript;base64,${mainJsContentBuffer.toString("base64")}`));
     }
+    const now = Date.now();
     const reportOptions = {
         reportName,
         logo,
         theme,
         reportLanguage,
-        createdAt: Date.now(),
+        createdAt: now,
         reportUuid,
         groupBy: groupBy?.length ? groupBy : ["parentSuite", "suite", "subSuite"],
         allureVersion,
+        cacheKey: now.toString(),
     };
     const html = compile({
         headTags: headTags.join("\n"),
@@ -223,14 +228,17 @@ export const generateStaticFiles = async (payload) => {
 };
 export const generateTreeByCategories = async (writer, treeName, tests) => {
     const visibleTests = tests.filter((test) => !test.hidden);
-    const tree = createTreeByCategories(visibleTests, ({ id, name, status, duration, flaky, start, retries }) => {
+    const tree = createTreeByCategories(visibleTests, ({ id, name, status, duration, flaky, transition, start, retries }) => {
+        const retriesCount = retries?.length ?? 0;
         return {
             nodeId: id,
-            retry: !!retries?.length,
+            retry: Boolean(retriesCount),
+            retriesCount,
             name,
             status,
             duration,
             flaky,
+            transition,
             start,
         };
     }, undefined, (group, leaf) => {

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/model.d.ts

@@ -1,5 +1,5 @@
 import type { TestResult, TestStatus } from "@allurereport/core-api";
-export type AwesomeOptions = {
+export type ClassicOptions = {
     reportName?: string;
     singleFile?: boolean;
     logo?: string;
@@ -14,8 +14,8 @@ export type AwesomeOptions = {
     filter?: (tr: TestResult) => boolean;
 };
 export type TemplateManifest = Record<string, string>;
-export type AwesomePluginOptions = AwesomeOptions;
-export interface AwesomeCategory {
+export type ClassicPluginOptions = ClassicOptions;
+export interface ClassicCategory {
     name: string;
     description?: string;
     descriptionHtml?: string;

package/dist/plugin.d.ts

@@ -1,9 +1,9 @@
 import type { AllureStore, Plugin, PluginContext, PluginSummary } from "@allurereport/plugin-api";
-import type { AwesomePluginOptions } from "./model.js";
-export declare class AwesomePlugin implements Plugin {
+import type { ClassicPluginOptions } from "./model.js";
+export declare class ClassicPlugin implements Plugin {
     #private;
-    readonly options: AwesomePluginOptions;
-    constructor(options?: AwesomePluginOptions);
+    readonly options: ClassicPluginOptions;
+    constructor(options?: ClassicPluginOptions);
     start: (context: PluginContext) => Promise<void>;
     update: (context: PluginContext, store: AllureStore) => Promise<void>;
     done: (context: PluginContext, store: AllureStore) => Promise<void>;

package/dist/plugin.js

@@ -9,38 +9,38 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _AwesomePlugin_writer, _AwesomePlugin_generate;
+var _ClassicPlugin_writer, _ClassicPlugin_generate;
 import { getWorstStatus } from "@allurereport/core-api";
 import { preciseTreeLabels } from "@allurereport/plugin-api";
 import { generateAttachmentsFiles, generateEnvironmentJson, generateHistoryDataPoints, generatePieChart, generateStaticFiles, generateStatistic, generateTestResults, generateTree, generateTreeByCategories, } from "./generators.js";
 import { InMemoryReportDataWriter, ReportFileDataWriter } from "./writer.js";
-export class AwesomePlugin {
+export class ClassicPlugin {
     constructor(options = {}) {
         this.options = options;
-        _AwesomePlugin_writer.set(this, void 0);
-        _AwesomePlugin_generate.set(this, async (context, store) => {
+        _ClassicPlugin_writer.set(this, void 0);
+        _ClassicPlugin_generate.set(this, async (context, store) => {
             const { singleFile, groupBy = [] } = this.options ?? {};
             const environmentItems = await store.metadataByKey("allure_environment");
             const statistic = await store.testsStatistic();
             const attachments = await store.allAttachments();
-            await generateStatistic(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), statistic);
-            await generatePieChart(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), statistic);
-            const convertedTrs = await generateTestResults(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), store);
+            await generateStatistic(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), statistic);
+            await generatePieChart(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), statistic);
+            const convertedTrs = await generateTestResults(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), store);
             const treeLabels = preciseTreeLabels(!groupBy.length ? ["parentSuite", "suite", "subSuite"] : groupBy, convertedTrs, ({ labels }) => labels.map(({ name }) => name));
             const behaviorLabels = preciseTreeLabels(!groupBy.length ? ["epic", "feature", "story"] : groupBy, convertedTrs, ({ labels }) => labels.map(({ name }) => name));
             const packagesLabels = preciseTreeLabels(!groupBy.length ? ["package"] : groupBy, convertedTrs, ({ labels }) => labels.map(({ name }) => name));
-            await generateTreeByCategories(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), "categories", convertedTrs);
-            await generateTree(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), "tree", treeLabels, convertedTrs);
-            await generateTree(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), "behaviors", behaviorLabels, convertedTrs);
-            await generateTree(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), "packages", packagesLabels, convertedTrs);
-            await generateHistoryDataPoints(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), store);
+            await generateTreeByCategories(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), "categories", convertedTrs);
+            await generateTree(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), "tree", treeLabels, convertedTrs);
+            await generateTree(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), "behaviors", behaviorLabels, convertedTrs);
+            await generateTree(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), "packages", packagesLabels, convertedTrs);
+            await generateHistoryDataPoints(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), store);
             if (environmentItems?.length) {
-                await generateEnvironmentJson(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), environmentItems);
+                await generateEnvironmentJson(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), environmentItems);
             }
             if (attachments?.length) {
-                await generateAttachmentsFiles(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), attachments, (id) => store.attachmentContentById(id));
+                await generateAttachmentsFiles(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), attachments, (id) => store.attachmentContentById(id));
             }
-            const reportDataFiles = singleFile ? __classPrivateFieldGet(this, _AwesomePlugin_writer, "f").reportFiles() : [];
+            const reportDataFiles = singleFile ? __classPrivateFieldGet(this, _ClassicPlugin_writer, "f").reportFiles() : [];
             await generateStaticFiles({
                 ...this.options,
                 allureVersion: context.allureVersion,
@@ -53,23 +53,23 @@ export class AwesomePlugin {
         this.start = async (context) => {
             const { singleFile } = this.options;
             if (singleFile) {
-                __classPrivateFieldSet(this, _AwesomePlugin_writer, new InMemoryReportDataWriter(), "f");
+                __classPrivateFieldSet(this, _ClassicPlugin_writer, new InMemoryReportDataWriter(), "f");
                 return;
             }
-            __classPrivateFieldSet(this, _AwesomePlugin_writer, new ReportFileDataWriter(context.reportFiles), "f");
+            __classPrivateFieldSet(this, _ClassicPlugin_writer, new ReportFileDataWriter(context.reportFiles), "f");
             await Promise.resolve();
         };
         this.update = async (context, store) => {
-            if (!__classPrivateFieldGet(this, _AwesomePlugin_writer, "f")) {
+            if (!__classPrivateFieldGet(this, _ClassicPlugin_writer, "f")) {
                 throw new Error("call start first");
             }
-            await __classPrivateFieldGet(this, _AwesomePlugin_generate, "f").call(this, context, store);
+            await __classPrivateFieldGet(this, _ClassicPlugin_generate, "f").call(this, context, store);
         };
         this.done = async (context, store) => {
-            if (!__classPrivateFieldGet(this, _AwesomePlugin_writer, "f")) {
+            if (!__classPrivateFieldGet(this, _ClassicPlugin_writer, "f")) {
                 throw new Error("call start first");
             }
-            await __classPrivateFieldGet(this, _AwesomePlugin_generate, "f").call(this, context, store);
+            await __classPrivateFieldGet(this, _ClassicPlugin_generate, "f").call(this, context, store);
         };
     }
     async info(context, store) {
@@ -87,4 +87,4 @@ export class AwesomePlugin {
         };
     }
 }
-_AwesomePlugin_writer = new WeakMap(), _AwesomePlugin_generate = new WeakMap();
+_ClassicPlugin_writer = new WeakMap(), _ClassicPlugin_generate = new WeakMap();

package/dist/writer.d.ts

@@ -4,13 +4,13 @@ export interface ReportFile {
     name: string;
     value: string;
 }
-export interface AwesomeDataWriter {
+export interface ClassicDataWriter {
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
     writeTestCase(test: AwesomeTestResult): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
 }
-export declare class FileSystemReportDataWriter implements AwesomeDataWriter {
+export declare class FileSystemReportDataWriter implements ClassicDataWriter {
     private readonly output;
     constructor(output: string);
     writeData(fileName: string, data: any): Promise<void>;
@@ -18,7 +18,7 @@ export declare class FileSystemReportDataWriter implements AwesomeDataWriter {
     writeTestCase(test: AwesomeTestResult): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
 }
-export declare class InMemoryReportDataWriter implements AwesomeDataWriter {
+export declare class InMemoryReportDataWriter implements ClassicDataWriter {
     #private;
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
@@ -26,7 +26,7 @@ export declare class InMemoryReportDataWriter implements AwesomeDataWriter {
     writeAttachment(fileName: string, file: ResultFile): Promise<void>;
     reportFiles(): ReportFile[];
 }
-export declare class ReportFileDataWriter implements AwesomeDataWriter {
+export declare class ReportFileDataWriter implements ClassicDataWriter {
     readonly reportFiles: ReportFiles;
     constructor(reportFiles: ReportFiles);
     writeData(fileName: string, data: any): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-classic",
-  "version": "3.0.0-beta.14",
+  "version": "3.0.0-beta.16",
   "description": "The classic version of Allure HTML report",
   "keywords": [
     "allure",
@@ -30,11 +30,11 @@
     "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-classic": "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-classic": "3.0.0-beta.16",
+    "@allurereport/web-commons": "3.0.0-beta.16",
     "d3-shape": "^3.2.0",
     "handlebars": "^4.7.8"
   },
@@ -45,7 +45,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",
@@ -56,6 +56,6 @@
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "rimraf": "^6.0.1",
     "typescript": "^5.6.3",
-    "vitest": "^2.1.8"
+    "vitest": "^2.1.9"
   }
 }