@allurereport/core 3.3.1 → 3.4.0

package/dist/store/store.js

@@ -9,10 +9,11 @@ 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_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_globalAttachmentIds, _DefaultAllureStore_globalErrors, _DefaultAllureStore_globalExitCode, _DefaultAllureStore_qualityGateResults, _DefaultAllureStore_historyPoints, _DefaultAllureStore_environments, _DefaultAllureStore_addEnvironments;
-import { DEFAULT_ENVIRONMENT, compareBy, createDictionary, getWorstStatus, htrsByTr, matchEnvironment, nullsLast, ordinal, reverse, } from "@allurereport/core-api";
-import { md5, } from "@allurereport/plugin-api";
+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_globalAttachmentIds, _DefaultAllureStore_globalErrors, _DefaultAllureStore_globalExitCode, _DefaultAllureStore_qualityGateResults, _DefaultAllureStore_historyPoints, _DefaultAllureStore_environments, _DefaultAllureStore_mergeEnvironmentIdentity, _DefaultAllureStore_environmentIdForLookup, _DefaultAllureStore_addEnvironments, _DefaultAllureStore_environmentIdByName, _DefaultAllureStore_setTestResultEnvironmentId, _DefaultAllureStore_environmentIdByTestResult;
 import { extname } from "node:path";
+import { DEFAULT_ENVIRONMENT, DEFAULT_ENVIRONMENT_IDENTITY, compareBy, createDictionary, getHistoryIdCandidates, getWorstStatus, nullsLast, ordinal, reverse, selectHistoryTestResults, validateEnvironmentId, validateEnvironmentName, } from "@allurereport/core-api";
+import { md5, } from "@allurereport/plugin-api";
+import { environmentIdentityById, normalizeEnvironmentDescriptorMap, resolveEnvironmentIdentity, resolveStoredEnvironmentIdentity, } from "../utils/environment.js";
 import { isFlaky } from "../utils/flaky.js";
 import { getStatusTransition } from "../utils/new.js";
 import { testFixtureResultRawToState, testResultRawToState } from "./convert.js";
@@ -26,14 +27,14 @@ const index = (indexMap, key, ...items) => {
     }
 };
 const wasStartedEarlier = (first, second) => first.start === undefined || second.start === undefined || first.start < second.start;
