@allurereport/core 3.19.1 → 3.20.1

package/dist/history.d.ts

@@ -1,6 +1,5 @@
 import { type AllureHistory, type HistoryDataPoint, type MetricSample, type TestCase, type TestResult } from "@allurereport/core-api";
 export declare const normalizeHistoryBaseUrl: (historyBaseUrl: string) => string;
-export declare const setHistoryDataPointUrl: (point: HistoryDataPoint, url: string) => HistoryDataPoint;
 export declare const createHistory: (reportUuid: string, reportName: string | undefined, testCases: TestCase[], testResults: TestResult[], remoteUrl?: string, metrics?: MetricSample[]) => HistoryDataPoint;
 export declare class AllureLocalHistory implements AllureHistory {
     #private;

package/dist/history.js

@@ -70,11 +70,6 @@ export const normalizeHistoryBaseUrl = (historyBaseUrl) => {
     url.pathname = `${url.pathname.replace(/\/+$/u, "")}/`;
     return url.toString();
 };
-export const setHistoryDataPointUrl = (point, url) => ({
-    ...point,
-    url,
-    testResults: Object.fromEntries(Object.entries(point.testResults).map(([historyId, item]) => [historyId, { ...item, url }])),
-});
 export const createHistory = (reportUuid, reportName = "Allure Report", testCases, testResults, remoteUrl = "", metrics = []) => {
     const knownTestCaseIds = testCases.map((tc) => tc.id);
     return {

package/dist/report.d.ts

@@ -8,12 +8,13 @@ export declare class AllureReport {
     #private;
     readonly reportUuid: string;
     readonly reportName: string;
-    reportUrl?: string;
     constructor(opts: FullConfig);
     get hasQualityGate(): boolean;
     get store(): DefaultAllureStore;
     get realtimeSubscriber(): RealtimeSubscriber;
     get realtimeDispatcher(): RealtimeEventsDispatcher;
+    get reportUrl(): string | undefined;
+    set reportUrl(url: string | undefined);
     readDirectory: (resultsDir: string) => Promise<void>;
     readFile: (resultsFile: string) => Promise<void>;
     readResult: (data: ResultFile) => Promise<void>;

package/dist/report.js

@@ -9,12 +9,12 @@ 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_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;
+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;
 import console from "node:console";
 import { randomUUID } from "node:crypto";
 import { once } from "node:events";
 import { createReadStream, createWriteStream, existsSync, readFileSync } from "node:fs";
-import { lstat, mkdtemp, readdir, realpath, rename, rm, writeFile } from "node:fs/promises";
+import { lstat, mkdtemp, readdir, rename, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { basename, dirname, join, resolve } from "node:path";
 import { promisify } from "node:util";
@@ -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, normalizeHistoryBaseUrl, setHistoryDataPointUrl } from "./history.js";
+import { AllureLocalHistory, createHistory, normalizeHistoryBaseUrl } from "./history.js";
 import { DefaultPluginState, PluginFiles } from "./plugin.js";
 import { QualityGate } from "./qualityGate/index.js";
 import { writeKnownIssues } from "./resolutions.js";
@@ -81,9 +81,7 @@ const getExecutorReportUrl = (executor) => {
         return undefined;
     }
     try {
-        const navUrl = new URL(reportUrl);
-        navUrl.pathname = navUrl.pathname.endsWith("/") ? navUrl.pathname : `${navUrl.pathname}/`;
-        return navUrl.toString();
+        return new URL(reportUrl).toString();
     }
     catch {
         return undefined;
@@ -134,22 +132,27 @@ 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;
+        _AllureReport_resolvedReportUrl.set(this, void 0);
+        _AllureReport_reportUrl.set(this, void 0);
+        _AllureReport_resolveReportUrl.set(this, async () => {
+            if (__classPrivateFieldGet(this, _AllureReport_reportUrl, "f"))
+                return;
+            if (__classPrivateFieldGet(this, _AllureReport_historyBaseUrl, "f")) {
+                const historyUrl = new URL(__classPrivateFieldGet(this, _AllureReport_historyBaseUrl, "f"));
+                historyUrl.pathname = `${historyUrl.pathname}index.html`;
+                __classPrivateFieldSet(this, _AllureReport_resolvedReportUrl, historyUrl.toString(), "f");
+                return;
             }
             const executorReportUrl = getExecutorReportUrl(await __classPrivateFieldGet(this, _AllureReport_store, "f").metadataByKey("allure2_executor"));
-            if (executorReportUrl) {
-                this.reportUrl = executorReportUrl;
-                return executorReportUrl;
-            }
-            return "";
+            if (!executorReportUrl)
+                return;
+            __classPrivateFieldSet(this, _AllureReport_resolvedReportUrl, executorReportUrl, "f");
         });
-        _AllureReport_createHistoryDataPoint.set(this, async () => {
+        _AllureReport_createHistoryDataPoint.set(this, async (flattenReport) => {
             const allTrs = await __classPrivateFieldGet(this, _AllureReport_store, "f").allTestResults();
             const allTcs = await __classPrivateFieldGet(this, _AllureReport_store, "f").allTestCases();
-            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());
+            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());
         });
         _AllureReport_ingestSelfPerfMetrics.set(this, async () => {
             if (!isPerfMetricsEnabled()) {
@@ -165,6 +168,14 @@ export class AllureReport {
                 metadata: { originalFileName },
             });
         });
+        _AllureReport_prepareReportFiles.set(this, async () => {
+            await __classPrivateFieldGet(this, _AllureReport_writeTestResultRegistry, "f").call(this);
+            if (__classPrivateFieldGet(this, _AllureReport_qualityGate, "f")) {
+                await __classPrivateFieldGet(this, _AllureReport_writeQualityGateFiles, "f").call(this);
+            }
+            await __classPrivateFieldGet(this, _AllureReport_writeSummaryFiles, "f").call(this);
+            await __classPrivateFieldGet(this, _AllureReport_generateRootSummary, "f").call(this);
+        });
         _AllureReport_publish.set(this, async () => {
             if (__classPrivateFieldGet(this, _AllureReport_published, "f")) {
                 return;
@@ -172,17 +183,6 @@ export class AllureReport {
             if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") !== "done") {
                 throw new Error("report is not completed. Call the done() method first.");
             }
-            let historyPoint = __classPrivateFieldGet(this, _AllureReport_historyDataPoint, "f");
-            if (!historyPoint) {
-                historyPoint = await __classPrivateFieldGet(this, _AllureReport_createHistoryDataPoint, "f").call(this);
-                __classPrivateFieldSet(this, _AllureReport_historyDataPoint, historyPoint, "f");
-            }
-            await __classPrivateFieldGet(this, _AllureReport_writeTestResultRegistry, "f").call(this);
-            if (__classPrivateFieldGet(this, _AllureReport_qualityGate, "f")) {
-                await __classPrivateFieldGet(this, _AllureReport_writeQualityGateFiles, "f").call(this);
-            }
-            await __classPrivateFieldGet(this, _AllureReport_writeSummaryFiles, "f").call(this);
-            await __classPrivateFieldGet(this, _AllureReport_generateRootSummary, "f").call(this);
             if (__classPrivateFieldGet(this, _AllureReport_realTime, "f") || !__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f")) {
                 __classPrivateFieldSet(this, _AllureReport_published, true, "f");
                 return;
@@ -271,7 +271,7 @@ export class AllureReport {
                 publishErrorMessage = "Report completion has failed, the report won't be published";
                 await client.completeReport({
                     reportUuid: this.reportUuid,
-                    historyPoint,
+                    historyPoint: __classPrivateFieldGet(this, _AllureReport_historyDataPoint, "f"),
                 });
                 Object.values(linksByPluginId)
                     .filter(Boolean)
@@ -319,8 +319,7 @@ export class AllureReport {
                 });
                 await Promise.all(entries.map((dirent) => limit(async () => {
                     try {
-                        const path = await measurePerfAggregate(PERF_METRIC_NAMES.generateReadResultsRealpath, () => realpath(join(resultsDirPath, dirent.name)));
-                        await this.readResult(new PathResultFile(path, dirent.name));
+                        await this.readResult(new PathResultFile(join(resultsDirPath, dirent.name), dirent.name));
                     }
                     catch (e) {
                         console.error(`can't read result file ${dirent.name}`, e);
@@ -866,7 +865,7 @@ export class AllureReport {
                     await this.dumpState();
                     return;
                 }
-                await __classPrivateFieldGet(this, _AllureReport_resolveHistoryReportUrl, "f").call(this);
+                await __classPrivateFieldGet(this, _AllureReport_resolveReportUrl, "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 () => {
@@ -876,7 +875,6 @@ export class AllureReport {
                 });
                 __classPrivateFieldGet(this, _AllureReport_finishGeneratePerfSpan, "f").call(this);
                 await __classPrivateFieldGet(this, _AllureReport_ingestSelfPerfMetrics, "f").call(this);
-                __classPrivateFieldSet(this, _AllureReport_historyDataPoint, await __classPrivateFieldGet(this, _AllureReport_createHistoryDataPoint, "f").call(this), "f");
                 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) {
@@ -893,28 +891,23 @@ export class AllureReport {
                 __classPrivateFieldSet(this, _AllureReport_summariesByPluginId, new Map(summaries
                     .filter((summary) => !!summary.pluginId)
                     .map((summary) => [summary.pluginId, summary])), "f");
-                await __classPrivateFieldGet(this, _AllureReport_publish, "f").call(this);
+                await __classPrivateFieldGet(this, _AllureReport_prepareReportFiles, "f").call(this);
                 let outputDirFiles = [];
                 try {
                     outputDirFiles = await readdir(__classPrivateFieldGet(this, _AllureReport_output, "f"));
                 }
                 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;
+                __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")) {
                     await writeKnownIssues(__classPrivateFieldGet(this, _AllureReport_store, "f"), __classPrivateFieldGet(this, _AllureReport_knownIssuesPath, "f"));
                 }
                 if (outputDirFiles.length === 0) {
                     return;
                 }
-                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;
-                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);
@@ -1030,7 +1023,9 @@ export class AllureReport {
                 };
                 try {
                     await consumer.call(this, plugin, pluginContext);
-                    this.reportUrl = pluginContext.reportUrl ?? this.reportUrl;
+                    if (pluginContext.reportUrl !== null && pluginContext.reportUrl !== this.reportUrl) {
+                        this.reportUrl = pluginContext.reportUrl;
+                    }
                     if (initState) {
                         __classPrivateFieldGet(this, _AllureReport_state, "f")[id] = pluginState;
                     }
@@ -1120,7 +1115,13 @@ export class AllureReport {
     get realtimeDispatcher() {
         return __classPrivateFieldGet(this, _AllureReport_realtimeChannel, "f").dispatcher;
     }
+    get reportUrl() {
+        return __classPrivateFieldGet(this, _AllureReport_reportUrl, "f") ?? __classPrivateFieldGet(this, _AllureReport_resolvedReportUrl, "f");
+    }
+    set reportUrl(url) {
+        __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_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) {
+_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) {
     return init ? new DefaultPluginState({}) : __classPrivateFieldGet(this, _AllureReport_state, "f")?.[id];
 };

package/dist/resolutions.d.ts

@@ -1,4 +1,4 @@
-import type { ResolutionRule, ResolutionsConfig, TestResult } from "@allurereport/core-api";
+import type { IssueResolutionRule, ResolutionIssue, ResolutionRule, ResolutionsConfig, TestResult } from "@allurereport/core-api";
 import type { AllureStore } from "@allurereport/plugin-api";
 export declare const DEFAULT_KNOWN_ISSUES_PATH = "known-issues.json";
 export declare const validateResolutionsConfig: (config?: ResolutionsConfig) => void;
@@ -12,5 +12,6 @@ export declare const KNOWN_FROM_RESULT_RESOLUTION: {
 };
 export declare const getResolutionByRules: (testResult: TestResult, config?: ResolutionsConfig) => ResolutionRule | undefined;
 export declare const isIgnoredFailure: (testResult: TestResult) => boolean;
+export declare const createResolutionIssue: (rule: IssueResolutionRule, config?: ResolutionsConfig) => ResolutionIssue;
 export declare const resolveExactIssuesFilePath: (pathOrDir: string | undefined, label: string) => Promise<string | undefined>;
 export declare const writeKnownIssues: (store: AllureStore, knownIssuesPath?: string) => Promise<void>;

package/dist/resolutions.js

@@ -52,7 +52,7 @@ const validateIssueUrl = (rule, template, errors) => {
     }
     let url;
     try {
-        url = new URL(template.urlTemplate.replace("%s", encodeURIComponent(rule.issue.id)));
+        url = new URL(template.urlTemplate.replace("%s", () => encodeURIComponent(rule.issue.id)));
     }
     catch {
         errors.push(`resolutions.links.${rule.issue.type}.urlTemplate must resolve to an absolute URL`);
@@ -155,6 +155,21 @@ export const getResolutionByRules = (testResult, config) => {
     return undefined;
 };
 export const isIgnoredFailure = (testResult) => testResult.resolution === "muted" || testResult.resolution === "accepted";
+export const createResolutionIssue = (rule, config) => {
+    const template = config?.links?.[rule.issue.type];
+    const issue = { ...rule.issue, comment: rule.comment };
+    if (!template) {
+        return issue;
+    }
+    return {
+        ...issue,
+        link: {
+            name: template.nameTemplate?.replace("%s", () => rule.issue.id) ?? rule.issue.id,
+            url: template.urlTemplate.replace("%s", () => encodeURIComponent(rule.issue.id)),
+            type: rule.issue.type,
+        },
+    };
+};
 export const resolveExactIssuesFilePath = async (pathOrDir, label) => {
     if (!pathOrDir)
         return undefined;

package/dist/store/retrySubstore.js

@@ -48,15 +48,18 @@ export class RetrySubstore {
         });
     }
     retriesByTr(testResult) {
-        if (!testResult.retryHash || testResult.isRetry) {
+        if (!testResult.retryHash) {
             return NO_RETRIES;
         }
         const attempts = __classPrivateFieldGet(this, _RetrySubstore_testResultsByRetryHash, "f").get(testResult.retryHash) ?? [];
+        if (attempts.length <= 1) {
+            return NO_RETRIES;
+        }
         const index = attempts.findIndex((attempt) => attempt.id === testResult.id);
-        if (index !== 0) {
+        if (index === -1) {
             return NO_RETRIES;
         }
-        return attempts.slice(1);
+        return attempts.filter((attempt) => attempt.id !== testResult.id);
     }
     reset() {
         __classPrivateFieldGet(this, _RetrySubstore_testResultsByRetryHash, "f").clear();

package/dist/store/store.d.ts

@@ -82,6 +82,7 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
         attachmentsByTrId: Map<string, AttachmentLink[]>;
         fixturesByTrId: Map<string, TestFixtureResult[]>;
         historyByTrId: Map<string, HistoryTestResult[] | undefined>;
+        resolutionIssuesByTrId: Map<string, ResolutionIssue | undefined>;
         retriesByTrId: Map<string, TestResult[]>;
     }>;
     failedTestResults(): Promise<TestResult[]>;

package/dist/store/store.js

@@ -13,7 +13,7 @@ var _DefaultAllureStore_instances, _DefaultAllureStore_testResults, _DefaultAllu
 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 { md5, } from "@allurereport/plugin-api";
-import { getResolutionByRules, isIgnoredFailure } from "../resolutions.js";
+import { createResolutionIssue, getResolutionByRules, isIgnoredFailure } from "../resolutions.js";
 import { environmentIdentityById, normalizeEnvironmentDescriptorMap, resolveEnvironmentIdentity, resolveStoredEnvironmentIdentity, validateAllowedEnvironmentId, } from "../utils/environment.js";
 import { createFlakyDetector } from "../utils/flaky.js";
 import { getStatusTransition } from "../utils/new.js";
@@ -689,11 +689,14 @@ export class DefaultAllureStore {
         const attachmentsByTrId = new Map();
         const fixturesByTrId = new Map();
         const historyByTrId = new Map();
+        const resolutionIssuesByTrId = new Map();
         const retriesByTrId = new Map();
         for (const trId of trIds) {
             const tr = __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").get(trId);
+            const resolutionIssueId = __classPrivateFieldGet(this, _DefaultAllureStore_resolutionIssueIdByTestResultId, "f").get(trId);
             attachmentsByTrId.set(trId, this.indexAttachmentByTestResult.get(trId) ?? []);
             fixturesByTrId.set(trId, this.indexFixturesByTestResult.get(trId) ?? []);
+            resolutionIssuesByTrId.set(trId, resolutionIssueId ? __classPrivateFieldGet(this, _DefaultAllureStore_resolutionIssues, "f").get(resolutionIssueId) : undefined);
             retriesByTrId.set(trId, __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_retriesByTr).call(this, tr));
             historyByTrId.set(trId, tr ? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_historyByTr).call(this, tr) : undefined);
         }
@@ -701,6 +704,7 @@ export class DefaultAllureStore {
             attachmentsByTrId,
             fixturesByTrId,
             historyByTrId,
+            resolutionIssuesByTrId,
             retriesByTrId,
         };
     }
@@ -1195,7 +1199,7 @@ _DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_attachments
     testResult.resolution = rule.resolution;
     testResult.resolutionComment = rule.comment;
     if (rule.resolution === "issue") {
-        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_associateResolutionIssue).call(this, { ...rule.issue, comment: rule.comment }, testResult.id);
+        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_associateResolutionIssue).call(this, createResolutionIssue(rule, __classPrivateFieldGet(this, _DefaultAllureStore_resolutionsConfig, "f")), testResult.id);
     }
 }, _DefaultAllureStore_associateResolutionIssue = function _DefaultAllureStore_associateResolutionIssue(resolutionIssue, testResultId) {
     __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_removeResolutionIssueAssociation).call(this, testResultId);

package/dist/utils/perf.d.ts

@@ -19,7 +19,6 @@ export declare const PERF_METRIC_NAMES: {
     readonly generateReadResultsXcresultCheck: "generate.readResults.xcresultCheck";
     readonly generateReadResultsReaddir: "generate.readResults.readdir";
     readonly generateReadResultsFiles: "generate.readResults.files";
-    readonly generateReadResultsRealpath: "generate.readResults.realpath";
     readonly generateReadResultsReaderRead: "generate.readResults.reader.read";
     readonly generatePluginsDone: "generate.plugins.done";
     readonly storeVisitTestResultConvert: "store.visitTestResult.convert";

package/dist/utils/perf.js

@@ -24,7 +24,6 @@ export const PERF_METRIC_NAMES = {
     generateReadResultsXcresultCheck: "generate.readResults.xcresultCheck",
     generateReadResultsReaddir: "generate.readResults.readdir",
     generateReadResultsFiles: "generate.readResults.files",
-    generateReadResultsRealpath: "generate.readResults.realpath",
     generateReadResultsReaderRead: "generate.readResults.reader.read",
     generatePluginsDone: "generate.plugins.done",
     storeVisitTestResultConvert: "store.visitTestResult.convert",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/core",
-  "version": "3.19.1",
+  "version": "3.20.1",
   "description": "Collection of generic Allure utilities used across the entire project",
   "keywords": [
     "allure"
@@ -25,32 +25,32 @@
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/ci": "3.19.1",
-    "@allurereport/cli-commons": "3.19.1",
-    "@allurereport/core-api": "3.19.1",
-    "@allurereport/plugin-agent": "3.19.1",
-    "@allurereport/plugin-allure2": "3.19.1",
-    "@allurereport/plugin-api": "3.19.1",
-    "@allurereport/plugin-awesome": "3.19.1",
-    "@allurereport/plugin-classic": "3.19.1",
-    "@allurereport/plugin-csv": "3.19.1",
-    "@allurereport/plugin-dashboard": "3.19.1",
-    "@allurereport/plugin-jira": "3.19.1",
-    "@allurereport/plugin-log": "3.19.1",
-    "@allurereport/plugin-progress": "3.19.1",
-    "@allurereport/plugin-slack": "3.19.1",
-    "@allurereport/plugin-testops": "3.19.1",
-    "@allurereport/plugin-testplan": "3.19.1",
-    "@allurereport/reader": "3.19.1",
-    "@allurereport/reader-api": "3.19.1",
-    "@allurereport/service": "3.19.1",
-    "@allurereport/summary": "3.19.1",
+    "@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",
     "glob": "^13.0.6",
     "handlebars": "^4.7.9",
     "jiti": "^2.5.1",
     "node-stream-zip": "^1.15.0",
     "p-limit": "^7.3.0",
-    "yaml": "^2.8.3",
+    "yaml": "^2.9.1",
     "yoctocolors": "^2.2.0",
     "zip-stream": "^7.0.5"
   },