@allurereport/plugin-allure2 3.20.1 → 3.22.0

package/dist/categories.js

@@ -38,7 +38,7 @@ const match = (regex, value) => {
         const b = new RegExp(regex, "s").test(value);
         return b;
     }
-    catch (ignored) {
+    catch {
         return false;
     }
 };

package/dist/converters.js

@@ -1,4 +1,4 @@
-import { isStep, redactParameters } from "@allurereport/core-api";
+import { hasRetriesStatusChange, isStep, redactParameters } from "@allurereport/core-api";
 import { matchCategories } from "./categories.js";
 import { severityValues } from "./model.js";
 import { createStatistic, updateStatistic } from "./utils.js";
@@ -170,8 +170,7 @@ export const convertTestResult = (context, test) => {
             duration: retry.duration,
         },
     }));
-    const retriesStatusChange = isImportantStatus(status) &&
-        retries.find((retry) => isImportantStatus(retry.status) && retry.status !== status) !== undefined;
+    const retriesStatusChange = hasRetriesStatusChange(test, context.retries);
     const historyItems = context.legacyHistory
         ? context.legacyHistory.items.map((item) => ({
             uid: item.uid,

package/dist/generators.d.ts

@@ -1,10 +1,7 @@
 import type { AttachmentLink, GlobalAttachmentLink, HistoryDataPoint, TestError } from "@allurereport/core-api";
-import type { ReportFiles, ResultFile } from "@allurereport/plugin-api";
-import type { ReportStaticManifest } from "@allurereport/plugin-api/static-assets";
+import type { ExitCode, ReportFiles, ResultFile } from "@allurereport/plugin-api";
 import type { Allure2CategoriesTrendItem, Allure2DurationTrendItem, Allure2ExecutorInfo, Allure2LegacyHistoryTrendItem, Allure2RetryTrendItem, Allure2TestResult } from "./model.js";
 import type { Allure2DataWriter, ReportFile } from "./writer.js";
-export type TemplateManifest = ReportStaticManifest;
-export declare const readTemplateManifest: () => Promise<TemplateManifest>;
 export declare const generateStaticFiles: (payload: {
     allureVersion: string;
     reportName: string;
@@ -13,6 +10,7 @@ export declare const generateStaticFiles: (payload: {
     reportFiles: ReportFiles;
     reportDataFiles: ReportFile[];
     reportUuid: string;
+    overviewHref?: string;
 }) => Promise<void>;
 export declare const generateTree: (writer: Allure2DataWriter, name: string, labelNames: string[], tests: Allure2TestResult[]) => Promise<void>;
 export declare const generatePackagesData: (writer: Allure2DataWriter, tests: Allure2TestResult[]) => Promise<void>;
@@ -31,4 +29,4 @@ export declare const generateDurationTrendData: (writer: Allure2DataWriter, test
 export declare const generateRetryTrendData: (writer: Allure2DataWriter, tests: Allure2TestResult[], history?: Allure2RetryTrendItem[], executor?: Partial<Allure2ExecutorInfo>) => Promise<void>;
 export declare const generateCategoriesTrendData: (writer: Allure2DataWriter, tests: Allure2TestResult[], history?: Allure2CategoriesTrendItem[], executor?: Partial<Allure2ExecutorInfo>) => Promise<void>;
 export declare const generateAttachmentsData: (writer: Allure2DataWriter, attachmentLinks: AttachmentLink[], contentFunction: (id: string) => Promise<ResultFile | undefined>) => Promise<Map<string, string>>;
-export declare const generateGlobalsData: (writer: Allure2DataWriter, globalErrors: TestError[], globalAttachments: GlobalAttachmentLink[], attachmentMap: Map<string, string>, attachmentTimestamps?: Record<string, number>, errorTimestamps?: Array<number | undefined>) => Promise<void>;
+export declare const generateGlobalsData: (writer: Allure2DataWriter, globalErrors: TestError[], globalAttachments: GlobalAttachmentLink[], attachmentMap: Map<string, string>, attachmentTimestamps?: Record<string, number>, errorTimestamps?: Array<number | undefined>, exitCode?: ExitCode) => Promise<void>;

package/dist/generators.js

@@ -1,14 +1,10 @@
-import { createBaseUrlScript, createScriptTag, createStylesLinkTag } from "@allurereport/core-api";
+import { createBaseUrlScript, createScriptTag, createStylesLinkTag, stringifyForInlineScript, } from "@allurereport/core-api";
+import { writeConcurrently } from "@allurereport/plugin-api/internal/report";
 import { copyReportStaticAssets, getReportStaticAsset, readReportStaticAssets, } from "@allurereport/plugin-api/static-assets";
 import Handlebars from "handlebars";
 import { byLabels, collapseTree, createTree, createWidget } from "./tree.js";
 import { createStatistic, updateStatistic, updateTime } from "./utils.js";
 const reportStaticArchive = new URL("../dist/static/report.tar", import.meta.url);
-const writeConcurrently = async (items, write, concurrency = 64) => {
-    for (let i = 0; i < items.length; i += concurrency) {
-        await Promise.all(items.slice(i, i + concurrency).map(write));
-    }
-};
 const template = `<!DOCTYPE html>
 <html dir="ltr" lang="{{reportLanguage}}">
 <head>
@@ -38,6 +34,11 @@ const template = `<!DOCTYPE html>
       }
     </script>
     ${createBaseUrlScript()}
+    {{#if reportOptions}}
+    <script>
+      window.allureReportOptions = {{{ reportOptions }}}
+    </script>
+    {{/if}}
     {{#if analyticsEnable}}
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-FVWC4GKEYS"></script>
     <script>
@@ -56,11 +57,15 @@ const template = `<!DOCTYPE html>
 </html>
 `;
 const compiledTemplate = Handlebars.compile(template);
-const createEmbeddedReportDataScript = (reportFiles) => {
-    const reportFilesDeclaration = reportFiles
-        .map(({ name, value }) => `d(${JSON.stringify(name)},${JSON.stringify(value)})`)
-        .join(",");
-    return `
+const reportDataScriptPlaceholder = "<!-- allure2-report-data -->";
+const injectEmbeddedReportDataScript = (html, reportFiles) => {
+    const placeholderIndex = html.indexOf(reportDataScriptPlaceholder);
+    if (placeholderIndex === -1) {
+        throw new Error("Report data script placeholder is missing from the Allure 2 HTML template");
+    }
+    const chunks = [
+        Buffer.from(html.slice(0, placeholderIndex), "utf8"),
+        Buffer.from(`
     <script>
       window.reportDataReady = false;
       window.reportData = window.reportData || {};
@@ -73,18 +78,20 @@ const createEmbeddedReportDataScript = (reportFiles) => {
       }
     </script>
     <script>
-      Promise.allSettled([${reportFilesDeclaration}]).then(function () {
+      Promise.allSettled([`),
+    ];
+    reportFiles.forEach(({ name, value }, index) => {
+        chunks.push(Buffer.from(`${index === 0 ? "" : ","}d(${stringifyForInlineScript(name)},${stringifyForInlineScript(value)})`));
+    });
+    chunks.push(Buffer.from(`]).then(function () {
         window.reportDataReady = true;
       });
     </script>
-  `;
-};
-export const readTemplateManifest = async () => {
-    const { manifest } = await readReportStaticAssets(reportStaticArchive);
-    return manifest;
+  `), Buffer.from(html.slice(placeholderIndex + reportDataScriptPlaceholder.length), "utf8"));
+    return Buffer.concat(chunks);
 };
 export const generateStaticFiles = async (payload) => {
-    const { reportName, reportLanguage, singleFile, reportFiles, reportDataFiles, reportUuid, allureVersion } = payload;
+    const { reportName, reportLanguage, singleFile, reportFiles, reportDataFiles, reportUuid, allureVersion, overviewHref, } = payload;
     const staticAssets = await readReportStaticAssets(reportStaticArchive);
     const { manifest } = staticAssets;
     const mainJs = manifest["main.js"];
@@ -110,15 +117,16 @@ export const generateStaticFiles = async (payload) => {
         const html = compiledTemplate({
             headTags: headTags.join("\n"),
             bodyTags: bodyTags.join("\n"),
-            reportFilesScript: singleFile ? createEmbeddedReportDataScript(reportDataFiles) : "",
+            reportFilesScript: singleFile ? reportDataScriptPlaceholder : "",
             analyticsEnable: process.env.ALLURE_NO_ANALYTICS?.toLowerCase() !== "true",
             allureVersion,
             reportLanguage,
             reportUuid,
             reportName,
             singleFile,
+            reportOptions: overviewHref ? stringifyForInlineScript({ overviewHref }) : undefined,
         });
-        await reportFiles.addFile("index.html", Buffer.from(html, "utf8"));
+        await reportFiles.addFile("index.html", singleFile ? injectEmbeddedReportDataScript(html, reportDataFiles) : Buffer.from(html, "utf8"));
     }
     catch (err) {
         if (err instanceof RangeError) {
@@ -308,7 +316,7 @@ export const generateAttachmentsData = async (writer, attachmentLinks, contentFu
     }
     return result;
 };
-export const generateGlobalsData = async (writer, globalErrors, globalAttachments, attachmentMap, attachmentTimestamps = {}, errorTimestamps = []) => {
+export const generateGlobalsData = async (writer, globalErrors, globalAttachments, attachmentMap, attachmentTimestamps = {}, errorTimestamps = [], exitCode) => {
     const data = {
         errors: globalErrors.map(({ message, trace, actual, expected }, index) => ({
             message,
@@ -334,5 +342,8 @@ export const generateGlobalsData = async (writer, globalErrors, globalAttachment
             ];
         }),
     };
+    if (exitCode) {
+        data.exitCode = exitCode;
+    }
     await writer.writeWidget("globals.json", data);
 };

package/dist/model.d.ts

@@ -1,4 +1,5 @@
 import type { Statistic } from "@allurereport/core-api";
+import type { ExitCode } from "@allurereport/plugin-api";
 export type Allure2Status = "failed" | "broken" | "passed" | "skipped" | "unknown";
 export interface Allure2Time {
     start?: number;
@@ -38,6 +39,7 @@ export interface Allure2GlobalAttachment extends Allure2Attachment {
     timestamp?: number;
 }
 export interface Allure2GlobalsData {
+    exitCode?: ExitCode;
     errors: Allure2GlobalError[];
     attachments: Allure2GlobalAttachment[];
 }

package/dist/plugin.js

@@ -16,13 +16,14 @@ export class Allure2Plugin {
             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 [globalErrors, globalAttachments] = await Promise.all([
+            const [globalErrors, globalAttachments, globalExitCode] = await Promise.all([
                 store.allGlobalErrors(),
                 store.allGlobalAttachments(),
+                store.globalExitCode(),
             ]);
             const globalAttachmentTimestamps = (await store.metadataByKey("allure2_global_attachment_timestamps")) ?? {};
             const globalErrorTimestamps = (await store.metadataByKey("allure2_global_error_timestamps")) ?? [];
-            await generateGlobalsData(writer, globalErrors, globalAttachments, attachmentMap, globalAttachmentTimestamps, globalErrorTimestamps);
+            await generateGlobalsData(writer, globalErrors, globalAttachments, attachmentMap, globalAttachmentTimestamps, globalErrorTimestamps, globalExitCode);
             const categories = (await store.metadataByKey("allure2_categories")) ?? [];
             const legacyHistory = (await store.metadataByKey("allure2_history")) ?? {};
             const environmentItems = (await store.metadataByKey("allure_environment")) ?? [];
@@ -80,6 +81,7 @@ export class Allure2Plugin {
                 reportFiles: context.reportFiles,
                 reportDataFiles,
                 reportUuid: context.reportUuid,
+                overviewHref: context.overviewHref,
             });
         });
         this.update = async (context, store) => {

package/dist/tree.js

@@ -1,5 +1,5 @@
-import { createHash } from "node:crypto";
-import { byStatistic, compareBy } from "@allurereport/core-api";
+import { byStatistic, compareBy, nullsFirst, ordinal } from "@allurereport/core-api";
+import { md5 } from "@allurereport/plugin-api";
 import { calculateStatisticByLeafs } from "./utils.js";
 const rootNodeUid = "__ROOT__";
 const createLeaf = (endNode, test) => {
@@ -28,7 +28,9 @@ 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 compareStart = nullsFirst(ordinal());
+    const orderedTests = [...tests].sort((a, b) => compareStart(a.time.start, b.time.start) || (a.uid < b.uid ? -1 : a.uid > b.uid ? 1 : 0));
+    for (const test of orderedTests) {
         const treeLayers = classifier(test);
         if (!treeLayers) {
             continue;
@@ -72,7 +74,6 @@ const groupByLabels = (test, labelNames) => {
 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)) {

package/dist/writer.d.ts

@@ -10,15 +10,6 @@ export interface Allure2DataWriter {
     writeTestCase(test: Allure2TestResult): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
 }
-export declare class FileSystemReportDataWriter implements Allure2DataWriter {
-    #private;
-    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>;
-    writeAttachment(source: string, file: ResultFile): Promise<void>;
-}
 export declare class InMemoryReportDataWriter implements Allure2DataWriter {
     #private;
     writeData(fileName: string, data: any): Promise<void>;

package/dist/writer.js

@@ -1,56 +1,10 @@
-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 __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 _FileSystemReportDataWriter_dataDir, _FileSystemReportDataWriter_widgetsDir, _FileSystemReportDataWriter_testCasesDir, _FileSystemReportDataWriter_attachmentsDir, _FileSystemReportDataWriter_dataDirReady, _FileSystemReportDataWriter_widgetsDirReady, _FileSystemReportDataWriter_testCasesDirReady, _FileSystemReportDataWriter_attachmentsDirReady, _InMemoryReportDataWriter_data;
-import { mkdir, writeFile } from "node:fs/promises";
-import { resolve } from "node:path";
+var _InMemoryReportDataWriter_data;
 import { joinPosixPath } from "@allurereport/core-api";
-export class FileSystemReportDataWriter {
-    constructor(output) {
-        this.output = output;
-        _FileSystemReportDataWriter_dataDir.set(this, void 0);
-        _FileSystemReportDataWriter_widgetsDir.set(this, void 0);
-        _FileSystemReportDataWriter_testCasesDir.set(this, void 0);
-        _FileSystemReportDataWriter_attachmentsDir.set(this, void 0);
-        _FileSystemReportDataWriter_dataDirReady.set(this, void 0);
-        _FileSystemReportDataWriter_widgetsDirReady.set(this, void 0);
-        _FileSystemReportDataWriter_testCasesDirReady.set(this, void 0);
-        _FileSystemReportDataWriter_attachmentsDirReady.set(this, void 0);
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_dataDir, resolve(this.output, "data"), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_widgetsDir, resolve(this.output, "widgets"), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_testCasesDir, resolve(this.output, "data", "test-cases"), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_attachmentsDir, resolve(this.output, "data", "attachments"), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_dataDirReady, mkdir(__classPrivateFieldGet(this, _FileSystemReportDataWriter_dataDir, "f"), { recursive: true }), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_widgetsDirReady, mkdir(__classPrivateFieldGet(this, _FileSystemReportDataWriter_widgetsDir, "f"), { recursive: true }), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_testCasesDirReady, mkdir(__classPrivateFieldGet(this, _FileSystemReportDataWriter_testCasesDir, "f"), { recursive: true }), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_attachmentsDirReady, mkdir(__classPrivateFieldGet(this, _FileSystemReportDataWriter_attachmentsDir, "f"), { recursive: true }), "f");
-    }
-    async writeData(fileName, data) {
-        await __classPrivateFieldGet(this, _FileSystemReportDataWriter_dataDirReady, "f");
-        await writeFile(resolve(__classPrivateFieldGet(this, _FileSystemReportDataWriter_dataDir, "f"), fileName), JSON.stringify(data), { encoding: "utf-8" });
-    }
-    async writeWidget(fileName, data) {
-        await __classPrivateFieldGet(this, _FileSystemReportDataWriter_widgetsDirReady, "f");
-        await writeFile(resolve(__classPrivateFieldGet(this, _FileSystemReportDataWriter_widgetsDir, "f"), fileName), JSON.stringify(data), { encoding: "utf-8" });
-    }
-    async writeTestCase(test) {
-        await __classPrivateFieldGet(this, _FileSystemReportDataWriter_testCasesDirReady, "f");
-        await writeFile(resolve(__classPrivateFieldGet(this, _FileSystemReportDataWriter_testCasesDir, "f"), `${test.uid}.json`), JSON.stringify(test), { encoding: "utf-8" });
-    }
-    async writeAttachment(source, file) {
-        await __classPrivateFieldGet(this, _FileSystemReportDataWriter_attachmentsDirReady, "f");
-        await file.writeTo(resolve(__classPrivateFieldGet(this, _FileSystemReportDataWriter_attachmentsDir, "f"), source));
-    }
-}
-_FileSystemReportDataWriter_dataDir = new WeakMap(), _FileSystemReportDataWriter_widgetsDir = new WeakMap(), _FileSystemReportDataWriter_testCasesDir = new WeakMap(), _FileSystemReportDataWriter_attachmentsDir = new WeakMap(), _FileSystemReportDataWriter_dataDirReady = new WeakMap(), _FileSystemReportDataWriter_widgetsDirReady = new WeakMap(), _FileSystemReportDataWriter_testCasesDirReady = new WeakMap(), _FileSystemReportDataWriter_attachmentsDirReady = new WeakMap();
 export class InMemoryReportDataWriter {
     constructor() {
         _InMemoryReportDataWriter_data.set(this, {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-allure2",
-  "version": "3.20.1",
+  "version": "3.22.0",
   "description": "The Allure 2-compatible HTML report",
   "keywords": [
     "allure",
@@ -25,23 +25,28 @@
   "scripts": {
     "build": "run clean && tsc --project ./tsconfig.json && node ../../scripts/pack-report-static.mjs ../web-allure2/dist/multi ./dist/static/report.tar",
     "clean": "rimraf ./dist",
-    "test": "rimraf ./out && vitest run",
-    "lint": "oxlint --import-plugin src test features stories",
-    "lint:fix": "oxlint --import-plugin --fix src test features stories"
+    "test": "rimraf out && vp test run",
+    "test:unit": "yarn test",
+    "lint": "vp lint --import-plugin src test features stories",
+    "lint:fix": "vp lint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.20.1",
-    "@allurereport/plugin-api": "3.20.1",
-    "handlebars": "^4.7.9"
+    "@allurereport/core-api": "3.22.0",
+    "@allurereport/plugin-api": "3.22.0",
+    "handlebars": "4.7.10"
   },
   "devDependencies": {
-    "@allurereport/web-allure2": "3.20.1",
+    "@allurereport/common-config": "3.22.0",
+    "@allurereport/web-allure2": "3.22.0",
     "@types/node": "^20",
+    "@vitest/coverage-istanbul": "5.0.4",
     "@vitest/runner": "^2",
     "allure-js-commons": "^3",
     "allure-vitest": "^3",
     "rimraf": "^6",
     "typescript": "^5",
-    "vitest": "^4.1.0"
+    "vite": "@voidzero-dev/vite-plus-core@1.2.0",
+    "vite-plus": "1.2.0",
+    "vitest": "5.0.4"
   }
 }