@allurereport/core 3.18.0 → 3.19.1

package/dist/store/convert.js

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

package/dist/store/retrySubstore.d.ts

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

package/dist/store/retrySubstore.js

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

package/dist/store/store.d.ts

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