@testomatio/reporter 2.1.1 → 2.1.2-beta.1-alias

package/lib/bin/startTest.js

@@ -4,103 +4,50 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cross_spawn_1 = require("cross-spawn");
-const commander_1 = require("commander");
-const picocolors_1 = __importDefault(require("picocolors"));
-const client_js_1 = __importDefault(require("../client.js"));
-const constants_js_1 = require("../constants.js");
+const node_child_process_1 = require("node:child_process");
+const node_path_1 = require("node:path");
 const utils_js_1 = require("../utils/utils.js");
-const config_js_1 = require("../config.js");
-const dotenv_1 = __importDefault(require("dotenv"));
+const picocolors_1 = __importDefault(require("picocolors"));
+// Define __dirname - this will be replaced by build script with actual __dirname for CommonJS
+const cliPath = (0, node_path_1.join)(__dirname, 'cli.js');
 const version = (0, utils_js_1.getPackageVersion)();
 console.log(picocolors_1.default.cyan(picocolors_1.default.bold(` 🤩 Testomat.io Reporter v${version}`)));
-const program = new commander_1.Command();
-program
-    .option('-c, --command <cmd>', 'Test runner command')
-    .option('--launch', 'Start a new run and return its ID')
-    .option('--finish', 'Finish Run by its ID')
-    .option('--env-file <envfile>', 'Load environment variables from env file')
-    .option('--filter <filter>', 'Additional execution filter')
-    .action(async (opts) => {
-    const { launch, finish, filter } = opts;
-    let { command } = opts;
-    if (opts.envFile)
-        dotenv_1.default.config({ path: opts.envFile });
-    const apiKey = process.env['INPUT_TESTOMATIO-KEY'] || config_js_1.config.TESTOMATIO;
-    const title = process.env.TESTOMATIO_TITLE;
-    if (launch) {
-        console.log('Starting a new Run on Testomat.io...');
-        const client = new client_js_1.default({ apiKey });
-        client.createRun().then(() => {
-            console.log(process.env.runId);
-            process.exit(0);
-        });
-        return;
-    }
-    if (finish) {
-        // TODO: add error in case of TESTOMATIO environment variable is not set
-        // because command is fine in console, but actually (on testomat.io) run is not finished
-        if (!process.env.TESTOMATIO_RUN) {
-            console.log('TESTOMATIO_RUN environment variable must be set.');
-            return process.exit(1);
+// Parse command line arguments to map start-test-run options to @testomatio/reporter run format
+const args = process.argv.slice(2);
+const newArgs = ['run'];
+let i = 0;
+while (i < args.length) {
+    const arg = args[i];
+    if (arg === '-c' || arg === '--command') {
+        // Map -c/--command to positional argument for run command
+        i++;
+        if (i < args.length) {
+            newArgs.push(args[i]);
         }
-        console.log('Finishing Run on Testomat.io...');
-        const client = new client_js_1.default({ apiKey });
-        // @ts-ignore
-        client.updateRunStatus(constants_js_1.STATUS.FINISHED).then(() => {
-            console.log(picocolors_1.default.yellow(`Run ${process.env.TESTOMATIO_RUN} was finished`));
-            process.exit(0);
-        });
-        return;
     }
-    let exitCode = 0;
-    if (!command.split) {
-        process.exitCode = 255;
-        console.log(constants_js_1.APP_PREFIX, `No command provided. Use -c option to launch a test runner.`);
-        return;
+    else if (arg.startsWith('--command=')) {
+        // Handle --command=value format
+        const command = arg.split('=', 2)[1];
+        newArgs.push(command);
     }
-    const client = new client_js_1.default({ apiKey, title, parallel: true });
-    if (filter) {
-        const [pipe, ...optsArray] = filter.split(':');
-        const pipeOptions = optsArray.join(':');
-        try {
-            const tests = await client.prepareRun({ pipe, pipeOptions });
-            if (!tests || tests.length === 0) {
-                return;
-            }
-            const grep = ` --grep (${tests.join('|')})`;
-            command += grep;
-        }
-        catch (err) {
-            console.log(constants_js_1.APP_PREFIX, err);
-        }
+    else if (arg === '--launch') {
+        // Map --launch to start command
+        newArgs[0] = 'start';
     }
-    const testCmds = command.split(' ');
-    console.log(constants_js_1.APP_PREFIX, `🚀 Running`, picocolors_1.default.green(command));
-    if (!apiKey) {
-        const cmd = (0, cross_spawn_1.spawn)(testCmds[0], testCmds.slice(1), { stdio: 'inherit' });
-        cmd.on('close', code => {
-            console.log(constants_js_1.APP_PREFIX, '⚠️ ', `Runner exited with ${picocolors_1.default.bold(code)}, report is ignored`);
-            if (code > exitCode)
-                exitCode = code;
-            process.exitCode = exitCode;
-        });
-        return;
+    else if (arg === '--finish') {
+        // Map --finish to finish command  
+        newArgs[0] = 'finish';
     }
-    client.createRun().then(() => {
-        const cmd = (0, cross_spawn_1.spawn)(testCmds[0], testCmds.slice(1), { stdio: 'inherit' });
-        cmd.on('close', code => {
-            const emoji = code === 0 ? '🟢' : '🔴';
-            console.log(constants_js_1.APP_PREFIX, emoji, `Runner exited with ${picocolors_1.default.bold(code)}`);
-            const status = code === 0 ? 'passed' : 'failed';
-            client.updateRunStatus(status, true);
-            if (code > exitCode)
-                exitCode = code;
-            process.exitCode = exitCode;
-        });
-    });
-});
-if (process.argv.length <= 2) {
-    program.outputHelp();
+    else {
+        // Pass through other arguments
+        newArgs.push(arg);
+    }
+    i++;
 }
-program.parse(process.argv);
+// Execute the main CLI with mapped arguments
+const child = (0, node_child_process_1.spawn)(process.execPath, [cliPath, ...newArgs], {
+    stdio: 'inherit'
+});
+child.on('exit', (code) => {
+    process.exit(code);
+});

package/lib/utils/utils.js

@@ -321,7 +321,7 @@ const fileSystem = {
 exports.fileSystem = fileSystem;
 const foundedTestLog = (app, tests) => {
     const n = tests.length;
-    return console.log(app, `✅ We found ${n === 1 ? 'one test' : `${n} tests`} in Testomat.io!`);
+    return n === 1 ? console.log(app, `✅ We found one test!`) : console.log(app, `✅ We found ${n} tests!`);
 };
 exports.foundedTestLog = foundedTestLog;
 const humanize = text => {
@@ -399,8 +399,6 @@ function storeRunId(runId) {
 function readLatestRunId() {
     try {
         const filePath = path_1.default.join(os_1.default.tmpdir(), `testomatio.latest.run`);
-        if (!fs_1.default.existsSync(filePath))
-            return null;
         const stats = fs_1.default.statSync(filePath);
         const diff = +new Date() - +stats.mtime;
         const diffHours = diff / 1000 / 60 / 60;

package/package.json

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

package/src/bin/startTest.js

@@ -1,124 +1,53 @@
 #!/usr/bin/env node
-import { spawn } from 'cross-spawn';
-import { Command } from 'commander';
-import pc from 'picocolors';
-import TestomatClient from '../client.js';
-import { APP_PREFIX, STATUS } from '../constants.js';
+import { spawn } from 'node:child_process';
+import { join, dirname } from 'node:path';
 import { getPackageVersion } from '../utils/utils.js';
-import { config } from '../config.js';
-import dotenv from 'dotenv';
+import pc from 'picocolors';
+
+// Define __dirname - this will be replaced by build script with actual __dirname for CommonJS
+const __dirname = typeof globalThis.__dirname !== 'undefined' ? globalThis.__dirname : '.';
+const cliPath = join(__dirname, 'cli.js');
 
 const version = getPackageVersion();
 console.log(pc.cyan(pc.bold(` 🤩 Testomat.io Reporter v${version}`)));
-const program = new Command();
-
-program
-  .option('-c, --command <cmd>', 'Test runner command')
-  .option('--launch', 'Start a new run and return its ID')
-  .option('--finish', 'Finish Run by its ID')
-  .option('--env-file <envfile>', 'Load environment variables from env file')
-  .option('--filter <filter>', 'Additional execution filter')
-  .action(async opts => {
-    const { launch, finish, filter } = opts;
-    let { command } = opts;
-
-    if (opts.envFile) dotenv.config({ path: opts.envFile });
-
-    const apiKey = process.env['INPUT_TESTOMATIO-KEY'] || config.TESTOMATIO;
-    const title = process.env.TESTOMATIO_TITLE;
-
-    if (launch) {
-      console.log('Starting a new Run on Testomat.io...');
-      const client = new TestomatClient({ apiKey });
-
-      client.createRun().then(() => {
-        console.log(process.env.runId);
-        process.exit(0);
-      });
-      return;
-    }
-
-    if (finish) {
-      // TODO: add error in case of TESTOMATIO environment variable is not set
-      // because command is fine in console, but actually (on testomat.io) run is not finished
-      if (!process.env.TESTOMATIO_RUN) {
-        console.log('TESTOMATIO_RUN environment variable must be set.');
-        return process.exit(1);
-      }
-
-      console.log('Finishing Run on Testomat.io...');
-
-      const client = new TestomatClient({ apiKey });
 
-      // @ts-ignore
-      client.updateRunStatus(STATUS.FINISHED).then(() => {
-        console.log(pc.yellow(`Run ${process.env.TESTOMATIO_RUN} was finished`));
-        process.exit(0);
-      });
-      return;
+// Parse command line arguments to map start-test-run options to @testomatio/reporter run format
+const args = process.argv.slice(2);
+const newArgs = ['run'];
+
+let i = 0;
+while (i < args.length) {
+  const arg = args[i];
+  
+  if (arg === '-c' || arg === '--command') {
+    // Map -c/--command to positional argument for run command
+    i++;
+    if (i < args.length) {
+      newArgs.push(args[i]);
     }
+  } else if (arg.startsWith('--command=')) {
+    // Handle --command=value format
+    const command = arg.split('=', 2)[1];
+    newArgs.push(command);
+  } else if (arg === '--launch') {
+    // Map --launch to start command
+    newArgs[0] = 'start';
+  } else if (arg === '--finish') {
+    // Map --finish to finish command  
+    newArgs[0] = 'finish';
+  } else {
+    // Pass through other arguments
+    newArgs.push(arg);
+  }
+  i++;
+}
 
-    let exitCode = 0;
-
-    if (!command.split) {
-      process.exitCode = 255;
-      console.log(APP_PREFIX, `No command provided. Use -c option to launch a test runner.`);
-      return;
-    }
-
-    const client = new TestomatClient({ apiKey, title, parallel: true });
-
-    if (filter) {
-      const [pipe, ...optsArray] = filter.split(':');
-      const pipeOptions = optsArray.join(':');
-
-      try {
-        const tests = await client.prepareRun({ pipe, pipeOptions });
-
-        if (!tests || tests.length === 0) {
-          return;
-        }
-
-        const grep = ` --grep (${tests.join('|')})`;
-        command += grep;
-      } catch (err) {
-        console.log(APP_PREFIX, err);
-      }
-    }
-
-    const testCmds = command.split(' ');
-    console.log(APP_PREFIX, `🚀 Running`, pc.green(command));
-
-    if (!apiKey) {
-      const cmd = spawn(testCmds[0], testCmds.slice(1), { stdio: 'inherit' });
-
-      cmd.on('close', code => {
-        console.log(APP_PREFIX, '⚠️ ', `Runner exited with ${pc.bold(code)}, report is ignored`);
-
-        if (code > exitCode) exitCode = code;
-        process.exitCode = exitCode;
-      });
-
-      return;
-    }
-
-    client.createRun().then(() => {
-      const cmd = spawn(testCmds[0], testCmds.slice(1), { stdio: 'inherit' });
-
-      cmd.on('close', code => {
-        const emoji = code === 0 ? '🟢' : '🔴';
-        console.log(APP_PREFIX, emoji, `Runner exited with ${pc.bold(code)}`);
-        const status = code === 0 ? 'passed' : 'failed';
-        client.updateRunStatus(status, true);
-
-        if (code > exitCode) exitCode = code;
-        process.exitCode = exitCode;
-      });
-    });
-  });
+// Execute the main CLI with mapped arguments
 
-if (process.argv.length <= 2) {
-  program.outputHelp();
-}
+const child = spawn(process.execPath, [cliPath, ...newArgs], {
+  stdio: 'inherit'
+});
 
-program.parse(process.argv);
+child.on('exit', (code) => {
+  process.exit(code);
+});

package/src/utils/utils.js

@@ -53,7 +53,7 @@ const parseSuite = suiteTitle => {
  */
 const validateSuiteId = suiteId => {
   if (!suiteId) return null;
-
+  
   const match = suiteId.match(SUITE_ID_REGEX);
   return match ? match[0] : null;
 };
@@ -273,7 +273,7 @@ const fileSystem = {
 const foundedTestLog = (app, tests) => {
   const n = tests.length;
 
-  return console.log(app, `✅ We found ${n === 1 ? 'one test' : `${n} tests`} in Testomat.io!`);
+  return n === 1 ? console.log(app, `✅ We found one test!`) : console.log(app, `✅ We found ${n} tests!`);
 };
 
 const humanize = text => {
@@ -354,14 +354,12 @@ function storeRunId(runId) {
 }
 
 /**
- *
+ * 
  * @returns {String|null} latest run ID
  */
 function readLatestRunId() {
   try {
     const filePath = path.join(os.tmpdir(), `testomatio.latest.run`);
-    if (!fs.existsSync(filePath)) return null;
-    
     const stats = fs.statSync(filePath);
     const diff = +new Date() - +stats.mtime;
     const diffHours = diff / 1000 / 60 / 60;