@allurereport/core 3.17.0 → 3.19.0

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_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_createHistoryDataPoint, _AllureReport_ingestSelfPerfMetrics, _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_testResultsRegistryPath, _AllureReport_summariesByPluginId, _AllureReport_publishedRemoteHrefs, _AllureReport_artifactFilesByPath, _AllureReport_published, _AllureReport_endGeneratePerfSpan, _AllureReport_resolveHistoryReportUrl, _AllureReport_createHistoryDataPoint, _AllureReport_ingestSelfPerfMetrics, _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;
 import console from "node:console";
 import { randomUUID } from "node:crypto";
 import { once } from "node:events";
@@ -20,7 +20,7 @@ import { basename, dirname, join, resolve } from "node:path";
 import { promisify } from "node:util";
 import { detect } from "@allurereport/ci";
 import { createProgressLogger } from "@allurereport/cli-commons";
-import { normalizeCategoriesConfig } from "@allurereport/core-api";
+import { normalizeCategoriesConfig, parseIntegerConfigValue } from "@allurereport/core-api";
 import { AllureStoreDumpFiles, createTestResultRegistry, } from "@allurereport/plugin-api";
 import { allure1, allure2, attachments, cucumberjson, junitXml, readXcResultBundle } from "@allurereport/reader";
 import { PathResultFile } from "@allurereport/reader-api";
@@ -30,7 +30,7 @@ import { glob } from "glob";
 import ZipReadStream from "node-stream-zip";
 import pLimit from "p-limit";
 import ZipWriteStream from "zip-stream";
-import { AllureLocalHistory, createHistory } from "./history.js";
+import { AllureLocalHistory, createHistory, normalizeHistoryBaseUrl, setHistoryDataPointUrl } from "./history.js";
 import { DefaultPluginState, PluginFiles } from "./plugin.js";
 import { QualityGate } from "./qualityGate/index.js";
 import { writeKnownIssues } from "./resolutions.js";
