@testomatio/reporter 2.7.2-beta.1 → 2.7.2

package/lib/adapter/vitest.d.ts

@@ -24,12 +24,21 @@ export class VitestReporter {
     tests: (TestData & {
         status: string;
     })[];
+    _finalized: boolean;
+    _finalizing: boolean;
     onInit(): void;
     /**
      * @param {VitestTestFile[] | undefined} files // array with results;
      * @param {unknown[] | undefined} errors // errors does not contain errors from tests; probably its testrunner errors
      */
     onFinished(files: VitestTestFile[] | undefined, errors: unknown[] | undefined): Promise<void>;
+    /**
+     * Vitest 4+ reporter API callback.
+     *
+     * @param {Array<unknown> | undefined} testModules
+     * @param {unknown[] | undefined} errors
+     */
+    onTestRunEnd(testModules: Array<unknown> | undefined, errors: unknown[] | undefined): Promise<void>;
     #private;
 }
 import { Client as TestomatioClient } from '../client.js';

package/lib/adapter/vitest.js

@@ -26,9 +26,13 @@ class VitestReporter {
          * @type {(TestData & {status: string})[]} tests
          */
         this.tests = [];
+        this._finalized = false;
+        this._finalizing = false;
     }
     // on run start
     onInit() {
+        this._finalized = false;
+        this._finalizing = false;
         this.client.createRun();
     }
     /**
@@ -36,33 +40,57 @@ class VitestReporter {
      * @param {unknown[] | undefined} errors // errors does not contain errors from tests; probably its testrunner errors
      */
     async onFinished(files, errors) {
-        if (!files || !files.length)
-            console.info('No tests executed');
-        files.forEach(file => {
-            // task could be test or suite
-            file.tasks.forEach(taskOrSuite => {
-                if (taskOrSuite.type === 'test') {
-                    const test = taskOrSuite;
-                    this.tests.push(this.#getDataFromTest(test));
-                }
-                else if (taskOrSuite.type === 'suite') {
-                    const suite = taskOrSuite;
-                    this.#processTasksOfSuite(suite);
-                }
-                else {
-                    throw new Error('Unprocessed case. Unknown task type');
-                }
+        if (this._finalized || this._finalizing)
+            return;
+        this._finalizing = true;
+        try {
+            this.tests = [];
+            if (!files || !files.length) {
+                console.info('No tests executed');
+                return;
+            }
+            files.forEach(file => {
+                // task could be test or suite
+                getTasks(file).forEach(taskOrSuite => {
+                    if (taskOrSuite.type === 'test') {
+                        const test = taskOrSuite;
+                        this.tests.push(this.#getDataFromTest(test));
+                    }
+                    else if (taskOrSuite.type === 'suite') {
+                        const suite = taskOrSuite;
+                        this.#processTasksOfSuite(suite);
+                    }
+                    else {
+                        throw new Error('Unprocessed case. Unknown task type');
+                    }
+                });
             });
-        });
-        debug(this.tests.length, 'tests collected');
-        // send tests to Testomat.io
-        for (const test of this.tests) {
-            await this.client.addTestRun(test.status, test);
+            debug(this.tests.length, 'tests collected');
+            // send tests to Testomat.io
+            for (const test of this.tests) {
+                await this.client.addTestRun(test.status, test);
+            }
+            console.log('finished');
+            if (errors.length)
+                console.error('Vitest adapter errors:', errors);
+            await this.client.updateRunStatus(getRunStatusFromResults(files));
+            this._finalized = true;
+        }
+        finally {
+            this._finalizing = false;
         }
-        console.log('finished');
-        if (errors.length)
-            console.error('Vitest adapter errors:', errors);
-        await this.client.updateRunStatus(getRunStatusFromResults(files));
+    }
+    /**
+     * Vitest 4+ reporter API callback.
+     *
+     * @param {Array<unknown> | undefined} testModules
+     * @param {unknown[] | undefined} errors
+     */
+    async onTestRunEnd(testModules, errors) {
+        const files = (testModules || [])
+            .map(module => module && ( /** @type {any} */(module).task || module))
+            .filter(Boolean);
+        await this.onFinished(files, errors);
     }
     /* non-used listeners
     onUserConsoleLog(log) {}
@@ -81,7 +109,7 @@ class VitestReporter {
      * @param {VitestSuite} suite
      */
     #processTasksOfSuite(suite) {
-        suite.tasks.forEach(taskOrSuite => {
+        getTasks(suite).forEach(taskOrSuite => {
             if (taskOrSuite.type === 'test') {
                 const test = taskOrSuite;
                 this.tests.push(this.#getDataFromTest(test));
@@ -105,12 +133,12 @@ class VitestReporter {
     #getDataFromTest(test) {
         return {
             error: test.result?.errors ? test.result.errors[0] : undefined,
-            file: test.file.name,
+            file: test.file?.name || test.file?.filepath || '',
             logs: test.logs ? transformLogsToString(test.logs) : '',
             meta: test.meta,
             // @ts-ignore - STATUS values are string literals but type system sees them as string
             status: getTestStatus(test),
-            suite_title: test.suite.name || test.file?.name,
+            suite_title: test.suite?.name || test.file?.name || test.file?.filepath,
             test_id: (0, utils_js_1.getTestomatIdFromTestTitle)(test.name),
             time: test.result?.duration || 0,
             title: test.name,
@@ -159,9 +187,10 @@ function getTestStatus(test) {
         return constants_js_1.STATUS.FAILED;
     if (test.result?.state === 'pass')
         return constants_js_1.STATUS.PASSED;
-    if (!test.result && test.mode === 'skip')
+    if (test.result?.state === 'skip' || (!test.result && test.mode === 'skip'))
         return constants_js_1.STATUS.SKIPPED;
     console.error(picocolors_1.default.red('Unprocessed case for defining test status. Contact dev team. Test:'), test);
+    return constants_js_1.STATUS.SKIPPED;
 }
 /**
  * @param {VitestTestLogs[]} logs
@@ -179,6 +208,23 @@ function transformLogsToString(logs) {
     });
     return logsStr;
 }
+/**
+ * Supports both old and new Vitest task tree shapes.
+ *
+ * @param {any} node
+ * @returns {any[]}
+ */
+function getTasks(node) {
+    if (!node)
+        return [];
+    if (Array.isArray(node.tasks))
+        return node.tasks;
+    if (Array.isArray(node.children))
+        return node.children;
+    if (node.task)
+        return [node.task];
+    return [];
+}
 module.exports = VitestReporter;
 
 module.exports.VitestReporter = VitestReporter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "2.7.2-beta.1",
+  "version": "2.7.2",
   "description": "Testomatio Reporter Client",
   "engines": {
     "node": ">=18"

package/src/adapter/vitest.js

@@ -23,10 +23,14 @@ class VitestReporter {
      * @type {(TestData & {status: string})[]} tests
      */
     this.tests = [];
+    this._finalized = false;
+    this._finalizing = false;
   }
 
   // on run start
   onInit() {
+    this._finalized = false;
+    this._finalizing = false;
     this.client.createRun();
   }
 
@@ -35,34 +39,59 @@ class VitestReporter {
    * @param {unknown[] | undefined} errors // errors does not contain errors from tests; probably its testrunner errors
    */
   async onFinished(files, errors) {
-    if (!files || !files.length) console.info('No tests executed');
+    if (this._finalized || this._finalizing) return;
+    this._finalizing = true;
+
+    try {
+      this.tests = [];
+      if (!files || !files.length) {
+        console.info('No tests executed');
+        return;
+      }
 
-    files.forEach(file => {
-      // task could be test or suite
-      file.tasks.forEach(taskOrSuite => {
-        if (taskOrSuite.type === 'test') {
-          const test = taskOrSuite;
-          this.tests.push(this.#getDataFromTest(test));
-        } else if (taskOrSuite.type === 'suite') {
-          const suite = taskOrSuite;
-          this.#processTasksOfSuite(suite);
-        } else {
-          throw new Error('Unprocessed case. Unknown task type');
-        }
+      files.forEach(file => {
+        // task could be test or suite
+        getTasks(file).forEach(taskOrSuite => {
+          if (taskOrSuite.type === 'test') {
+            const test = taskOrSuite;
+            this.tests.push(this.#getDataFromTest(test));
+          } else if (taskOrSuite.type === 'suite') {
+            const suite = taskOrSuite;
+            this.#processTasksOfSuite(suite);
+          } else {
+            throw new Error('Unprocessed case. Unknown task type');
+          }
+        });
       });
-    });
 
-    debug(this.tests.length, 'tests collected');
+      debug(this.tests.length, 'tests collected');
 
-    // send tests to Testomat.io
-    for (const test of this.tests) {
-      await this.client.addTestRun(test.status, test);
-    }
+      // send tests to Testomat.io
+      for (const test of this.tests) {
+        await this.client.addTestRun(test.status, test);
+      }
 
-    console.log('finished');
-    if (errors.length) console.error('Vitest adapter errors:', errors);
+      console.log('finished');
+      if (errors.length) console.error('Vitest adapter errors:', errors);
 
-    await this.client.updateRunStatus(getRunStatusFromResults(files));
+      await this.client.updateRunStatus(getRunStatusFromResults(files));
+      this._finalized = true;
+    } finally {
+      this._finalizing = false;
+    }
+  }
+
+  /**
+   * Vitest 4+ reporter API callback.
+   *
+   * @param {Array<unknown> | undefined} testModules
+   * @param {unknown[] | undefined} errors
+   */
+  async onTestRunEnd(testModules, errors) {
+    const files = (testModules || [])
+      .map(module => module && (/** @type {any} */ (module).task || module))
+      .filter(Boolean);
+    await this.onFinished(files, errors);
   }
 
   /* non-used listeners
@@ -83,7 +112,7 @@ class VitestReporter {
    * @param {VitestSuite} suite
    */
   #processTasksOfSuite(suite) {
-    suite.tasks.forEach(taskOrSuite => {
+    getTasks(suite).forEach(taskOrSuite => {
       if (taskOrSuite.type === 'test') {
         const test = taskOrSuite;
         this.tests.push(this.#getDataFromTest(test));
@@ -106,12 +135,12 @@ class VitestReporter {
   #getDataFromTest(test) {
     return {
       error: test.result?.errors ? test.result.errors[0] : undefined,
-      file: test.file.name,
+      file: test.file?.name || test.file?.filepath || '',
       logs: test.logs ? transformLogsToString(test.logs) : '',
       meta: test.meta,
       // @ts-ignore - STATUS values are string literals but type system sees them as string
       status: getTestStatus(test),
-      suite_title: test.suite.name || test.file?.name,
+      suite_title: test.suite?.name || test.file?.name || test.file?.filepath,
       test_id: getTestomatIdFromTestTitle(test.name),
       time: test.result?.duration || 0,
       title: test.name,
@@ -162,8 +191,9 @@ function getRunStatusFromResults(files) {
 function getTestStatus(test) {
   if (test.result?.state === 'fail') return STATUS.FAILED;
   if (test.result?.state === 'pass') return STATUS.PASSED;
-  if (!test.result && test.mode === 'skip') return STATUS.SKIPPED;
+  if (test.result?.state === 'skip' || (!test.result && test.mode === 'skip')) return STATUS.SKIPPED;
   console.error(pc.red('Unprocessed case for defining test status. Contact dev team. Test:'), test);
+  return STATUS.SKIPPED;
 }
 
 /**
@@ -180,5 +210,19 @@ function transformLogsToString(logs) {
   return logsStr;
 }
 
+/**
+ * Supports both old and new Vitest task tree shapes.
+ *
+ * @param {any} node
+ * @returns {any[]}
+ */
+function getTasks(node) {
+  if (!node) return [];
+  if (Array.isArray(node.tasks)) return node.tasks;
+  if (Array.isArray(node.children)) return node.children;
+  if (node.task) return [node.task];
+  return [];
+}
+
 export default VitestReporter;
 export { VitestReporter };