@allurereport/core 3.8.2 → 3.9.0

package/dist/store/convert.js

@@ -54,7 +54,7 @@ export const testResultRawToState = (stateData, raw, context) => {
         flaky: raw.flaky ?? false,
         muted: raw.muted ?? false,
         known: raw.known ?? false,
-        hidden: false,
+        isRetry: false,
         labels,
         steps: convertSteps(stateData, raw.steps).convertedSteps,
         parameters,

package/dist/store/retrySubstore.d.ts

@@ -0,0 +1,12 @@
+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;
+export declare class RetrySubstore {
+    #private;
+    recordIngestOrder(testResultId: string): void;
+    restoreIngestOrder(restoredIds: string[] | undefined, hasTestResult: (testResultId: string) => boolean): void;
+    ingestOrderIdsForDump(): string[];
+    upsert(testResult: TestResult): void;
+    retriesByTr(testResult: TestResult): TestResult[];
+    reset(): void;
+}

package/dist/store/retrySubstore.js

@@ -0,0 +1,94 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _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);
+        _RetrySubstore_testResultsByRetryHash.set(this, new Map());
+        _RetrySubstore_testResultIngestIndexById.set(this, new Map());
+    }
+    recordIngestOrder(testResultId) {
+        if (__classPrivateFieldGet(this, _RetrySubstore_testResultIngestIndexById, "f").has(testResultId)) {
+            return;
+        }
+        __classPrivateFieldGet(this, _RetrySubstore_testResultIngestIndexById, "f").set(testResultId, __classPrivateFieldGet(this, _RetrySubstore_testResultIngestIndexById, "f").size);
+    }
+    restoreIngestOrder(restoredIds, hasTestResult) {
+        __classPrivateFieldGet(this, _RetrySubstore_testResultIngestIndexById, "f").clear();
+        for (const id of restoredIds ?? []) {
+            if (!hasTestResult(id) || __classPrivateFieldGet(this, _RetrySubstore_testResultIngestIndexById, "f").has(id)) {
+                continue;
+            }
+            __classPrivateFieldGet(this, _RetrySubstore_testResultIngestIndexById, "f").set(id, __classPrivateFieldGet(this, _RetrySubstore_testResultIngestIndexById, "f").size);
+        }
+    }
+    ingestOrderIdsForDump() {
+        return Array.from(__classPrivateFieldGet(this, _RetrySubstore_testResultIngestIndexById, "f").keys());
+    }
+    upsert(testResult) {
+        testResult.isRetry = false;
+        if (!testResult.retryHash) {
+            return;
+        }
+        const results = __classPrivateFieldGet(this, _RetrySubstore_testResultsByRetryHash, "f").get(testResult.retryHash);
+        if (!results) {
+            __classPrivateFieldGet(this, _RetrySubstore_testResultsByRetryHash, "f").set(testResult.retryHash, [testResult]);
+            return;
+        }
+        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;
+        });
+    }
+    retriesByTr(testResult) {
+        if (!testResult.retryHash || testResult.isRetry) {
+            return NO_RETRIES;
+        }
+        const attempts = __classPrivateFieldGet(this, _RetrySubstore_testResultsByRetryHash, "f").get(testResult.retryHash) ?? [];
+        const index = attempts.findIndex((attempt) => attempt.id === testResult.id);
+        if (index !== 0) {
+            return NO_RETRIES;
+        }
+        return attempts.slice(1);
+    }
+    reset() {
+        __classPrivateFieldGet(this, _RetrySubstore_testResultsByRetryHash, "f").clear();
+    }
+}
+_RetrySubstore_testResultsByRetryHash = new WeakMap(), _RetrySubstore_testResultIngestIndexById = new WeakMap(), _RetrySubstore_instances = new WeakSet(), _RetrySubstore_getIngestIndex = function _RetrySubstore_getIngestIndex(testResultId) {
+    return __classPrivateFieldGet(this, _RetrySubstore_testResultIngestIndexById, "f").get(testResultId) ?? -1;
+}, _RetrySubstore_compareResults = function _RetrySubstore_compareResults(first, second) {
+    const firstHasStart = typeof first.start === "number";
+    const secondHasStart = typeof second.start === "number";
+    if (firstHasStart !== secondHasStart) {
+        return firstHasStart ? 1 : -1;
+    }
+    if (firstHasStart && secondHasStart && first.start !== second.start) {
+        return first.start > second.start ? -1 : 1;
+    }
+    const indexA = __classPrivateFieldGet(this, _RetrySubstore_instances, "m", _RetrySubstore_getIngestIndex).call(this, first.id);
+    const indexB = __classPrivateFieldGet(this, _RetrySubstore_instances, "m", _RetrySubstore_getIngestIndex).call(this, second.id);
+    if (indexA !== indexB) {
+        return indexA > indexB ? -1 : 1;
+    }
+    return 0;
+};

