@allurereport/plugin-classic 3.0.0-beta.7 → 3.0.0-beta.9

package/dist/plugin.js

@@ -3,67 +3,73 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Allure2Plugin_generate;
-import { convertTestResult } from "./converters.js";
-import { generateAttachmentsData, generateCategoriesData, generateDefaultWidgetData, generateEmptyTrendData, generateEnvironmentJson, generateExecutorJson, generatePackagesData, generateStaticFiles, generateSummaryJson, generateTestResults, generateTimelineData, generateTree, generateTrendData, } from "./generators.js";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    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 _AllureAwesomePlugin_writer, _AllureAwesomePlugin_generate;
+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 Allure2Plugin {
+export class AllureAwesomePlugin {
     constructor(options = {}) {
         this.options = options;
-        _Allure2Plugin_generate.set(this, async (context, store) => {
-            const { reportName = "Allure Report", singleFile = false, reportLanguage = "en" } = this.options ?? {};
-            const writer = singleFile ? new InMemoryReportDataWriter() : new ReportFileDataWriter(context.reportFiles);
-            const attachmentLinks = await store.allAttachments();
-            const attachmentMap = await generateAttachmentsData(writer, attachmentLinks, (id) => store.attachmentContentById(id));
-            const categories = (await store.metadataByKey("allure2_categories")) ?? [];
-            const environmentItems = (await store.metadataByKey("allure_environment")) ?? [];
-            const tests = await store.allTestResults({ includeHidden: true });
-            const allTr = [];
-            for (const value of tests) {
-                const fixtures = await store.fixturesByTrId(value.id);
-                const retries = await store.retriesByTrId(value.id);
-                const history = await store.historyByTrId(value.id);
-                const allure2TestResult = convertTestResult({
-                    attachmentMap,
-                    fixtures,
-                    categories,
-                    retries,
-                    history,
-                }, value);
-                allTr.push(allure2TestResult);
+        _AllureAwesomePlugin_writer.set(this, void 0);
+        _AllureAwesomePlugin_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, _AllureAwesomePlugin_writer, "f"), statistic);
+            await generatePieChart(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), statistic);
+            const convertedTrs = await generateTestResults(__classPrivateFieldGet(this, _AllureAwesomePlugin_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, _AllureAwesomePlugin_writer, "f"), "categories", convertedTrs);
+            await generateTree(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), "tree", treeLabels, convertedTrs);
+            await generateTree(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), "behaviors", behaviorLabels, convertedTrs);
+            await generateTree(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), "packages", packagesLabels, convertedTrs);
+            await generateHistoryDataPoints(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), store);
+            if (environmentItems?.length) {
+                await generateEnvironmentJson(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), environmentItems);
+            }
+            if (attachments?.length) {
+                await generateAttachmentsFiles(__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f"), attachments, (id) => store.attachmentContentById(id));
             }
-            await generateTestResults(writer, allTr);
-            const displayedTr = allTr.filter((atr) => !atr.hidden);
-            await generateTree(writer, "suites", ["parentSuite", "suite", "subSuite"], displayedTr);
-            await generateTree(writer, "behaviors", ["epic", "feature", "story"], displayedTr);
-            await generatePackagesData(writer, displayedTr);
-            await generateCategoriesData(writer, displayedTr);
-            await generateTimelineData(writer, allTr);
-            await generateSummaryJson(writer, reportName, displayedTr);
-            await generateEnvironmentJson(writer, environmentItems);
-            const executor = await store.metadataByKey("allure2_executor");
-            const historyDataPoints = await store.allHistoryDataPoints();
-            await generateExecutorJson(writer, executor);
-            await generateDefaultWidgetData(writer, displayedTr, "duration.json", "status-chart.json", "severity.json");
-            await generateTrendData(writer, reportName, displayedTr, historyDataPoints);
-            await generateEmptyTrendData(writer, "duration-trend.json", "categories-trend.json", "retry-trend.json");
-            const reportDataFiles = singleFile ? writer.reportFiles() : [];
+            const reportDataFiles = singleFile ? __classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f").reportFiles() : [];
             await generateStaticFiles({
+                ...this.options,
                 allureVersion: context.allureVersion,
-                reportName,
-                reportLanguage,
-                singleFile,
                 reportFiles: context.reportFiles,
                 reportDataFiles,
                 reportUuid: context.reportUuid,
+                reportName: context.reportName,
             });
         });