@@ -45,6 +45,7 @@ const { version } = JSON.parse(readFileSync(new URL("../package.json", import.me
 const INIT_REQUIRED_ERROR_MESSAGE = "report is not initialised. Call the start() method first.";
 const DEFAULT_READ_CONCURRENCY = 64;
 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 ROOT_INTEGRATION_FILENAMES = new Set([
@@ -66,6 +67,23 @@ const remoteReportParams = (ci) => {
     return repo && branch ? { repo, branch } : {};
 };
 const errorDetails = (err) => (err instanceof Error ? (err.stack ?? err.message) : String(err));
+const getExecutorReportUrl = (executor) => {
+    if (!executor || typeof executor !== "object" || !("reportUrl" in executor)) {
+        return undefined;
+    }
+    const { reportUrl } = executor;
+    if (typeof reportUrl !== "string") {
+        return undefined;
+    }
+    try {
+        const navUrl = new URL(reportUrl);
+        navUrl.pathname = navUrl.pathname.endsWith("/") ? navUrl.pathname : `${navUrl.pathname}/`;
+        return navUrl.toString();
+    }
+    catch {
+        return undefined;
+    }
+};
 const closeReadStream = async (stream) => {
     if (stream.closed) {
         return;
@@ -90,6 +108,7 @@ export class AllureReport {
         _AllureReport_hideLabels.set(this, void 0);
         _AllureReport_output.set(this, void 0);
         _AllureReport_history.set(this, void 0);
+        _AllureReport_historyBaseUrl.set(this, void 0);
         _AllureReport_appendHistory.set(this, void 0);
         _AllureReport_allureServiceClient.set(this, void 0);
         _AllureReport_qualityGate.set(this, void 0);
@@ -110,10 +129,22 @@ export class AllureReport {
         _AllureReport_artifactFilesByPath.set(this, new Map());
         _AllureReport_published.set(this, false);
         _AllureReport_endGeneratePerfSpan.set(this, void 0);
+        _AllureReport_resolveHistoryReportUrl.set(this, async () => {
+            if (this.reportUrl) {
+                return this.reportUrl;
+            }
+            const executorReportUrl = getExecutorReportUrl(await __classPrivateFieldGet(this, _AllureReport_store, "f").metadataByKey("allure2_executor"));
+            if (executorReportUrl) {
+                this.reportUrl = executorReportUrl;
+                return executorReportUrl;
+            }
+            return "";
+        });
         _AllureReport_createHistoryDataPoint.set(this, async () => {
             const allTrs = await __classPrivateFieldGet(this, _AllureReport_store, "f").allTestResults();
             const allTcs = await __classPrivateFieldGet(this, _AllureReport_store, "f").allTestCases();
-            return createHistory(this.reportUuid, this.reportName, allTcs, allTrs, this.reportUrl, await __classPrivateFieldGet(this, _AllureReport_store, "f").allMetrics());
+            const historyReportUrl = await __classPrivateFieldGet(this, _AllureReport_resolveHistoryReportUrl, "f").call(this);
+            return createHistory(this.reportUuid, this.reportName, allTcs, allTrs, historyReportUrl, await __classPrivateFieldGet(this, _AllureReport_store, "f").allMetrics());
         });
         _AllureReport_ingestSelfPerfMetrics.set(this, async () => {
             if (!isPerfMetricsEnabled()) {
@@ -268,6 +299,7 @@ export class AllureReport {
             }
             const resultsDirPath = resolve(resultsDir);
             if (await readXcResultBundle(__classPrivateFieldGet(this, _AllureReport_store, "f"), resultsDirPath)) {
+                __classPrivateFieldGet(this, _AllureReport_store, "f").updateHistoryFlags();
                 return;
             }
             try {
@@ -288,12 +320,14 @@ export class AllureReport {
             catch (e) {
                 console.error("can't read directory", e);
             }
+            __classPrivateFieldGet(this, _AllureReport_store, "f").updateHistoryFlags();
         });
         this.readFile = async (resultsFile) => measurePerf(PERF_METRIC_NAMES.generateReadResults, async () => {
             if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") !== "running") {
                 throw new Error(INIT_REQUIRED_ERROR_MESSAGE);
             }
             await this.readResult(new PathResultFile(resultsFile));
+            __classPrivateFieldGet(this, _AllureReport_store, "f").updateHistoryFlags();
         });
         this.readResult = async (data) => {
             if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") !== "running") {
@@ -314,6 +348,9 @@ export class AllureReport {
         };
         this.validate = async (params) => {
             const { trs, state, environment } = params;
+            if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") !== "done") {
+                __classPrivateFieldGet(this, _AllureReport_store, "f").updateHistoryFlags(trs.filter(Boolean));
+            }
             const qualityGateEnvironment = environment === undefined
                 ? undefined
                 : (environmentIdentityById(__classPrivateFieldGet(this, _AllureReport_environments, "f"), environment)?.name ??
@@ -339,6 +376,7 @@ export class AllureReport {
             if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") === "done") {
                 throw new Error("the report is already stopped, the restart isn't supported at the moment");
             }
+            __classPrivateFieldGet(this, _AllureReport_store, "f").updateHistoryFlags();
             __classPrivateFieldSet(this, _AllureReport_executionStage, "running", "f");
             __classPrivateFieldSet(this, _AllureReport_endGeneratePerfSpan, startPerfSpan(PERF_METRIC_NAMES.generateTotal), "f");
             if (__classPrivateFieldGet(this, _AllureReport_globalAttachments, "f")?.length) {
@@ -368,6 +406,7 @@ export class AllureReport {
             if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") !== "running") {
                 return;
             }
+            __classPrivateFieldGet(this, _AllureReport_store, "f").updateHistoryFlags();
             await __classPrivateFieldGet(this, _AllureReport_eachPlugin, "f").call(this, false, async (plugin, context) => {
                 await plugin.update?.(context, __classPrivateFieldGet(this, _AllureReport_store, "f"));
             });
@@ -418,7 +457,7 @@ export class AllureReport {
             const addJsonDumpEntry = async (entryName, value) => {
                 await addRequiredDumpEntry(Buffer.from(JSON.stringify(value)), entryName);
             };
-            const dumpJsonEntries = ({ testResults, testCases, fixtures, attachments, environments, reportVariables, checkResults = {}, globalAttachmentIds = [], globalErrors = [], indexAttachmentByTestResult = {}, indexTestResultByHistoryId = {}, indexTestResultByTestCase = {}, indexTestResultByResolutionIssue = {}, indexAttachmentByFixture = {}, indexFixturesByTestResult = {}, resolutionIssues = {}, qualityGateResults = [], testResultIdsIngestOrder = [], metrics = [], }) => [
+            const dumpJsonEntries = ({ testResults, testCases, fixtures, attachments, environments, reportVariables, checkResults = {}, globalAttachmentIds = [], globalErrors = [], indexAttachmentByTestResult = {}, indexTestResultByRetryHash = {}, indexTestResultByTestCase = {}, indexTestResultByResolutionIssue = {}, indexAttachmentByFixture = {}, indexFixturesByTestResult = {}, resolutionIssues = {}, qualityGateResults = [], testResultIdsIngestOrder = [], metrics = [], }) => [
                 [AllureStoreDumpFiles.TestResults, testResults],
                 [AllureStoreDumpFiles.TestCases, testCases],
                 [AllureStoreDumpFiles.Fixtures, fixtures],
@@ -430,7 +469,7 @@ export class AllureReport {
                 [AllureStoreDumpFiles.GlobalAttachments, globalAttachmentIds],
                 [AllureStoreDumpFiles.GlobalErrors, globalErrors],
                 [AllureStoreDumpFiles.IndexAttachmentsByTestResults, indexAttachmentByTestResult],
-                [AllureStoreDumpFiles.IndexTestResultsByHistoryId, indexTestResultByHistoryId],
+                [AllureStoreDumpFiles.IndexTestResultsByRetryHash, indexTestResultByRetryHash],
                 [AllureStoreDumpFiles.IndexTestResultsByTestCase, indexTestResultByTestCase],
                 [AllureStoreDumpFiles.IndexTestResultsByResolutionIssue, indexTestResultByResolutionIssue],
                 [AllureStoreDumpFiles.IndexAttachmentsByFixture, indexAttachmentByFixture],
@@ -506,6 +545,7 @@ export class AllureReport {
         this.restoreState = async (dumps) => {
             __classPrivateFieldGet(this, _AllureReport_store, "f").resetIngestOrder();
             await __classPrivateFieldGet(this, _AllureReport_restoreStateDumps, "f").call(this, dumps.map((path) => ({ artifactPath: path, path })));
+            __classPrivateFieldGet(this, _AllureReport_store, "f").updateHistoryFlags();
         };
         _AllureReport_recordArtifact.set(this, (filePath, name = basename(filePath)) => {
             const artifact = createReportArtifact(filePath, __classPrivateFieldGet(this, _AllureReport_getCwd, "f").call(this), name);
@@ -576,8 +616,6 @@ export class AllureReport {
                             const globalAttachmentsEntry = await requiredEntryData(AllureStoreDumpFiles.GlobalAttachments);
                             const globalErrorsEntry = await requiredEntryData(AllureStoreDumpFiles.GlobalErrors);
                             const indexAttachmentsEntry = await requiredEntryData(AllureStoreDumpFiles.IndexAttachmentsByTestResults);
-                            const indexTestResultsByHistoryId = await requiredEntryData(AllureStoreDumpFiles.IndexTestResultsByHistoryId);
-                            const indexTestResultsByTestCaseEntry = await requiredEntryData(AllureStoreDumpFiles.IndexTestResultsByTestCase);
                             const indexTestResultsByResolutionIssueEntry = await optionalEntryData(AllureStoreDumpFiles.IndexTestResultsByResolutionIssue);
                             const indexAttachmentsByFixtureEntry = await requiredEntryData(AllureStoreDumpFiles.IndexAttachmentsByFixture);
                             const indexFixturesByTestResultEntry = await requiredEntryData(AllureStoreDumpFiles.IndexFixturesByTestResult);
@@ -599,7 +637,7 @@ export class AllureReport {
                                     case AllureStoreDumpFiles.GlobalAttachments:
                                     case AllureStoreDumpFiles.GlobalErrors:
                                     case AllureStoreDumpFiles.IndexAttachmentsByTestResults:
-                                    case AllureStoreDumpFiles.IndexTestResultsByHistoryId:
+                                    case AllureStoreDumpFiles.IndexTestResultsByRetryHash:
                                     case AllureStoreDumpFiles.IndexTestResultsByTestCase:
                                     case AllureStoreDumpFiles.IndexTestResultsByResolutionIssue:
                                     case AllureStoreDumpFiles.IndexAttachmentsByFixture:
@@ -628,8 +666,8 @@ export class AllureReport {
                                 globalAttachmentIds: JSON.parse(globalAttachmentsEntry.toString("utf8")),
                                 globalErrors: JSON.parse(globalErrorsEntry.toString("utf8")),
                                 indexAttachmentByTestResult: JSON.parse(indexAttachmentsEntry.toString("utf8")),
-                                indexTestResultByHistoryId: JSON.parse(indexTestResultsByHistoryId.toString("utf8")),
-                                indexTestResultByTestCase: JSON.parse(indexTestResultsByTestCaseEntry.toString("utf8")),
+                                indexTestResultByRetryHash: {},
+                                indexTestResultByTestCase: {},
                                 indexTestResultByResolutionIssue: indexTestResultsByResolutionIssueEntry
                                     ? JSON.parse(indexTestResultsByResolutionIssueEntry.toString("utf8"))
                                     : {},
@@ -809,10 +847,12 @@ export class AllureReport {
                     console.error("realtime update failed during shutdown", e);
                 }
                 __classPrivateFieldSet(this, _AllureReport_executionStage, "done", "f");
+                __classPrivateFieldGet(this, _AllureReport_store, "f").updateHistoryFlags();
                 if (__classPrivateFieldGet(this, _AllureReport_dump, "f")) {
                     await this.dumpState();
                     return;
                 }
+                await __classPrivateFieldGet(this, _AllureReport_resolveHistoryReportUrl, "f").call(this);
                 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 () => {
@@ -853,7 +893,15 @@ export class AllureReport {
                 }
                 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());
-                if (outputDirectoryEntries.length === 1) {
+                const shouldFlattenOutput = outputDirectoryEntries.length === 1;
+                if (__classPrivateFieldGet(this, _AllureReport_historyBaseUrl, "f")) {
+                    const historyUrl = new URL(__classPrivateFieldGet(this, _AllureReport_historyBaseUrl, "f"));
+                    if (shouldFlattenOutput) {
+                        historyUrl.pathname = `${historyUrl.pathname}index.html`;
+                    }
+                    __classPrivateFieldSet(this, _AllureReport_historyDataPoint, setHistoryDataPointUrl(__classPrivateFieldGet(this, _AllureReport_historyDataPoint, "f"), historyUrl.toString()), "f");
+                }
+                if (shouldFlattenOutput) {
                     const reportPath = join(__classPrivateFieldGet(this, _AllureReport_output, "f"), outputDirectoryEntries[0].file);
                     const reportContent = await readdir(reportPath);
                     for (const entry of reportContent) {
@@ -965,12 +1013,13 @@ export class AllureReport {
                 }
             }
         });
-        const { name, readers = [allure1, allure2, cucumberjson, junitXml, attachments], plugins = [], resolutions, reportFiles, realTime, historyPath, historyLimit, appendHistory, defaultLabels = {}, variables = {}, environment, allowedEnvironments, environments, output, hideLabels, qualityGate, performance, dump, categories, allureService, globalAttachments, cwd, } = opts;
+        const { name, readers = [allure1, allure2, cucumberjson, junitXml, attachments], plugins = [], resolutions, reportFiles, realTime, historyPath, historyBaseUrl, historyLimit, flakyDetection, appendHistory, defaultLabels = {}, variables = {}, environment, allowedEnvironments, environments, output, hideLabels, qualityGate, performance, dump, categories, allureService, globalAttachments, cwd, } = opts;
         const allureServiceAccessToken = allureService?.accessToken;
         if (allureServiceAccessToken) {
             const allureServiceClientConfig = {
                 ...allureService,
                 accessToken: allureServiceAccessToken,
+                uploadConcurrency: parseIntegerConfigValue(allureService.uploadConcurrency, 1) ?? DEFAULT_UPLOAD_CONCURRENCY,
             };
             __classPrivateFieldSet(this, _AllureReport_allureServiceClient, allureServiceAccessToken.startsWith("ato1.")
                 ? new AllureTestOpsClient(allureServiceClientConfig)
@@ -983,7 +1032,11 @@ export class AllureReport {
         __classPrivateFieldSet(this, _AllureReport_ci, detect(), "f");
         const reportTitleSuffix = __classPrivateFieldGet(this, _AllureReport_ci, "f")?.pullRequestName ?? __classPrivateFieldGet(this, _AllureReport_ci, "f")?.jobRunName;
         this.reportName = [name, reportTitleSuffix].filter(Boolean).join(" – ");
-        __classPrivateFieldSet(this, _AllureReport_realtimeChannel, new RealtimeChannel(), "f");
+        __classPrivateFieldSet(this, _AllureReport_realtimeChannel, new RealtimeChannel(() => {
+            if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") === "running") {
+                __classPrivateFieldGet(this, _AllureReport_store, "f").updateHistoryFlags();
+            }
+        }), "f");
         __classPrivateFieldSet(this, _AllureReport_realtimeUpdateScheduler, new RealtimeUpdateScheduler(__classPrivateFieldGet(this, _AllureReport_runRealtimeUpdate, "f")), "f");
         __classPrivateFieldSet(this, _AllureReport_realTime, realTime, "f");
         __classPrivateFieldSet(this, _AllureReport_dump, dump, "f");
@@ -996,6 +1049,7 @@ export class AllureReport {
             __classPrivateFieldSet(this, _AllureReport_qualityGate, new QualityGate(qualityGate), "f");
         }
         __classPrivateFieldSet(this, _AllureReport_categories, normalizeCategoriesConfig(categories), "f");
+        __classPrivateFieldSet(this, _AllureReport_historyBaseUrl, !__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f") && historyPath && historyBaseUrl ? normalizeHistoryBaseUrl(historyBaseUrl) : undefined, "f");
         if (__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f")) {
             __classPrivateFieldSet(this, _AllureReport_history, new AllureRemoteHistory({
                 limit: historyLimit,
@@ -1015,6 +1069,7 @@ export class AllureReport {
             reportVariables: variables,
             environmentsConfig: environments,
             history: __classPrivateFieldGet(this, _AllureReport_history, "f"),
+            flakyDetection,
             resolutionsConfig: resolutions,
             defaultLabels,
             environment,
@@ -1039,6 +1094,6 @@ export class AllureReport {
         return __classPrivateFieldGet(this, _AllureReport_realtimeChannel, "f").dispatcher;
     }
 }
-_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_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_createHistoryDataPoint = new WeakMap(), _AllureReport_ingestSelfPerfMetrics = 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_testResultsRegistryPath = new WeakMap(), _AllureReport_summariesByPluginId = new WeakMap(), _AllureReport_publishedRemoteHrefs = new WeakMap(), _AllureReport_artifactFilesByPath = new WeakMap(), _AllureReport_published = new WeakMap(), _AllureReport_endGeneratePerfSpan = new WeakMap(), _AllureReport_resolveHistoryReportUrl = new WeakMap(), _AllureReport_createHistoryDataPoint = new WeakMap(), _AllureReport_ingestSelfPerfMetrics = 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) {
     return init ? new DefaultPluginState({}) : __classPrivateFieldGet(this, _AllureReport_state, "f")?.[id];
 };

package/dist/resolutions.d.ts

@@ -2,6 +2,14 @@ import type { ResolutionRule, ResolutionsConfig, TestResult } from "@allurerepor
 import type { AllureStore } from "@allurereport/plugin-api";
 export declare const DEFAULT_KNOWN_ISSUES_PATH = "known-issues.json";
 export declare const validateResolutionsConfig: (config?: ResolutionsConfig) => void;
+export declare const MUTED_FROM_RESULT_RESOLUTION: {
+    readonly resolution: "muted";
+    readonly comment: "Muted from result";
+};
+export declare const KNOWN_FROM_RESULT_RESOLUTION: {
+    readonly resolution: "accepted";
+    readonly comment: "Accepted from result (known)";
+};
 export declare const getResolutionByRules: (testResult: TestResult, config?: ResolutionsConfig) => ResolutionRule | undefined;
 export declare const isIgnoredFailure: (testResult: TestResult) => boolean;
 export declare const resolveExactIssuesFilePath: (pathOrDir: string | undefined, label: string) => Promise<string | undefined>;

package/dist/resolutions.js

@@ -121,11 +121,32 @@ const matches = (rule, testResult) => {
         (!rule.retryHash || (!!testResult.retryHash && rule.retryHash.includes(testResult.retryHash))) &&
         (!rule.environment || (!!testResult.environment && rule.environment.includes(testResult.environment))));
 };
+export const MUTED_FROM_RESULT_RESOLUTION = {
+    resolution: "muted",
+    comment: "Muted from result",
+};
+export const KNOWN_FROM_RESULT_RESOLUTION = {
+    resolution: "accepted",
+    comment: "Accepted from result (known)",
+};
 export const getResolutionByRules = (testResult, config) => {
-    if ((testResult.status !== "failed" && testResult.status !== "broken") || !config?.rules.length) {
+    if (testResult.status !== "failed" && testResult.status !== "broken") {
+        return undefined;
+    }
+    const issueRule = config?.rules.find((candidate) => candidate.resolution === "issue" && matches(candidate, testResult));
+    if (issueRule) {
+        return issueRule;
+    }
+    if (testResult.muted) {
+        return MUTED_FROM_RESULT_RESOLUTION;
+    }
+    if (testResult.known) {
+        return KNOWN_FROM_RESULT_RESOLUTION;
+    }
+    if (!config?.rules.length) {
         return undefined;
     }
-    for (const resolution of ["issue", "muted", "accepted"]) {
+    for (const resolution of ["muted", "accepted"]) {
         const rule = config.rules.find((candidate) => candidate.resolution === resolution && matches(candidate, testResult));
         if (rule) {
             return rule;

package/dist/store/convert.d.ts

@@ -1,6 +1,5 @@
 import type { AttachmentLink, TestCase, TestFixtureResult, TestResult } from "@allurereport/core-api";
 import type { RawFixtureResult, RawTestResult, ReaderContext } from "@allurereport/reader-api";
-export declare const __unknown = "#___unknown_value___#";
 export type StateData = {
     testCases: Map<string, TestCase>;
     attachments: Map<string, AttachmentLink>;

package/dist/store/convert.js

@@ -1,9 +1,19 @@
 import { randomUUID } from "node:crypto";
-import { findByLabelName, notNull } from "@allurereport/core-api";
+import { UNKNOWN_PARAMETER_VALUE, calculateParametersHash, calculateRetryHash, calculateTestCaseHash, findByLabelName, notNull, } from "@allurereport/core-api";
 import { md5 } from "@allurereport/plugin-api";
 import { extension, lookupContentType } from "@allurereport/reader-api";
 const defaultStatus = "unknown";
-export const __unknown = "#___unknown_value___#";
+const convertRawError = (raw) => ({
+    message: raw.message,
+    trace: raw.trace,
+    ...(raw.actual && raw.expected ? { expected: raw.expected, actual: raw.actual } : {}),
+});
+const convertTestErrors = (raw) => {
+    const errors = raw.errors?.filter(notNull);
+    if (errors?.length) {
+        return errors.map(convertRawError);
+    }
+};
 export const testFixtureResultRawToState = (stateData, raw, context) => {
     const name = raw.name || "Unknown test";
     return {
@@ -26,24 +36,32 @@ export const testFixtureResultRawToState = (stateData, raw, context) => {
     };
 };
 export const testResultRawToState = (stateData, raw, context) => {
+    const legacyTestCaseHash = calculateLegacyTestCaseHash(raw);
+    const allureId = raw.labels
+        ?.find((label) => (label?.name === "ALLURE_ID" || label?.name === "AS_ID") && label.value?.trim())
+        ?.value?.trim();
     const labels = convertLabels(raw.labels);
     const hostId = findByLabelName(labels, "host");
     const threadId = findByLabelName(labels, "thread");
     const name = raw.name || "Unknown test";
-    const testCase = processTestCase(stateData, raw);
     const parameters = convertParameters(raw.parameters);
+    const error = convertRawError(raw);
+    const errors = convertTestErrors(raw);
+    const testCaseHash = calculateTestCaseHash(raw.testId, raw.fullName);
+    const parametersHash = calculateParametersHash(parameters);
+    const testCase = processTestCase({ stateData, raw, allureId, testCaseHash });
     return {
         id: md5(raw.uuid || randomUUID()),
         name,
         testCase,
         fullName: raw.fullName,
-        historyId: calculateHistoryId(testCase, parameters),
+        testCaseHash,
+        parametersHash,
+        environmentHash: null,
+        retryHash: calculateRetryHash({ testCaseHash, parametersHash }),
         status: raw.status ?? defaultStatus,
-        error: {
-            message: raw.message,
-            trace: raw.trace,
-            ...(raw.actual && raw.expected ? { expected: raw.expected, actual: raw.actual } : {}),
-        },
+        error: errors?.[0] ?? error,
+        errors,
         ...processTimings(raw),
         description: raw.description,
         descriptionHtml: raw.descriptionHtml,
@@ -53,6 +71,7 @@ export const testResultRawToState = (stateData, raw, context) => {
         expectedResultHtml: raw.expectedResultHtml,
         flaky: raw.flaky ?? false,
         muted: raw.muted ?? false,
+        known: raw.known ?? false,
         isRetry: false,
         labels,
         steps: convertSteps(stateData, raw.steps).convertedSteps,
@@ -63,25 +82,43 @@ export const testResultRawToState = (stateData, raw, context) => {
         sourceMetadata: {
             readerId: context.readerId,
             metadata: context.metadata ?? {},
+            legacyHistoryId: raw.historyId?.length ? raw.historyId : undefined,
+            reportedFlaky: raw.flaky ?? false,
+            legacyTestCaseHash,
         },
         titlePath: raw.titlePath ?? [],
     };
 };
-const processTestCase = ({ testCases }, raw) => {
-    const [id, allureId] = calculateTestId(raw);
-    if (id) {
-        const maybeTestCase = testCases.get(id);
+const calculateLegacyTestCaseHash = (raw) => {
+    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;
+};
+const processTestCase = ({ stateData: { testCases }, raw, allureId, testCaseHash, }) => {
+    if (testCaseHash) {
+        const maybeTestCase = testCases.get(testCaseHash);
         if (maybeTestCase) {
+            if (!maybeTestCase.allureId && allureId) {
+                maybeTestCase.allureId = allureId;
+            }
             return maybeTestCase;
         }
         const testCase = {
-            id,
+            id: testCaseHash,
             allureId,
             externalId: raw.testId,
-            name: raw.testCaseName ?? raw.name ?? __unknown,
+            name: raw.testCaseName ?? raw.name ?? UNKNOWN_PARAMETER_VALUE,
             fullName: raw.fullName,
         };
-        testCases.set(id, testCase);
+        testCases.set(testCaseHash, testCase);
         return testCase;
     }
     return undefined;
@@ -99,7 +136,7 @@ const processAttachmentLink = ({ attachments, visitAttachmentLink }, attach) =>
             originalFileName: undefined,
             contentType: attach.contentType,
             ext: "",
-            name: attach.name ?? __unknown,
+            name: attach.name ?? UNKNOWN_PARAMETER_VALUE,
             missed: true,
             used: true,
         });
@@ -127,7 +164,7 @@ const processAttachmentLink = ({ attachments, visitAttachmentLink }, attach) =>
             id: randomUUID(),
             originalFileName: undefined,
             ext: "",
-            name: attach.name ?? attach.originalFileName ?? __unknown,
+            name: attach.name ?? attach.originalFileName ?? UNKNOWN_PARAMETER_VALUE,
             contentType: attach.contentType,
             missed: true,
             used: true,
@@ -164,11 +201,11 @@ const processTimings = ({ start, stop, duration, }) => {
     return { start: undefined, stop: undefined, duration };
 };
 const convertLabels = (labels) => {
-    return labels?.filter(notNull)?.map(convertLabel)?.flatMap(processTagLabels) ?? [];
+    return labels?.filter(notNull)?.map(convertLabel)?.flatMap(processTagLabels).map(normalizeAllureIdLabel) ?? [];
 };
 const convertLabel = (label) => {
     return {
-        name: label.name ?? __unknown,
+        name: label.name ?? UNKNOWN_PARAMETER_VALUE,
         value: label.value,
     };
 };
@@ -195,7 +232,7 @@ const convertStep = (stateData, step) => {
         return {
             convertedStep: {
                 stepId: md5(`${step.name}${step.start}`),
-                name: step.name ?? __unknown,
+                name: step.name ?? UNKNOWN_PARAMETER_VALUE,
                 status: step.status ?? defaultStatus,
                 steps: subSteps,
                 parameters: convertParameters(step.parameters),
@@ -216,11 +253,11 @@ const convertStep = (stateData, step) => {
 };
 const convertParameters = (parameters) => parameters
     ?.filter(notNull)
-    ?.filter((p) => p.name)
+    ?.filter((p) => typeof p.name === "string" && p.name.length > 0)
     ?.map(convertParameter) ?? [];
 const convertParameter = (param) => ({
-    name: param.name ?? __unknown,
-    value: param.value ?? __unknown,
+    name: param.name ?? UNKNOWN_PARAMETER_VALUE,
+    value: param.value ?? UNKNOWN_PARAMETER_VALUE,
     hidden: param.hidden ?? false,
     excluded: param.excluded ?? false,
     masked: param.masked ?? false,
@@ -231,42 +268,9 @@ const convertLinks = (links) => links
     ?.map(convertLink) ?? [];
 const convertLink = (link) => ({
     name: link.name,
-    url: link.url ?? __unknown,
+    url: link.url ?? UNKNOWN_PARAMETER_VALUE,
     type: link.type,
 });
-const calculateTestId = (raw) => {
-    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}`), maybeAllureId];
-    }
-    if (raw.testId) {
-        return [md5(raw.testId), undefined];
-    }
-    if (raw.fullName) {
-        return [md5(raw.fullName), undefined];
-    }
-    return [undefined, undefined];
-};
-const calculateHistoryId = (testCase, parameters) => {
-    if (!testCase) {
-        return undefined;
-    }
-    const paramsPart = stringifyParams(parameters);
-    return `${testCase.id}.${md5(paramsPart)}`;
-};
-const parametersCompare = (a, b) => {
-    return (a.name ?? "").localeCompare(b.name) || a.value.localeCompare(b.value ?? "");
-};
-const stringifyParams = (parameters) => {
-    if (!parameters) {
-        return "";
-    }
-    return parameters
-        .filter((p) => !p?.excluded)
-        .sort(parametersCompare)
-        .map((p) => `${p.name}:${p.value}`)
-        .join(",");
-};
 const idLabelMatcher = new RegExp("^@?allure\\.id[:=](?<id>.+)$");
 const tagLabelMatcher = new RegExp("^@?allure\\.label\\.(?<name>.+)[:=](?<value>.+)$");
 const processTagLabels = (label) => {
@@ -285,3 +289,13 @@ const processTagLabels = (label) => {
     }
     return label.name ? [{ name: label.name, value: label.value }] : [];
 };
+const normalizeAllureIdLabel = (label) => {
+    if (label.name !== "ALLURE_ID" && label.name !== "AS_ID") {
+        return label;
+    }
+    const value = label.value?.trim();
+    return {
+        name: "ALLURE_ID",
+        value: value?.length ? value : undefined,
+    };
+};

package/dist/store/retrySubstore.d.ts

@@ -1,6 +1,4 @@
-import type { TestParameter, TestResult } from "@allurereport/core-api";
-export declare const calculateParametersHash: (parameters?: TestParameter[]) => string;
-export declare const calculateRetryHash: (testCaseId: string | undefined, parametersHash: string, environmentId: string | undefined) => string | undefined;
+import type { TestResult } from "@allurereport/core-api";
 export declare class RetrySubstore {
     #private;
     recordIngestOrder(testResultId: string): void;

package/dist/store/retrySubstore.js

@@ -4,21 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _RetrySubstore_instances, _RetrySubstore_testResultsByRetryHash, _RetrySubstore_testResultIngestIndexById, _RetrySubstore_getIngestIndex, _RetrySubstore_compareResults;
-import { md5 } from "../utils/crypto.js";
 const NO_RETRIES = [];
-const compareByNameThenValue = (first, second) => first.name.localeCompare(second.name) || first.value.localeCompare(second.value);
-const stringifyRetryParameters = (parameters = []) => parameters
-    .filter((parameter) => !parameter.excluded)
-    .sort(compareByNameThenValue)
-    .map((parameter) => `${parameter.name}:${parameter.value}`)
-    .join(",");
-export const calculateParametersHash = (parameters = []) => md5(stringifyRetryParameters(parameters));
-export const calculateRetryHash = (testCaseId, parametersHash, environmentId) => {
-    if (!testCaseId) {
-        return undefined;
-    }
-    return md5(`${testCaseId}:${parametersHash}:${environmentId ?? "default"}`);
-};
 export class RetrySubstore {
     constructor() {
         _RetrySubstore_instances.add(this);

package/dist/store/store.d.ts

@@ -1,4 +1,4 @@
-import { type AllureCheckResult, type AllureHistory, type AllurePerformanceResult, type AttachmentLink, type DefaultLabelsConfig, type EnvironmentIdentity, type EnvironmentsConfig, type GlobalAttachmentLink, type HistoryDataPoint, type HistoryTestResult, type ResolutionIssue, type ResolutionsConfig, type MetricSample, type PerformanceConfig, type ReportVariables, type Statistic, type TestCase, type TestEnvGroup, type TestError, type TestFixtureResult, type TestResult } from "@allurereport/core-api";
+import { type AllureCheckResult, type AllureHistory, type AllurePerformanceResult, type AttachmentLink, type DefaultLabelsConfig, type EnvironmentIdentity, type EnvironmentsConfig, type FlakyDetectionConfig, type GlobalAttachmentLink, type HistoryDataPoint, type HistoryTestResult, type ResolutionIssue, type ResolutionsConfig, type MetricSample, type PerformanceConfig, type ReportVariables, type Statistic, type TestCase, type TestEnvGroup, type TestError, type TestFixtureResult, type TestResult } from "@allurereport/core-api";
 import { type AllureStore, type AllureStoreDump, type ExitCode, type PluginGlobalError, type QualityGateValidationResult, type RealtimeEventsDispatcher, type RealtimeSubscriber, type ResultFile, type TestResultFilter } from "@allurereport/plugin-api";
 import type { RawFixtureResult, RawGlobals, RawMetadata, RawTestResult, ReaderContext, ResultsVisitor } from "@allurereport/reader-api";
 export declare const mapToObject: <K extends string | number | symbol, T = any>(map: Map<K, T>) => Record<K, T>;
@@ -7,12 +7,13 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
     #private;
     readonly indexTestResultByTestCase: Map<string, TestResult[]>;
     readonly indexTestResultByEnvironmentId: Map<string, TestResult[]>;
-    readonly indexTestResultByHistoryId: Map<string, TestResult[]>;
+    readonly indexTestResultByRetryHash: Map<string, TestResult[]>;
     readonly indexAttachmentByTestResult: Map<string, AttachmentLink[]>;
     readonly indexAttachmentByFixture: Map<string, AttachmentLink[]>;
     readonly indexFixturesByTestResult: Map<string, TestFixtureResult[]>;
     constructor(params?: {
         history?: AllureHistory;
+        flakyDetection?: FlakyDetectionConfig;
         resolutionsConfig?: ResolutionsConfig;
         realtimeDispatcher?: RealtimeEventsDispatcher;
         realtimeSubscriber?: RealtimeSubscriber;
@@ -24,6 +25,7 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
         performance?: PerformanceConfig;
     });
     readHistory(): Promise<HistoryDataPoint[]>;
+    updateHistoryFlags(testResults?: Iterable<TestResult>): void;
     appendHistory(history: HistoryDataPoint): Promise<void>;
     addCheckResult(result: AllureCheckResult): Promise<void>;
     allCheckResults(): Promise<AllureCheckResult[]>;