codeceptjs 4.0.0-beta.2 → 4.0.0-beta.21

package/lib/config.js

@@ -1,9 +1,8 @@
-import fs from 'fs';
-import path from 'path';
-import importSync from 'import-sync';
-import {
-  fileExists, isFile, deepMerge, deepClone,
-} from './utils.js';
+import fs from 'fs'
+import path from 'path'
+import { createRequire } from 'module'
+import { fileExists, isFile, deepMerge, deepClone } from './utils.js'
+import { transpileTypeScript, cleanupTempFiles } from './utils/typescript.js'
 
 const defaultConfig = {
   output: './_output',
@@ -31,18 +30,12 @@ const defaultConfig = {
       timeout: 0,
     },
   ],
-};
+}
 
-let hooks = [];
-let config = {};
+let hooks = []
+let config = {}
 
-const configFileNames = [
-  'codecept.config.js',
-  'codecept.conf.js',
-  'codecept.js',
-  'codecept.config.ts',
-  'codecept.conf.ts',
-];
+const configFileNames = ['codecept.config.js', 'codecept.conf.js', 'codecept.js', 'codecept.config.cjs', 'codecept.conf.cjs', 'codecept.config.ts', 'codecept.conf.ts']
 
 /**
  * Current configuration
@@ -55,9 +48,9 @@ class Config {
    * @return {Object<string, *>}
    */
   static create(newConfig) {
-    config = deepMerge(deepClone(defaultConfig), newConfig);
-    hooks.forEach(f => f(config));
-    return config;
+    config = deepMerge(deepClone(defaultConfig), newConfig)
+    hooks.forEach(f => f(config))
+    return config
   }
 
   /**
@@ -73,34 +66,45 @@ class Config {
    * @param {string} configFile
    * @return {*}
    */
-  static load(configFile) {
-    configFile = path.resolve(configFile || '.');
+  static async load(configFile) {
+    configFile = path.resolve(configFile || '.')
 
     if (!fileExists(configFile)) {
-      configFile = configFile.replace('.js', '.ts');
-
-      if (!fileExists(configFile)) {
-        throw new Error(`Config file ${configFile} does not exist. Execute 'codeceptjs init' to create config`);
+      // Try different extensions if the file doesn't exist
+      const extensions = ['.ts', '.cjs', '.mjs']
+      let found = false
+      
+      for (const ext of extensions) {
+        const altConfig = configFile.replace(/\.js$/, ext)
+        if (fileExists(altConfig)) {
+          configFile = altConfig
+          found = true
+          break
+        }
+      }
+      
+      if (!found) {
+        throw new Error(`Config file ${configFile} does not exist. Execute 'codeceptjs init' to create config`)
       }
     }
 
     // is config file
     if (isFile(configFile)) {
-      return loadConfigFile(configFile);
+      return await loadConfigFile(configFile)
     }
 
     for (const name of configFileNames) {
       // is path to directory
-      const jsConfig = path.join(configFile, name);
+      const jsConfig = path.join(configFile, name)
 
       if (isFile(jsConfig)) {
-        return loadConfigFile(jsConfig);
+        return await loadConfigFile(jsConfig)
       }
     }
 
-    const configPaths = configFileNames.map(name => path.join(configFile, name)).join(' or ');
+    const configPaths = configFileNames.map(name => path.join(configFile, name)).join(' or ')
 
-    throw new Error(`Can not load config from ${configPaths}\nCodeceptJS is not initialized in this dir. Execute 'codeceptjs init' to start`);
+    throw new Error(`Can not load config from ${configPaths}\nCodeceptJS is not initialized in this dir. Execute 'codeceptjs init' to start`)
   }
 
   /**
@@ -111,13 +115,13 @@ class Config {
    */
   static get(key, val) {
     if (key) {
-      return config[key] || val;
+      return config[key] || val
     }
-    return config;
+    return config
   }
 
   static addHook(fn) {
-    hooks.push(fn);
+    hooks.push(fn)
   }
 
   /**
@@ -127,7 +131,7 @@ class Config {
    * @return {Object<string, *>}
    */
   static append(additionalConfig) {
-    return config = deepMerge(config, additionalConfig);
+    return (config = deepMerge(config, additionalConfig))
   }
 
   /**
@@ -135,34 +139,89 @@ class Config {
    * @return {Object<string, *>}
    */
   static reset() {
-    hooks = [];
-    return config = { ...defaultConfig };
+    hooks = []
+    return (config = { ...defaultConfig })
   }
 }
 
-export default Config;
+export default Config
 
-function loadConfigFile(configFile) {
-  const extensionName = path.extname(configFile);
+async function loadConfigFile(configFile) {
+  const require = createRequire(import.meta.url)
+  const extensionName = path.extname(configFile)
 
-  if (extensionName === '.ts') {
+  // .conf.js config file
+  if (extensionName === '.js' || extensionName === '.ts' || extensionName === '.cjs') {
+    let configModule
     try {
-      require('ts-node/register');
-    } catch (err) {
-      console.log('ts-node package is required to parse codecept.conf.ts config correctly');
+      // For .ts files, try to compile and load as JavaScript
+      if (extensionName === '.ts') {
+        try {
+          // Use the TypeScript transpilation utility
+          const typescript = require('typescript')
+          const { tempFile, allTempFiles } = await transpileTypeScript(configFile, typescript)
+
+          try {
+            configModule = await import(tempFile)
+            cleanupTempFiles(allTempFiles)
+          } catch (err) {
+            cleanupTempFiles(allTempFiles)
+            throw err
+          }
+        } catch (tsError) {
+          // If TypeScript compilation fails, fallback to ts-node
+          try {
+            require('ts-node/register')
+            configModule = require(configFile)
+          } catch (tsNodeError) {
+            throw new Error(`Failed to load TypeScript config: ${tsError.message}`)
+          }
+        }
+      } else {
+        // Try ESM import first for JS files
+        configModule = await import(configFile)
+      }
+    } catch (importError) {
+      try {
+        // Fall back to CommonJS require for .js/.cjs files
+        if (extensionName !== '.ts') {
+          configModule = require(configFile)
+        } else {
+          throw importError
+        }
+      } catch (requireError) {
+        throw new Error(`Failed to load config file ${configFile}: ${importError.message}`)
+      }
     }
-  }
 
-  // .conf.js config file
-  if (extensionName === '.js' || extensionName === '.ts' || extensionName === '.cjs') {
-    const { config } = importSync(configFile);
-    return Config.create(config);
+    const rawConfig = configModule.config || configModule.default?.config || configModule.default || configModule
+
+    // Process helpers to extract imported classes
+    if (rawConfig.helpers) {
+      const processedHelpers = {}
+      for (const [helperName, helperConfig] of Object.entries(rawConfig.helpers)) {
+        // Check if the helper name itself is a class (ESM import)
+        if (typeof helperName === 'function' && helperName.prototype) {
+          // This is an imported class, use its constructor name
+          const className = helperName.name
+          processedHelpers[className] = {
+            ...helperConfig,
+            _helperClass: helperName,
+          }
+        } else {
+          processedHelpers[helperName] = helperConfig
+        }
+      }
+      rawConfig.helpers = processedHelpers
+    }
+
+    return Config.create(rawConfig)
   }
 
   // json config provided
   if (extensionName === '.json') {
-    return Config.create(JSON.parse(fs.readFileSync(configFile, 'utf8')));
+    return Config.create(JSON.parse(fs.readFileSync(configFile, 'utf8')))
   }
 
-  throw new Error(`Config file ${configFile} can't be loaded`);
+  throw new Error(`Config file ${configFile} can't be loaded`)
 }