@testomatio/reporter 2.0.0-beta-esm → 2.0.1-beta-esm

package/lib/xmlReader.js

@@ -15,12 +15,12 @@ const utils_js_1 = require("./utils/utils.js");
 const index_js_1 = require("./pipe/index.js");
 const index_js_2 = __importDefault(require("./junit-adapter/index.js"));
 const config_js_1 = require("./config.js");
-const fileUploader_js_1 = require("./fileUploader.js");
+const uploader_js_1 = require("./uploader.js");
 // @ts-ignore this line will be removed in compiled code, because __dirname is defined in commonjs
 const debug = (0, debug_1.default)('@testomatio/reporter:xml');
 const ridRunId = (0, crypto_1.randomUUID)();
 const TESTOMATIO_URL = process.env.TESTOMATIO_URL || 'https://app.testomat.io';
-const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_TITLE, TESTOMATIO_ENV, TESTOMATIO_RUN } = process.env;
+const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_TITLE, TESTOMATIO_ENV, TESTOMATIO_RUN, TESTOMATIO_MARK_DETACHED } = process.env;
 const options = {
     ignoreDeclaration: true,
     ignoreAttributes: false,
@@ -37,6 +37,7 @@ class XmlReader {
             title: TESTOMATIO_TITLE,
             env: TESTOMATIO_ENV,
             group_title: TESTOMATIO_RUNGROUP_TITLE,
+            detach: TESTOMATIO_MARK_DETACHED,
             // batch uploading is implemented for xml already
             isBatchEnabled: false,
         };
@@ -51,7 +52,7 @@ class XmlReader {
         this.tests = [];
         this.stats = {};
         this.stats.language = opts.lang?.toLowerCase();
-        this.filesToUpload = {};
+        this.uploader = new uploader_js_1.S3Uploader();
         // @ts-ignore
         const packageJsonPath = path_1.default.resolve(__dirname, '..', 'package.json');
         this.version = JSON.parse(fs_1.default.readFileSync(packageJsonPath).toString()).version;
@@ -105,16 +106,24 @@ class XmlReader {
         const resultTests = processTestSuite(testsuite);
         const hasFailures = resultTests.filter(t => t.status === 'failed').length > 0;
         const status = failures > 0 || errors > 0 || hasFailures ? 'failed' : 'passed';
+        const time = testsuite.time || 0;
+        // debug('time', jsonSuite, time)
+        if (time) {
+            if (!this.stats.duration)
+                this.stats.duration = 0;
+            this.stats.duration += parseFloat(time);
+        }
         this.tests = this.tests.concat(resultTests);
         return {
-            status,
             create_tests: true,
+            duration: parseFloat(time),
+            failed_count: parseInt(failures, 10),
             name,
-            tests_count: parseInt(tests, 10),
             passed_count: parseInt(tests, 10) - parseInt(failures, 10),
-            failed_count: parseInt(failures, 10),
             skipped_count: 0,
+            status,
             tests: resultTests,
+            tests_count: parseInt(tests, 10),
         };
     }
     processNUnit(jsonSuite) {
@@ -266,6 +275,7 @@ class XmlReader {
     calculateStats() {
         this.stats = {
             ...this.stats,
+            detach: this.requestParams.detach,
             status: 'passed',
             create_tests: true,
             tests_count: 0,
@@ -355,7 +365,7 @@ class XmlReader {
             if (!files.length)
                 continue;
             const runId = this.runId || this.store.runId || Date.now().toString();
-            test.artifacts = await Promise.all(files.map(f => fileUploader_js_1.upload.uploadFileByPath(f, runId)));
+            test.artifacts = await Promise.all(files.map(f => this.uploader.uploadFileByPath(f, [runId])));
             console.log(constants_js_1.APP_PREFIX, `🗄️ Uploaded ${picocolors_1.default.bold(`${files.length} artifacts`)} for test ${test.title}`);
         }
     }
@@ -369,7 +379,9 @@ class XmlReader {
         };
         debug('Run', runParams);
         this.pipes = this.pipes || (await this.pipesPromise);
-        return Promise.all(this.pipes.map(p => p.createRun(runParams)));
+        const run = await Promise.all(this.pipes.map(p => p.createRun(runParams)));
+        this.uploader.checkEnabled();
+        return run;
     }
     async uploadData() {
         await this.uploadArtifacts();
@@ -378,16 +390,14 @@ class XmlReader {
         this.fetchSourceCode();
         this.formatErrors();
         this.formatTests();
-        debug('Uploading data', {
-            ...this.stats,
-            tests: this.tests,
-        });
         const dataString = {
             ...this.stats,
             api_key: this.requestParams.apiKey,
             status: 'finished',
+            duration: this.stats.duration,
             tests: this.tests,
         };
+        debug('Uploading data', dataString);
         this.pipes = this.pipes || (await this.pipesPromise);
         return Promise.all(this.pipes.map(p => p.finishRun(dataString)));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "2.0.0-beta-esm",
+  "version": "2.0.1-beta-esm",
   "description": "Testomatio Reporter Client",
   "engines": {
     "node": ">=18"
@@ -19,14 +19,14 @@
     "axios": "^1.6.2",
     "axios-retry": "^3.9.1",
     "callsite-record": "^4.1.4",
-    "chalk": "^5.3.0",
-    "commander": "^4.1.1",
+    "commander": "^12",
     "cross-spawn": "^7.0.3",
     "csv-writer": "^1.6.0",
     "debug": "^4.3.4",
     "dotenv": "^16.0.1",
     "fast-xml-parser": "^4.4.1",
     "file-url": "3.0.0",
+    "filesize": "^10.1.6",
     "glob": "^10.3",
     "handlebars": "^4.7.8",
     "has-flag": "^5.0.1",
@@ -37,6 +37,7 @@
     "lodash.merge": "^4.6.2",
     "minimatch": "^9.0.3",
     "picocolors": "^1.0.1",
+    "pretty-ms": "^7.0.1",
     "promise-retry": "^2.0.1",
     "strip-ansi": "^7.1.0",
     "uuid": "^9.0.0"
@@ -67,10 +68,11 @@
     "test:adapter:playwright:example": "npx playwright test --config='./tests/adapter/examples/playwright/playwright.config.ts'",
     "test:adapter:vitest:example": "npx vitest --config='./tests/adapter/examples/vitest/vitest.config.ts'",
     "test:storage": "npx mocha tests-storage/artifact-storage.test.js && npx mocha tests-storage/data-storage.test.js && TESTOMATIO_INTERCEPT_CONSOLE_LOGS=true npx mocha tests-storage/logger.test.js && npx mocha tests-storage/logger-2.test.js && npx mocha tests-storage/reporter-functions.test.js",
-    "build:cjs": "rm -rf ./cjs && tsc --module commonjs && npx tsx build/scripts/edit-js-files.js && npx tsx build/scripts/edit-package-json.js && chmod +x ./build/scripts/copy-tesmplate.sh && ./build/scripts/copy-tesmplate.sh"
+    "//": "builds code from /src (esm) into /lib (commonjs)",
+    "build": "rm -rf ./cjs && tsc --module commonjs && npx tsx build/scripts/edit-js-files.js && npx tsx build/scripts/edit-package-json.js && chmod +x ./build/scripts/copy-tesmplate.sh && ./build/scripts/copy-tesmplate.sh"
   },
   "devDependencies": {
-    "@playwright/test": "^1.46.1",
+    "@playwright/test": "^1.49.1",
     "@redocly/cli": "^1.0.0-beta.125",
     "@types/cross-spawn": "^6.0.6",
     "@types/cucumber": "^7.0.0",
@@ -95,14 +97,16 @@
     "vitest": "^1.6.0"
   },
   "bin": {
+    "@testomatio/reporter": "./lib/bin/cli.js",
     "report-xml": "./lib/bin/reportXml.js",
-    "start-test-run": "./lib/bin/startTest.js"
+    "start-test-run": "./lib/bin/startTest.js",
+    "upload-artifacts": "./lib/bin/uploadArtifacts.js"
   },
   "exports": {
     ".": {
       "import": "./src/reporter.js",
       "require": "./lib/reporter.js",
-      "types": "./index.d.ts"
+      "types": "./types/types.d.ts"
     },
     "./lib/adapter/codecept/codecept.js": "./lib/adapter/codecept.js",
     "./lib/adapter/codecept": "./lib/adapter/codecept.js",
@@ -111,6 +115,7 @@
     "./cucumber": "./lib/adapter/cucumber/current.js",
     "./lib/adapter/cypress-plugin": "./lib/adapter/cypress-plugin/index.js",
     "./cypress-plugin": "./lib/adapter/cypress-plugin/index.js",
+    "./cypress": "./lib/adapter/cypress-plugin/index.js",
     "./lib/adapter/jasmine.js": "./lib/adapter/jasmine.js",
     "./jasmine": "./lib/adapter/jasmine.js",
     "./lib/adapter/jest.js": "./lib/adapter/jest.js",
@@ -119,9 +124,10 @@
     "./mocha": "./lib/adapter/mocha.js",
     "./lib/adapter/playwright.js": "./lib/adapter/playwright.js",
     "./playwright": "./lib/adapter/playwright.js",
-    "./vitest": "./src/adapter/vitest.js",
+    "./vitest": "./lib/adapter/vitest.js",
     "./lib/adapter/webdriver.js": "./lib/adapter/webdriver.js",
     "./lib/adapter/webdriver": "./lib/adapter/webdriver.js",
-    "./webdriver": "./lib/adapter/webdriver.js"
+    "./webdriver": "./lib/adapter/webdriver.js",
+    "./wdio": "./lib/adapter/webdriver.js"
   }
 }

package/src/adapter/codecept.js

@@ -4,7 +4,6 @@ import TestomatClient from '../client.js';
 import { STATUS, APP_PREFIX, TESTOMAT_TMP_STORAGE_DIR } from '../constants.js';
 import { getTestomatIdFromTestTitle, fileSystem } from '../utils/utils.js';
 import { services } from '../services/index.js';
-import { upload } from '../fileUploader.js';
 // eslint-disable-next-line
 import codeceptjs from 'codeceptjs';
 
@@ -46,8 +45,9 @@ function CodeceptReporter(config) {
   const { apiKey } = config;
 
   const getDuration = test => {
-    if (testTimeMap[test.id]) {
-      return Date.now() - testTimeMap[test.id];
+    if (!test.uid) return 0;
+    if (testTimeMap[test.uid]) {
+      return Date.now() - testTimeMap[test.uid];
     }
 
     return 0;
@@ -125,7 +125,8 @@ function CodeceptReporter(config) {
     services.setContext(test.fullTitle());
 
     testTimeMap[test.id] = Date.now();
-    // start logging
+    if (!test.uid) return;
+    testTimeMap[test.uid] = Date.now();
   });
 
   event.dispatcher.on(event.all.result, async () => {
@@ -133,10 +134,8 @@ function CodeceptReporter(config) {
     // all tests were reported and we can upload videos
     await Promise.all(reportTestPromises);
 
-    if (upload.isArtifactsEnabled()) {
-      await uploadAttachments(client, videos, '🎞️ Uploading', 'video');
-      await uploadAttachments(client, traces, '📁 Uploading', 'trace');
-    }
+    await uploadAttachments(client, videos, '🎞️ Uploading', 'video');
+    await uploadAttachments(client, traces, '📁 Uploading', 'trace');
 
     const status = failedTests.length === 0 ? STATUS.PASSED : STATUS.FAILED;
     // @ts-ignore
@@ -144,9 +143,9 @@ function CodeceptReporter(config) {
   });
 
   event.dispatcher.on(event.test.passed, test => {
-    const { id, tags, title } = test;
-    if (id && failedTests.includes(id)) {
-      failedTests = failedTests.filter(failed => id !== failed);
+    const { uid, tags, title } = test;
+    if (uid && failedTests.includes(uid)) {
+      failedTests = failedTests.filter(failed => uid !== failed);
     }
     const testObj = getTestAndMessage(title);
 
@@ -157,7 +156,7 @@ function CodeceptReporter(config) {
 
     client.addTestRun(STATUS.PASSED, {
       ...stripExampleFromTitle(title),
-      rid: id,
+      rid: uid,
       suite_title: test.parent && test.parent.title,
       message: testObj.message,
       time: getDuration(test),
@@ -180,12 +179,12 @@ function CodeceptReporter(config) {
     if (!suite) return;
     if (!suite.tests) return;
     for (const test of suite.tests) {
-      const { id, tags, title } = test;
-      failedTests.push(id || title);
+      const { uid, tags, title } = test;
+      failedTests.push(uid || title);
       const testId = getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`);
 
       client.addTestRun(STATUS.FAILED, {
-        rid: id,
+        rid: uid,
         ...stripExampleFromTitle(title),
         suite_title: suite.title,
         test_id: testId,
@@ -199,8 +198,8 @@ function CodeceptReporter(config) {
   event.dispatcher.on(event.test.after, test => {
     if (test.state && test.state !== STATUS.FAILED) return;
     if (test.err) error = test.err;
-    const { id, tags, title, artifacts } = test;
-    failedTests.push(id || title);
+    const { uid, tags, title, artifacts } = test;
+    failedTests.push(uid || title);
     const testObj = getTestAndMessage(title);
 
     const files = [];
@@ -214,7 +213,7 @@ function CodeceptReporter(config) {
 
     client.addTestRun(STATUS.FAILED, {
       ...stripExampleFromTitle(title),
-      rid: id,
+      rid: uid,
       test_id: getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`),
       suite_title: test.parent && test.parent.title,
       error,
@@ -230,20 +229,20 @@ function CodeceptReporter(config) {
     debug('artifacts', artifacts);
 
     for (const aid in artifacts) {
-      if (aid.startsWith('video')) videos.push({ rid: id, title, path: artifacts[aid], type: 'video/webm' });
-      if (aid.startsWith('trace')) traces.push({ rid: id, title, path: artifacts[aid], type: 'application/zip' });
+      if (aid.startsWith('video')) videos.push({ rid: uid, title, path: artifacts[aid], type: 'video/webm' });
+      if (aid.startsWith('trace')) traces.push({ rid: uid, title, path: artifacts[aid], type: 'application/zip' });
     }
 
     // output.stop();
   });
 
   event.dispatcher.on(event.test.skipped, test => {
-    const { id, tags, title } = test;
-    if (failedTests.includes(id || title)) return;
+    const { uid, tags, title } = test;
+    if (failedTests.includes(uid || title)) return;
 
     const testObj = getTestAndMessage(title);
     client.addTestRun(STATUS.SKIPPED, {
-      rid: id,
+      rid: uid,
       ...stripExampleFromTitle(title),
       test_id: getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`),
       suite_title: test.parent && test.parent.title,
@@ -312,11 +311,17 @@ function CodeceptReporter(config) {
 async function uploadAttachments(client, attachments, messagePrefix, attachmentType) {
   if (!attachments?.length) return;
 
-  console.log(APP_PREFIX, `Attachments: ${messagePrefix} ${attachments.length} ${attachmentType} ...`);
+  if (client.uploader.isEnabled) {
+    console.log(APP_PREFIX, `Attachments: ${messagePrefix} ${attachments.length} ${attachmentType} ...`);
+  }
 
   const promises = attachments.map(async attachment => {
     const { rid, title, path, type } = attachment;
     const file = { path, type, title };
+
+    // we are storing file if upload is disabled
+    if (!client.uploader.isEnabled) return client.uploader.storeUploadedFile(path, client.runId, rid, false);
+
     return client.addTestRun(undefined, {
       ...stripExampleFromTitle(title),
       rid,
@@ -367,3 +372,4 @@ function getTestLogs(test) {
 }
 
 export { CodeceptReporter };
+export default CodeceptReporter;

package/src/adapter/cypress-plugin/index.js

@@ -1,7 +1,7 @@
 import { STATUS } from '../../constants.js';
 import { getTestomatIdFromTestTitle, parseSuite } from '../../utils/utils.js';
 import TestomatClient from '../../client.js';
-import {config} from '../../config.js';
+import { config } from '../../config.js';
 
 const testomatioReporter = on => {
   if (!config.TESTOMATIO) {
@@ -50,7 +50,8 @@ const testomatioReporter = on => {
         };
       }
 
-      const formattedError = error ? {
+      const formattedError = error
+        ? {
             message: error.message,
             name: error.name,
             inspect:
@@ -59,7 +60,8 @@ const testomatioReporter = on => {
               function () {
                 return this.message;
               },
-          } : undefined;
+          }
+        : undefined;
 
       const screenshots = Array.isArray(results.screenshots)
         ? results.screenshots

package/src/adapter/mocha.cjs

@@ -1,2 +1,2 @@
-const MochaReporter = require('../../../lib/adapter/mocha/mocha.js');
+const MochaReporter = require('../../../lib/adapter/mocha.js');
 module.exports = MochaReporter;

package/src/adapter/mocha.js

@@ -33,6 +33,7 @@ function MochaReporter(runner, opts) {
   runner.on(EVENT_RUN_BEGIN, () => {
     client.createRun();
 
+    // clear dir with artifacts/logs
     fileSystem.clearDir(TESTOMAT_TMP_STORAGE_DIR);
   });
 
@@ -66,7 +67,7 @@ function MochaReporter(runner, opts) {
       test_id: testId,
       suite_title: getSuiteTitle(test),
       title: getTestName(test),
-      code: test.body.toString(),
+      code: process.env.TESTOMATIO_UPDATE_CODE ? test.body.toString() : '',
       file: getFile(test),
       time: test.duration,
       logs,
@@ -82,7 +83,7 @@ function MochaReporter(runner, opts) {
     client.addTestRun(STATUS.SKIPPED, {
       title: getTestName(test),
       suite_title: getSuiteTitle(test),
-      code: test.body.toString(),
+      code: process.env.TESTOMATIO_UPDATE_CODE ? test.body.toString() : '',
       file: getFile(test),
       test_id: testId,
       time: test.duration,
@@ -102,7 +103,7 @@ function MochaReporter(runner, opts) {
       file: getFile(test),
       test_id: testId,
       title: getTestName(test),
-      code: test.body.toString(),
+      code: process.env.TESTOMATIO_UPDATE_CODE ? test.body.toString() : '',
       time: test.duration,
       logs,
     });

package/src/adapter/playwright.js

@@ -6,7 +6,6 @@ import { v4 as uuidv4 } from 'uuid';
 import fs from 'fs';
 import { APP_PREFIX, STATUS as Status, TESTOMAT_TMP_STORAGE_DIR } from '../constants.js';
 import TestomatioClient from '../client.js';
-import { upload } from '../fileUploader.js';
 import { getTestomatIdFromTestTitle, fileSystem } from '../utils/utils.js';
 import { services } from '../services/index.js';
 import { dataStorage } from '../data-storage.js';
@@ -57,11 +56,37 @@ class PlaywrightReporter {
       logs = `\n\n${pc.bold('Logs:')}\n${pc.red(result.stderr.join(''))}\n${result.stdout.join('')}`;
     }
     const manuallyAttachedArtifacts = services.artifacts.get(fullTestTitle);
-    const keyValues = services.keyValues.get(fullTestTitle);
+    const testMeta = services.keyValues.get(fullTestTitle);
     const rid = test.id || test.testId || uuidv4();
 
-    const reportTestPromise = this.client.addTestRun(checkStatus(result.status), {
-      rid,
+    /**
+     * @type {{
+     * browser?: string,
+     * dependencies: string[],
+     * isMobile?: boolean
+     * metadata: Record<string, any>,
+     * name: string,
+     * }}
+     */
+    const project = {
+      browser: test.parent.project().use.defaultBrowserType,
+      dependencies: test.parent.project().dependencies,
+      isMobile: test.parent.project().use.isMobile,
+      metadata: test.parent.project().metadata,
+      name: test.parent.project().name,
+    };
+
+    let status = result.status;
+    // process test.fail() annotation
+    if (test.expectedStatus === 'failed') {
+      // actual status = expected
+      if (result.status === 'failed') status = 'passed';
+      // actual status != expected
+      if (result.status === 'passed') status = 'failed';
+    }
+
+    const reportTestPromise = this.client.addTestRun(checkStatus(status), {
+      rid: `${rid}-${project.name}`,
       error,
       test_id: getTestomatIdFromTestTitle(`${title} ${test.tags?.join(' ')}`),
       suite_title,
@@ -70,12 +95,19 @@ class PlaywrightReporter {
       time: duration,
       logs,
       manuallyAttachedArtifacts,
-      meta: keyValues,
+      meta: {
+        browser: project.browser,
+        isMobile: project.isMobile,
+        project: project.name,
+        projectDependencies: project.dependencies?.length ? project.dependencies : null,
+        ...testMeta,
+        ...project.metadata, // metadata has any type (in playwright), but we will stringify it in client.js
+      },
       file: test.location?.file,
     });
 
     this.uploads.push({
-      rid,
+      rid: `${rid}-${project.name}`,
       title: test.title,
       files: result.attachments.filter(a => a.body || a.path),
       file: test.location?.file,
@@ -94,9 +126,13 @@ class PlaywrightReporter {
     }
 
     if (artifact.body) {
-      const fileName = tmpFile();
-      fs.writeFileSync(fileName, artifact.body);
-      return fileName;
+      let filePath = generateTmpFilepath(artifact.name);
+
+      const extension = artifact.contentType?.split('/')[1]?.replace('jpeg', 'jpg');
+      if (extension) filePath += `.${extension}`;
+
+      fs.writeFileSync(filePath, artifact.body);
+      return filePath;
     }
 
     return null;
@@ -107,20 +143,26 @@ class PlaywrightReporter {
 
     await Promise.all(reportTestPromises);
 
-    if (this.uploads.length && upload.isArtifactsEnabled()) {
-      console.log(APP_PREFIX, `🎞️  Uploading ${this.uploads.length} files...`);
+    if (this.uploads.length) {
+      if (this.client.uploader.isEnabled) console.log(APP_PREFIX, `🎞️  Uploading ${this.uploads.length} files...`);
 
       const promises = [];
 
-      for (const anUpload of this.uploads) {
-        const { rid, file, title } = anUpload;
+      // ? possible move to addTestRun (needs investigation if files are ready)
+      for (const upload of this.uploads) {
+        const { rid, file, title } = upload;
 
-        const files = anUpload.files.map(attachment => ({
+        const files = upload.files.map(attachment => ({
           path: this.#getArtifactPath(attachment),
           title,
           type: attachment.contentType,
         }));
 
+        if (!this.client.uploader.isEnabled) {
+          files.forEach(f => this.client.uploader.storeUploadedFile(f, this.client.runId, rid, false));
+          continue;
+        }
+
         promises.push(
           this.client.addTestRun(undefined, {
             rid,
@@ -190,9 +232,10 @@ function appendStep(step, shift = 0) {
   return resultStep;
 }
 
-function tmpFile(prefix = 'tmp.') {
+function generateTmpFilepath(filename = '') {
+  filename = filename || `tmp.${crypto.randomBytes(16).toString('hex')}`;
   const tmpdir = os.tmpdir();
-  return path.join(tmpdir, prefix + crypto.randomBytes(16).toString('hex'));
+  return path.join(tmpdir, filename);
 }
 
 /**
@@ -204,19 +247,4 @@ function getTestContextName(test) {
   return `${test._requireFile || ''}_${test.title}`;
 }
 
-function initPlaywrightForStorage() {
-  try {
-    // @ts-ignore-next-line
-    // eslint-disable-next-line import/no-extraneous-dependencies
-    const { test } = require('@playwright/test');
-    // eslint-disable-next-line no-empty-pattern
-    test.beforeEach(async ({}, testInfo) => {
-      global.testomatioTestTitle = `${testInfo.file || ''}_${testInfo.title}`;
-    });
-  } catch (e) {
-    // ignore
-  }
-}
-
 export default PlaywrightReporter;
-export { initPlaywrightForStorage };

package/src/adapter/vitest.js

@@ -7,13 +7,13 @@ import createDebugMessages from 'debug';
 const debug = createDebugMessages('@testomatio/reporter:adapter-jest');
 
 /**
- * @typedef {import('../../types').VitestTest} VitestTest
- * @typedef {import('../../types').VitestTestFile} VitestTestFile
- * @typedef {import('../../types').VitestSuite} VitestSuite
- * @typedef {import('../../types').VitestTestLogs} VitestTestLogs
- * @typedef {import('../../vitest.types').ErrorWithDiff} ErrorWithDiff
+ * @typedef {import('../../types/types.js').VitestTest} VitestTest
+ * @typedef {import('../../types/types.js').VitestTestFile} VitestTestFile
+ * @typedef {import('../../types/types.js').VitestSuite} VitestSuite
+ * @typedef {import('../../types/types.js').VitestTestLogs} VitestTestLogs
+ * @typedef {import('../../types/vitest.types.js').ErrorWithDiff} ErrorWithDiff
  * @typedef {typeof import('../constants.js').STATUS} STATUS
- * @typedef {import('../../types').TestData} TestData
+ * @typedef {import('../../types/types.js').TestData} TestData
  */
 
 class VitestReporter {