@allurereport/reader 3.17.0 → 3.19.0

package/dist/allure2/index.js

@@ -3,7 +3,7 @@ import { randomUUID } from "node:crypto";
 import { notNull } from "@allurereport/core-api";
 import { XMLParser } from "fast-xml-parser";
 import { parseProperties } from "../properties.js";
-import { ensureBoolean, ensureInt, ensureString } from "../utils.js";
+import { ensureArray, ensureBoolean, ensureInt, ensureString } from "../utils.js";
 import { cleanBadXmlCharacters, isStringAnyRecord, isStringAnyRecordArray } from "../xml-utils.js";
 import { ParameterMode } from "./model.js";
 const arrayTags = new Set(["environment.parameter"]);
@@ -24,6 +24,43 @@ const historyMetadataKeys = {
     "retry-trend.json": "allure2_retry_trend",
     "categories-trend.json": "allure2_categories_trend",
 };
+const stripAnsi = (value) => value.replace(/\x1B\[[0-9;?]*[ -/]*[@-~]/g, "");
+const trimDiffValue = (value) => value?.trim().replace(/^["'`](.*)["'`]$/s, "$1");
+const findLabeledAssertionDiff = (text) => {
+    const expected = text.match(/^\s*Expected(?:\s+\w+)?:\s*(?<value>.+)\s*$/im)?.groups?.value;
+    const actual = text.match(/^\s*(?:Received|Actual)(?:\s+\w+)?:\s*(?<value>.+)\s*$/im)?.groups?.value;
+    const normalizedActual = trimDiffValue(actual);
+    const normalizedExpected = trimDiffValue(expected);
+    return normalizedActual && normalizedExpected
+        ? { actual: normalizedActual, expected: normalizedExpected }
+        : undefined;
+};
+const findPytestAssertionDiff = (text) => {
+    const lines = text.split(/\r?\n/).map((line) => line
+        .replace(/^\s*(?:E\s+|>\s*)/, "")
+        .replace(/^AssertionError:\s*/, "")
+        .trim());
+    for (const line of lines) {
+        const match = line.match(/^assert\s+(?<actual>.+?)\s+==\s+(?<expected>.+)$/);
+        if (!match?.groups) {
+            continue;
+        }
+        const actual = trimDiffValue(match.groups.actual);
+        const expected = trimDiffValue(match.groups.expected);
+        if (actual && expected) {
+            return { actual, expected };
+        }
+    }
+    return undefined;
+};
+const inferAssertionDiff = (message, trace, actual, expected) => {
+    if (actual || expected) {
+        return { actual, expected };
+    }
+    const text = stripAnsi([message, trace].filter(Boolean).join("\n"));
+    const inferredDiff = findLabeledAssertionDiff(text) ?? findPytestAssertionDiff(text);
+    return inferredDiff ?? { actual, expected };
+};
 const isAllure2AttachmentFileName = (fileName) => {
     const attachmentIdx = fileName.lastIndexOf("-attachment");
     if (attachmentIdx === -1) {
@@ -199,6 +236,22 @@ export const allure2 = {
 const processTestResult = async (visitor, result, originalFileName) => {
     const links = result?.links?.filter(notNull) ?? [];
     const topLevelAttachmentCount = result?.attachments?.filter(notNull).length ?? 0;
+    const message = ensureString(result?.statusDetails?.message);
+    const trace = ensureString(result?.statusDetails?.trace);
+    const diff = inferAssertionDiff(message, trace, ensureString(result?.statusDetails?.actual, ""), ensureString(result?.statusDetails?.expected, ""));
+    const errors = ensureArray(result?.statusDetails?.errors)
+        ?.filter(notNull)
+        .map((error) => {
+        const errorMessage = ensureString(error.message);
+        const errorTrace = ensureString(error.trace);
+        const errorDiff = inferAssertionDiff(errorMessage, errorTrace, ensureString(error.actual, ""), ensureString(error.expected, ""));
+        return {
+            message: errorMessage,
+            trace: errorTrace,
+            actual: errorDiff.actual,
+            expected: errorDiff.expected,
+        };
+    });
     const dest = {
         uuid: ensureString(result.uuid),
         titlePath: result?.titlePath?.length ? result.titlePath : [],
@@ -211,10 +264,11 @@ const processTestResult = async (visitor, result, originalFileName) => {
         description: ensureString(result.description),
         descriptionHtml: ensureString(result.descriptionHtml),
         status: convertStatus(result.status),
-        message: ensureString(result?.statusDetails?.message),
-        trace: ensureString(result?.statusDetails?.trace),
-        actual: ensureString(result?.statusDetails?.actual, ""),
-        expected: ensureString(result?.statusDetails?.expected, ""),
+        message,
+        trace,
+        actual: diff.actual,
+        expected: diff.expected,
+        errors,
         flaky: ensureBoolean(result?.statusDetails?.flaky),
         known: ensureBoolean(result?.statusDetails?.known),
         muted: ensureBoolean(result?.statusDetails?.muted),

package/dist/allure2/model.d.ts

@@ -43,6 +43,7 @@ export interface Parameter {
 export interface StatusDetails {
     message?: string;
     trace?: string;
+    errors?: StatusDetails[];
     known?: boolean;
     muted?: boolean;
     flaky?: boolean;

package/dist/xcresult/utils.js

@@ -56,6 +56,8 @@ export const utiToMediaType = {
     "public.tiff": "image/tiff",
     "com.apple.pict": "image/x-pict",
     "public.png": "image/png",
+    "public.webp": "image/webp",
+    "org.webmproject.webp": "image/webp",
     "public.xbitmap-image": "image/x-quicktime",
     "com.apple.quicktime-image": "image/x-quicktime",
     "com.apple.quicktime-movie": "video/quicktime",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/reader",
-  "version": "3.17.0",
+  "version": "3.19.0",
   "description": "Collection of utilities which helps to process different kind of test results as Allure Results",
   "keywords": [
     "allure",
@@ -26,10 +26,10 @@
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.17.0",
-    "@allurereport/plugin-api": "3.17.0",
-    "@allurereport/reader-api": "3.17.0",
-    "fast-xml-parser": "^5.7.0"
+    "@allurereport/core-api": "3.19.0",
+    "@allurereport/plugin-api": "3.19.0",
+    "@allurereport/reader-api": "3.19.0",
+    "fast-xml-parser": "^5.11.1"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.3",