+        this.start = async (context) => {
+            const { singleFile } = this.options;
+            if (singleFile) {
+                __classPrivateFieldSet(this, _AllureAwesomePlugin_writer, new InMemoryReportDataWriter(), "f");
+                return;
+            }
+            __classPrivateFieldSet(this, _AllureAwesomePlugin_writer, new ReportFileDataWriter(context.reportFiles), "f");
+            await Promise.resolve();
+        };
         this.update = async (context, store) => {
-            await __classPrivateFieldGet(this, _Allure2Plugin_generate, "f").call(this, context, store);
+            if (!__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f")) {
+                throw new Error("call start first");
+            }
+            await __classPrivateFieldGet(this, _AllureAwesomePlugin_generate, "f").call(this, context, store);
         };
         this.done = async (context, store) => {
-            await this.update(context, store);
+            if (!__classPrivateFieldGet(this, _AllureAwesomePlugin_writer, "f")) {
+                throw new Error("call start first");
+            }
+            await __classPrivateFieldGet(this, _AllureAwesomePlugin_generate, "f").call(this, context, store);
         };
     }
 }
-_Allure2Plugin_generate = new WeakMap();
+_AllureAwesomePlugin_writer = new WeakMap(), _AllureAwesomePlugin_generate = new WeakMap();

package/dist/writer.d.ts

@@ -1,36 +1,36 @@
 import type { ReportFiles, ResultFile } from "@allurereport/plugin-api";
-import type { Allure2TestResult } from "./model.js";
+import type { AllureAwesomeTestResult } from "@allurereport/web-awesome";
 export interface ReportFile {
     name: string;
     value: string;
 }
