@allurereport/reader 3.8.2 → 3.9.0

package/dist/allure1/index.js

@@ -34,27 +34,26 @@ const xmlParser = new XMLParser({
     isArray: arrayTags.has.bind(arrayTags),
 });
 const readerId = "allure1";
+const matchesAllure1File = (fileName) => fileName.endsWith("-testsuite.xml");
 export const allure1 = {
+    matches: (data) => matchesAllure1File(data.getOriginalFileName()),
     read: async (visitor, data) => {
-        if (data.getOriginalFileName().endsWith("-testsuite.xml")) {
-            try {
-                const asBuffer = await data.asBuffer();
-                if (!asBuffer) {
-                    return false;
-                }
-                const content = cleanBadXmlCharacters(asBuffer).toString("utf-8");
-                const parsed = xmlParser.parse(content);
-                if (!isStringAnyRecord(parsed)) {
-                    return false;
-                }
-                return await parseRootElement(visitor, parsed);
+        try {
+            const asBuffer = await data.asBuffer();
+            if (!asBuffer) {
+                return false;
             }
-            catch (e) {
-                console.error("error parsing", data.getOriginalFileName(), e);
+            const content = cleanBadXmlCharacters(asBuffer).toString("utf-8");
+            const parsed = xmlParser.parse(content);
+            if (!isStringAnyRecord(parsed)) {
                 return false;
             }
+            return await parseRootElement(visitor, parsed);
+        }
+        catch (e) {
+            console.error("error parsing", data.getOriginalFileName(), e);
+            return false;
         }
-        return false;
     },
     readerId: () => readerId,
 };

package/dist/allure2/index.js

@@ -17,13 +17,39 @@ const xmlParser = new XMLParser({
     isArray: (tagName, jPath) => arrayTags.has(jPath.toString()),
 });
 const readerId = "allure2";
+const isAllure2AttachmentFileName = (fileName) => {
+    const attachmentIdx = fileName.lastIndexOf("-attachment");
+    if (attachmentIdx === -1) {
+        return false;
+    }
+    const suffix = fileName.slice(attachmentIdx + "-attachment".length);
+    return suffix === "" || suffix.startsWith(".");
+};
+const matchesAllure2File = (fileName) => {
+    if (fileName.endsWith("-result.json"))
+        return true;
+    if (fileName.endsWith("-check.json"))
+        return true;
+    if (fileName.endsWith("-container.json"))
+        return true;
+    if (fileName.endsWith("-globals.json"))
+        return true;
+    if (isAllure2AttachmentFileName(fileName))
+        return true;
+    if (fileName === "executor.json")
+        return true;
+    if (fileName === "categories.json")
+        return true;
+    if (fileName === "environment.properties")
+        return true;
+    if (fileName === "environment.xml")
+        return true;
+    return false;
+};
 export const allure2 = {
+    matches: (data) => matchesAllure2File(data.getOriginalFileName()),
     read: async (visitor, data) => {
         const originalFileName = data.getOriginalFileName();
-        if (originalFileName.match(/-attachment(?:\..+)?/)) {
-            await visitor.visitAttachmentFile(data, { readerId });
-            return true;
-        }
         if (originalFileName.endsWith("-check.json")) {
             try {
                 const parsed = await data.asJson();

package/dist/attachments/index.js

@@ -1,5 +1,6 @@
 const readerId = "attachments";
 export const attachments = {
+    matches: () => true,
     read: async (visitor, data) => {
         await visitor.visitAttachmentFile(data, { readerId });
         return true;

package/dist/cucumberjson/index.js

@@ -5,6 +5,7 @@ import { ensureArray, ensureInt, ensureString, isArray, isNonNullObject, isStrin
 import { STEP_NAME_PLACEHOLDER, TEST_NAME_PLACEHOLDER } from "./model.js";
 const NS_IN_MS = 1000000;
 const readerId = "cucumberjson";
+const matchesCucumberJsonFile = (fileName) => fileName.endsWith(".json");
 const allureStepStatusPriorityOrder = {
     failed: 0,
     broken: 1,
@@ -31,23 +32,25 @@ const allureStepMessages = {
     failed: "The step failed",
 };
 export const cucumberjson = {
+    matches: (data) => matchesCucumberJsonFile(data.getOriginalFileName()),
     read: async (visitor, data) => {
         const originalFileName = data.getOriginalFileName();
-        if (originalFileName.endsWith(".json")) {
-            try {
-                const parsed = await data.asJson();
-                if (isArray(parsed)) {
-                    let oneOrMoreFeaturesParsed = false;
-                    for (const feature of parsed) {
-                        oneOrMoreFeaturesParsed || (oneOrMoreFeaturesParsed = await processFeature(visitor, originalFileName, feature));
+        try {
+            const parsed = await data.asJson();
+            if (isArray(parsed)) {
+                let oneOrMoreFeaturesParsed = false;
+                for (const feature of parsed) {
+                    oneOrMoreFeaturesParsed || (oneOrMoreFeaturesParsed = await processFeature(visitor, originalFileName, feature));
+                    if (oneOrMoreFeaturesParsed) {
+                        break;
                     }
-                    return oneOrMoreFeaturesParsed;
                 }
+                return oneOrMoreFeaturesParsed;
             }
-            catch (e) {
-                console.error("error parsing", originalFileName, e);
-                return false;
-            }
+        }
+        catch (e) {
+            console.error("error parsing", originalFileName, e);
+            return false;
         }
         return false;
     },

package/dist/junitxml/index.js

@@ -23,26 +23,26 @@ const xmlParser = new XMLParser({
     isArray: (tagName, jPath) => arrayTags.has(jPath.toString()),
 });
 const readerId = "junit";
+const matchesJunitXmlFile = (fileName) => fileName.endsWith(".xml");
 export const junitXml = {
+    matches: (data) => matchesJunitXmlFile(data.getOriginalFileName()),
     read: async (visitor, data) => {
-        if (data.getOriginalFileName().endsWith(".xml")) {
-            try {
-                const content = await data.asUtf8String();
-                if (!content) {
-                    return false;
-                }
-                const parsed = xmlParser.parse(content);
-                if (!isStringAnyRecord(parsed)) {
-                    return false;
-                }
-                return await parseRootElement(visitor, parsed);
+        const originalFileName = data.getOriginalFileName();
+        try {
+            const content = await data.asUtf8String();
+            if (!content) {
+                return false;
             }
-            catch (e) {
-                console.error("error parsing", data.getOriginalFileName(), e);
+            const parsed = xmlParser.parse(content);
+            if (!isStringAnyRecord(parsed)) {
                 return false;
             }
+            return await parseRootElement(visitor, parsed);
+        }
+        catch (e) {
+            console.error("error parsing", originalFileName, e);
+            return false;
         }
-        return false;
     },
     readerId: () => readerId,
 };

package/package.json

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