@allurereport/core 3.0.0-beta.22 → 3.0.0-beta.24

package/dist/config.d.ts

@@ -1,7 +1,5 @@
 import type { Config } from "@allurereport/plugin-api";
 import type { FullConfig, PluginInstance } from "./api.js";
-export declare const getPluginId: (key: string) => string;
-export declare const findConfig: (cwd: string, configPath?: string) => Promise<string | undefined>;
 export interface ConfigOverride {
     name?: Config["name"];
     output?: Config["output"];
@@ -9,11 +7,15 @@ export interface ConfigOverride {
     knownIssuesPath?: Config["knownIssuesPath"];
     plugins?: Config["plugins"];
 }
+export declare const getPluginId: (key: string) => string;
+export declare const findConfig: (cwd: string, configPath?: string) => Promise<string | undefined>;
 export declare const validateConfig: (config: Config) => {
     valid: boolean;
     fields: string[];
 };
-export declare const loadConfig: (configPath: string) => Promise<Config>;
+export declare const loadYamlConfig: (configPath: string) => Promise<Config>;
+export declare const loadJsonConfig: (configPath: string) => Promise<Config>;
+export declare const loadJsConfig: (configPath: string) => Promise<Config>;
 export declare const resolveConfig: (config: Config, override?: ConfigOverride) => Promise<FullConfig>;
 export declare const readConfig: (cwd?: string, configPath?: string, override?: ConfigOverride) => Promise<FullConfig>;
 export declare const getPluginInstance: (config: FullConfig, predicate: (plugin: PluginInstance) => boolean) => PluginInstance | undefined;

package/dist/config.js

@@ -1,16 +1,17 @@
 import * as console from "node:console";
-import { stat } from "node:fs/promises";
+import { readFile, stat } from "node:fs/promises";
 import { resolve } from "node:path";
 import * as process from "node:process";
+import { parse } from "yaml";
 import { readKnownIssues } from "./known.js";
 import { FileSystemReportFiles } from "./plugin.js";
 import { importWrapper } from "./utils/module.js";
 import { normalizeImportPath } from "./utils/path.js";
+const CONFIG_FILENAMES = ["allurerc.js", "allurerc.mjs", "allurerc.json"];
+const DEFAULT_CONFIG = {};
 export const getPluginId = (key) => {
     return key.replace(/^@.*\//, "").replace(/[/\\]/g, "-");
 };
-const configNames = ["allurerc.js", "allurerc.mjs"];
-const defaultConfig = {};
 export const findConfig = async (cwd, configPath) => {
     if (configPath) {
         const resolved = resolve(cwd, configPath);
@@ -25,8 +26,8 @@ export const findConfig = async (cwd, configPath) => {
         }
         throw new Error(`invalid config path ${resolved}: not a regular file`);
     }
-    for (const configName of configNames) {
-        const resolved = resolve(cwd, configName);
+    for (const configFilename of CONFIG_FILENAMES) {
+        const resolved = resolve(cwd, configFilename);
         try {
             const stats = await stat(resolved);
             if (stats.isFile()) {
@@ -57,7 +58,33 @@ export const validateConfig = (config) => {
         fields: unsupportedFields,
     };
 };
-export const loadConfig = async (configPath) => {
+export const loadYamlConfig = async (configPath) => {
+    try {
+        const rawConfig = await readFile(configPath, "utf-8");
+        const parsedConfig = parse(rawConfig);
+        return parsedConfig || DEFAULT_CONFIG;
+    }
+    catch (err) {
+        if (err?.code === "ENOENT") {
+            return DEFAULT_CONFIG;
+        }
+        throw err;
+    }
+};
+export const loadJsonConfig = async (configPath) => {
+    try {
+        const rawConfig = await readFile(configPath, "utf-8");
+        const parsedConfig = JSON.parse(rawConfig);
+        return parsedConfig || DEFAULT_CONFIG;
+    }
+    catch (err) {
+        if (err?.code === "ENOENT") {
+            return DEFAULT_CONFIG;
+        }
+        throw err;
+    }
+};
+export const loadJsConfig = async (configPath) => {
     return (await import(normalizeImportPath(configPath))).default;
 };
 export const resolveConfig = async (config, override = {}) => {
@@ -98,9 +125,23 @@ export const resolveConfig = async (config, override = {}) => {
     };
 };
 export const readConfig = async (cwd = process.cwd(), configPath, override) => {
-    const cfg = await findConfig(cwd, configPath);
-    const config = cfg ? await loadConfig(cfg) : { ...defaultConfig };
-    return await resolveConfig(config, override);
+    const cfg = (await findConfig(cwd, configPath)) ?? "";
+    let config;
+    switch (true) {
+        case /allurerc\.json$/.test(cfg):
+            config = await loadJsonConfig(cfg);
+            break;
+        case /allurerc\.ya?ml$/.test(cfg):
+            config = await loadYamlConfig(cfg);
+            break;
+        case /allurerc\.(m|c)?js$/.test(cfg):
+            config = await loadJsConfig(cfg);
+            break;
+        default:
+            config = DEFAULT_CONFIG;
+    }
+    const fullConfig = await resolveConfig(config, override);
+    return fullConfig;
 };
 export const getPluginInstance = (config, predicate) => {
     return config?.plugins?.find(predicate);

package/dist/history.js

@@ -4,11 +4,12 @@ import { isFileNotFoundError } from "./utils/misc.js";
 const createHistoryItems = (testResults) => {
     return testResults
         .filter((tr) => tr.historyId)
-        .map(({ id, name, fullName, historyId, status, error: { message, trace } = {}, start, stop, duration, labels }) => {
+        .map(({ id, name, fullName, environment, historyId, status, error: { message, trace } = {}, start, stop, duration, labels, }) => {
         return {
             id,
             name,
             fullName,
+            environment,
             status,
             message,
             trace,

package/dist/index.d.ts

@@ -2,7 +2,6 @@ export type * from "./api.js";
 export * from "./utils/misc.js";
 export * from "./utils/crypto.js";
 export * from "./utils/path.js";
-export * from "./utils/git.js";
 export * from "./utils/new.js";
 export * from "./utils/flaky.js";
 export * from "./history.js";

package/dist/index.js

@@ -1,7 +1,6 @@
 export * from "./utils/misc.js";
 export * from "./utils/crypto.js";
 export * from "./utils/path.js";
-export * from "./utils/git.js";
 export * from "./utils/new.js";
 export * from "./utils/flaky.js";
 export * from "./history.js";

package/dist/qualityGate/qualityGate.js

@@ -58,7 +58,7 @@ export class QualityGate {
             if (fastFailed) {
                 break;
             }
-            for (const [key, value] of Object.entries(ruleset)) {
+            for (const [key, expected] of Object.entries(ruleset)) {
                 if (key === "filter" || key === "id" || key === "fastFail") {
                     continue;
                 }
@@ -66,21 +66,28 @@ export class QualityGate {
                 if (!rule) {
                     throw new Error(`Rule ${key} is not provided. Make sure you have provided it in the "use" field of the quality gate config!`);
                 }
+                const trsToValidate = ruleset.filter ? trs.filter(ruleset.filter) : trs;
                 const ruleId = ruleset.id ? [ruleset.id, rule.rule].join("/") : rule.rule;
                 const result = await rule.validate({
-                    expected: value,
-                    trs,
+                    trs: trsToValidate,
+                    state: {
+                        getResult: () => state?.getResult?.(ruleId),
+                        setResult: (value) => state?.setResult?.(ruleId, value),
+                    },
+                    expected,
                     knownIssues,
-                    state: state?.getResult?.(ruleId),
                 });
-                state?.setResult(ruleId, result.actual);
                 if (result.success) {
                     continue;
                 }
                 results.push({
                     ...result,
+                    expected,
                     rule: ruleset.id ? [ruleset.id, rule.rule].join("/") : rule.rule,
-                    message: rule.message(result),
+                    message: rule.message({
+                        actual: result.actual,
+                        expected,
+                    }),
                 });
                 if (ruleset.fastFail) {
                     fastFailed = true;

package/dist/qualityGate/rules.js

@@ -3,27 +3,27 @@ import { bold } from "yoctocolors";
 export const maxFailuresRule = {
     rule: "maxFailures",
     message: ({ actual, expected }) => `The number of failed tests ${bold(String(actual))} exceeds the allowed threshold value ${bold(String(expected))}`,
-    validate: async ({ trs, knownIssues, expected, state = 0 }) => {
+    validate: async ({ trs, knownIssues, expected, state }) => {
         const knownIssuesHistoryIds = knownIssues.map(({ historyId }) => historyId);
         const unknown = trs.filter((tr) => !tr.historyId || !knownIssuesHistoryIds.includes(tr.historyId));
         const failedTrs = unknown.filter(filterUnsuccessful);
-        const actual = failedTrs.length + state;
+        const actual = failedTrs.length + (state.getResult() ?? 0);
+        state.setResult(actual);
         return {
             success: actual <= expected,
             actual,
-            expected,
         };
     },
 };
 export const minTestsCountRule = {
     rule: "minTestsCount",
     message: ({ actual, expected }) => `The total number of tests ${bold(String(actual))} is less than the expected threshold value ${bold(String(expected))}`,
-    validate: async ({ trs, expected, state = 0 }) => {
-        const actual = trs.length + state;
+    validate: async ({ trs, expected, state }) => {
+        const actual = trs.length + (state.getResult() ?? 0);
+        state.setResult(actual);
         return {
             success: actual >= expected,
             actual,
-            expected,
         };
     },
 };
@@ -38,7 +38,6 @@ export const successRateRule = {
         return {
             success: rate >= expected,
             actual: rate,
-            expected,
         };
     },
 };

package/dist/report.js

@@ -107,7 +107,7 @@ export class AllureReport {
             });
         };
         this.start = async () => {
-            const repoData = await __classPrivateFieldGet(this, _AllureReport_store, "f").repoData();
+            const branch = __classPrivateFieldGet(this, _AllureReport_ci, "f")?.jobRunBranch;
             await __classPrivateFieldGet(this, _AllureReport_store, "f").readHistory();
             if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") === "running") {
                 throw new Error("the report is already started");
@@ -116,11 +116,11 @@ export class AllureReport {
                 throw new Error("the report is already stopped, the restart isn't supported at the moment");
             }
             __classPrivateFieldSet(this, _AllureReport_executionStage, "running", "f");
-            if (__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f") && __classPrivateFieldGet(this, _AllureReport_instances, "a", _AllureReport_publish_get) && repoData?.branch) {
+            if (__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f") && __classPrivateFieldGet(this, _AllureReport_instances, "a", _AllureReport_publish_get) && branch) {
                 const { url } = await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").createReport({
                     reportUuid: this.reportUuid,
                     reportName: __classPrivateFieldGet(this, _AllureReport_reportName, "f"),
-                    branch: repoData.branch,
+                    branch,
                 });
                 this.reportUrl = url;
             }
@@ -312,6 +312,7 @@ export class AllureReport {
         this.done = async () => {
             const summaries = [];
             const remoteHrefs = [];
+            const cancelledPluginsIds = new Set();
             if (__classPrivateFieldGet(this, _AllureReport_executionStage, "f") !== "running") {
                 throw new Error(initRequired);
             }
@@ -331,12 +332,17 @@ export class AllureReport {
                 if (__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f") && context.publish) {
                     const pluginFiles = (await context.state.get("files")) ?? {};
                     const pluginFilesEntries = Object.entries(pluginFiles);
-                    const progressBar = new ProgressBar(`Publishing "${context.id}" report [:bar] :current/:total`, {
-                        total: pluginFilesEntries.length,
-                        width: 20,
-                    });
+                    const progressBar = pluginFilesEntries?.length > 0
+                        ? new ProgressBar(`Publishing "${context.id}" report [:bar] :current/:total`, {
+                            total: pluginFilesEntries.length,
+                            width: 20,
+                        })
+                        : undefined;
                     const limitFn = pLimit(50);
                     const fns = pluginFilesEntries.map(([filename, filepath]) => limitFn(async () => {
+                        if (cancelledPluginsIds.has(context.id)) {
+                            return;
+                        }
                         if (/^(data|widgets|index\.html$|summary\.json$)/.test(filename)) {
                             await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").addReportFile({
                                 reportUuid: this.reportUuid,
@@ -351,10 +357,21 @@ export class AllureReport {
                                 filepath,
                             });
                         }
-                        progressBar.tick();
+                        progressBar?.tick?.();
                     }));
-                    progressBar.render();
-                    await Promise.all(fns);
+                    progressBar?.render?.();
+                    try {
+                        await Promise.all(fns);
+                    }
+                    catch (err) {
+                        cancelledPluginsIds.add(context.id);
+                        await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f").deleteReport({
+                            reportUuid: this.reportUuid,
+                            pluginId: context.id,
+                        });
+                        console.error(`Plugin "${context.id}" upload has failed, the plugin won't be published`);
+                        console.error(err);
+                    }
                 }
                 const summary = await plugin?.info?.(context, __classPrivateFieldGet(this, _AllureReport_store, "f"));
                 if (!summary) {
@@ -362,7 +379,7 @@ export class AllureReport {
                 }
                 summary.pullRequestHref = __classPrivateFieldGet(this, _AllureReport_ci, "f")?.pullRequestUrl;
                 summary.jobHref = __classPrivateFieldGet(this, _AllureReport_ci, "f")?.jobRunUrl;
-                if (context.publish && this.reportUrl) {
+                if (context.publish && this.reportUrl && !cancelledPluginsIds.has(context.id)) {
                     summary.remoteHref = `${this.reportUrl}/${context.id}/`;
                     remoteHrefs.push(summary.remoteHref);
                 }
@@ -374,7 +391,9 @@ export class AllureReport {
             });
             if (summaries.length > 1) {
                 const summaryPath = await generateSummary(__classPrivateFieldGet(this, _AllureReport_output, "f"), summaries);
-                const publishedReports = __classPrivateFieldGet(this, _AllureReport_plugins, "f").map((plugin) => !!plugin?.options?.publish).filter(Boolean);
+                const publishedReports = __classPrivateFieldGet(this, _AllureReport_plugins, "f")
+                    .map((plugin) => !!plugin?.options?.publish && !cancelledPluginsIds.has(plugin.id))
+                    .filter(Boolean);
                 if (__classPrivateFieldGet(this, _AllureReport_instances, "a", _AllureReport_publish_get) && summaryPath && publishedReports.length > 1) {
                     await __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f")?.addReportFile({
                         reportUuid: this.reportUuid,
@@ -502,7 +521,7 @@ export class AllureReport {
         __classPrivateFieldSet(this, _AllureReport_realTime, realTime, "f");
         __classPrivateFieldSet(this, _AllureReport_stage, stage, "f");
         if (__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f")) {
-            __classPrivateFieldSet(this, _AllureReport_history, new AllureRemoteHistory(__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f")), "f");
+            __classPrivateFieldSet(this, _AllureReport_history, new AllureRemoteHistory(__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f"), __classPrivateFieldGet(this, _AllureReport_ci, "f")?.jobRunBranch), "f");
         }
         else if (historyPath) {
             __classPrivateFieldSet(this, _AllureReport_history, new AllureLocalHistory(historyPath), "f");
@@ -525,7 +544,7 @@ export class AllureReport {
         __classPrivateFieldSet(this, _AllureReport_reportFiles, reportFiles, "f");
         __classPrivateFieldSet(this, _AllureReport_output, output, "f");
         __classPrivateFieldSet(this, _AllureReport_history, __classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f")
-            ? new AllureRemoteHistory(__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f"))
+            ? new AllureRemoteHistory(__classPrivateFieldGet(this, _AllureReport_allureServiceClient, "f"), __classPrivateFieldGet(this, _AllureReport_ci, "f")?.jobRunBranch)
             : new AllureLocalHistory(historyPath), "f");
     }
     get hasQualityGate() {

package/dist/store/store.d.ts

@@ -1,4 +1,4 @@
-import { type AllureHistory, type AttachmentLink, type DefaultLabelsConfig, type EnvironmentsConfig, type HistoryDataPoint, type HistoryTestResult, type KnownTestFailure, type RepoData, type ReportVariables, type Statistic, type TestCase, type TestEnvGroup, type TestError, type TestFixtureResult, type TestResult } from "@allurereport/core-api";
+import { type AllureHistory, type AttachmentLink, type DefaultLabelsConfig, type EnvironmentsConfig, type HistoryDataPoint, type HistoryTestResult, type KnownTestFailure, type ReportVariables, type Statistic, type TestCase, type TestEnvGroup, type TestError, type TestFixtureResult, type TestResult } from "@allurereport/core-api";
 import { type AllureStore, type AllureStoreDump, type ExitCode, type QualityGateValidationResult, type RealtimeEventsDispatcher, type RealtimeSubscriber, type ResultFile, type TestResultFilter } from "@allurereport/plugin-api";
 import type { RawFixtureResult, RawMetadata, RawTestResult, ReaderContext, ResultsVisitor } from "@allurereport/reader-api";
 export declare const mapToObject: <K extends string | number | symbol, T = any>(map: Map<K, T>) => Record<K, T>;
@@ -24,7 +24,6 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
     });
     readHistory(): Promise<HistoryDataPoint[]>;
     appendHistory(history: HistoryDataPoint): Promise<void>;
-    repoData(): Promise<RepoData | undefined>;
     qualityGateResults(): Promise<QualityGateValidationResult[]>;
     globalExitCode(): Promise<ExitCode | undefined>;
     allGlobalErrors(): Promise<TestError[]>;
@@ -44,6 +43,7 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
     allMetadata(): Promise<Record<string, any>>;
     allFixtures(): Promise<TestFixtureResult[]>;
     allHistoryDataPoints(): Promise<HistoryDataPoint[]>;
+    allHistoryDataPointsByEnvironment(environment: string): Promise<HistoryDataPoint[]>;
     allKnownIssues(): Promise<KnownTestFailure[]>;
     allNewTestResults(): Promise<TestResult[]>;
     testCaseById(tcId: string): Promise<TestCase | undefined>;

package/dist/store/store.js

@@ -9,11 +9,10 @@ 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_globalAttachments, _DefaultAllureStore_globalErrors, _DefaultAllureStore_globalExitCode, _DefaultAllureStore_qualityGateResultsByRules, _DefaultAllureStore_historyPoints, _DefaultAllureStore_repoData, _DefaultAllureStore_environments, _DefaultAllureStore_addEnvironments;
+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_globalAttachments, _DefaultAllureStore_globalErrors, _DefaultAllureStore_globalExitCode, _DefaultAllureStore_qualityGateResultsByRules, _DefaultAllureStore_historyPoints, _DefaultAllureStore_environments, _DefaultAllureStore_addEnvironments;
 import { DEFAULT_ENVIRONMENT, compareBy, getWorstStatus, htrsByTr, matchEnvironment, nullsLast, ordinal, reverse, } from "@allurereport/core-api";
 import { md5, } from "@allurereport/plugin-api";
 import { isFlaky } from "../utils/flaky.js";
-import { getGitBranch, getGitRepoName } from "../utils/git.js";
 import { getStatusTransition } from "../utils/new.js";
 import { testFixtureResultRawToState, testResultRawToState } from "./convert.js";
 const index = (indexMap, key, ...items) => {
@@ -92,7 +91,6 @@ export class DefaultAllureStore {
         _DefaultAllureStore_globalExitCode.set(this, void 0);
         _DefaultAllureStore_qualityGateResultsByRules.set(this, {});
         _DefaultAllureStore_historyPoints.set(this, []);
-        _DefaultAllureStore_repoData.set(this, void 0);
         _DefaultAllureStore_environments.set(this, []);
         const { history, known = [], realtimeDispatcher, realtimeSubscriber, defaultLabels = {}, environment, environmentsConfig = {}, reportVariables = {}, } = params ?? {};
         const environments = Object.keys(environmentsConfig)
@@ -143,8 +141,7 @@ export class DefaultAllureStore {
         if (!__classPrivateFieldGet(this, _DefaultAllureStore_history, "f")) {
             return [];
         }
-        const repoData = await this.repoData();
-        __classPrivateFieldSet(this, _DefaultAllureStore_historyPoints, (await __classPrivateFieldGet(this, _DefaultAllureStore_history, "f").readHistory(repoData.branch)) ?? [], "f");
+        __classPrivateFieldSet(this, _DefaultAllureStore_historyPoints, (await __classPrivateFieldGet(this, _DefaultAllureStore_history, "f").readHistory()) ?? [], "f");
         __classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f").sort(compareBy("timestamp", reverse(ordinal())));
         return __classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f");
     }
@@ -152,24 +149,8 @@ export class DefaultAllureStore {
         if (!__classPrivateFieldGet(this, _DefaultAllureStore_history, "f")) {
             return;
         }
-        const repoData = await this.repoData();
         __classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f").push(history);
-        await __classPrivateFieldGet(this, _DefaultAllureStore_history, "f").appendHistory(history, repoData?.branch);
-    }
-    async repoData() {
-        if (__classPrivateFieldGet(this, _DefaultAllureStore_repoData, "f")) {
-            return __classPrivateFieldGet(this, _DefaultAllureStore_repoData, "f");
-        }
-        try {
-            __classPrivateFieldSet(this, _DefaultAllureStore_repoData, {
-                name: await getGitRepoName(),
-                branch: await getGitBranch(),
-            }, "f");
-            return __classPrivateFieldGet(this, _DefaultAllureStore_repoData, "f");
-        }
-        catch (err) {
-            return undefined;
-        }
+        await __classPrivateFieldGet(this, _DefaultAllureStore_history, "f").appendHistory(history);
     }
     async qualityGateResults() {
         return Object.values(__classPrivateFieldGet(this, _DefaultAllureStore_qualityGateResultsByRules, "f"));
@@ -295,6 +276,31 @@ export class DefaultAllureStore {
     async allHistoryDataPoints() {
         return __classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f");
     }
+    async allHistoryDataPointsByEnvironment(environment) {
+        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) {
+                    filteredTestResults.push(tr);
+                }
+            }
+            const hasNoEnvironmentTestResults = filteredTestResults.length === 0;
+            result.push({
+                ...dp,
+                testResults: hasNoEnvironmentTestResults
+                    ? {}
+                    : filteredTestResults.reduce((acc, tr) => {
+                        acc[tr.historyId] = tr;
+                        return acc;
+                    }, {}),
+                knownTestCaseIds: hasNoEnvironmentTestResults ? [] : filteredTestResults.map((tr) => tr.id),
+            });
+            return result;
+        }, []);
+    }
     async allKnownIssues() {
         return __classPrivateFieldGet(this, _DefaultAllureStore_known, "f");
     }
@@ -618,7 +624,7 @@ export class DefaultAllureStore {
         Object.assign(__classPrivateFieldGet(this, _DefaultAllureStore_qualityGateResultsByRules, "f"), qualityGateResultsByRules);
     }
 }
-_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_globalAttachments = new WeakMap(), _DefaultAllureStore_globalErrors = new WeakMap(), _DefaultAllureStore_globalExitCode = new WeakMap(), _DefaultAllureStore_qualityGateResultsByRules = new WeakMap(), _DefaultAllureStore_historyPoints = new WeakMap(), _DefaultAllureStore_repoData = new WeakMap(), _DefaultAllureStore_environments = new WeakMap(), _DefaultAllureStore_instances = new WeakSet(), _DefaultAllureStore_addEnvironments = function _DefaultAllureStore_addEnvironments(envs) {
+_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_globalAttachments = new WeakMap(), _DefaultAllureStore_globalErrors = new WeakMap(), _DefaultAllureStore_globalExitCode = new WeakMap(), _DefaultAllureStore_qualityGateResultsByRules = new WeakMap(), _DefaultAllureStore_historyPoints = new WeakMap(), _DefaultAllureStore_environments = new WeakMap(), _DefaultAllureStore_instances = new WeakSet(), _DefaultAllureStore_addEnvironments = function _DefaultAllureStore_addEnvironments(envs) {
     if (__classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").length === 0) {
         __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").push(DEFAULT_ENVIRONMENT);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/core",
-  "version": "3.0.0-beta.22",
+  "version": "3.0.0-beta.24",
   "description": "Collection of generic Allure utilities used across the entire project",
   "keywords": [
     "allure"
@@ -25,28 +25,29 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@allurereport/ci": "3.0.0-beta.22",
-    "@allurereport/core-api": "3.0.0-beta.22",
-    "@allurereport/plugin-allure2": "3.0.0-beta.22",
-    "@allurereport/plugin-api": "3.0.0-beta.22",
-    "@allurereport/plugin-awesome": "3.0.0-beta.22",
-    "@allurereport/plugin-classic": "3.0.0-beta.22",
-    "@allurereport/plugin-csv": "3.0.0-beta.22",
-    "@allurereport/plugin-dashboard": "3.0.0-beta.22",
-    "@allurereport/plugin-jira": "3.0.0-beta.22",
-    "@allurereport/plugin-log": "3.0.0-beta.22",
-    "@allurereport/plugin-progress": "3.0.0-beta.22",
-    "@allurereport/plugin-slack": "3.0.0-beta.22",
-    "@allurereport/plugin-testplan": "3.0.0-beta.22",
-    "@allurereport/reader": "3.0.0-beta.22",
-    "@allurereport/reader-api": "3.0.0-beta.22",
-    "@allurereport/service": "3.0.0-beta.22",
-    "@allurereport/summary": "3.0.0-beta.22",
+    "@allurereport/ci": "3.0.0-beta.24",
+    "@allurereport/core-api": "3.0.0-beta.24",
+    "@allurereport/plugin-allure2": "3.0.0-beta.24",
+    "@allurereport/plugin-api": "3.0.0-beta.24",
+    "@allurereport/plugin-awesome": "3.0.0-beta.24",
+    "@allurereport/plugin-classic": "3.0.0-beta.24",
+    "@allurereport/plugin-csv": "3.0.0-beta.24",
+    "@allurereport/plugin-dashboard": "3.0.0-beta.24",
+    "@allurereport/plugin-jira": "3.0.0-beta.24",
+    "@allurereport/plugin-log": "3.0.0-beta.24",
+    "@allurereport/plugin-progress": "3.0.0-beta.24",
+    "@allurereport/plugin-slack": "3.0.0-beta.24",
+    "@allurereport/plugin-testplan": "3.0.0-beta.24",
+    "@allurereport/reader": "3.0.0-beta.24",
+    "@allurereport/reader-api": "3.0.0-beta.24",
+    "@allurereport/service": "3.0.0-beta.24",
+    "@allurereport/summary": "3.0.0-beta.24",
     "handlebars": "^4.7.8",
     "markdown-it": "^14.1.0",
     "node-stream-zip": "^1.15.0",
     "p-limit": "^7.2.0",
     "progress": "^2.0.3",
+    "yaml": "^2.8.1",
     "yoctocolors": "^2.1.1",
     "zip-stream": "^7.0.2"
   },

package/dist/utils/git.d.ts

@@ -1,2 +0,0 @@
-export declare const getGitBranch: (cwd?: string) => Promise<string>;
-export declare const getGitRepoName: (cwd?: string) => Promise<string>;

package/dist/utils/git.js

@@ -1,46 +0,0 @@
-import { spawn } from "node:child_process";
-import { basename } from "node:path";
-export const getGitBranch = (cwd) => {
-    return new Promise((resolve, reject) => {
-        const git = spawn("git", ["rev-parse", "--abbrev-ref", "HEAD"], { cwd });
-        let output = "";
-        let errorOutput = "";
-        git.stdout.on("data", (data) => {
-            output += data;
-        });
-        git.stderr.on("data", (data) => {
-            errorOutput += data;
-        });
-        git.on("close", (code) => {
-            if (code !== 0) {
-                return reject(new Error(errorOutput || "Git command failed"));
-            }
-            return resolve(output.trim());
-        });
-        git.on("error", (err) => {
-            return reject(err);
-        });
-    });
-};
-export const getGitRepoName = (cwd) => {
-    return new Promise((resolve, reject) => {
-        const git = spawn("git", ["rev-parse", "--show-toplevel"], { cwd });
-        let output = "";
-        let errorOutput = "";
-        git.stdout.on("data", (data) => {
-            output += data;
-        });
-        git.stderr.on("data", (data) => {
-            errorOutput += data;
-        });
-        git.on("close", (code) => {
-            if (code !== 0) {
-                return reject(new Error(errorOutput || "Git command failed"));
-            }
-            return resolve(basename(output.trim()));
-        });
-        git.on("error", (err) => {
-            return reject(err);
-        });
-    });
-};