-const hidePreviousAttempt = (state, testResult) => {
-    const { environment, historyId } = testResult;
-    if (environment) {
-        if (!state.has(environment)) {
-            state.set(environment, new Map());
+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(environment);
+            const historyIdToLastAttemptResult = state.get(environmentId);
             const currentLastAttemptResult = historyIdToLastAttemptResult.get(historyId);
             if (currentLastAttemptResult) {
                 if (wasStartedEarlier(currentLastAttemptResult, testResult)) {
@@ -67,6 +68,8 @@ export class DefaultAllureStore {
     constructor(params) {
         _DefaultAllureStore_instances.add(this);
         _DefaultAllureStore_testResults.set(this, void 0);
+        _DefaultAllureStore_environmentDisplayNames.set(this, void 0);
+        _DefaultAllureStore_environmentNameToId.set(this, void 0);
         _DefaultAllureStore_attachments.set(this, void 0);
         _DefaultAllureStore_attachmentContents.set(this, void 0);
         _DefaultAllureStore_testCases.set(this, void 0);
@@ -81,6 +84,7 @@ export class DefaultAllureStore {
         _DefaultAllureStore_realtimeDispatcher.set(this, void 0);
         _DefaultAllureStore_realtimeSubscriber.set(this, void 0);
         this.indexTestResultByTestCase = new Map();
+        this.indexTestResultByEnvironmentId = new Map();
         this.indexLatestEnvTestResultByHistoryId = new Map();
         this.indexTestResultByHistoryId = new Map();
         this.indexAttachmentByTestResult = new Map();
@@ -94,10 +98,24 @@ export class DefaultAllureStore {
         _DefaultAllureStore_historyPoints.set(this, []);
         _DefaultAllureStore_environments.set(this, []);
         const { history, known = [], realtimeDispatcher, realtimeSubscriber, defaultLabels = {}, environment, environmentsConfig = {}, reportVariables = {}, } = params ?? {};
-        const environments = Object.keys(environmentsConfig)
-            .concat(environment ?? "")
-            .filter(Boolean);
+        const errors = [];
+        const { normalized: normalizedEnvironmentsConfig, identities, errors: configErrors, } = normalizeEnvironmentDescriptorMap(environmentsConfig, "environmentsConfig");
+        errors.push(...configErrors);
+        const forcedEnvironment = resolveEnvironmentIdentity({
+            environment,
+        }, normalizedEnvironmentsConfig, "store constructor");
+        errors.push(...forcedEnvironment.errors);
+        const resolvedEnvironment = forcedEnvironment.identity;
+        if (errors.length > 0) {
+            throw new Error(errors.join("; "));
+        }
+        const environments = [...identities];
+        if (resolvedEnvironment) {
+            environments.push(resolvedEnvironment);
+        }
         __classPrivateFieldSet(this, _DefaultAllureStore_testResults, new Map(), "f");
+        __classPrivateFieldSet(this, _DefaultAllureStore_environmentDisplayNames, new Map(), "f");
+        __classPrivateFieldSet(this, _DefaultAllureStore_environmentNameToId, new Map(), "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_attachments, new Map(), "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_attachmentContents, new Map(), "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_testCases, new Map(), "f");
@@ -109,12 +127,30 @@ export class DefaultAllureStore {
         __classPrivateFieldSet(this, _DefaultAllureStore_realtimeDispatcher, realtimeDispatcher, "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_realtimeSubscriber, realtimeSubscriber, "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_defaultLabels, defaultLabels, "f");
-        __classPrivateFieldSet(this, _DefaultAllureStore_environmentsConfig, environmentsConfig, "f");
-        __classPrivateFieldSet(this, _DefaultAllureStore_environment, environment, "f");
+        __classPrivateFieldSet(this, _DefaultAllureStore_environmentsConfig, normalizedEnvironmentsConfig, "f");
+        __classPrivateFieldSet(this, _DefaultAllureStore_environment, resolvedEnvironment, "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_reportVariables, reportVariables, "f");
         __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, environments);
         __classPrivateFieldGet(this, _DefaultAllureStore_realtimeSubscriber, "f")?.onQualityGateResults(async (results) => {
             __classPrivateFieldGet(this, _DefaultAllureStore_qualityGateResults, "f").push(...results);
+            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, results
+                .map((result) => {
+                const aliasedEnvironmentId = typeof result.environment === "string" ? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByName).call(this, result.environment) : undefined;
+                if (aliasedEnvironmentId) {
+                    const aliasedEnvironment = __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").find(({ id }) => id === aliasedEnvironmentId)?.name ?? aliasedEnvironmentId;
+                    return {
+                        id: aliasedEnvironmentId,
+                        name: aliasedEnvironment,
+                    };
+                }
+                return resolveStoredEnvironmentIdentity({
+                    environmentName: result.environment,
+                    labels: [],
+                }, __classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), {
+                    forcedEnvironment: __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f"),
+                });
+            })
+                .filter(Boolean));
         });
         __classPrivateFieldGet(this, _DefaultAllureStore_realtimeSubscriber, "f")?.onGlobalExitCode(async (exitCode) => {
             __classPrivateFieldSet(this, _DefaultAllureStore_globalExitCode, exitCode, "f");
@@ -155,18 +191,41 @@ export class DefaultAllureStore {
         await __classPrivateFieldGet(this, _DefaultAllureStore_history, "f").appendHistory(history);
     }
     async qualityGateResults() {
-        return __classPrivateFieldGet(this, _DefaultAllureStore_qualityGateResults, "f");
+        return [...__classPrivateFieldGet(this, _DefaultAllureStore_qualityGateResults, "f")];
     }
     async qualityGateResultsByEnv() {
+        const resultsById = await this.qualityGateResultsByEnvironmentId();
         const resultsByEnv = createDictionary();
+        Object.entries(resultsById).forEach(([environmentId, results]) => {
+            const environmentName = __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").find(({ id }) => id === environmentId)?.name ?? environmentId;
+            resultsByEnv[environmentName] = results;
+        });
+        return resultsByEnv;
+    }
+    async qualityGateResultsByEnvironmentId() {
+        const resultsById = createDictionary();
         for (const result of __classPrivateFieldGet(this, _DefaultAllureStore_qualityGateResults, "f")) {
-            const environment = result.environment || "default";
-            if (!resultsByEnv[environment]) {
-                resultsByEnv[environment] = [];
+            const aliasedEnvironmentId = typeof result.environment === "string" ? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByName).call(this, result.environment) : undefined;
+            const envIdentity = aliasedEnvironmentId !== undefined
+                ? {
+                    id: aliasedEnvironmentId,
+                    name: __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").find(({ id }) => id === aliasedEnvironmentId)?.name ?? aliasedEnvironmentId,
+                }
+                : resolveStoredEnvironmentIdentity({
+                    environmentName: result.environment,
+                    labels: [],
+                }, __classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), {
+                    forcedEnvironment: __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f"),
+                });
+            if (!envIdentity) {
+                continue;
             }
-            resultsByEnv[environment].push(result);
+            if (!resultsById[envIdentity.id]) {
+                resultsById[envIdentity.id] = [];
+            }
+            resultsById[envIdentity.id].push(result);
         }
-        return resultsByEnv;
+        return resultsById;
     }
     async globalExitCode() {
         return __classPrivateFieldGet(this, _DefaultAllureStore_globalExitCode, "f");
@@ -205,14 +264,25 @@ export class DefaultAllureStore {
                 }
             });
         }
-        testResult.environment = __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f") || matchEnvironment(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), testResult);
+        const environmentIdentity = __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f") ??
+            (() => {
+                const match = Object.entries(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f")).find(([, { matcher }]) => matcher({ labels: testResult.labels }));
+                if (!match) {
+                    return DEFAULT_ENVIRONMENT_IDENTITY;
+                }
+                const [id, descriptor] = match;
+                return { id, name: descriptor.name ?? id };
+            })();
+        testResult.environment = environmentIdentity.name;
+        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, [environmentIdentity]);
         const trHistory = await this.historyByTr(testResult);
         if (trHistory !== undefined) {
             testResult.transition = getStatusTransition(testResult, trHistory);
             testResult.flaky = isFlaky(testResult, trHistory);
         }
         __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").set(testResult.id, testResult);
-        hidePreviousAttempt(this.indexLatestEnvTestResultByHistoryId, testResult);
+        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_setTestResultEnvironmentId).call(this, testResult, environmentIdentity.id);
+        hidePreviousAttemptByEnvironment(this.indexLatestEnvTestResultByHistoryId, testResult, environmentIdentity.id);
         index(this.indexTestResultByTestCase, testResult.testCase?.id, testResult);
         index(this.indexTestResultByHistoryId, testResult.historyId, testResult);
         index(this.indexAttachmentByTestResult, testResult.id, ...attachmentLinks);
@@ -323,13 +393,35 @@ export class DefaultAllureStore {
         return __classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f");
     }
     async allHistoryDataPointsByEnvironment(environment) {
+        const environmentNameValidation = validateEnvironmentName(environment);
+        if (!environmentNameValidation.valid) {
+            return [];
+        }
+        const environmentId = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByName).call(this, environmentNameValidation.normalized);
+        if (!environmentId) {
+            return [];
+        }
+        return this.allHistoryDataPointsByEnvironmentId(environmentId);
+    }
+    async allHistoryDataPointsByEnvironmentId(environmentId) {
+        const normalizedEnvironmentId = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdForLookup).call(this, environmentId);
+        if (!normalizedEnvironmentId) {
+            const validation = validateEnvironmentId(environmentId);
+            const reason = validation.valid ? "unknown environment id" : validation.reason;
+            throw new Error(`Invalid environmentId ${JSON.stringify(environmentId)}: ${reason}`);
+        }
         return __classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f").reduce((result, dp) => {
             const filteredTestResults = [];
             for (const tr of Object.values(dp.testResults)) {
-                const hasLabels = tr.labels && tr.labels.length > 0;
-                const trEnvironment = tr.environment ??
-                    (hasLabels ? matchEnvironment(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), tr) : undefined);
-                if (trEnvironment === environment) {
+                const storedEnvironmentKey = typeof tr.environment === "string" ? tr.environment : undefined;
+                const trEnvId = (storedEnvironmentKey ? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByName).call(this, storedEnvironmentKey) : undefined) ??
+                    resolveStoredEnvironmentIdentity({
+                        environment: tr.environment,
+                        labels: tr.labels ?? [],
+                    }, __classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), {
+                        forcedEnvironment: __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f"),
+                    })?.id;
+                if (trEnvId === normalizedEnvironmentId) {
                     filteredTestResults.push(tr);
                 }
             }
@@ -367,7 +459,8 @@ export class DefaultAllureStore {
             if (typeof filter === "function" && !filter(tr)) {
                 continue;
             }
-            if (!tr.historyId || !historicalIds.has(tr.historyId)) {
+            const historyIdCandidates = getHistoryIdCandidates(tr);
+            if (historyIdCandidates.length === 0 || historyIdCandidates.every((historyId) => !historicalIds.has(historyId))) {
                 newTrs.push(tr);
             }
         }
@@ -391,26 +484,43 @@ export class DefaultAllureStore {
     async testResultsByTcId(tcId) {
         return this.indexTestResultByTestCase.get(tcId) ?? [];
     }
+    async environmentIdByTrId(trId) {
+        const testResult = __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").get(trId);
+        return testResult ? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByTestResult).call(this, testResult) : undefined;
+    }
     async attachmentsByTrId(trId) {
         return this.indexAttachmentByTestResult.get(trId) ?? [];
     }
     async retriesByTr(tr) {
+        const retries = [];
         if (!tr || tr.hidden || !tr.historyId) {
-            return [];
+            return retries;
+        }
+        const trByHistoryId = this.indexTestResultByHistoryId.get(tr.historyId);
+        if (!trByHistoryId) {
+            return retries;
         }
-        return (this.indexTestResultByHistoryId.get(tr.historyId) ?? [])
-            .filter((r) => r.hidden)
-            .sort(nullsLast(compareBy("start", reverse(ordinal()))));
+        for (const r of trByHistoryId) {
+            if (!r.hidden || tr.environment !== r.environment) {
+                continue;
+            }
+            retries.push(r);
+        }
+        return retries.sort(nullsLast(compareBy("start", reverse(ordinal()))));
     }
     async retriesByTrId(trId) {
         const tr = await this.testResultById(trId);
-        return tr ? this.retriesByTr(tr) : [];
+        return this.retriesByTr(tr);
     }
     async historyByTr(tr) {
         if (!__classPrivateFieldGet(this, _DefaultAllureStore_history, "f")) {
             return undefined;
         }
-        return htrsByTr(__classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f"), tr);
+        const historyIdCandidates = getHistoryIdCandidates(tr);
+        if (historyIdCandidates.length === 0) {
+            return [];
+        }
+        return selectHistoryTestResults(__classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f"), historyIdCandidates);
     }
     async historyByTrId(trId) {
         const tr = await this.testResultById(trId);
@@ -439,8 +549,11 @@ export class DefaultAllureStore {
         if (!__classPrivateFieldGet(this, _DefaultAllureStore_known, "f")?.length) {
             return failedTestResults;
         }
-        const knownHistoryIds = __classPrivateFieldGet(this, _DefaultAllureStore_known, "f").map((ktf) => ktf.historyId);
-        return failedTestResults.filter(({ historyId }) => historyId && !knownHistoryIds.includes(historyId));
+        const knownHistoryIds = new Set(__classPrivateFieldGet(this, _DefaultAllureStore_known, "f").map((ktf) => ktf.historyId));
+        return failedTestResults.filter((tr) => {
+            const historyIdCandidates = getHistoryIdCandidates(tr);
+            return (historyIdCandidates.length > 0 && historyIdCandidates.every((historyId) => !knownHistoryIds.has(historyId)));
+        });
     }
     async testResultsByLabel(labelName) {
         const results = createDictionary();
@@ -491,19 +604,31 @@ export class DefaultAllureStore {
         return statistic;
     }
     async allEnvironments() {
+        return __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").map(({ name }) => name);
+    }
+    async allEnvironmentIdentities() {
         return __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f");
     }
     async testResultsByEnvironment(env, options = { includeHidden: false }) {
-        const trs = [];
-        for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
-            if (!options.includeHidden && tr.hidden) {
-                continue;
-            }
-            if (tr.environment === env) {
-                trs.push(tr);
-            }
+        const environmentNameValidation = validateEnvironmentName(env);
+        if (!environmentNameValidation.valid) {
+            return [];
         }
-        return trs;
+        const environmentId = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByName).call(this, environmentNameValidation.normalized);
+        if (!environmentId) {
+            return [];
+        }
+        return this.testResultsByEnvironmentId(environmentId, options);
+    }
+    async testResultsByEnvironmentId(envId, options = { includeHidden: false }) {
+        const normalizedEnvId = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdForLookup).call(this, envId);
+        if (!normalizedEnvId) {
+            const validation = validateEnvironmentId(envId);
+            const reason = validation.valid ? "unknown environment id" : validation.reason;
+            throw new Error(`Invalid environmentId ${JSON.stringify(envId)}: ${reason}`);
+        }
+        const trs = this.indexTestResultByEnvironmentId.get(normalizedEnvId) ?? [];
+        return options.includeHidden ? [...trs] : trs.filter((tr) => !tr.hidden);
     }
     async allTestEnvGroups() {
         const trByTestCaseId = {};
@@ -532,7 +657,7 @@ export class DefaultAllureStore {
                 testResultsByEnv: {},
             };
             trs.forEach((tr) => {
-                const env = tr.environment || __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f") || matchEnvironment(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), tr);
+                const env = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByTestResult).call(this, tr) ?? DEFAULT_ENVIRONMENT;
                 envGroup.testResultsByEnv[env] = tr.id;
             });
             acc.push(envGroup);
@@ -543,9 +668,33 @@ export class DefaultAllureStore {
         return __classPrivateFieldGet(this, _DefaultAllureStore_reportVariables, "f");
     }
     async envVariables(env) {
+        const environmentNameValidation = validateEnvironmentName(env);
+        if (!environmentNameValidation.valid) {
+            return {
+                ...__classPrivateFieldGet(this, _DefaultAllureStore_reportVariables, "f"),
+            };
+        }
+        const environmentId = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByName).call(this, environmentNameValidation.normalized);
+        if (!environmentId) {
+            return {
+                ...__classPrivateFieldGet(this, _DefaultAllureStore_reportVariables, "f"),
+            };
+        }
+        return this.envVariablesByEnvironmentId(environmentId);
+    }
+    async envVariablesByEnvironmentId(envId) {
+        const normalizedEnvId = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdForLookup).call(this, envId);
+        if (!normalizedEnvId) {
+            const validation = validateEnvironmentId(envId);
+            const reason = validation.valid ? "unknown environment id" : validation.reason;
+            throw new Error(`Invalid environmentId ${JSON.stringify(envId)}: ${reason}`);
+        }
+        const envDescriptor = Object.prototype.hasOwnProperty.call(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), normalizedEnvId)
+            ? __classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f")[normalizedEnvId]
+            : undefined;
         return {
             ...__classPrivateFieldGet(this, _DefaultAllureStore_reportVariables, "f"),
-            ...(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f")?.[env]?.variables ?? {}),
+            ...(envDescriptor?.variables ?? {}),
         };
     }
     dumpState() {
@@ -567,9 +716,12 @@ export class DefaultAllureStore {
             indexKnownByHistoryId: {},
             qualityGateResults: __classPrivateFieldGet(this, _DefaultAllureStore_qualityGateResults, "f"),
         };
-        this.indexLatestEnvTestResultByHistoryId.forEach((envMap) => {
+        this.indexLatestEnvTestResultByHistoryId.forEach((envMap, environmentId) => {
+            if (!storeDump.indexLatestEnvTestResultByHistoryId[environmentId]) {
+                storeDump.indexLatestEnvTestResultByHistoryId[environmentId] = {};
+            }
             envMap.forEach((tr, historyId) => {
-                storeDump.indexLatestEnvTestResultByHistoryId[historyId] = tr.id;
+                storeDump.indexLatestEnvTestResultByHistoryId[environmentId][historyId] = tr.id;
             });
         });
         this.indexAttachmentByFixture.forEach((link, fxId) => {
@@ -594,12 +746,56 @@ export class DefaultAllureStore {
     }
     async restoreState(stateDump, attachmentsContents = {}) {
         const { testResults, attachments, testCases, fixtures, reportVariables, environments, globalAttachmentIds = [], globalErrors = [], indexAttachmentByTestResult = {}, indexTestResultByHistoryId = {}, indexTestResultByTestCase = {}, indexLatestEnvTestResultByHistoryId = {}, indexAttachmentByFixture = {}, indexFixturesByTestResult = {}, indexKnownByHistoryId = {}, qualityGateResults = [], } = stateDump;
-        updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f"), testResults);
+        const storedEnvironmentAliases = environments.flatMap((environmentValue) => {
+            if (typeof environmentValue === "string") {
+                return [{ id: environmentValue, name: environmentValue }];
+            }
+            const idValidation = validateEnvironmentId(environmentValue.id);
+            if (!idValidation.valid) {
+                return [];
+            }
+            return [
+                {
+                    id: idValidation.normalized,
+                    name: environmentValue.name ?? idValidation.normalized,
+                },
+            ];
+        });
+        const normalizedEnvironments = environments
+            .map((environmentValue) => {
+            if (typeof environmentValue === "string") {
+                return resolveStoredEnvironmentIdentity({
+                    environmentName: environmentValue,
+                }, __classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), {
+                    forcedEnvironment: __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f"),
+                    fallbackToMatch: false,
+                });
+            }
+            return resolveStoredEnvironmentIdentity({
+                environment: environmentValue.id,
+                environmentName: environmentValue.name,
+            }, __classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), {
+                forcedEnvironment: __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f"),
+                fallbackToMatch: false,
+            });
+        })
+            .filter(Boolean);
+        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, [...storedEnvironmentAliases, ...normalizedEnvironments]);
+        const envNameToId = new Map();
+        for (const { id, name } of __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f")) {
+            envNameToId.set(name, id);
+            envNameToId.set(id, id);
+        }
+        Object.values(testResults).forEach((testResult) => {
+            __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").set(testResult.id, testResult);
+            const storedEnvKey = typeof testResult.environment === "string" ? testResult.environment : undefined;
+            const envId = (storedEnvKey ? envNameToId.get(storedEnvKey) : undefined) ?? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByTestResult).call(this, testResult);
+            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_setTestResultEnvironmentId).call(this, testResult, envId);
+        });
         updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f"), attachments);
         updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_testCases, "f"), testCases);
         updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_fixtures, "f"), fixtures);
         updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_attachmentContents, "f"), attachmentsContents);