package/dist/store/store.d.ts

@@ -7,7 +7,6 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
     #private;
     readonly indexTestResultByTestCase: Map<string, TestResult[]>;
     readonly indexTestResultByEnvironmentId: Map<string, TestResult[]>;
-    readonly indexLatestEnvTestResultByHistoryId: Map<string, Map<string, TestResult>>;
     readonly indexTestResultByHistoryId: Map<string, TestResult[]>;
     readonly indexAttachmentByTestResult: Map<string, AttachmentLink[]>;
     readonly indexAttachmentByFixture: Map<string, AttachmentLink[]>;
@@ -44,7 +43,7 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
     visitGlobals(globals: RawGlobals): Promise<void>;
     allTestCases(): Promise<TestCase[]>;
     allTestResults(options?: {
-        includeHidden?: boolean;
+        includeRetries?: boolean;
         filter?: TestResultFilter;
     }): Promise<TestResult[]>;
     allAttachments(options?: {
@@ -72,6 +71,12 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
     historyByTr(tr: TestResult): Promise<HistoryTestResult[] | undefined>;
     historyByTrId(trId: string): Promise<HistoryTestResult[] | undefined>;
     fixturesByTrId(trId: string): Promise<TestFixtureResult[]>;
+    relatedByTestResultIds(trIds: readonly string[]): Promise<{
+        attachmentsByTrId: Map<string, AttachmentLink[]>;
+        fixturesByTrId: Map<string, TestFixtureResult[]>;
+        historyByTrId: Map<string, HistoryTestResult[] | undefined>;
+        retriesByTrId: Map<string, TestResult[]>;
+    }>;
     failedTestResults(): Promise<TestResult[]>;
     unknownFailedTestResults(): Promise<TestResult[]>;
     testResultsByLabel(labelName: string): Promise<{
@@ -82,10 +87,10 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
     allEnvironments(): Promise<string[]>;
     allEnvironmentIdentities(): Promise<EnvironmentIdentity[]>;
     testResultsByEnvironment(env: string, options?: {
-        includeHidden?: boolean;
+        includeRetries?: boolean;
     }): Promise<TestResult[]>;
     testResultsByEnvironmentId(envId: string, options?: {
-        includeHidden?: boolean;
+        includeRetries?: boolean;
     }): Promise<TestResult[]>;
     allTestEnvGroups(): Promise<TestEnvGroup[]>;
     allVariables(): Promise<ReportVariables>;

package/dist/store/store.js

@@ -9,14 +9,15 @@ 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 _DefaultAllureStore_instances, _DefaultAllureStore_testResults, _DefaultAllureStore_environmentDisplayNames, _DefaultAllureStore_environmentNameToId, _DefaultAllureStore_attachments, _DefaultAllureStore_attachmentContents, _DefaultAllureStore_testCases, _DefaultAllureStore_metadata, _DefaultAllureStore_history, _DefaultAllureStore_known, _DefaultAllureStore_fixtures, _DefaultAllureStore_defaultLabels, _DefaultAllureStore_environment, _DefaultAllureStore_environmentsConfig, _DefaultAllureStore_reportVariables, _DefaultAllureStore_realtimeDispatcher, _DefaultAllureStore_realtimeSubscriber, _DefaultAllureStore_allowedEnvironmentIds, _DefaultAllureStore_globalAttachmentIds, _DefaultAllureStore_globalAttachmentIdsByEnv, _DefaultAllureStore_globalErrors, _DefaultAllureStore_globalErrorsByEnv, _DefaultAllureStore_globalExitCode, _DefaultAllureStore_checkResults, _DefaultAllureStore_qualityGateResults, _DefaultAllureStore_historyPoints, _DefaultAllureStore_environments, _DefaultAllureStore_mergeEnvironmentIdentity, _DefaultAllureStore_environmentIdForLookup, _DefaultAllureStore_addEnvironments, _DefaultAllureStore_environmentIdByName, _DefaultAllureStore_setTestResultEnvironmentId, _DefaultAllureStore_assertAllowedEnvironmentId, _DefaultAllureStore_assertAllowedStoredEnvironment, _DefaultAllureStore_environmentIdByTestResult, _DefaultAllureStore_resolveGlobalEnvironmentIdentity, _DefaultAllureStore_globalAttachmentId, _DefaultAllureStore_indexGlobalError, _DefaultAllureStore_addGlobalError, _DefaultAllureStore_indexGlobalAttachment, _DefaultAllureStore_addGlobalAttachment, _DefaultAllureStore_restoreAttachmentContent, _DefaultAllureStore_relinkRestoredAttachmentSteps;
+var _DefaultAllureStore_instances, _DefaultAllureStore_testResults, _DefaultAllureStore_environmentDisplayNames, _DefaultAllureStore_environmentNameToId, _DefaultAllureStore_attachments, _DefaultAllureStore_attachmentContents, _DefaultAllureStore_testCases, _DefaultAllureStore_metadata, _DefaultAllureStore_history, _DefaultAllureStore_known, _DefaultAllureStore_fixtures, _DefaultAllureStore_defaultLabels, _DefaultAllureStore_environment, _DefaultAllureStore_environmentsConfig, _DefaultAllureStore_reportVariables, _DefaultAllureStore_realtimeDispatcher, _DefaultAllureStore_realtimeSubscriber, _DefaultAllureStore_allowedEnvironmentIds, _DefaultAllureStore_retrySubstore, _DefaultAllureStore_testResultIdsByEnvironmentId, _DefaultAllureStore_cachedEnvironmentEntries, _DefaultAllureStore_globalAttachmentIds, _DefaultAllureStore_globalAttachmentIdsByEnv, _DefaultAllureStore_globalErrors, _DefaultAllureStore_globalErrorsByEnv, _DefaultAllureStore_globalExitCode, _DefaultAllureStore_checkResults, _DefaultAllureStore_qualityGateResults, _DefaultAllureStore_historyPoints, _DefaultAllureStore_environments, _DefaultAllureStore_mergeEnvironmentIdentity, _DefaultAllureStore_environmentIdForLookup, _DefaultAllureStore_addEnvironments, _DefaultAllureStore_environmentIdByName, _DefaultAllureStore_setTestResultEnvironmentId, _DefaultAllureStore_assertAllowedEnvironmentId, _DefaultAllureStore_assertAllowedStoredEnvironment, _DefaultAllureStore_environmentIdByTestResult, _DefaultAllureStore_assignRetryHash, _DefaultAllureStore_rebuildRetrySubstore, _DefaultAllureStore_resolveGlobalEnvironmentIdentity, _DefaultAllureStore_globalAttachmentId, _DefaultAllureStore_indexGlobalError, _DefaultAllureStore_addGlobalError, _DefaultAllureStore_indexGlobalAttachment, _DefaultAllureStore_addGlobalAttachment, _DefaultAllureStore_restoreAttachmentContent, _DefaultAllureStore_relinkRestoredAttachmentSteps, _DefaultAllureStore_retriesByTr, _DefaultAllureStore_historyByTr;
 import { extname } from "node:path";
-import { DEFAULT_ENVIRONMENT, DEFAULT_ENVIRONMENT_IDENTITY, compareBy, createDictionary, getHistoryIdCandidates, getWorstStatus, nullsLast, normalizeHistoryDataPoint, ordinal, reverse, selectHistoryTestResults, validateEnvironmentId, validateEnvironmentName, } from "@allurereport/core-api";
+import { DEFAULT_ENVIRONMENT, DEFAULT_ENVIRONMENT_IDENTITY, compareBy, createDictionary, getHistoryIdCandidates, getWorstStatus, normalizeHistoryDataPoint, ordinal, reverse, selectHistoryTestResults, validateEnvironmentId, validateEnvironmentName, } from "@allurereport/core-api";
 import { md5, } from "@allurereport/plugin-api";
 import { environmentIdentityById, normalizeEnvironmentDescriptorMap, resolveEnvironmentIdentity, resolveStoredEnvironmentIdentity, validateAllowedEnvironmentId, } from "../utils/environment.js";
 import { isFlaky } from "../utils/flaky.js";
 import { getStatusTransition } from "../utils/new.js";
 import { testFixtureResultRawToState, testResultRawToState } from "./convert.js";
+import { calculateParametersHash, calculateRetryHash, RetrySubstore } from "./retrySubstore.js";
 const index = (indexMap, key, ...items) => {
     if (key) {
         if (!indexMap.has(key)) {
@@ -26,31 +27,6 @@ const index = (indexMap, key, ...items) => {
         current.push(...items);
     }
 };
-const wasStartedEarlier = (first, second) => first.start === undefined || second.start === undefined || first.start < second.start;
-const hidePreviousAttemptByEnvironment = (state, testResult, environmentId) => {
-    const { historyId } = testResult;
-    if (environmentId) {
-        if (!state.has(environmentId)) {
-            state.set(environmentId, new Map());
-        }
-        if (historyId) {
-            const historyIdToLastAttemptResult = state.get(environmentId);
-            const currentLastAttemptResult = historyIdToLastAttemptResult.get(historyId);
-            if (currentLastAttemptResult) {
-                if (wasStartedEarlier(currentLastAttemptResult, testResult)) {
-                    historyIdToLastAttemptResult.set(historyId, testResult);
-                    currentLastAttemptResult.hidden = true;
-                }
-                else {
-                    testResult.hidden = true;
-                }
-            }
-            else {
-                historyIdToLastAttemptResult.set(historyId, testResult);
-            }
-        }
-    }
-};
 export const mapToObject = (map) => {
     const result = {};
     map.forEach((value, key) => {
@@ -96,9 +72,11 @@ export class DefaultAllureStore {
         _DefaultAllureStore_realtimeDispatcher.set(this, void 0);
         _DefaultAllureStore_realtimeSubscriber.set(this, void 0);
         _DefaultAllureStore_allowedEnvironmentIds.set(this, void 0);
+        _DefaultAllureStore_retrySubstore.set(this, void 0);
+        _DefaultAllureStore_testResultIdsByEnvironmentId.set(this, new Map());
+        _DefaultAllureStore_cachedEnvironmentEntries.set(this, []);
         this.indexTestResultByTestCase = new Map();
         this.indexTestResultByEnvironmentId = new Map();
-        this.indexLatestEnvTestResultByHistoryId = new Map();
         this.indexTestResultByHistoryId = new Map();
         this.indexAttachmentByTestResult = new Map();
         this.indexAttachmentByFixture = new Map();
@@ -147,6 +125,8 @@ export class DefaultAllureStore {
         __classPrivateFieldSet(this, _DefaultAllureStore_environment, resolvedEnvironment, "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_reportVariables, reportVariables, "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_allowedEnvironmentIds, new Set(allowedEnvironments ?? []), "f");
+        __classPrivateFieldSet(this, _DefaultAllureStore_retrySubstore, new RetrySubstore(), "f");
+        __classPrivateFieldSet(this, _DefaultAllureStore_cachedEnvironmentEntries, Object.entries(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f")), "f");
         __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, environments);
         __classPrivateFieldGet(this, _DefaultAllureStore_realtimeSubscriber, "f")?.onQualityGateResults((results) => {
             __classPrivateFieldGet(this, _DefaultAllureStore_qualityGateResults, "f").push(...results);
@@ -323,7 +303,7 @@ export class DefaultAllureStore {
         }
         const environmentIdentity = __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f") ??
             (() => {
-                const match = Object.entries(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f")).find(([, { matcher }]) => matcher({ labels: testResult.labels }));
+                const match = __classPrivateFieldGet(this, _DefaultAllureStore_cachedEnvironmentEntries, "f").find(([, { matcher }]) => matcher({ labels: testResult.labels }));
                 if (!match) {
                     return DEFAULT_ENVIRONMENT_IDENTITY;
                 }
@@ -332,14 +312,19 @@ export class DefaultAllureStore {
             })();
         testResult.environment = environmentIdentity.name;
         __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, [environmentIdentity]);
-        const trHistory = await this.historyByTr(testResult);
+        const parametersHash = typeof raw.parametersHash === "string" && raw.parametersHash.length > 0
+            ? raw.parametersHash
+            : calculateParametersHash(testResult.parameters);
+        testResult.retryHash = calculateRetryHash(testResult.testCase?.id, parametersHash, environmentIdentity.id);
+        const trHistory = __classPrivateFieldGet(this, _DefaultAllureStore_history, "f") ? await this.historyByTr(testResult) : undefined;
         if (trHistory !== undefined) {
             testResult.transition = getStatusTransition(testResult, trHistory);
             testResult.flaky = isFlaky(testResult, trHistory);
         }
         __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").set(testResult.id, testResult);
         __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_setTestResultEnvironmentId).call(this, testResult, environmentIdentity.id);
-        hidePreviousAttemptByEnvironment(this.indexLatestEnvTestResultByHistoryId, testResult, environmentIdentity.id);
+        __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").recordIngestOrder(testResult.id);
+        __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").upsert(testResult);
         index(this.indexTestResultByTestCase, testResult.testCase?.id, testResult);
         index(this.indexTestResultByHistoryId, testResult.historyId, testResult);
         index(this.indexAttachmentByTestResult, testResult.id, ...attachmentLinks);
@@ -431,11 +416,11 @@ export class DefaultAllureStore {
     async allTestCases() {
         return Array.from(__classPrivateFieldGet(this, _DefaultAllureStore_testCases, "f").values());
     }
-    async allTestResults(options = { includeHidden: false }) {
-        const { includeHidden = false, filter } = options;
+    async allTestResults(options = { includeRetries: false }) {
+        const { includeRetries = false, filter } = options;
         const result = [];
         for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
-            if (!includeHidden && tr.hidden) {
+            if (!includeRetries && tr.isRetry) {
                 continue;
             }
             if (typeof filter === "function" && !filter(tr)) {
@@ -531,7 +516,7 @@ export class DefaultAllureStore {
         const historicalIds = new Set(allHistoryDps.flatMap((dp) => Object.keys(dp.testResults ?? {})));
         const newTrs = [];
         for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
-            if (tr.hidden) {
+            if (tr.isRetry) {
                 continue;
             }
             if (typeof filter === "function" && !filter(tr)) {
@@ -581,50 +566,48 @@ export class DefaultAllureStore {
         return this.indexAttachmentByTestResult.get(trId) ?? [];
     }
     async retriesByTr(tr) {
-        const retries = [];
-        if (!tr || tr.hidden || !tr.historyId) {
-            return retries;
-        }
-        const trByHistoryId = this.indexTestResultByHistoryId.get(tr.historyId);
-        if (!trByHistoryId) {
-            return retries;
-        }
-        for (const r of trByHistoryId) {
-            if (!r.hidden || tr.environment !== r.environment) {
-                continue;
-            }
-            retries.push(r);
-        }
-        return retries.sort(nullsLast(compareBy("start", reverse(ordinal()))));
+        return __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_retriesByTr).call(this, tr);
     }
     async retriesByTrId(trId) {
-        const tr = await this.testResultById(trId);
-        return this.retriesByTr(tr);
+        const tr = __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").get(trId);
+        return __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_retriesByTr).call(this, tr);
     }
     async historyByTr(tr) {
-        if (!__classPrivateFieldGet(this, _DefaultAllureStore_history, "f")) {
-            return undefined;
-        }
-        const historyIdCandidates = getHistoryIdCandidates(tr);
-        if (historyIdCandidates.length === 0) {
-            return [];
-        }
-        return selectHistoryTestResults(__classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f"), historyIdCandidates);
+        return __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_historyByTr).call(this, tr);
     }
     async historyByTrId(trId) {
-        const tr = await this.testResultById(trId);
+        const tr = __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").get(trId);
         if (!tr) {
             return undefined;
         }
-        return this.historyByTr(tr);
+        return __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_historyByTr).call(this, tr);
     }
     async fixturesByTrId(trId) {
         return this.indexFixturesByTestResult.get(trId) ?? [];
     }
+    async relatedByTestResultIds(trIds) {
+        const attachmentsByTrId = new Map();
+        const fixturesByTrId = new Map();
+        const historyByTrId = new Map();
+        const retriesByTrId = new Map();
+        for (const trId of trIds) {
+            const tr = __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").get(trId);
+            attachmentsByTrId.set(trId, this.indexAttachmentByTestResult.get(trId) ?? []);
+            fixturesByTrId.set(trId, this.indexFixturesByTestResult.get(trId) ?? []);
+            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);
+        }
+        return {
+            attachmentsByTrId,
+            fixturesByTrId,
+            historyByTrId,
+            retriesByTrId,
+        };
+    }
     async failedTestResults() {
         const failedTrs = [];
         for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
-            if (tr.hidden) {
+            if (tr.isRetry) {
                 continue;
             }
             if (tr.status === "failed" || tr.status === "broken") {
@@ -648,7 +631,7 @@ export class DefaultAllureStore {
         const results = createDictionary();
         results._ = [];
         for (const [, test] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
-            if (test.hidden) {
+            if (test.isRetry) {
                 continue;
             }
             const targetLabels = (test.labels ?? []).filter((label) => label.name === labelName);
@@ -668,14 +651,14 @@ export class DefaultAllureStore {
     async testsStatistic(filter) {
         const statistic = { total: 0 };
         for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
-            if (tr.hidden) {
+            if (tr.isRetry) {
                 continue;
             }
             if (filter && !filter(tr)) {
                 continue;
             }
             statistic.total++;
-            const retries = await this.retriesByTr(tr);
+            const retries = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_retriesByTr).call(this, tr);
             if (retries.length > 0) {
                 statistic.retries = (statistic.retries ?? 0) + 1;
             }
@@ -698,7 +681,7 @@ export class DefaultAllureStore {
     async allEnvironmentIdentities() {
         return __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f");
     }
-    async testResultsByEnvironment(env, options = { includeHidden: false }) {
+    async testResultsByEnvironment(env, options = { includeRetries: false }) {
         const environmentNameValidation = validateEnvironmentName(env);
         if (!environmentNameValidation.valid) {
             return [];
@@ -709,7 +692,7 @@ export class DefaultAllureStore {
         }
         return this.testResultsByEnvironmentId(environmentId, options);
     }
-    async testResultsByEnvironmentId(envId, options = { includeHidden: false }) {
+    async testResultsByEnvironmentId(envId, options = { includeRetries: false }) {
         const normalizedEnvId = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdForLookup).call(this, envId);
         if (!normalizedEnvId) {
             const validation = validateEnvironmentId(envId);
@@ -717,7 +700,7 @@ export class DefaultAllureStore {
             throw new Error(`Invalid environmentId ${JSON.stringify(envId)}: ${reason}`);
         }
         const trs = this.indexTestResultByEnvironmentId.get(normalizedEnvId) ?? [];
-        return options.includeHidden ? [...trs] : trs.filter((tr) => !tr.hidden);
+        return options.includeRetries ? [...trs] : trs.filter((tr) => !tr.isRetry);
     }
     async allTestEnvGroups() {
         const trByTestCaseId = {};
@@ -800,7 +783,6 @@ export class DefaultAllureStore {
                 ...result,
                 ...(result.tags ? { tags: [...result.tags] } : {}),
             })),
-            indexLatestEnvTestResultByHistoryId: {},
             indexAttachmentByTestResult: {},
             indexTestResultByHistoryId: {},
             indexTestResultByTestCase: {},
@@ -808,15 +790,8 @@ export class DefaultAllureStore {
             indexFixturesByTestResult: {},
             indexKnownByHistoryId: {},
             qualityGateResults: __classPrivateFieldGet(this, _DefaultAllureStore_qualityGateResults, "f"),
+            testResultIdsIngestOrder: __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").ingestOrderIdsForDump(),
         };
-        this.indexLatestEnvTestResultByHistoryId.forEach((envMap, environmentId) => {
-            if (!storeDump.indexLatestEnvTestResultByHistoryId[environmentId]) {
-                storeDump.indexLatestEnvTestResultByHistoryId[environmentId] = {};
-            }
-            envMap.forEach((tr, historyId) => {
-                storeDump.indexLatestEnvTestResultByHistoryId[environmentId][historyId] = tr.id;
-            });
-        });
         this.indexAttachmentByFixture.forEach((link, fxId) => {
             storeDump.indexAttachmentByFixture[fxId] = link.map((l) => l.id);
         });
@@ -838,7 +813,7 @@ export class DefaultAllureStore {
         return storeDump;
     }
     async restoreState(stateDump, attachmentsContents = {}) {
-        const { testResults, attachments, testCases, fixtures, reportVariables, environments, globalAttachmentIds = [], globalErrors = [], checkResults = [], indexAttachmentByTestResult = {}, indexTestResultByHistoryId = {}, indexTestResultByTestCase = {}, indexLatestEnvTestResultByHistoryId = {}, indexAttachmentByFixture = {}, indexFixturesByTestResult = {}, indexKnownByHistoryId = {}, qualityGateResults = [], } = stateDump;
+        const { testResults, attachments, testCases, fixtures, reportVariables, environments, globalAttachmentIds = [], globalErrors = [], checkResults = [], indexAttachmentByTestResult = {}, indexTestResultByHistoryId = {}, indexTestResultByTestCase = {}, indexAttachmentByFixture = {}, indexFixturesByTestResult = {}, indexKnownByHistoryId = {}, qualityGateResults = [], testResultIdsIngestOrder = [], } = stateDump;
         const storedEnvironmentAliases = environments.flatMap((environmentValue) => {
             if (typeof environmentValue === "string") {
                 return [{ id: environmentValue, name: environmentValue }];
@@ -893,6 +868,11 @@ export class DefaultAllureStore {
             const envId = (storedEnvKey ? envNameToId.get(storedEnvKey) : undefined) ?? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByTestResult).call(this, testResult);
             __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_assertAllowedEnvironmentId).call(this, envId, `restored testResults[${JSON.stringify(testResult.id)}]`);
             __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_setTestResultEnvironmentId).call(this, testResult, envId);
+            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_assignRetryHash).call(this, testResult, { environmentId: envId });
+        });
+        __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").restoreIngestOrder(testResultIdsIngestOrder, (id) => __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").has(id));
+        this.indexTestResultByEnvironmentId.forEach((trs, envId) => {
+            __classPrivateFieldGet(this, _DefaultAllureStore_testResultIdsByEnvironmentId, "f").set(envId, new Set(trs.map((tr) => tr.id)));
         });
         updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f"), attachments);
         updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_testCases, "f"), testCases);
@@ -1005,56 +985,7 @@ export class DefaultAllureStore {
             }
             existingKnown.push(...knownFailures);
         });
-        __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").forEach(({ id }) => {
-            if (!this.indexLatestEnvTestResultByHistoryId.has(id)) {
-                this.indexLatestEnvTestResultByHistoryId.set(id, new Map());
-            }
-        });
-        const latestAttemptsEntries = Object.entries(indexLatestEnvTestResultByHistoryId);
-        const hasNestedLatestAttempts = latestAttemptsEntries.some(([, value]) => typeof value === "object" && value !== null);
-        if (hasNestedLatestAttempts) {
-            latestAttemptsEntries.forEach(([environmentId, historyIds]) => {
-                const environmentIdValidation = validateEnvironmentId(environmentId);
-                if (!environmentIdValidation.valid || typeof historyIds !== "object" || historyIds === null) {
-                    return;
-                }
-                const normalizedEnvironmentId = environmentIdValidation.normalized;
-                __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_assertAllowedEnvironmentId).call(this, normalizedEnvironmentId, `restored indexLatestEnvTestResultByHistoryId[${JSON.stringify(environmentId)}]`);
-                Object.values(historyIds).forEach((trId) => {
-                    const tr = __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").get(trId);
-                    if (!tr) {
-                        return;
-                    }
-                    hidePreviousAttemptByEnvironment(this.indexLatestEnvTestResultByHistoryId, tr, normalizedEnvironmentId);
-                });
-            });
-        }
-        else {
-            Object.entries(indexLatestEnvTestResultByHistoryId).forEach(([historyId, latestTrId]) => {
-                const trIdsForHistory = indexTestResultByHistoryId[historyId] ?? [];
-                const storedLatestTr = __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").get(latestTrId);
-                const storedLatestEnvironmentId = storedLatestTr
-                    ? (__classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByTestResult).call(this, storedLatestTr) ?? DEFAULT_ENVIRONMENT)
-                    : undefined;
-                if (storedLatestTr && storedLatestEnvironmentId) {
-                    hidePreviousAttemptByEnvironment(this.indexLatestEnvTestResultByHistoryId, storedLatestTr, storedLatestEnvironmentId);
-                }
-                for (const trId of trIdsForHistory) {
-                    if (trId === latestTrId) {
-                        continue;
-                    }
-                    const tr = __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").get(trId);
-                    if (!tr) {
-                        continue;
-                    }
-                    const environmentId = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByTestResult).call(this, tr) ?? DEFAULT_ENVIRONMENT;
-                    if (storedLatestEnvironmentId && environmentId === storedLatestEnvironmentId) {
-                        continue;
-                    }
-                    hidePreviousAttemptByEnvironment(this.indexLatestEnvTestResultByHistoryId, tr, environmentId);
-                }
-            });
-        }
+        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_rebuildRetrySubstore).call(this);
         qualityGateResults.forEach((result, index) => {
             __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_assertAllowedStoredEnvironment).call(this, {
                 environment: result.environment,
@@ -1066,7 +997,7 @@ export class DefaultAllureStore {
         });
     }
 }
-_DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environmentDisplayNames = new WeakMap(), _DefaultAllureStore_environmentNameToId = new WeakMap(), _DefaultAllureStore_attachments = new WeakMap(), _DefaultAllureStore_attachmentContents = new WeakMap(), _DefaultAllureStore_testCases = new WeakMap(), _DefaultAllureStore_metadata = new WeakMap(), _DefaultAllureStore_history = new WeakMap(), _DefaultAllureStore_known = new WeakMap(), _DefaultAllureStore_fixtures = new WeakMap(), _DefaultAllureStore_defaultLabels = new WeakMap(), _DefaultAllureStore_environment = new WeakMap(), _DefaultAllureStore_environmentsConfig = new WeakMap(), _DefaultAllureStore_reportVariables = new WeakMap(), _DefaultAllureStore_realtimeDispatcher = new WeakMap(), _DefaultAllureStore_realtimeSubscriber = new WeakMap(), _DefaultAllureStore_allowedEnvironmentIds = new WeakMap(), _DefaultAllureStore_globalAttachmentIds = new WeakMap(), _DefaultAllureStore_globalAttachmentIdsByEnv = new WeakMap(), _DefaultAllureStore_globalErrors = new WeakMap(), _DefaultAllureStore_globalErrorsByEnv = new WeakMap(), _DefaultAllureStore_globalExitCode = new WeakMap(), _DefaultAllureStore_checkResults = new WeakMap(), _DefaultAllureStore_qualityGateResults = new WeakMap(), _DefaultAllureStore_historyPoints = new WeakMap(), _DefaultAllureStore_environments = new WeakMap(), _DefaultAllureStore_instances = new WeakSet(), _DefaultAllureStore_mergeEnvironmentIdentity = function _DefaultAllureStore_mergeEnvironmentIdentity(existingEnvironment, incomingEnvironment) {
+_DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environmentDisplayNames = new WeakMap(), _DefaultAllureStore_environmentNameToId = new WeakMap(), _DefaultAllureStore_attachments = new WeakMap(), _DefaultAllureStore_attachmentContents = new WeakMap(), _DefaultAllureStore_testCases = new WeakMap(), _DefaultAllureStore_metadata = new WeakMap(), _DefaultAllureStore_history = new WeakMap(), _DefaultAllureStore_known = new WeakMap(), _DefaultAllureStore_fixtures = new WeakMap(), _DefaultAllureStore_defaultLabels = new WeakMap(), _DefaultAllureStore_environment = new WeakMap(), _DefaultAllureStore_environmentsConfig = new WeakMap(), _DefaultAllureStore_reportVariables = new WeakMap(), _DefaultAllureStore_realtimeDispatcher = new WeakMap(), _DefaultAllureStore_realtimeSubscriber = new WeakMap(), _DefaultAllureStore_allowedEnvironmentIds = new WeakMap(), _DefaultAllureStore_retrySubstore = new WeakMap(), _DefaultAllureStore_testResultIdsByEnvironmentId = new WeakMap(), _DefaultAllureStore_cachedEnvironmentEntries = new WeakMap(), _DefaultAllureStore_globalAttachmentIds = new WeakMap(), _DefaultAllureStore_globalAttachmentIdsByEnv = new WeakMap(), _DefaultAllureStore_globalErrors = new WeakMap(), _DefaultAllureStore_globalErrorsByEnv = new WeakMap(), _DefaultAllureStore_globalExitCode = new WeakMap(), _DefaultAllureStore_checkResults = new WeakMap(), _DefaultAllureStore_qualityGateResults = new WeakMap(), _DefaultAllureStore_historyPoints = new WeakMap(), _DefaultAllureStore_environments = new WeakMap(), _DefaultAllureStore_instances = new WeakSet(), _DefaultAllureStore_mergeEnvironmentIdentity = function _DefaultAllureStore_mergeEnvironmentIdentity(existingEnvironment, incomingEnvironment) {
     const configuredEnvironment = environmentIdentityById(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), incomingEnvironment.id);
     if (configuredEnvironment) {
         return configuredEnvironment;
@@ -1114,11 +1045,6 @@ _DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environment
     envs.forEach(({ id, name }) => {
         __classPrivateFieldGet(this, _DefaultAllureStore_environmentDisplayNames, "f").set(name, id);
     });
-    envs.forEach(({ id }) => {
-        if (!this.indexLatestEnvTestResultByHistoryId.has(id)) {
-            this.indexLatestEnvTestResultByHistoryId.set(id, new Map());
-        }
-    });
 }, _DefaultAllureStore_environmentIdByName = function _DefaultAllureStore_environmentIdByName(environmentName) {
     const canonicalId = __classPrivateFieldGet(this, _DefaultAllureStore_environmentNameToId, "f").get(environmentName);
     if (canonicalId) {
@@ -1129,10 +1055,16 @@ _DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environment
     if (!environmentId) {
         return;
     }
-    const existing = this.indexTestResultByEnvironmentId.get(environmentId);
-    if (existing?.some((tr) => tr.id === testResult.id)) {
+    const ids = __classPrivateFieldGet(this, _DefaultAllureStore_testResultIdsByEnvironmentId, "f").get(environmentId);
+    if (ids?.has(testResult.id)) {
         return;
     }
+    if (!ids) {
+        __classPrivateFieldGet(this, _DefaultAllureStore_testResultIdsByEnvironmentId, "f").set(environmentId, new Set([testResult.id]));
+    }
+    else {
+        ids.add(testResult.id);
+    }
     index(this.indexTestResultByEnvironmentId, environmentId, testResult);
 }, _DefaultAllureStore_assertAllowedEnvironmentId = function _DefaultAllureStore_assertAllowedEnvironmentId(environmentId, sourcePath) {
     if (!environmentId) {
@@ -1163,6 +1095,18 @@ _DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environment
         }, __classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), {
             forcedEnvironment: __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f"),
         })?.id);
+}, _DefaultAllureStore_assignRetryHash = function _DefaultAllureStore_assignRetryHash(testResult, options) {
+    const environmentId = options?.environmentId ?? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByTestResult).call(this, testResult);
+    const parametersHash = options?.parametersHash ?? calculateParametersHash(testResult.parameters);
+    testResult.retryHash = calculateRetryHash(testResult.testCase?.id, parametersHash, environmentId);
+}, _DefaultAllureStore_rebuildRetrySubstore = function _DefaultAllureStore_rebuildRetrySubstore() {
+    __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").reset();
+    for (const [, testResult] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
+        if (!testResult.retryHash) {
+            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_assignRetryHash).call(this, testResult);
+        }
+        __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").upsert(testResult);
+    }
 }, _DefaultAllureStore_resolveGlobalEnvironmentIdentity = function _DefaultAllureStore_resolveGlobalEnvironmentIdentity(environment) {
     if (environment !== undefined) {
         const resolvedEnvironment = resolveStoredEnvironmentIdentity({
@@ -1227,4 +1171,18 @@ _DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environment
     __classPrivateFieldGet(this, _DefaultAllureStore_fixtures, "f").forEach(({ steps }) => {
         relinkAttachmentSteps(steps, __classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f"));
     });
+}, _DefaultAllureStore_retriesByTr = function _DefaultAllureStore_retriesByTr(tr) {
+    if (!tr) {
+        return [];
+    }
+    return __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").retriesByTr(tr);
+}, _DefaultAllureStore_historyByTr = function _DefaultAllureStore_historyByTr(tr) {
+    if (!__classPrivateFieldGet(this, _DefaultAllureStore_history, "f")) {
+        return undefined;
+    }
+    const historyIdCandidates = getHistoryIdCandidates(tr);
+    if (historyIdCandidates.length === 0) {
+        return [];
+    }
+    return selectHistoryTestResults(__classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f"), historyIdCandidates);
 };

package/dist/utils/cli.d.ts

@@ -0,0 +1,4 @@
+export declare const createUploadProgressBarCounter: (message: string, total: number) => {
+    tick: () => void;
+    terminate: () => void;
+};