fixed issue for loading TypeScript config file

CHANGELOG.md

@@ -1,7 +1,10 @@
 ## Changelog
 
+* 2.8.3
+  - fixed issue for loading TypeScript config file
+
 * 2.8.2
-  - fixed loading .ts config file (`npm i amaro`)
+  - fixed loading .ts config file
 
 * 2.8.1
   - fixed onData issue (#141)

lib/cli.js

@@ -7,7 +7,6 @@ const https = require('https');
 const net = require('net');
 const os = require('os');
 const { pathToFileURL } = require('url');
-const { register } = require('module');
 const EC = require('eight-colors');
 const KSR = require('koa-static-resolver');
 const Koa = require('koa');
@@ -210,29 +209,48 @@ const checkRegisterFeature = () => {
     return true;
 };
 
-const initTSPreload = () => {
+const loadEnv = (cliOptions) => {
+    if (!cliOptions.env) {
+        return;
+    }
+    const envFile = cliOptions.env === true ? '.env' : cliOptions.env;
+    const loadEnvFile = process.loadEnvFile;
+    if (typeof loadEnvFile === 'function') {
+        loadEnvFile(envFile);
+    }
+};
+
+
+const initNodeOptions = async (cliOptions) => {
+
+    loadEnv(cliOptions);
 
     const supportRegister = checkRegisterFeature();
     if (!supportRegister) {
         return;
     }
 
-    register('./hooks.js', pathToFileURL(__filename));
+    // for loading mr.config.ts
+    const modulePath = cliOptions.import || cliOptions.require;
+    if (!modulePath) {
+        return;
+    }
+
+    const res = await import(modulePath);
+    if (res && typeof res.register === 'function') {
+        await res.register();
+    }
 
 };
 
-// eslint-disable-next-line complexity
+
 const resolveConfigOptions = async (configPath) => {
     // json format
     const ext = path.extname(configPath);
     if (ext === '.json' || configPath.slice(-2) === 'rc') {
         return JSON.parse(Util.readFileSync(configPath));
     }
 
-    if (ext === '.ts') {
-        initTSPreload();
-    }
-
     let configOptions;
     let err;
     try {
@@ -256,6 +274,8 @@ const resolveConfigOptions = async (configPath) => {
 
 const mergeReports = async (str, cliOptions) => {
 
+    await initNodeOptions(cliOptions);
+
     const customConfig = cliOptions.config;
     const configPath = findUpConfig(customConfig);
 
@@ -321,6 +341,11 @@ program.command('merge-reports')
     .option('-n, --name <name>', 'report name for title')
     .option('-o, --outputFile <path>', 'output file')
 
+    .option('--import <module>', 'preload module at startup')
+    .option('--require <module>', 'preload module at startup')
+
+    .option('--env [path]', 'env file (default: ".env")')
+
     .action((str, options) => {
         mergeReports(str, options);
     });

package.json

@@ -53,7 +53,6 @@
     "devDependencies": {
         "@babel/code-frame": "^7.24.7",
         "@playwright/test": "^1.47.2",
-        "amaro": "^0.1.8",
         "ansi-to-html": "^0.7.2",
         "async-tick": "^1.0.0",
         "autolinker": "^4.0.0",
@@ -84,4 +83,4 @@
         "vine-ui": "^3.1.16",
         "ws": "^8.18.0"
     }
-}
+}