-export interface Allure2DataWriter {
+export interface AllureAwesomeDataWriter {
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
-    writeTestCase(test: Allure2TestResult): Promise<void>;
+    writeTestCase(test: AllureAwesomeTestResult): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
 }
-export declare class FileSystemReportDataWriter implements Allure2DataWriter {
+export declare class FileSystemReportDataWriter implements AllureAwesomeDataWriter {
     private readonly output;
     constructor(output: string);
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
-    writeTestCase(test: Allure2TestResult): Promise<void>;
+    writeTestCase(test: AllureAwesomeTestResult): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
 }
-export declare class InMemoryReportDataWriter implements Allure2DataWriter {
+export declare class InMemoryReportDataWriter implements AllureAwesomeDataWriter {
     #private;
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
-    writeTestCase(test: Allure2TestResult): Promise<void>;
+    writeTestCase(test: AllureAwesomeTestResult): Promise<void>;
     writeAttachment(fileName: string, file: ResultFile): Promise<void>;
     reportFiles(): ReportFile[];
 }
-export declare class ReportFileDataWriter implements Allure2DataWriter {
+export declare class ReportFileDataWriter implements AllureAwesomeDataWriter {
     readonly reportFiles: ReportFiles;
     constructor(reportFiles: ReportFiles);
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
-    writeTestCase(test: Allure2TestResult): Promise<void>;
+    writeTestCase(test: AllureAwesomeTestResult): Promise<void>;
 }

package/dist/writer.js

@@ -21,9 +21,9 @@ export class FileSystemReportDataWriter {
         await writeFile(resolve(distFolder, fileName), JSON.stringify(data), { encoding: "utf-8" });
     }
     async writeTestCase(test) {
-        const distFolder = resolve(this.output, "data", "test-cases");
+        const distFolder = resolve(this.output, "data", "test-results");
         await mkdir(distFolder, { recursive: true });
-        await writeFile(resolve(distFolder, `${test.uid}.json`), JSON.stringify(test), { encoding: "utf-8" });
+        await writeFile(resolve(distFolder, `${test.id}.json`), JSON.stringify(test), { encoding: "utf-8" });
     }
     async writeAttachment(source, file) {
         const distFolder = resolve(this.output, "data", "attachments");
@@ -44,7 +44,7 @@ export class InMemoryReportDataWriter {
         __classPrivateFieldGet(this, _InMemoryReportDataWriter_data, "f")[dist] = Buffer.from(JSON.stringify(data), "utf-8");
     }
     async writeTestCase(test) {
-        const dist = join("data", "test-cases", `${test.uid}.json`);
+        const dist = join("data", "test-results", `${test.id}.json`);
         __classPrivateFieldGet(this, _InMemoryReportDataWriter_data, "f")[dist] = Buffer.from(JSON.stringify(test), "utf-8");
     }
     async writeAttachment(fileName, file) {
@@ -55,10 +55,7 @@ export class InMemoryReportDataWriter {
         }
     }
     reportFiles() {
-        return Object.keys(__classPrivateFieldGet(this, _InMemoryReportDataWriter_data, "f")).map((key) => ({
-            name: key,
-            value: __classPrivateFieldGet(this, _InMemoryReportDataWriter_data, "f")[key].toString("base64"),
-        }));
+        return Object.keys(__classPrivateFieldGet(this, _InMemoryReportDataWriter_data, "f")).map((key) => ({ name: key, value: __classPrivateFieldGet(this, _InMemoryReportDataWriter_data, "f")[key].toString("base64") }));
     }
 }
 _InMemoryReportDataWriter_data = new WeakMap();
@@ -80,6 +77,6 @@ export class ReportFileDataWriter {
         await this.reportFiles.addFile(join("data", "attachments", source), contentBuffer);
     }
     async writeTestCase(test) {
-        await this.reportFiles.addFile(join("data", "test-cases", `${test.uid}.json`), Buffer.from(JSON.stringify(test), "utf8"));
+        await this.reportFiles.addFile(join("data", "test-results", `${test.id}.json`), Buffer.from(JSON.stringify(test), "utf8"));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-classic",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.9",
   "description": "The classic version of Allure HTML report",
   "keywords": [
     "allure",
@@ -30,20 +30,23 @@
     "test": "rimraf ./out && vitest run"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.0.0-beta.7",
-    "@allurereport/plugin-api": "3.0.0-beta.7",
-    "@allurereport/web-classic": "3.0.0-beta.7",
-    "@allurereport/web-commons": "3.0.0-beta.7",
+    "@allurereport/core-api": "3.0.0-beta.9",
+    "@allurereport/plugin-api": "3.0.0-beta.9",
+    "@allurereport/web-awesome": "3.0.0-beta.9",
+    "@allurereport/web-classic": "3.0.0-beta.9",
+    "@allurereport/web-commons": "3.0.0-beta.9",
+    "d3-shape": "^3.2.0",
     "handlebars": "^4.7.8"
   },
   "devDependencies": {
     "@stylistic/eslint-plugin": "^2.6.1",
+    "@types/d3-shape": "^3.1.6",
     "@types/eslint": "^8.56.11",
     "@types/node": "^20.17.9",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "@vitest/runner": "^2.1.8",
-    "allure-vitest": "^3.0.7",
+    "allure-vitest": "^3.0.9",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",

package/dist/tree.d.ts

@@ -1,44 +0,0 @@
-import type { Statistic } from "@allurereport/core-api";
-import type { Allure2Status, Allure2TestResult, Allure2Time } from "./model.js";
-export interface TreeNode {
-    name: string;
-}
-export interface TreeGroup extends TreeNode {
-    uid: string;
-    name: string;
-    children: TreeNode[];
-}
-export interface TreeLeaf extends TreeNode {
-    uid: string;
-    parentUid: string;
-    status: Allure2Status;
-    time: Allure2Time;
-    flaky: boolean;
-    newFailed: boolean;
-    newBroken: boolean;
-    newPassed: boolean;
-    retriesCount: number;
-    retriesStatusChange: boolean;
-    tags: string[];
-    parameters: string[];
-}
-export interface TreeLayer {
-    groups: string[];
-}
-export interface WidgetItem {
-    uid: string;
-    name: string;
-    statistic: Statistic;
-}
-export interface WidgetData {
-    items: WidgetItem[];
-    total: number;
-}
-declare const createLeaf: (endNode: TreeGroup, test: Allure2TestResult) => TreeLeaf;
-export type LeafFactory = typeof createLeaf;
-export type Classifier = (test: Allure2TestResult) => TreeLayer[] | undefined;
-export declare const byLabels: (labelNames: string[]) => Classifier;
-export declare const createTree: (tests: Allure2TestResult[], classifier: Classifier, leafFactory?: LeafFactory) => TreeGroup;
-export declare const collapseTree: (treeGroup: TreeGroup, separator?: string) => TreeGroup;
-export declare const createWidget: (root: TreeGroup) => WidgetData;
-export {};

package/dist/tree.js

@@ -1,113 +0,0 @@
-import { byStatistic } from "@allurereport/core-api";
-import { compareBy } from "@allurereport/core-api";
-import { createHash } from "node:crypto";
-import { calculateStatisticByLeafs } from "./utils.js";
-const rootNodeUid = "__ROOT__";
-const createLeaf = (endNode, test) => {
-    const leaf = {
-        parentUid: endNode.uid,
-        uid: test.uid,
-        name: test.name,
-        status: test.status,
-        time: { ...test.time },
-        flaky: test.flaky,
-        newFailed: test.newFailed,
-        newBroken: test.newBroken,
-        newPassed: test.newPassed,
-        retriesCount: test.retriesCount,
-        retriesStatusChange: test.retriesStatusChange,
-        parameters: test.parameters.filter((p) => p.value).map((p) => p.value),
-        tags: test.extra.tags ?? [],
-    };
-    return leaf;
-};
-export const byLabels = (labelNames) => {
-    return (test) => groupByLabels(test, labelNames);
-};
-export const createTree = (tests, classifier, leafFactory = createLeaf) => {
-    const groups = new Map();
-    const root = { uid: rootNodeUid, name: rootNodeUid, children: [] };
-    groups.set(root.uid, root);
-    for (const test of tests) {
-        const treeLayers = classifier(test);
-        if (!treeLayers) {
-            continue;
-        }
-        getEndNodes(test, root, treeLayers, 0, groups).forEach((endNode) => {
-            const leaf = leafFactory(endNode, test);
-            endNode.children.push(leaf);
-        });
-    }
-    return root;
-};
-const getEndNodes = (item, node, classifiers, index, groups) => {
-    if (index >= classifiers.length) {
-        return [node];
-    }
-    const layer = classifiers[index];
-    return layer.groups.flatMap((name) => {
-        const uid = groupUid(node.uid, name);
-        if (!groups.has(uid)) {
-            const value = { uid, name, children: [] };
-            groups.set(uid, value);
-            node.children.push(value);
-        }
-        const treeGroup = groups.get(uid);
-        return getEndNodes(item, treeGroup, classifiers, index + 1, groups);
-    });
-};
-const groupByLabels = (test, labelNames) => {
-    const result = [];
-    for (const name of labelNames) {
-        const groups = test.labels
-            .filter((label) => label.name === name)
-            .filter((label) => !!label.value)
-            .map((label) => label.value);
-        if (groups.length !== 0) {
-            result.push({ groups: Array.from(new Set(groups)) });
-        }
-    }
-    return result;
-};
-const groupUid = (parentUid, groupName) => {
-    return md5(parentUid ? `${parentUid}.${groupName}` : groupName);
-};
-const md5 = (data) => createHash("md5").update(data).digest("hex");
-export const collapseTree = (treeGroup, separator = ".") => {
-    const newChildren = treeGroup.children.map((c) => {
-        if (!("children" in c)) {
-            return c;
-        }
-        let res = c;
-        while (res.children.length === 1 && "children" in res.children[0]) {
-            const child = res.children[0];
-            res = {
-                uid: groupUid(res.uid, child.uid),
-                name: res.name + separator + child.name,
-                children: child.children,
-            };
-        }
-        return res;
-    });
-    treeGroup.children = newChildren;
-    return treeGroup;
-};
-export const createWidget = (root) => {
-    const items = root.children
-        .map((c) => {
-        if (!("children" in c)) {
-            return undefined;
-        }
-        const res = c;
-        const statistic = calculateStatisticByLeafs(res);
-        return { uid: res.uid, name: res.name, statistic };
-    })
-        .filter((value) => value)
-        .map((value) => value)
-        .sort(compareBy("statistic", byStatistic()))
-        .slice(0, 10);
-    return {
-        items,
-        total: root.children.length,
-    };
-};

package/dist/utils.d.ts

@@ -1,8 +0,0 @@
-import type { Statistic } from "@allurereport/core-api";
-import type { Allure2Status, Allure2TestResult, GroupTime } from "./model.js";
-import type { TreeGroup } from "./tree.js";
-export declare const updateStatistic: (statistic: Statistic, test: {
-    status: Allure2Status;
-}) => undefined;
-export declare const updateTime: (time: GroupTime, test: Allure2TestResult) => undefined;
-export declare const calculateStatisticByLeafs: (treeGroup: TreeGroup) => Statistic;

package/dist/utils.js

@@ -1,43 +0,0 @@
-import { statisticKeys } from "./model.js";
-export const updateStatistic = (statistic, test) => {
-    statistic[test.status] = (statistic[test.status] ?? 0) + 1;
-    statistic.total = (statistic.total ?? 0) + 1;
-};
-export const updateTime = (time, test) => {
-    const { start, stop, duration } = test.time;
-    if (duration === undefined) {
-        return;
-    }
-    time.maxDuration = Math.max(time.maxDuration ?? 0, duration);
-    time.minDuration = Math.min(time.minDuration ?? Number.MAX_VALUE, duration);
-    time.sumDuration = (time.sumDuration ?? 0) + duration;
-    if (start !== undefined) {
-        time.start = Math.min(time.start ?? Number.MAX_VALUE, start);
-    }
-    if (stop !== undefined) {
-        time.stop = Math.max(time.stop ?? Number.MIN_VALUE, stop);
-    }
-    if (time.start !== undefined && time.stop !== undefined) {
-        time.duration = Math.max(0, time.stop - time.start);
-    }
-};
-export const calculateStatisticByLeafs = (treeGroup) => {
-    const current = { total: 0 };
-    treeGroup.children.forEach((child) => {
-        if ("children" in child) {
-            const childGroup = child;
-            const statistic = calculateStatisticByLeafs(childGroup);
-            statisticKeys.forEach((key) => {
-                const statisticElement = statistic[key];
-                if (statisticElement !== undefined) {
-                    current[key] = (current[key] ?? 0) + statisticElement;
-                }
-            });
-        }
-        else {
-            const childLeaf = child;
-            updateStatistic(current, childLeaf);
-        }
-    });
-    return current;
-};