-        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, environments);
         __classPrivateFieldGet(this, _DefaultAllureStore_globalAttachmentIds, "f").push(...globalAttachmentIds);
         __classPrivateFieldGet(this, _DefaultAllureStore_globalErrors, "f").push(...globalErrors);
         Object.assign(__classPrivateFieldGet(this, _DefaultAllureStore_reportVariables, "f"), reportVariables);
@@ -671,24 +867,133 @@ export class DefaultAllureStore {
             }
             existingKnown.push(...knownFailures);
         });
-        Object.values(indexLatestEnvTestResultByHistoryId).forEach((trId) => {
-            const tr = __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").get(trId);
-            if (!tr) {
-                return;
+        __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").forEach(({ id }) => {
+            if (!this.indexLatestEnvTestResultByHistoryId.has(id)) {
+                this.indexLatestEnvTestResultByHistoryId.set(id, new Map());
             }
-            hidePreviousAttempt(this.indexLatestEnvTestResultByHistoryId, tr);
         });
+        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;
+                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_qualityGateResults, "f").push(...qualityGateResults);
     }
 }
-_DefaultAllureStore_testResults = 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_globalAttachmentIds = new WeakMap(), _DefaultAllureStore_globalErrors = new WeakMap(), _DefaultAllureStore_globalExitCode = new WeakMap(), _DefaultAllureStore_qualityGateResults = new WeakMap(), _DefaultAllureStore_historyPoints = new WeakMap(), _DefaultAllureStore_environments = new WeakMap(), _DefaultAllureStore_instances = new WeakSet(), _DefaultAllureStore_addEnvironments = function _DefaultAllureStore_addEnvironments(envs) {
+_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_globalAttachmentIds = new WeakMap(), _DefaultAllureStore_globalErrors = new WeakMap(), _DefaultAllureStore_globalExitCode = 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;
+    }
+    if (existingEnvironment) {
+        const existingNameValidation = validateEnvironmentName(existingEnvironment.name);
+        if (existingNameValidation.valid) {
+            return {
+                id: existingEnvironment.id,
+                name: existingNameValidation.normalized,
+            };
+        }
+    }
+    const incomingNameValidation = validateEnvironmentName(incomingEnvironment.name);
+    if (incomingNameValidation.valid) {
+        return {
+            id: incomingEnvironment.id,
+            name: incomingNameValidation.normalized,
+        };
+    }
+    return {
+        id: incomingEnvironment.id,
+        name: incomingEnvironment.id,
+    };
+}, _DefaultAllureStore_environmentIdForLookup = function _DefaultAllureStore_environmentIdForLookup(environmentKey) {
+    const aliasedEnvironmentId = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByName).call(this, environmentKey);
+    if (aliasedEnvironmentId) {
+        return aliasedEnvironmentId;
+    }
+    const environmentIdValidation = validateEnvironmentId(environmentKey);
+    return environmentIdValidation.valid ? environmentIdValidation.normalized : undefined;
+}, _DefaultAllureStore_addEnvironments = function _DefaultAllureStore_addEnvironments(envs) {
     if (__classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").length === 0) {
-        __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").push(DEFAULT_ENVIRONMENT);
+        __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").push(DEFAULT_ENVIRONMENT_IDENTITY);
     }
-    __classPrivateFieldSet(this, _DefaultAllureStore_environments, Array.from(new Set([...__classPrivateFieldGet(this, _DefaultAllureStore_environments, "f"), ...envs])), "f");
-    envs.forEach((key) => {
-        if (!this.indexLatestEnvTestResultByHistoryId.has(key)) {
-            this.indexLatestEnvTestResultByHistoryId.set(key, new Map());
+    const nextById = new Map(__classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").map((environment) => [environment.id, environment]));
+    envs.forEach((environment) => {
+        nextById.set(environment.id, __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_mergeEnvironmentIdentity).call(this, nextById.get(environment.id), environment));
+    });
+    __classPrivateFieldSet(this, _DefaultAllureStore_environments, Array.from(nextById.values()), "f");
+    __classPrivateFieldGet(this, _DefaultAllureStore_environmentNameToId, "f").clear();
+    __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").forEach(({ id, name }) => {
+        __classPrivateFieldGet(this, _DefaultAllureStore_environmentNameToId, "f").set(name, id);
+    });
+    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) {
+        return canonicalId;
+    }
+    return __classPrivateFieldGet(this, _DefaultAllureStore_environmentDisplayNames, "f").get(environmentName);
+}, _DefaultAllureStore_setTestResultEnvironmentId = function _DefaultAllureStore_setTestResultEnvironmentId(testResult, environmentId) {
+    if (!environmentId) {
+        return;
+    }
+    const existing = this.indexTestResultByEnvironmentId.get(environmentId);
+    if (existing?.some((tr) => tr.id === testResult.id)) {
+        return;
+    }
+    index(this.indexTestResultByEnvironmentId, environmentId, testResult);
+}, _DefaultAllureStore_environmentIdByTestResult = function _DefaultAllureStore_environmentIdByTestResult(testResult) {
+    const storedEnvironmentKey = typeof testResult.environment === "string" ? testResult.environment : undefined;
+    return ((storedEnvironmentKey ? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByName).call(this, storedEnvironmentKey) : undefined) ??
+        resolveStoredEnvironmentIdentity({
+            environment: testResult.environment,
+            labels: testResult.labels,
+        }, __classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), {
+            forcedEnvironment: __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f"),
+        })?.id);
 };

