@allurereport/core 3.20.1 → 3.21.0

package/dist/config.d.ts

@@ -7,6 +7,7 @@ export interface ConfigOverride {
     output?: Config["output"];
     open?: Config["open"];
     port?: Config["port"];
+    host?: Config["host"];
     hideLabels?: Config["hideLabels"];
     historyPath?: Config["historyPath"];
     historyBaseUrl?: Config["historyBaseUrl"];

package/dist/config.js

@@ -87,6 +87,7 @@ export const validateConfig = (config) => {
         "output",
         "open",
         "port",
+        "host",
         "hideLabels",
         "historyPath",
         "historyBaseUrl",
@@ -208,6 +209,7 @@ export const resolveConfig = async (config, override = {}) => {
     const name = override.name ?? config.name ?? "Allure Report";
     const open = override.open ?? config.open ?? false;
     const port = override.port ?? config.port ?? undefined;
+    const host = override.host ?? config.host ?? undefined;
     const hideLabels = override.hideLabels ?? config.hideLabels;
     const historyPath = override.historyPath ?? config.historyPath;
     const historyBaseUrl = override.historyBaseUrl ?? config.historyBaseUrl;
@@ -252,6 +254,7 @@ export const resolveConfig = async (config, override = {}) => {
         output,
         open,
         port,
+        host,
         hideLabels,
         resolutions,
         environment,

package/dist/history.js

@@ -9,7 +9,7 @@ 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 _AllureLocalHistory_cachedHistory, _AllureLocalHistory_openFileToReadIfExists, _AllureLocalHistory_ensureFileOpenedToAppend, _AllureLocalHistory_findFirstEntryAddress, _AllureLocalHistory_throwUnexpectedReadError;
+var _AllureLocalHistory_cachedHistory, _AllureLocalHistory_closeStreams, _AllureLocalHistory_openFileToReadIfExists, _AllureLocalHistory_ensureFileOpenedToAppend, _AllureLocalHistory_findFirstEntryAddress, _AllureLocalHistory_throwUnexpectedReadError;
 import { once } from "node:events";
 import { mkdir, open } from "node:fs/promises";
 import path from "node:path";
@@ -20,13 +20,14 @@ import { isFileNotFoundError } from "./utils/misc.js";
 const createHistoryItems = (testResults, remoteUrl) => {
     return testResults
         .filter((tr) => tr.retryHash)
-        .map(({ id, name, fullName, environment, retryHash, status, error: { message, trace } = {}, start, stop, duration, labels, }) => {
+        .map(({ id, name, fullName, environment, retryHash, status, retries = [], error: { message, trace } = {}, start, stop, duration, labels, }) => {
         return {
             id,
             name,
             fullName,
             environment,
             status,
+            retries: retries.map((retry) => retry.status).reverse(),
             message,
             trace,
             start,
@@ -82,10 +83,35 @@ export const createHistory = (reportUuid, reportName = "Allure Report", testCase
         url: remoteUrl,
     };
 };
+const closeStream = async (stream) => {
+    if (stream.closed) {
+        return;
+    }
+    await new Promise((resolve) => {
+        stream.once("error", () => { });
+        stream.once("close", () => resolve());
+        stream.destroy();
+    });
+};
+const closeFileHandle = async (file) => {
+    try {
+        await file.close();
+    }
+    catch (err) {
+        if (err?.code !== "EBADF") {
+            throw err;
+        }
+    }
+};
 export class AllureLocalHistory {
     constructor(params) {
         this.params = params;
         _AllureLocalHistory_cachedHistory.set(this, []);
+        _AllureLocalHistory_closeStreams.set(this, async (streams) => {
+            for (const stream of streams) {
+                await closeStream(stream);
+            }
+        });
         _AllureLocalHistory_openFileToReadIfExists.set(this, async (filePath) => {
             try {
                 return await open(filePath, "r");
@@ -175,9 +201,11 @@ export class AllureLocalHistory {
         if (historyFile === undefined) {
             return [];
         }
+        const openedStreams = [];
         try {
             const start = await __classPrivateFieldGet(this, _AllureLocalHistory_findFirstEntryAddress, "f").call(this, historyFile, this.params.limit);
             const stream = historyFile.createReadStream({ start, encoding: "utf-8", autoClose: false });
+            openedStreams.push(stream);
             const historyPoints = [];
             const readlineInterface = readline
                 .createInterface({ input: stream, terminal: false, crlfDelay: Infinity })
@@ -192,7 +220,8 @@ export class AllureLocalHistory {
             return __classPrivateFieldGet(this, _AllureLocalHistory_cachedHistory, "f");
         }
         finally {
-            await historyFile.close();
+            await __classPrivateFieldGet(this, _AllureLocalHistory_closeStreams, "f").call(this, openedStreams);
+            await closeFileHandle(historyFile);
         }
     }
     async appendHistory(data) {
@@ -202,6 +231,7 @@ export class AllureLocalHistory {
         const { limit } = this.params;
         await mkdir(parentDir, { recursive: true });
         const { file: historyFile, exists: historyExists } = await __classPrivateFieldGet(this, _AllureLocalHistory_ensureFileOpenedToAppend, "f").call(this, fullPath);
+        const openedStreams = [];
         let dst;
         try {
             if (limit === 0) {
@@ -210,9 +240,11 @@ export class AllureLocalHistory {
                 return;
             }
             dst = historyFile.createWriteStream({ encoding: "utf-8", start: 0, autoClose: false });
+            openedStreams.push(dst);
             if (historyExists) {
                 const start = await __classPrivateFieldGet(this, _AllureLocalHistory_findFirstEntryAddress, "f").call(this, historyFile, limit ? limit - 1 : undefined);
                 const src = historyFile.createReadStream({ start, autoClose: false });
+                openedStreams.push(src);
                 await pipeline(src, dst, { end: false });
             }
             const sources = [JSON.stringify(normalizedData), Buffer.from([0x0a])];
@@ -222,11 +254,8 @@ export class AllureLocalHistory {
             }
         }
         finally {
-            const closing = historyFile.close();
-            if (historyFile.fd !== -1) {
-                dst?.destroy();
-            }
-            await closing;
+            await __classPrivateFieldGet(this, _AllureLocalHistory_closeStreams, "f").call(this, openedStreams);
+            await closeFileHandle(historyFile);
             if (limit !== 0) {
                 __classPrivateFieldGet(this, _AllureLocalHistory_cachedHistory, "f").push(normalizedData);
             }
@@ -236,4 +265,4 @@ export class AllureLocalHistory {
         }
     }
 }
-_AllureLocalHistory_cachedHistory = new WeakMap(), _AllureLocalHistory_openFileToReadIfExists = new WeakMap(), _AllureLocalHistory_ensureFileOpenedToAppend = new WeakMap(), _AllureLocalHistory_findFirstEntryAddress = new WeakMap(), _AllureLocalHistory_throwUnexpectedReadError = new WeakMap();
+_AllureLocalHistory_cachedHistory = new WeakMap(), _AllureLocalHistory_closeStreams = new WeakMap(), _AllureLocalHistory_openFileToReadIfExists = new WeakMap(), _AllureLocalHistory_ensureFileOpenedToAppend = new WeakMap(), _AllureLocalHistory_findFirstEntryAddress = new WeakMap(), _AllureLocalHistory_throwUnexpectedReadError = new WeakMap();

package/dist/report.js

@@ -9,7 +9,7 @@ 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 _AllureReport_instances, _AllureReport_ci, _AllureReport_store, _AllureReport_readers, _AllureReport_plugins, _AllureReport_reportFiles, _AllureReport_realtimeChannel, _AllureReport_realtimeUpdateScheduler, _AllureReport_realTime, _AllureReport_hideLabels, _AllureReport_output, _AllureReport_history, _AllureReport_historyBaseUrl, _AllureReport_appendHistory, _AllureReport_allureServiceClient, _AllureReport_qualityGate, _AllureReport_dump, _AllureReport_categories, _AllureReport_environments, _AllureReport_globalAttachments, _AllureReport_knownIssuesPath, _AllureReport_dumpTempDirs, _AllureReport_cwd, _AllureReport_state, _AllureReport_executionStage, _AllureReport_historyDataPoint, _AllureReport_summaryPath, _AllureReport_testResultsRegistryPath, _AllureReport_summariesByPluginId, _AllureReport_publishedRemoteHrefs, _AllureReport_artifactFilesByPath, _AllureReport_published, _AllureReport_endGeneratePerfSpan, _AllureReport_resolvedReportUrl, _AllureReport_reportUrl, _AllureReport_resolveReportUrl, _AllureReport_createHistoryDataPoint, _AllureReport_ingestSelfPerfMetrics, _AllureReport_prepareReportFiles, _AllureReport_publish, _AllureReport_getCwd, _AllureReport_runRealtimeUpdate, _AllureReport_recordArtifact, _AllureReport_restoreStateDumps, _AllureReport_getReportsToPublish, _AllureReport_cleanupFailedRemoteReport, _AllureReport_logPublishError, _AllureReport_applyPublishLinksToSummaries, _AllureReport_cloneSummariesByPluginId, _AllureReport_writeSummaryFiles, _AllureReport_writeTestResultRegistry, _AllureReport_getRootRemoteReportFiles, _AllureReport_writeQualityGateFiles, _AllureReport_finishArtifactsManifest, _AllureReport_generateRootSummary, _AllureReport_finishGeneratePerfSpan, _AllureReport_finishPerfMetrics, _AllureReport_eachPlugin, _AllureReport_getPluginState;
+var _AllureReport_instances, _AllureReport_ci, _AllureReport_store, _AllureReport_readers, _AllureReport_plugins, _AllureReport_reportFiles, _AllureReport_realtimeChannel, _AllureReport_realtimeUpdateScheduler, _AllureReport_realTime, _AllureReport_hideLabels, _AllureReport_output, _AllureReport_history, _AllureReport_historyBaseUrl, _AllureReport_appendHistory, _AllureReport_allureServiceClient, _AllureReport_qualityGate, _AllureReport_dump, _AllureReport_categories, _AllureReport_environments, _AllureReport_globalAttachments, _AllureReport_knownIssuesPath, _AllureReport_dumpTempDirs, _AllureReport_cwd, _AllureReport_state, _AllureReport_executionStage, _AllureReport_historyDataPoint, _AllureReport_summaryPath, _AllureReport_overviewHref, _AllureReport_testResultsRegistryPath, _AllureReport_summariesByPluginId, _AllureReport_publishedRemoteHrefs, _AllureReport_artifactFilesByPath, _AllureReport_published, _AllureReport_endGeneratePerfSpan, _AllureReport_resolvedReportUrl, _AllureReport_reportUrl, _AllureReport_resolveReportUrl, _AllureReport_createHistoryDataPoint, _AllureReport_ingestSelfPerfMetrics, _AllureReport_prepareReportFiles, _AllureReport_publish, _AllureReport_getCwd, _AllureReport_runRealtimeUpdate, _AllureReport_recordArtifact, _AllureReport_restoreStateDumps, _AllureReport_resolveOverviewHref, _AllureReport_getReportsToPublish, _AllureReport_cleanupFailedRemoteReport, _AllureReport_logPublishError, _AllureReport_applyPublishLinksToSummaries, _AllureReport_cloneSummariesByPluginId, _AllureReport_writeSummaryFiles, _AllureReport_writeTestResultRegistry, _AllureReport_getRootRemoteReportFiles, _AllureReport_writeQualityGateFiles, _AllureReport_finishArtifactsManifest, _AllureReport_generateRootSummary, _AllureReport_finishGeneratePerfSpan, _AllureReport_finishPerfMetrics, _AllureReport_eachPlugin, _AllureReport_getPluginState;
 import console from "node:console";
 import { randomUUID } from "node:crypto";
 import { once } from "node:events";
@@ -48,6 +48,7 @@ const MAX_READ_CONCURRENCY = 256;
 const DEFAULT_UPLOAD_CONCURRENCY = 10;
 const TEST_RESULTS_REGISTRY_FILENAME = "test-results.json";
 const QUALITY_GATE_RESULTS_FILENAME = "quality-gate.json";
+const AUXILIARY_OUTPUT_DIRECTORIES = new Set(["export"]);
 const ROOT_INTEGRATION_FILENAMES = new Set([
     TEST_RESULTS_REGISTRY_FILENAME,
     QUALITY_GATE_RESULTS_FILENAME,
@@ -66,11 +67,15 @@ const readConcurrency = () => {
     return Math.min(MAX_READ_CONCURRENCY, Math.max(1, parsed));
 };
 const clonePluginSummary = (summary) => structuredClone(summary);
-const remoteReportParams = (ci) => {
+const remoteBranchParams = (ci, branch) => {
     const repo = ci?.repoName;
-    const branch = ci?.jobRunBranch;
     return repo && branch ? { repo, branch } : {};
 };
+const remoteHistoryParams = (ci) => {
+    const historyBranch = ci?.targetBranch || ci?.jobRunBranch;
+    return remoteBranchParams(ci, historyBranch);
+};
+const remoteReportParams = (ci) => remoteBranchParams(ci, ci?.jobRunBranch);
 const errorDetails = (err) => (err instanceof Error ? (err.stack ?? err.message) : String(err));
 const getExecutorReportUrl = (executor) => {
     if (!executor || typeof executor !== "object" || !("reportUrl" in executor)) {
@@ -126,6 +131,7 @@ export class AllureReport {
         _AllureReport_executionStage.set(this, "init");
         _AllureReport_historyDataPoint.set(this, void 0);
         _AllureReport_summaryPath.set(this, void 0);
+        _AllureReport_overviewHref.set(this, void 0);
         _AllureReport_testResultsRegistryPath.set(this, void 0);
         _AllureReport_summariesByPluginId.set(this, new Map());
         _AllureReport_publishedRemoteHrefs.set(this, new Set());
@@ -149,7 +155,10 @@ export class AllureReport {
             __classPrivateFieldSet(this, _AllureReport_resolvedReportUrl, executorReportUrl, "f");
         });
         _AllureReport_createHistoryDataPoint.set(this, async (flattenReport) => {
-            const allTrs = await __classPrivateFieldGet(this, _AllureReport_store, "f").allTestResults();
+            const allTrs = await Promise.all((await __classPrivateFieldGet(this, _AllureReport_store, "f").allTestResults()).map(async (tr) => ({
+                ...tr,
+                retries: await __classPrivateFieldGet(this, _AllureReport_store, "f").retriesByTrId(tr.id),
+            })));
             const allTcs = await __classPrivateFieldGet(this, _AllureReport_store, "f").allTestCases();
             const historyUrl = __classPrivateFieldGet(this, _AllureReport_reportUrl, "f") ?? (!flattenReport && __classPrivateFieldGet(this, _AllureReport_historyBaseUrl, "f") ? __classPrivateFieldGet(this, _AllureReport_historyBaseUrl, "f") : __classPrivateFieldGet(this, _AllureReport_resolvedReportUrl, "f"));
             return createHistory(this.reportUuid, this.reportName, allTcs, allTrs, historyUrl ?? "", await __classPrivateFieldGet(this, _AllureReport_store, "f").allMetrics());
@@ -747,6 +756,19 @@ export class AllureReport {
             }
             return restoredCount;
         }));
+        _AllureReport_resolveOverviewHref.set(this, async () => {
+            if (__classPrivateFieldGet(this, _AllureReport_realTime, "f")) {
+                return undefined;
+            }
+            let summariesCount = 0;
+            await __classPrivateFieldGet(this, _AllureReport_eachPlugin, "f").call(this, false, async (plugin, context) => {
+                const summary = await plugin.info?.(context, __classPrivateFieldGet(this, _AllureReport_store, "f"));
+                if (summary) {
+                    summariesCount += 1;
+                }
+            });
+            return summariesCount > 1 ? "../index.html" : undefined;
+        });
         _AllureReport_getReportsToPublish.set(this, async () => {
             const reports = [];
             for (const { enabled, id, options } of __classPrivateFieldGet(this, _AllureReport_plugins, "f")) {
@@ -866,6 +888,7 @@ export class AllureReport {
                     return;
                 }
                 await __classPrivateFieldGet(this, _AllureReport_resolveReportUrl, "f").call(this);
+                __classPrivateFieldSet(this, _AllureReport_overviewHref, await __classPrivateFieldGet(this, _AllureReport_resolveOverviewHref, "f").call(this), "f");
                 await measurePerf(PERF_METRIC_NAMES.generatePluginsDone, async () => {
                     await __classPrivateFieldGet(this, _AllureReport_eachPlugin, "f").call(this, false, async (plugin, context) => {
                         await measurePerf(`${PERF_METRIC_PREFIXES.generatePluginDone}${context.id}`, async () => {
@@ -899,7 +922,8 @@ export class AllureReport {
                 catch { }
                 const outputEntries = await Promise.all(outputDirFiles.map(async (file) => ({ file, stats: await lstat(join(__classPrivateFieldGet(this, _AllureReport_output, "f"), file)) })));
                 const outputDirectoryEntries = outputEntries.filter(({ stats }) => stats.isDirectory());
-                const shouldFlattenOutput = outputDirectoryEntries.length === 1;
+                const reportDirectoryEntries = outputDirectoryEntries.filter(({ file }) => !AUXILIARY_OUTPUT_DIRECTORIES.has(file));
+                const shouldFlattenOutput = reportDirectoryEntries.length === 1 && __classPrivateFieldGet(this, _AllureReport_plugins, "f").some(({ id }) => id === reportDirectoryEntries[0].file);
                 __classPrivateFieldSet(this, _AllureReport_historyDataPoint, await __classPrivateFieldGet(this, _AllureReport_createHistoryDataPoint, "f").call(this, shouldFlattenOutput), "f");
                 await __classPrivateFieldGet(this, _AllureReport_publish, "f").call(this);
                 if (__classPrivateFieldGet(this, _AllureReport_knownIssuesPath, "f")) {
@@ -909,7 +933,7 @@ export class AllureReport {
                     return;
                 }
                 if (shouldFlattenOutput) {
-                    const reportPath = join(__classPrivateFieldGet(this, _AllureReport_output, "f"), outputDirectoryEntries[0].file);
+                    const reportPath = join(__classPrivateFieldGet(this, _AllureReport_output, "f"), reportDirectoryEntries[0].file);
                     const reportContent = await readdir(reportPath);
                     for (const entry of reportContent) {
                         if (ROOT_INTEGRATION_FILENAMES.has(entry)) {
@@ -1015,6 +1039,7 @@ export class AllureReport {
                         }
                         : {}),
                     reportUrl: this.reportUrl,
+                    overviewHref: __classPrivateFieldGet(this, _AllureReport_overviewHref, "f"),
                     realTime: !!__classPrivateFieldGet(this, _AllureReport_realTime, "f"),
                     output: __classPrivateFieldGet(this, _AllureReport_output, "f"),
                     ci: __classPrivateFieldGet(this, _AllureReport_ci, "f"),
@@ -1075,7 +1100,7 @@ export class AllureReport {
         if (__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f")) {
             __classPrivateFieldSet(this, _AllureReport_history, new AllureRemoteHistory({
                 limit: historyLimit,
-                ...remoteReportParams(__classPrivateFieldGet(this, _AllureReport_ci, "f")),
+                ...remoteHistoryParams(__classPrivateFieldGet(this, _AllureReport_ci, "f")),
                 allureServiceClient: __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f"),
             }), "f");
         }
@@ -1122,6 +1147,6 @@ export class AllureReport {
         __classPrivateFieldSet(this, _AllureReport_reportUrl, url, "f");
     }
 }
-_AllureReport_ci = new WeakMap(), _AllureReport_store = new WeakMap(), _AllureReport_readers = new WeakMap(), _AllureReport_plugins = new WeakMap(), _AllureReport_reportFiles = new WeakMap(), _AllureReport_realtimeChannel = new WeakMap(), _AllureReport_realtimeUpdateScheduler = new WeakMap(), _AllureReport_realTime = new WeakMap(), _AllureReport_hideLabels = new WeakMap(), _AllureReport_output = new WeakMap(), _AllureReport_history = new WeakMap(), _AllureReport_historyBaseUrl = new WeakMap(), _AllureReport_appendHistory = new WeakMap(), _AllureReport_allureServiceClient = new WeakMap(), _AllureReport_qualityGate = new WeakMap(), _AllureReport_dump = new WeakMap(), _AllureReport_categories = new WeakMap(), _AllureReport_environments = new WeakMap(), _AllureReport_globalAttachments = new WeakMap(), _AllureReport_knownIssuesPath = new WeakMap(), _AllureReport_dumpTempDirs = new WeakMap(), _AllureReport_cwd = new WeakMap(), _AllureReport_state = new WeakMap(), _AllureReport_executionStage = new WeakMap(), _AllureReport_historyDataPoint = new WeakMap(), _AllureReport_summaryPath = new WeakMap(), _AllureReport_testResultsRegistryPath = new WeakMap(), _AllureReport_summariesByPluginId = new WeakMap(), _AllureReport_publishedRemoteHrefs = new WeakMap(), _AllureReport_artifactFilesByPath = new WeakMap(), _AllureReport_published = new WeakMap(), _AllureReport_endGeneratePerfSpan = new WeakMap(), _AllureReport_resolvedReportUrl = new WeakMap(), _AllureReport_reportUrl = new WeakMap(), _AllureReport_resolveReportUrl = new WeakMap(), _AllureReport_createHistoryDataPoint = new WeakMap(), _AllureReport_ingestSelfPerfMetrics = new WeakMap(), _AllureReport_prepareReportFiles = new WeakMap(), _AllureReport_publish = new WeakMap(), _AllureReport_getCwd = new WeakMap(), _AllureReport_runRealtimeUpdate = new WeakMap(), _AllureReport_recordArtifact = new WeakMap(), _AllureReport_restoreStateDumps = new WeakMap(), _AllureReport_getReportsToPublish = new WeakMap(), _AllureReport_cleanupFailedRemoteReport = new WeakMap(), _AllureReport_logPublishError = new WeakMap(), _AllureReport_applyPublishLinksToSummaries = new WeakMap(), _AllureReport_cloneSummariesByPluginId = new WeakMap(), _AllureReport_writeSummaryFiles = new WeakMap(), _AllureReport_writeTestResultRegistry = new WeakMap(), _AllureReport_getRootRemoteReportFiles = new WeakMap(), _AllureReport_writeQualityGateFiles = new WeakMap(), _AllureReport_finishArtifactsManifest = new WeakMap(), _AllureReport_generateRootSummary = new WeakMap(), _AllureReport_finishGeneratePerfSpan = new WeakMap(), _AllureReport_finishPerfMetrics = new WeakMap(), _AllureReport_eachPlugin = new WeakMap(), _AllureReport_instances = new WeakSet(), _AllureReport_getPluginState = function _AllureReport_getPluginState(init, id) {
+_AllureReport_ci = new WeakMap(), _AllureReport_store = new WeakMap(), _AllureReport_readers = new WeakMap(), _AllureReport_plugins = new WeakMap(), _AllureReport_reportFiles = new WeakMap(), _AllureReport_realtimeChannel = new WeakMap(), _AllureReport_realtimeUpdateScheduler = new WeakMap(), _AllureReport_realTime = new WeakMap(), _AllureReport_hideLabels = new WeakMap(), _AllureReport_output = new WeakMap(), _AllureReport_history = new WeakMap(), _AllureReport_historyBaseUrl = new WeakMap(), _AllureReport_appendHistory = new WeakMap(), _AllureReport_allureServiceClient = new WeakMap(), _AllureReport_qualityGate = new WeakMap(), _AllureReport_dump = new WeakMap(), _AllureReport_categories = new WeakMap(), _AllureReport_environments = new WeakMap(), _AllureReport_globalAttachments = new WeakMap(), _AllureReport_knownIssuesPath = new WeakMap(), _AllureReport_dumpTempDirs = new WeakMap(), _AllureReport_cwd = new WeakMap(), _AllureReport_state = new WeakMap(), _AllureReport_executionStage = new WeakMap(), _AllureReport_historyDataPoint = new WeakMap(), _AllureReport_summaryPath = new WeakMap(), _AllureReport_overviewHref = new WeakMap(), _AllureReport_testResultsRegistryPath = new WeakMap(), _AllureReport_summariesByPluginId = new WeakMap(), _AllureReport_publishedRemoteHrefs = new WeakMap(), _AllureReport_artifactFilesByPath = new WeakMap(), _AllureReport_published = new WeakMap(), _AllureReport_endGeneratePerfSpan = new WeakMap(), _AllureReport_resolvedReportUrl = new WeakMap(), _AllureReport_reportUrl = new WeakMap(), _AllureReport_resolveReportUrl = new WeakMap(), _AllureReport_createHistoryDataPoint = new WeakMap(), _AllureReport_ingestSelfPerfMetrics = new WeakMap(), _AllureReport_prepareReportFiles = new WeakMap(), _AllureReport_publish = new WeakMap(), _AllureReport_getCwd = new WeakMap(), _AllureReport_runRealtimeUpdate = new WeakMap(), _AllureReport_recordArtifact = new WeakMap(), _AllureReport_restoreStateDumps = new WeakMap(), _AllureReport_resolveOverviewHref = new WeakMap(), _AllureReport_getReportsToPublish = new WeakMap(), _AllureReport_cleanupFailedRemoteReport = new WeakMap(), _AllureReport_logPublishError = new WeakMap(), _AllureReport_applyPublishLinksToSummaries = new WeakMap(), _AllureReport_cloneSummariesByPluginId = new WeakMap(), _AllureReport_writeSummaryFiles = new WeakMap(), _AllureReport_writeTestResultRegistry = new WeakMap(), _AllureReport_getRootRemoteReportFiles = new WeakMap(), _AllureReport_writeQualityGateFiles = new WeakMap(), _AllureReport_finishArtifactsManifest = new WeakMap(), _AllureReport_generateRootSummary = new WeakMap(), _AllureReport_finishGeneratePerfSpan = new WeakMap(), _AllureReport_finishPerfMetrics = new WeakMap(), _AllureReport_eachPlugin = new WeakMap(), _AllureReport_instances = new WeakSet(), _AllureReport_getPluginState = function _AllureReport_getPluginState(init, id) {
     return init ? new DefaultPluginState({}) : __classPrivateFieldGet(this, _AllureReport_state, "f")?.[id];
 };

package/dist/store/convert.js

@@ -36,7 +36,8 @@ export const testFixtureResultRawToState = (stateData, raw, context) => {
     };
 };
 export const testResultRawToState = (stateData, raw, context) => {
-    const legacyTestCaseHash = calculateLegacyTestCaseHash(raw);
+    const testCaseHash = calculateTestCaseHash(raw.testId, raw.fullName);
+    const legacyTestCaseHash = calculateLegacyTestCaseHash(raw, testCaseHash);
     const allureId = raw.labels
         ?.find((label) => (label?.name === "ALLURE_ID" || label?.name === "AS_ID") && label.value?.trim())
         ?.value?.trim();
@@ -45,9 +46,8 @@ export const testResultRawToState = (stateData, raw, context) => {
     const threadId = findByLabelName(labels, "thread");
     const name = raw.name || "Unknown test";
     const parameters = convertParameters(raw.parameters);
-    const error = convertRawError(raw);
     const errors = convertTestErrors(raw);
-    const testCaseHash = calculateTestCaseHash(raw.testId, raw.fullName);
+    const error = errors?.[0] ?? convertRawError(raw);
     const parametersHash = calculateParametersHash(parameters);
     const testCase = processTestCase({ stateData, raw, allureId, testCaseHash });
     return {
@@ -60,7 +60,7 @@ export const testResultRawToState = (stateData, raw, context) => {
         environmentHash: null,
         retryHash: calculateRetryHash({ testCaseHash, parametersHash }),
         status: raw.status ?? defaultStatus,
-        error: errors?.[0] ?? error,
+        error,
         errors,
         ...processTimings(raw),
         description: raw.description,
@@ -89,18 +89,12 @@ export const testResultRawToState = (stateData, raw, context) => {
         titlePath: raw.titlePath ?? [],
     };
 };
-const calculateLegacyTestCaseHash = (raw) => {
+const calculateLegacyTestCaseHash = (raw, testCaseHash) => {
     const maybeAllureId = raw.labels?.find((label) => (label?.name === "ALLURE_ID" || label?.name === "AS_ID") && label.value !== "-1")?.value;
     if (maybeAllureId) {
         return md5(`ALLURE_ID=${maybeAllureId}`);
     }
-    if (raw.testId) {
-        return md5(raw.testId);
-    }
-    if (raw.fullName) {
-        return md5(raw.fullName);
-    }
-    return undefined;
+    return testCaseHash ?? undefined;
 };
 const processTestCase = ({ stateData: { testCases }, raw, allureId, testCaseHash, }) => {
     if (testCaseHash) {
@@ -201,7 +195,16 @@ const processTimings = ({ start, stop, duration, }) => {
     return { start: undefined, stop: undefined, duration };
 };
 const convertLabels = (labels) => {
-    return labels?.filter(notNull)?.map(convertLabel)?.flatMap(processTagLabels).map(normalizeAllureIdLabel) ?? [];
+    const convertedLabels = [];
+    for (const label of labels ?? []) {
+        if (!notNull(label)) {
+            continue;
+        }
+        for (const expandedLabel of processTagLabels(convertLabel(label))) {
+            convertedLabels.push(normalizeAllureIdLabel(expandedLabel));
+        }
+    }
+    return convertedLabels;
 };
 const convertLabel = (label) => {
     return {
@@ -210,16 +213,19 @@ const convertLabel = (label) => {
     };
 };
 const convertSteps = (stateData, steps) => {
-    const convertedStepData = steps?.filter(notNull)?.map((step) => convertStep(stateData, step)) ?? [];
-    return {
-        convertedSteps: convertedStepData.map(({ convertedStep }) => convertedStep),
-        messages: new Set(convertedStepData.reduce((acc, { messages }) => {
-            if (messages) {
-                acc.push(...messages);
-            }
-            return acc;
-        }, [])),
-    };
+    const convertedSteps = [];
+    const messages = new Set();
+    for (const step of steps ?? []) {
+        if (!notNull(step)) {
+            continue;
+        }
+        const converted = convertStep(stateData, step);
+        convertedSteps.push(converted.convertedStep);
+        for (const message of converted.messages ?? []) {
+            messages.add(message);
+        }
+    }
+    return { convertedSteps, messages };
 };
 const convertStep = (stateData, step) => {
     if (step.type === "step") {
@@ -251,10 +257,15 @@ const convertStep = (stateData, step) => {
         },
     };
 };
-const convertParameters = (parameters) => parameters
-    ?.filter(notNull)
-    ?.filter((p) => typeof p.name === "string" && p.name.length > 0)
-    ?.map(convertParameter) ?? [];
+const convertParameters = (parameters) => {
+    const convertedParameters = [];
+    for (const parameter of parameters ?? []) {
+        if (notNull(parameter) && typeof parameter.name === "string" && parameter.name.length > 0) {
+            convertedParameters.push(convertParameter(parameter));
+        }
+    }
+    return convertedParameters;
+};
 const convertParameter = (param) => ({
     name: param.name ?? UNKNOWN_PARAMETER_VALUE,
     value: param.value ?? UNKNOWN_PARAMETER_VALUE,
@@ -262,10 +273,15 @@ const convertParameter = (param) => ({
     excluded: param.excluded ?? false,
     masked: param.masked ?? false,
 });
-const convertLinks = (links) => links
-    ?.filter(notNull)
-    ?.filter((l) => l.url)
-    ?.map(convertLink) ?? [];
+const convertLinks = (links) => {
+    const convertedLinks = [];
+    for (const link of links ?? []) {
+        if (notNull(link) && link.url) {
+            convertedLinks.push(convertLink(link));
+        }
+    }
+    return convertedLinks;
+};
 const convertLink = (link) => ({
     name: link.name,
     url: link.url ?? UNKNOWN_PARAMETER_VALUE,

package/dist/store/retrySubstore.js

@@ -41,7 +41,13 @@ export class RetrySubstore {
             __classPrivateFieldGet(this, _RetrySubstore_testResultsByRetryHash, "f").set(testResult.retryHash, [testResult]);
             return;
         }
-        results.push(testResult);
+        const existingIndex = results.findIndex((attempt) => attempt.id === testResult.id);
+        if (existingIndex !== -1) {
+            results.splice(existingIndex, 1, testResult);
+        }
+        else {
+            results.push(testResult);
+        }
         results.sort((first, second) => __classPrivateFieldGet(this, _RetrySubstore_instances, "m", _RetrySubstore_compareResults).call(this, first, second));
         results.forEach((attempt, index) => {
             attempt.isRetry = index !== 0;

package/dist/store/store.js

@@ -11,7 +11,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _DefaultAllureStore_instances, _DefaultAllureStore_testResults, _DefaultAllureStore_attachments, _DefaultAllureStore_attachmentContents, _DefaultAllureStore_testCases, _DefaultAllureStore_metadata, _DefaultAllureStore_history, _DefaultAllureStore_detectFlaky, _DefaultAllureStore_resolutionsConfig, _DefaultAllureStore_resolutionIssues, _DefaultAllureStore_testResultIdsByResolutionIssueId, _DefaultAllureStore_resolutionIssueIdByTestResultId, _DefaultAllureStore_fixtures, _DefaultAllureStore_defaultLabels, _DefaultAllureStore_environment, _DefaultAllureStore_environmentsConfig, _DefaultAllureStore_reportVariables, _DefaultAllureStore_realtimeDispatcher, _DefaultAllureStore_realtimeSubscriber, _DefaultAllureStore_allowedEnvironmentIds, _DefaultAllureStore_retrySubstore, _DefaultAllureStore_testResultIdsByEnvironmentId, _DefaultAllureStore_globalAttachmentIds, _DefaultAllureStore_globalAttachmentIdsByEnv, _DefaultAllureStore_globalErrors, _DefaultAllureStore_globalErrorsByEnv, _DefaultAllureStore_processGlobalAttachmentIds, _DefaultAllureStore_processGlobalAttachmentIdsByEnv, _DefaultAllureStore_processGlobalErrors, _DefaultAllureStore_processGlobalErrorsByEnv, _DefaultAllureStore_globalExitCode, _DefaultAllureStore_checkResultsById, _DefaultAllureStore_qualityGateResults, _DefaultAllureStore_metrics, _DefaultAllureStore_performance, _DefaultAllureStore_historyPoints, _DefaultAllureStore_historyLookup, _DefaultAllureStore_environments, _DefaultAllureStore_mergeEnvironmentIdentity, _DefaultAllureStore_environmentIdForLookup, _DefaultAllureStore_environmentIdByName, _DefaultAllureStore_addEnvironments, _DefaultAllureStore_setTestResultEnvironmentId, _DefaultAllureStore_assertAllowedEnvironmentId, _DefaultAllureStore_assertAllowedStoredEnvironment, _DefaultAllureStore_environmentIdByTestResult, _DefaultAllureStore_assignIdentityHashes, _DefaultAllureStore_classifyResolution, _DefaultAllureStore_associateResolutionIssue, _DefaultAllureStore_removeResolutionIssueAssociation, _DefaultAllureStore_rebuildRetrySubstore, _DefaultAllureStore_rebuildIdentityIndexes, _DefaultAllureStore_rebuildEnvironmentIndexes, _DefaultAllureStore_resolveGlobalEnvironmentIdentity, _DefaultAllureStore_globalAttachmentId, _DefaultAllureStore_processGlobalAttachmentId, _DefaultAllureStore_indexGlobalError, _DefaultAllureStore_addGlobalError, _DefaultAllureStore_indexGlobalAttachment, _DefaultAllureStore_addGlobalAttachment, _DefaultAllureStore_resetProcessGlobals, _DefaultAllureStore_getHistoryLookup, _DefaultAllureStore_historyFor, _DefaultAllureStore_applyHistoryFlags, _DefaultAllureStore_restoreAttachmentContent, _DefaultAllureStore_relinkRestoredAttachmentSteps, _DefaultAllureStore_retriesByTr, _DefaultAllureStore_historyByTr;
 import { extname } from "node:path";
-import { DEFAULT_ENVIRONMENT, DEFAULT_ENVIRONMENT_IDENTITY, calculateEnvironmentHash, calculateParametersHash, calculateRetryHash, calculateTestCaseHash, compareBy, createDictionary, fallbackTestCaseIdLabelName, getWorstStatus, createHistoryTestResultLookup, normalizeHistoryDataPoint, ordinal, reverse, resolveMetricSamples, validateEnvironmentId, validateEnvironmentName, } from "@allurereport/core-api";
+import { DEFAULT_ENVIRONMENT, DEFAULT_ENVIRONMENT_IDENTITY, calculateEnvironmentHash, calculateParametersHash, calculateRetryHash, calculateTestCaseHash, compareBy, createDictionary, fallbackTestCaseIdLabelName, getWorstStatus, createHistoryTestResultLookup, hasRetriesStatusChange, normalizeHistoryDataPoint, ordinal, reverse, resolveMetricSamples, validateEnvironmentId, validateEnvironmentName, } from "@allurereport/core-api";
 import { md5, } from "@allurereport/plugin-api";
 import { createResolutionIssue, getResolutionByRules, isIgnoredFailure } from "../resolutions.js";
 import { environmentIdentityById, normalizeEnvironmentDescriptorMap, resolveEnvironmentIdentity, resolveStoredEnvironmentIdentity, validateAllowedEnvironmentId, } from "../utils/environment.js";
@@ -22,10 +22,11 @@ import { testFixtureResultRawToState, testResultRawToState } from "./convert.js"
 import { RetrySubstore } from "./retrySubstore.js";
 const index = (indexMap, key, ...items) => {
     if (key) {
-        if (!indexMap.has(key)) {
-            indexMap.set(key, []);
+        let current = indexMap.get(key);
+        if (!current) {
+            current = [];
+            indexMap.set(key, current);
         }
-        const current = indexMap.get(key);
         current.push(...items);
     }
 };
@@ -776,6 +777,9 @@ export class DefaultAllureStore {
             if (retries.length > 0) {
                 statistic.retries = (statistic.retries ?? 0) + 1;
             }
+            if (hasRetriesStatusChange(tr, retries)) {
+                statistic.retriesStatusChange = (statistic.retriesStatusChange ?? 0) + 1;
+            }
             if (tr.flaky) {
                 statistic.flaky = (statistic.flaky ?? 0) + 1;
             }

package/dist/utils/crypto.d.ts

@@ -1,2 +1,2 @@
+export { md5 } from "@allurereport/plugin-api";
 export declare const shortHash: () => string;
-export declare const md5: (data: string) => string;

package/dist/utils/crypto.js

@@ -1,3 +1,3 @@
-import { randomBytes, createHash } from "node:crypto";
+import { randomBytes } from "node:crypto";
+export { md5 } from "@allurereport/plugin-api";
 export const shortHash = () => randomBytes(8).toString("hex");
-export const md5 = (data) => createHash("md5").update(data).digest("hex");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/core",
-  "version": "3.20.1",
+  "version": "3.21.0",
   "description": "Collection of generic Allure utilities used across the entire project",
   "keywords": [
     "allure"
@@ -21,32 +21,35 @@
     "build": "run clean && tsc --project ./tsconfig.json",
     "clean": "rimraf ./dist",
     "test": "vitest run",
+    "test:unit": "yarn test",
     "lint": "oxlint --import-plugin src test features stories",
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/ci": "3.20.1",
-    "@allurereport/cli-commons": "3.20.1",
-    "@allurereport/core-api": "3.20.1",
-    "@allurereport/plugin-agent": "3.20.1",
-    "@allurereport/plugin-allure2": "3.20.1",
-    "@allurereport/plugin-api": "3.20.1",
-    "@allurereport/plugin-awesome": "3.20.1",
-    "@allurereport/plugin-classic": "3.20.1",
-    "@allurereport/plugin-csv": "3.20.1",
-    "@allurereport/plugin-dashboard": "3.20.1",
-    "@allurereport/plugin-jira": "3.20.1",
-    "@allurereport/plugin-log": "3.20.1",
-    "@allurereport/plugin-progress": "3.20.1",
-    "@allurereport/plugin-slack": "3.20.1",
-    "@allurereport/plugin-testops": "3.20.1",
-    "@allurereport/plugin-testplan": "3.20.1",
-    "@allurereport/reader": "3.20.1",
-    "@allurereport/reader-api": "3.20.1",
-    "@allurereport/service": "3.20.1",
-    "@allurereport/summary": "3.20.1",
+    "@allurereport/ci": "3.21.0",
+    "@allurereport/cli-commons": "3.21.0",
+    "@allurereport/core-api": "3.21.0",
+    "@allurereport/plugin-agent": "3.21.0",
+    "@allurereport/plugin-allure2": "3.21.0",
+    "@allurereport/plugin-api": "3.21.0",
+    "@allurereport/plugin-awesome": "3.21.0",
+    "@allurereport/plugin-classic": "3.21.0",
+    "@allurereport/plugin-csv": "3.21.0",
+    "@allurereport/plugin-dashboard": "3.21.0",
+    "@allurereport/plugin-jira": "3.21.0",
+    "@allurereport/plugin-log": "3.21.0",
+    "@allurereport/plugin-metrics": "3.21.0",
+    "@allurereport/plugin-progress": "3.21.0",
+    "@allurereport/plugin-slack": "3.21.0",
+    "@allurereport/plugin-testops": "3.21.0",
+    "@allurereport/plugin-testplan": "3.21.0",
+    "@allurereport/plugin-xray": "3.21.0",
+    "@allurereport/reader": "3.21.0",
+    "@allurereport/reader-api": "3.21.0",
+    "@allurereport/service": "3.21.0",
+    "@allurereport/summary": "3.21.0",
     "glob": "^13.0.6",
-    "handlebars": "^4.7.9",
+    "handlebars": "4.7.10",
     "jiti": "^2.5.1",
     "node-stream-zip": "^1.15.0",
     "p-limit": "^7.3.0",
@@ -55,8 +58,10 @@
     "zip-stream": "^7.0.5"
   },
   "devDependencies": {
+    "@allurereport/test-config": "3.21.0",
     "@types/node": "^20",
     "@types/zip-stream": "^7.0.0",
+    "@vitest/coverage-istanbul": "^4.1.0",
     "@vitest/runner": "^2",
     "@vitest/snapshot": "^5.0.1",
     "allure-js-commons": "^3",