monocart-reporter 2.8.2 → 2.8.4

package/README.md

@@ -1057,6 +1057,12 @@ npx monocart merge path-to/shard*/index.json -o merged-reports/index.html
 # -c --config
 npx monocart merge path-to/shard*/index.json -c mr.config.js
 ```
+The default config files (In order of priority)
+- mr.config.js
+- mr.config.cjs
+- mr.config.mjs
+- mr.config.json
+- mr.config.ts
 
 
 ## onEnd Hook

package/lib/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const fs = require('fs');
 const path = require('path');
@@ -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,18 +209,41 @@ 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);
@@ -229,10 +251,6 @@ const resolveConfigOptions = async (configPath) => {
         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/lib/index.js

@@ -55,23 +55,26 @@ class MonocartReporter {
         this.tickTime = this.options.tickTime || 1000;
         this.tickStart();
 
+        // read trends from json before clean dir
+        getTrends(this.options.trend).then((trends) => {
+            // console.log('=========================== ', 'trends', trends.length);
+            this.trends = trends;
+        });
+
         this.init();
+
     }
 
     async init() {
 
         this.options.cwd = Util.formatPath(process.cwd());
 
-        // read trends from json before clean dir
-        this.trends = await getTrends(this.options.trend);
-
         // init outputDir
         const outputFile = await Util.resolveOutputFile(this.options.outputFile);
         this.options.outputFile = outputFile;
 
         const outputDir = path.dirname(outputFile);
 
-        Util.initDir(outputDir);
         // for visitor relative path of attachments
         this.options.outputDir = outputDir;
 
@@ -85,6 +88,14 @@ class MonocartReporter {
             this.bindFunctions(stateOptions);
             this.stateServer = createStateServer(stateOptions);
         }
+
+        this.cleanOutputDir();
+
+    }
+
+    cleanOutputDir() {
+        Util.initDir(this.options.outputDir);
+        // console.log('=========================== ', 'cleanOutputDir');
     }
 
     // ==========================================================================
@@ -139,6 +150,8 @@ class MonocartReporter {
         this.config = config;
         this.root = suite;
 
+        // console.log('=========================== ', 'onBegin');
+
         // output dir for test results (not reporter)
         this.options.testOutputDir = config.projects[0].outputDir;
         // console.log(`onBegin: ${suite.allTests().length} tests`);