@allurereport/web-awesome 3.0.0-beta.9 → 3.0.1

package/test/utils/treeFilters.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { createRecursiveTree, filterLeaves } from "../../src/utils/treeFilters.js";
-import type { AllureAwesomeTestResult } from "../../types.js";
+import type { AwesomeTestResult } from "../../types.js";
 
 describe("utils > treeFilters", () => {
   describe("filterLeaves", () => {
@@ -11,15 +11,15 @@ describe("utils > treeFilters", () => {
         a1: {
           name: "a1",
           start: baseDate,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
           start: baseDate + 1000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
           start: baseDate + 2000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         query: "",
@@ -48,17 +48,17 @@ describe("utils > treeFilters", () => {
           name: "a1",
           status: "passed",
           start: baseDate,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
           status: "failed",
           start: baseDate + 1000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
           status: "passed",
           start: baseDate + 2000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         query: "",
@@ -83,17 +83,17 @@ describe("utils > treeFilters", () => {
           name: "a1",
           start: baseDate,
           flaky: true,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
           start: baseDate + 1000,
           flaky: false,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
           start: baseDate + 2000,
           flaky: true,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         query: "",
@@ -118,17 +118,17 @@ describe("utils > treeFilters", () => {
           name: "a1",
           start: baseDate,
           retry: true,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
           start: baseDate + 1000,
           retry: false,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
           start: baseDate + 2000,
           retry: false,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         filter: {
@@ -139,21 +139,166 @@ describe("utils > treeFilters", () => {
       expect(result).toEqual([expect.objectContaining({ name: "a1" })]);
     });
 
+    it("filters leaves by name query", () => {
+      const leaves = ["a1", "b2", "c3"];
+      const leavesById = {
+        a1: {
+          name: "Login test",
+          nodeId: "id-001",
+        },
+        b2: {
+          name: "Logout test",
+          nodeId: "id-002",
+        },
+        c3: {
+          name: "Registration test",
+          nodeId: "id-003",
+        },
+      };
+      const result = filterLeaves(leaves, leavesById as any, {
+        query: "Login",
+      });
+
+      expect(result).toEqual([expect.objectContaining({ name: "Login test" })]);
+    });
+
+    it("filters leaves by nodeId query", () => {
+      const leaves = ["a1", "b2", "c3"];
+      const leavesById = {
+        a1: {
+          name: "Login test",
+          nodeId: "abc-123",
+        },
+        b2: {
+          name: "Logout test",
+          nodeId: "def-456",
+        },
+        c3: {
+          name: "Registration test",
+          nodeId: "ghi-789",
+        },
+      };
+      const result = filterLeaves(leaves, leavesById as any, {
+        query: "def-456",
+      });
+
+      expect(result).toEqual([expect.objectContaining({ name: "Logout test", nodeId: "def-456" })]);
+    });
+
+    it("does not match partial nodeId (exact match only)", () => {
+      const leaves = ["a1", "b2", "c3"];
+      const leavesById = {
+        a1: {
+          name: "Test 1",
+          nodeId: "feature-login-001",
+        },
+        b2: {
+          name: "Test 2",
+          nodeId: "feature-login-002",
+        },
+        c3: {
+          name: "Test 3",
+          nodeId: "feature-logout-001",
+        },
+      };
+      const result = filterLeaves(leaves, leavesById as any, {
+        query: "login",
+      });
+
+      // nodeId requires exact match, so no results by nodeId
+      expect(result).toEqual([]);
+    });
+
+    it("matches nodeId with exact query", () => {
+      const leaves = ["a1", "b2", "c3"];
+      const leavesById = {
+        a1: {
+          name: "Test 1",
+          nodeId: "feature-login-001",
+        },
+        b2: {
+          name: "Test 2",
+          nodeId: "feature-login-002",
+        },
+        c3: {
+          name: "Test 3",
+          nodeId: "feature-logout-001",
+        },
+      };
+      const result = filterLeaves(leaves, leavesById as any, {
+        query: "feature-login-001",
+      });
+
+      expect(result).toEqual([expect.objectContaining({ nodeId: "feature-login-001" })]);
+    });
+
+    it("filters leaves matching by name (partial) or nodeId (exact)", () => {
+      const leaves = ["a1", "b2", "c3"];
+      const leavesById = {
+        a1: {
+          name: "Search functionality",
+          nodeId: "test-001",
+        },
+        b2: {
+          name: "Login test",
+          nodeId: "search",
+        },
+        c3: {
+          name: "Logout test",
+          nodeId: "test-003",
+        },
+      };
+      const result = filterLeaves(leaves, leavesById as any, {
+        query: "search",
+      });
+
+      // Both results match: one by name (partial), one by nodeId (exact)
+      expect(result).toHaveLength(2);
+      expect(result).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ name: "Search functionality" }),
+          expect.objectContaining({ nodeId: "search" }),
+        ]),
+      );
+    });
+
+    it("filters leaves case-insensitively by name (partial) and nodeId (exact)", () => {
+      const leaves = ["a1", "b2"];
+      const leavesById = {
+        a1: {
+          name: "LOGIN Test",
+          nodeId: "id-001",
+        },
+        b2: {
+          name: "Other test",
+          nodeId: "login",
+        },
+      };
+      const result = filterLeaves(leaves, leavesById as any, {
+        query: "login",
+      });
+
+      expect(result).toEqual([
+        expect.objectContaining({ name: "LOGIN Test" }),
+        expect.objectContaining({ nodeId: "login" }),
+      ]);
+    });
+
     it("sorts leave by duration in ascending order", () => {
       const leaves = ["a1", "b2", "c3"];
       const leavesById = {
         a1: {
           name: "a1",
           duration: 1000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
           duration: 2000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
           duration: 3000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         direction: "asc",
@@ -173,15 +318,15 @@ describe("utils > treeFilters", () => {
         a1: {
           name: "a1",
           duration: 1000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
           duration: 2000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
           duration: 3000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         direction: "desc",
@@ -200,13 +345,13 @@ describe("utils > treeFilters", () => {
       const leavesById = {
         a1: {
           name: "a1",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         direction: "asc",
@@ -225,13 +370,13 @@ describe("utils > treeFilters", () => {
       const leavesById = {
         a1: {
           name: "a1",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         direction: "desc",
@@ -251,23 +396,23 @@ describe("utils > treeFilters", () => {
         a1: {
           name: "a1",
           status: "passed",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
           status: "failed",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
           status: "broken",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         d4: {
           name: "d4",
           status: "unknown",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         e5: {
           name: "e5",
           status: "skipped",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         direction: "asc",
@@ -289,23 +434,23 @@ describe("utils > treeFilters", () => {
         a1: {
           name: "a1",
           status: "passed",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
           status: "failed",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
           status: "broken",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         d4: {
           name: "d4",
           status: "unknown",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         e5: {
           name: "e5",
           status: "skipped",
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         direction: "desc",
@@ -329,17 +474,17 @@ describe("utils > treeFilters", () => {
           name: "a1",
           start: baseDate + 2000,
           groupOrder: 3,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
           start: baseDate + 1000,
           groupOrder: 2,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
           start: baseDate,
           groupOrder: 1,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         direction: "asc",
@@ -361,17 +506,17 @@ describe("utils > treeFilters", () => {
           name: "a1",
           start: baseDate + 2000,
           groupOrder: 3,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
           start: baseDate + 1000,
           groupOrder: 2,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
           start: baseDate,
           groupOrder: 1,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const result = filterLeaves(leaves, leavesById, {
         direction: "desc",
@@ -397,15 +542,15 @@ describe("utils > treeFilters", () => {
         a1: {
           name: "a1",
           start: baseDate,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         b2: {
           name: "b2",
           start: baseDate + 1000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
         c3: {
           name: "c3",
           start: baseDate + 2000,
-        } as AllureAwesomeTestResult,
+        } as AwesomeTestResult,
       };
       const groupsById = {
         a1: {

package/tsconfig.json

@@ -17,11 +17,16 @@
     "noImplicitAny": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
-    "lib": ["ES2019", "dom"],
+    "lib": ["ES2019", "dom", "dom.iterable"],
     // node types should not be used in web-commons
     "types": [],
     "skipLibCheck": true
   },
   "include": ["src"],
-  "exclude": ["node_modules", "dist"]
+  "exclude": ["node_modules", "dist"],
+  "references": [
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
 }

package/tsconfig.node.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "include": ["vitest.config.ts", "./src", "./test/**/*.ts", "./test/**/*.tsx"],
+  "compilerOptions": {
+    "composite": true,
+    "types": ["@testing-library/jest-dom"]
+  }
+}

package/types.d.ts

@@ -1,5 +1,6 @@
 import type {
   AttachmentTestStepResult,
+  CiDescriptor,
   DefaultTreeGroup,
   HistoryTestResult,
   TestFixtureResult,
@@ -10,30 +11,38 @@ import type {
   WithChildren,
 } from "@allurereport/core-api";
 
-export type AllureAwesomeReportOptions = {
+export type Layout = "base" | "split";
+
+export type AwesomeReportOptions = {
+  allureVersion: string;
   reportName?: string;
   logo?: string;
-  theme?: "light" | "dark";
+  theme?: "light" | "dark" | "auto";
   groupBy?: string[];
-  reportLanguage?: "en" | "ru";
+  reportLanguage?: "en";
   createdAt: number;
   reportUuid: string;
+  layout?: Layout;
+  defaultSection?: string;
+  sections?: string[];
+  cacheKey: string;
+  ci?: CiDescriptor;
 };
 
-export type AllureAwesomeFixtureResult = Omit<
+export type AwesomeFixtureResult = Omit<
   TestFixtureResult,
   "testResultIds" | "start" | "stop" | "sourceMetadata" | "steps"
 > & {
-  steps: AllureAwesomeTestStepResult[];
+  steps: AwesomeTestStepResult[];
 };
 
-export type AllureAwesomeStatus = TestStatus | "total";
+export type AwesomeStatus = TestStatus | "total";
 
-export type AllureAwesomeTestStepResult = TestStepResult;
+export type AwesomeTestStepResult = TestStepResult;
 
-type AllureAwesomeBreadcrumbItem = string[] | string[][];
+type AwesomeBreadcrumbItem = string[] | string[][];
 
-export interface AllureAwesomeCategory {
+export interface AwesomeCategory {
   name: string;
   description?: string;
   descriptionHtml?: string;
@@ -42,7 +51,8 @@ export interface AllureAwesomeCategory {
   matchedStatuses?: TestStatus[];
   flaky?: boolean;
 }
-export type AllureAwesomeTestResult = Omit<
+
+export type AwesomeTestResult = Omit<
   TestResult,
   | "runSelector"
   | "sourceMetadata"
@@ -51,37 +61,48 @@ export type AllureAwesomeTestResult = Omit<
   | "precondition"
   | "preconditionHtml"
   | "steps"
+  | "environment"
 > & {
-  setup: AllureAwesomeFixtureResult[];
-  teardown: AllureAwesomeFixtureResult[];
-  steps: AllureAwesomeTestStepResult[];
+  setup: AwesomeFixtureResult[];
+  teardown: AwesomeFixtureResult[];
+  steps: AwesomeTestStepResult[];
   history: HistoryTestResult[];
   retries?: TestResult[];
+  retriesCount?: number;
   groupedLabels: Record<string, string[]>;
   attachments?: AttachmentTestStepResult[];
-  breadcrumbs: AllureAwesomeBreadcrumbItem[];
+  breadcrumbs: AwesomeBreadcrumbItem[];
   order?: number;
   groupOrder?: number;
   retry: boolean;
-  categories?: AllureAwesomeCategory[];
+  categories?: AwesomeCategory[];
+  environment?: string | "default";
+  tooltips?: Record<string, string>;
 };
 
-export type AllureAwesomeTreeLeaf = Pick<
-  AllureAwesomeTestResult,
-  "duration" | "name" | "start" | "status" | "groupOrder" | "flaky" | "retry"
+export type AwesomeTreeLeaf = Pick<
+  AwesomeTestResult,
+  "duration" | "name" | "start" | "status" | "groupOrder" | "flaky" | "transition" | "retry" | "retriesCount"
 > & {
   nodeId: string;
+  transitionTooltip?: string;
+  tooltips?: Record<string, string>;
 };
 
-export type AllureAwesomeTreeGroup = WithChildren & DefaultTreeGroup & { nodeId: string };
-
-export type AllureAwesomeTree = TreeData<AllureAwesomeTreeLeaf, AllureAwesomeTreeGroup>;
+export type AwesomeTreeGroup = WithChildren & DefaultTreeGroup & { nodeId: string };
 
+export type AwesomeTree = TreeData<AwesomeTreeLeaf, AwesomeTreeGroup>;
 /**
  * Tree which contains tree leaves instead of their IDs and recursive trees structure instead of groups
  */
-export type AllureAwesomeRecursiveTree = DefaultTreeGroup & {
+export type AwesomeRecursiveTree = DefaultTreeGroup & {
   nodeId: string;
-  leaves: AllureAwesomeTreeLeaf[];
-  trees: AllureAwesomeRecursiveTree[];
+  leaves: AwesomeTreeLeaf[];
+  trees: AwesomeRecursiveTree[];
+};
+
+// TODO: maybe it should call `TestCase` instead of Group
+// TODO: add worst status
+export type AwesomeTestResultGroup = Pick<AwesomeTestResult, "name" | "fullName" | "groupOrder"> & {
+  testResults: AwesomeTestResult[];
 };

package/vitest.config.ts

@@ -1,12 +1,25 @@
 import { createRequire } from "node:module";
 import { defineConfig } from "vitest/config";
+import { resolve } from "path";
+import { preact } from "@preact/preset-vite";
 
 const require = createRequire(import.meta.url);
 
 export default defineConfig({
+  plugins: [preact()],
+  resolve: {
+    alias: {
+      "@": resolve(__dirname, "./src"),
+    },
+  },
   test: {
-    include: ["./test/**/*.test.ts"],
-    setupFiles: [require.resolve("allure-vitest/setup")],
+    environment: "jsdom",
+    include: ["./test/**/*.test.{ts,tsx}"],
+    globals: true,
+    setupFiles: [
+      require.resolve("allure-vitest/setup"),
+      "./vitest.setup.ts",
+    ],
     reporters: [
       "default",
       [

package/vitest.setup.ts

@@ -0,0 +1 @@
+import "@testing-library/jest-dom/vitest";

package/webpack.config.js

@@ -1,26 +1,43 @@
+import ForkTsCheckerPlugin from "fork-ts-checker-webpack-plugin";
 import HtmlWebpackPlugin from "html-webpack-plugin";
 import MiniCssExtractPlugin from "mini-css-extract-plugin";
 import { dirname, join } from "node:path";
 import { env } from "node:process";
 import { fileURLToPath } from "node:url";
 import SpriteLoaderPlugin from "svg-sprite-loader/plugin.js";
+import TerserPlugin from "terser-webpack-plugin";
 import webpack from "webpack";
 import { WebpackManifestPlugin } from "webpack-manifest-plugin";
-import ForkTsCheckerPlugin from "fork-ts-checker-webpack-plugin";
 
 const { SINGLE_FILE_MODE } = env;
 const baseDir = dirname(fileURLToPath(import.meta.url));
 
 export default (env, argv) => {
   const devMode = argv?.mode === "development";
+  /**
+   * @type {import("webpack").Configuration}
+   */
   const config = {
     entry: "./src/index.tsx",
     output: {
       path: join(baseDir, SINGLE_FILE_MODE ? "dist/single" : "dist/multi"),
-      filename: devMode ? "app.js" : "app-[hash:8].js",
-      assetModuleFilename: devMode ? `[name].[ext]` : `[name]-[hash:8].[ext]`,
+      filename: devMode ? "app.js" : "app-[fullhash].js",
+      assetModuleFilename: "[name][ext]",
+    },
+    devtool: devMode ? "eval-source-map" : false,
+    optimization: {
+      minimize: !devMode,
+      minimizer: [
+        new TerserPlugin({
+          terserOptions: {
+            compress: {
+              drop_console: false,
+              drop_debugger: false,
+            },
+          },
+        }),
+      ],
     },
-    devtool: devMode ? "inline-source-map" : false,
     module: {
       rules: [
         {
@@ -74,7 +91,7 @@ export default (env, argv) => {
         DEVELOPMENT: devMode,
       }),
       new MiniCssExtractPlugin({
-        filename: devMode ? "styles.css" : "styles-[hash:8].css",
+        filename: devMode ? "styles.css" : "styles-[contenthash].css",
       }),
       new SpriteLoaderPlugin(),
       new WebpackManifestPlugin({
@@ -90,8 +107,21 @@ export default (env, argv) => {
         "react-dom": "@preact/compat",
       },
     },
+    externals: {
+      // Some packages use crypto from node:crypto, but webpack doesn't support it
+      // I think this does not end up in a bundle, so it is safe to do this
+      "node:crypto": "crypto",
+    },
   };
 
+  if (devMode) {
+    // Get and use source maps from dependencies
+    config.module.rules.push({
+      test: /\.js$/i,
+      extractSourceMap: true,
+    });
+  }
+
   if (SINGLE_FILE_MODE) {
     config.plugins.push(
       new webpack.optimize.LimitChunkCountPlugin({