@allurereport/core 3.0.0-beta.19 → 3.0.0-beta.20

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/stats.js";
 export * from "./utils/git.js";
 export * from "./utils/new.js";
 export * from "./utils/flaky.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/stats.js";
 export * from "./utils/git.js";
 export * from "./utils/new.js";
 export * from "./utils/flaky.js";

package/dist/store/store.d.ts

@@ -1,8 +1,8 @@
-import { type AllureHistory, type AttachmentLink, type DefaultLabelsConfig, type EnvironmentsConfig, type HistoryDataPoint, type HistoryTestResult, type KnownTestFailure, type RepoData, type ReportVariables, 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 RepoData, 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>;
-export declare const mergeMapWithRecord: <K extends string | number | symbol, T = any>(map: Map<K, T>, record: Record<K, T>) => Map<K, T>;
+export declare const updateMapWithRecord: <K extends string | number | symbol, T = any>(map: Map<K, T>, record: Record<K, T>) => Map<K, T>;
 export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
     #private;
     readonly indexTestResultByTestCase: Map<string, TestResult[]>;
@@ -64,7 +64,7 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
         [x: string]: TestResult[];
         _: TestResult[];
     }>;
-    testsStatistic(filter?: TestResultFilter): Promise<import("@allurereport/core-api").Statistic>;
+    testsStatistic(filter?: TestResultFilter): Promise<Statistic>;
     allEnvironments(): Promise<string[]>;
     testResultsByEnvironment(env: string, options?: {
         includeHidden: boolean;

package/dist/store/store.js

@@ -15,7 +15,6 @@ 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 { getTestResultsStats } from "../utils/stats.js";
 import { testFixtureResultRawToState, testResultRawToState } from "./convert.js";
 const index = (indexMap, key, ...items) => {
     if (key) {
@@ -58,28 +57,9 @@ export const mapToObject = (map) => {
     });
     return result;
 };
-export const mergeMapWithRecord = (map, record) => {
+export const updateMapWithRecord = (map, record) => {
     Object.entries(record).forEach(([key, value]) => {
-        const existingValue = map.get(key);
-        if (existingValue !== undefined) {
-            if (Array.isArray(existingValue) && Array.isArray(value)) {
-                map.set(key, [...existingValue, ...value]);
-            }
-            else if (typeof existingValue === "object" &&
-                existingValue !== null &&
-                typeof value === "object" &&
-                value !== null &&
-                !Array.isArray(existingValue) &&
-                !Array.isArray(value)) {
-                map.set(key, { ...existingValue, ...value });
-            }
-            else {
-                map.set(key, value);
-            }
-        }
-        else {
-            map.set(key, value);
-        }
+        map.set(key, value);
     });
     return map;
 };
@@ -281,15 +261,28 @@ export class DefaultAllureStore {
     }
     async allTestResults(options = { includeHidden: false }) {
         const { includeHidden } = options;
-        const result = Array.from(__classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").values());
-        return includeHidden ? result : result.filter((tr) => !tr.hidden);
+        const result = [];
+        for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
+            if (!includeHidden && tr.hidden) {
+                continue;
+            }
+            result.push(tr);
+        }
+        return result;
     }
     async allAttachments(options = {}) {
         const { includeMissed = false, includeUnused = false } = options;
-        const attachments = Array.from(__classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f").values());
-        return attachments
-            .filter((link) => (!includeMissed ? !link.missed : true))
-            .filter((link) => (!includeUnused ? link.used : true));
+        const filteredAttachments = [];
+        for (const [, attachment] of __classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f")) {
+            if (!includeMissed && attachment.missed) {
+                continue;
+            }
+            if (!includeUnused && !attachment.used) {
+                continue;
+            }
+            filteredAttachments.push(attachment);
+        }
+        return filteredAttachments;
     }
     async allMetadata() {
         const result = {};
@@ -306,14 +299,21 @@ export class DefaultAllureStore {
         return __classPrivateFieldGet(this, _DefaultAllureStore_known, "f");
     }
     async allNewTestResults() {
-        const allTrs = await this.allTestResults();
+        const newTrs = [];
         const allHistoryDps = await this.allHistoryDataPoints();
-        return allTrs.filter((tr) => {
+        for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
+            if (tr.hidden) {
+                continue;
+            }
             if (!tr.historyId) {
-                return true;
+                newTrs.push(tr);
+                continue;
             }
-            return !allHistoryDps.some((dp) => dp.testResults[tr.historyId]);
-        });
+            if (!allHistoryDps.some((dp) => dp.testResults[tr.historyId])) {
+                newTrs.push(tr);
+            }
+        }
+        return newTrs;
     }
     async testCaseById(tcId) {
         return __classPrivateFieldGet(this, _DefaultAllureStore_testCases, "f").get(tcId);
@@ -359,8 +359,16 @@ export class DefaultAllureStore {
         return this.indexFixturesByTestResult.get(trId) ?? [];
     }
     async failedTestResults() {
-        const allTestResults = await this.allTestResults();
-        return allTestResults.filter(({ status }) => status === "failed" || status === "broken");
+        const failedTrs = [];
+        for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
+            if (tr.hidden) {
+                continue;
+            }
+            if (tr.status === "failed" || tr.status === "broken") {
+                failedTrs.push(tr);
+            }
+        }
+        return failedTrs;
     }
     async unknownFailedTestResults() {
         const failedTestResults = await this.failedTestResults();
@@ -374,12 +382,14 @@ export class DefaultAllureStore {
         const results = {
             _: [],
         };
-        const all = await this.allTestResults();
-        all.forEach((test) => {
+        for (const [, test] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
+            if (test.hidden) {
+                continue;
+            }
             const targetLabels = (test.labels ?? []).filter((label) => label.name === labelName);
             if (targetLabels.length === 0) {
                 results._.push(test);
-                return;
+                continue;
             }
             targetLabels.forEach((label) => {
                 if (!results[label.value]) {
@@ -387,42 +397,65 @@ export class DefaultAllureStore {
                 }
                 results[label.value].push(test);
             });
-        });
+        }
         return results;
     }
     async testsStatistic(filter) {
-        const all = await this.allTestResults();
-        const allWithStats = await Promise.all(all.map(async (tr) => {
+        const statistic = { total: 0 };
+        for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
+            if (tr.hidden) {
+                continue;
+            }
+            if (filter && !filter(tr)) {
+                continue;
+            }
+            statistic.total++;
             const retries = await this.retriesByTr(tr);
-            return {
-                ...tr,
-                retries,
-            };
-        }));
-        return getTestResultsStats(allWithStats, filter);
+            if (retries.length > 0) {
+                statistic.retries = (statistic.retries ?? 0) + 1;
+            }
+            if (tr.flaky) {
+                statistic.flaky = (statistic.flaky ?? 0) + 1;
+            }
+            if (tr.transition === "new") {
+                statistic.new = (statistic.new ?? 0) + 1;
+            }
+            if (!statistic[tr.status]) {
+                statistic[tr.status] = 0;
+            }
+            statistic[tr.status]++;
+        }
+        return statistic;
     }
     async allEnvironments() {
         return __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f");
     }
     async testResultsByEnvironment(env, options = { includeHidden: false }) {
-        const allTrs = await this.allTestResults(options);
-        return allTrs.filter((tr) => tr.environment === env);
+        const trs = [];
+        for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
+            if (!options.includeHidden && tr.hidden) {
+                continue;
+            }
+            if (tr.environment === env) {
+                trs.push(tr);
+            }
+        }
+        return trs;
     }
     async allTestEnvGroups() {
-        const allTr = await this.allTestResults({ includeHidden: true });
-        const trByTestCaseId = allTr.reduce((acc, tr) => {
+        const trByTestCaseId = {};
+        for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
             const testCaseId = tr?.testCase?.id;
             if (!testCaseId) {
-                return acc;
+                continue;
             }
-            if (acc[testCaseId]) {
-                acc[testCaseId].push(tr);
+            if (trByTestCaseId[testCaseId]) {
+                trByTestCaseId[testCaseId].push(tr);
             }
             else {
-                acc[testCaseId] = [tr];
+                trByTestCaseId[testCaseId] = [tr];
             }
-            return acc;
-        }, {});
+        }
         return Object.entries(trByTestCaseId).reduce((acc, [testCaseId, trs]) => {
             if (trs.length === 0) {
                 return acc;
@@ -497,11 +530,11 @@ export class DefaultAllureStore {
     }
     async restoreState(stateDump, attachmentsContents = {}) {
         const { testResults, attachments, testCases, fixtures, reportVariables, environments, globalAttachments = [], globalErrors = [], indexAttachmentByTestResult = {}, indexTestResultByHistoryId = {}, indexTestResultByTestCase = {}, indexLatestEnvTestResultByHistoryId = {}, indexAttachmentByFixture = {}, indexFixturesByTestResult = {}, indexKnownByHistoryId = {}, } = stateDump;
-        mergeMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f"), testResults);
-        mergeMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f"), attachments);
-        mergeMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_testCases, "f"), testCases);
-        mergeMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_fixtures, "f"), fixtures);
-        mergeMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_attachmentContents, "f"), attachmentsContents);
+        updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f"), testResults);
+        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_globalAttachments, "f").push(...globalAttachments);
         __classPrivateFieldGet(this, _DefaultAllureStore_globalErrors, "f").push(...globalErrors);

package/package.json

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

package/dist/utils/stats.d.ts

@@ -1,2 +0,0 @@
-import type { Statistic, TestResult } from "@allurereport/core-api";
-export declare const getTestResultsStats: (trs: TestResult[], filter?: (tr: TestResult) => boolean) => Statistic;

package/dist/utils/stats.js

@@ -1,22 +0,0 @@
-export const getTestResultsStats = (trs, filter = () => true) => {
-    const trsToProcess = trs.filter(filter);
-    return trsToProcess.reduce((acc, tr) => {
-        if (filter && !filter(tr)) {
-            return acc;
-        }
-        if (tr.retries && tr.retries?.length > 0) {
-            acc.retries = (acc.retries ?? 0) + 1;
-        }
-        if (tr.flaky) {
-            acc.flaky = (acc.flaky ?? 0) + 1;
-        }
-        if (tr.transition === "new") {
-            acc.new = (acc.new ?? 0) + 1;
-        }
-        if (!acc[tr.status]) {
-            acc[tr.status] = 0;
-        }
-        acc[tr.status]++;
-        return acc;
-    }, { total: trsToProcess.length });
-};