@allurereport/core-api 3.0.0-beta.7 → 3.0.0-beta.9

package/dist/constants.d.ts

@@ -17,4 +17,5 @@ export declare const filterIncludedInSuccessRate: (t: {
     status: TestStatus;
 }) => boolean;
 export declare const emptyStatistic: () => Statistic;
-export declare const incrementStatistic: (statistic: Statistic, status: TestStatus) => void;
+export declare const incrementStatistic: (statistic: Statistic, status: TestStatus, count?: number) => void;
+export declare const mergeStatistic: (statistic: Statistic, additional: Statistic) => void;

package/dist/constants.js

@@ -10,7 +10,14 @@ export const filterSuccessful = filterByStatus(successfulStatuses);
 export const filterUnsuccessful = filterByStatus(unsuccessfulStatuses);
 export const filterIncludedInSuccessRate = filterByStatus(includedInSuccessRate);
 export const emptyStatistic = () => ({ total: 0 });
-export const incrementStatistic = (statistic, status) => {
-    statistic[status] = (statistic[status] ?? 0) + 1;
-    statistic.total++;
+export const incrementStatistic = (statistic, status, count = 1) => {
+    statistic[status] = (statistic[status] ?? 0) + count;
+    statistic.total += count;
+};
+export const mergeStatistic = (statistic, additional) => {
+    statusesList.forEach((status) => {
+        if (additional[status]) {
+            incrementStatistic(statistic, status, additional[status]);
+        }
+    });
 };

package/dist/history.d.ts

@@ -1,11 +1,10 @@
-import type { TestStatus } from "./model.js";
+import type { TestError, TestStatus } from "./model.js";
 export interface HistoryTestResult {
     id: string;
     name: string;
     fullName?: string;
     status: TestStatus;
-    message?: string;
-    trace?: string;
+    error?: TestError;
     start?: number;
     stop?: number;
     duration?: number;

package/dist/known.d.ts

@@ -1,4 +1,5 @@
-import type { TestError, TestLink } from "./metadata.js";
+import type { TestLink } from "./metadata.js";
+import type { TestError } from "./model.js";
 export interface KnownTestFailure {
     historyId: string;
     issues?: TestLink[];

package/dist/metadata.d.ts

@@ -1,6 +1,3 @@
-import type { TestStatus } from "./model.js";
-export interface Location {
-}
 export interface TestLabel {
     name: string;
     value?: string;
@@ -17,13 +14,3 @@ export interface TestParameter {
     excluded: boolean;
     masked: boolean;
 }
-export interface TestError {
-    id: string;
-    message: string;
-    trace?: string;
-    status?: TestStatus;
-    code?: string;
-    location?: Location;
-    tags: string[];
-    expected?: boolean;
-}

package/dist/model.d.ts

@@ -7,12 +7,17 @@ export interface SourceMetadata {
         [key: string]: any;
     };
 }
+export interface TestError {
+    message?: string;
+    trace?: string;
+    actual?: string;
+    expected?: string;
+}
 export interface TestResult {
     id: string;
     name: string;
     status: TestStatus;
-    message?: string;
-    trace?: string;
+    error?: TestError;
     testCase?: TestCase;
     fullName?: string;
     historyId?: string;
@@ -38,6 +43,7 @@ export interface TestResult {
     sourceMetadata: SourceMetadata;
     runSelector?: string;
     retries?: TestResult[];
+    categories?: any;
 }
 export interface TestFixtureResult {
     id: string;
@@ -45,8 +51,7 @@ export interface TestFixtureResult {
     type: "before" | "after";
     name: string;
     status: TestStatus;
-    message?: string;
-    trace?: string;
+    error?: TestError;
     start?: number;
     stop?: number;
     duration?: number;
@@ -58,12 +63,12 @@ export interface DefaultTestStepResult {
     name: string;
     parameters: TestParameter[];
     status: TestStatus;
-    message?: string;
-    trace?: string;
+    error?: TestError;
     start?: number;
     stop?: number;
     duration?: number;
     steps: TestStepResult[];
+    stepId?: string;
     type: "step";
 }
 export interface AttachmentLinkFile {

package/dist/utils/comparator.d.ts

@@ -5,7 +5,9 @@ export type Comparator<T> = (a: T, b: T) => number;
 type Value<T, P> = T extends any ? (P extends keyof T ? T[P] : P extends "" ? T : never) : never;
 export declare const reverse: <T>(comparator: Comparator<T>) => Comparator<T>;
 export declare const nullsLast: <T extends {}>(compare: Comparator<T>) => Comparator<T | undefined>;
-export declare const compareBy: <T extends Record<string, any> = {}, P extends keyof T = keyof T>(property: P, compare: Comparator<Value<T, P>>) => Comparator<T>;
+export declare const nullsFirst: <T extends {}>(compare: Comparator<T>) => Comparator<T | undefined>;
+export declare const nullsDefault: <T extends {}>(compare: Comparator<T>, defaultValue: T) => Comparator<T | undefined>;
+export declare const compareBy: <T extends Record<string, any> = {}, P extends keyof T = keyof T>(property: P, compare: Comparator<Value<T, P>>, defaultValue?: T[P]) => Comparator<T>;
 export declare const andThen: <T>(comparators: Comparator<T>[]) => Comparator<T>;
 export declare const alphabetically: SortFunction<string | undefined>;
 export declare const ordinal: SortFunction<number | undefined>;

package/dist/utils/comparator.js

@@ -5,8 +5,17 @@ export const reverse = (comparator) => {
 export const nullsLast = (compare) => {
     return (a, b) => a === b ? 0 : a === undefined || a === null ? 1 : b === undefined || b === null ? -1 : compare(a, b);
 };
-export const compareBy = (property, compare) => {
+export const nullsFirst = (compare) => {
+    return (a, b) => a === b ? 0 : a === undefined || a === null ? -1 : b === undefined || b === null ? 1 : compare(a, b);
+};
+export const nullsDefault = (compare, defaultValue) => {
+    return (a, b) => compare(a ?? defaultValue, b ?? defaultValue);
+};
+export const compareBy = (property, compare, defaultValue) => {
     return nullsLast((a, b) => {
+        if (defaultValue !== undefined) {
+            return compare(a[property] ?? defaultValue, b[property] ?? defaultValue);
+        }
         if (property in a && property in b) {
             return compare(a[property], b[property]);
         }
@@ -32,7 +41,7 @@ export const byStatus = () => {
     });
 };
 export const byStatistic = () => {
-    const compares = statusesList.map((status) => compareBy(status, reverse(ordinal())));
+    const compares = statusesList.map((status) => compareBy(status, reverse(ordinal()), 0));
     return nullsLast(andThen(compares));
 };
 export const byName = () => nullsLast(compareBy("name", alphabetically()));

package/dist/utils/time.d.ts

@@ -1 +1 @@
-export declare const formatDuration: (duration: number | undefined) => string;
+export declare const formatDuration: (duration?: number) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/core-api",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.9",
   "description": "Allure Core API",
   "keywords": [
     "allure"
@@ -32,7 +32,7 @@
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "@vitest/runner": "^2.1.8",
-    "allure-vitest": "^3.0.7",
+    "allure-vitest": "^3.0.9",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",