package/dist/utils/environment.d.ts

@@ -0,0 +1,24 @@
+import { type EnvironmentIdentity, type EnvironmentsConfig, type TestResult } from "@allurereport/core-api";
+export type NormalizedEnvironmentsResult = {
+    normalized: EnvironmentsConfig;
+    identities: EnvironmentIdentity[];
+    errors: string[];
+};
+export declare const normalizeEnvironmentDescriptorMap: (input: EnvironmentsConfig, sourcePath: string) => NormalizedEnvironmentsResult;
+export declare const environmentIdentityById: (environmentsConfig: EnvironmentsConfig, environmentId: string) => EnvironmentIdentity | undefined;
+export declare const environmentIdentityByName: (environmentsConfig: EnvironmentsConfig, environmentName: string) => EnvironmentIdentity | undefined;
+export declare const resolveStoredEnvironmentIdentity: (params: {
+    environment?: unknown;
+    environmentName?: unknown;
+    labels?: TestResult["labels"];
+}, environmentsConfig: EnvironmentsConfig, options?: {
+    forcedEnvironment?: EnvironmentIdentity;
+    fallbackToMatch?: boolean;
+}) => EnvironmentIdentity | undefined;
+export declare const resolveEnvironmentIdentity: (params: {
+    environment?: string;
+    environmentName?: string;
+}, environmentsConfig: EnvironmentsConfig, sourcePath: string) => {
+    identity?: EnvironmentIdentity;
+    errors: string[];
+};