codeceptjs 4.0.0-beta.12 → 4.0.0-beta.13

package/lib/config.js

@@ -158,28 +158,134 @@ async function loadConfigFile(configFile) {
         try {
           // Try to load ts-node and compile the file
           const { transpile } = require('typescript')
-          const tsContent = fs.readFileSync(configFile, 'utf8')
+          
+          // Recursively transpile the file and its dependencies
+          const transpileTS = (filePath) => {
+            const tsContent = fs.readFileSync(filePath, 'utf8')
+            
+            // Transpile TypeScript to JavaScript with ES module output
+            let jsContent = transpile(tsContent, {
+              module: 99, // ModuleKind.ESNext
+              target: 99, // ScriptTarget.ESNext
+              esModuleInterop: true,
+              allowSyntheticDefaultImports: true,
+            })
+            
+            // Check if the code uses __dirname or __filename (CommonJS globals)
+            const usesCommonJSGlobals = /__dirname|__filename/.test(jsContent)
+            
+            if (usesCommonJSGlobals) {
+              // Inject ESM equivalents at the top of the file
+              const esmGlobals = `import { fileURLToPath as __fileURLToPath } from 'url';
+import { dirname as __dirname_fn } from 'path';
+const __filename = __fileURLToPath(import.meta.url);
+const __dirname = __dirname_fn(__filename);
 
-          // Transpile TypeScript to JavaScript with ES module output
-          const jsContent = transpile(tsContent, {
-            module: 99, // ModuleKind.ESNext
-            target: 99, // ScriptTarget.ESNext
-            esModuleInterop: true,
-            allowSyntheticDefaultImports: true,
-          })
+`
+              jsContent = esmGlobals + jsContent
+            }
+            
+            return jsContent
+          }
+          
+          // Create a map to track transpiled files
+          const transpiledFiles = new Map()
+          const baseDir = path.dirname(configFile)
+          
+          // Transpile main file
+          let jsContent = transpileTS(configFile)
+          
+          // Find and transpile all relative TypeScript imports
+          // Match: import ... from './file' or '../file' or './file.ts'
+          const importRegex = /from\s+['"](\..+?)(?:\.ts)?['"]/g
+          let match
+          const imports = []
+          
+          while ((match = importRegex.exec(jsContent)) !== null) {
+            imports.push(match[1])
+          }
+          
+          // Transpile each imported TypeScript file
+          for (const relativeImport of imports) {
+            let importedPath = path.resolve(baseDir, relativeImport)
+            
+            // Handle .js extensions that might actually be .ts files
+            if (importedPath.endsWith('.js')) {
+              const tsVersion = importedPath.replace(/\.js$/, '.ts')
+              if (fs.existsSync(tsVersion)) {
+                importedPath = tsVersion
+              }
+            }
+            
+            // Try adding .ts extension if file doesn't exist and no extension provided
+            if (!path.extname(importedPath)) {
+              if (fs.existsSync(importedPath + '.ts')) {
+                importedPath = importedPath + '.ts'
+              }
+            }
+            
+            // If it's a TypeScript file, transpile it
+            if (importedPath.endsWith('.ts') && fs.existsSync(importedPath)) {
+              const transpiledImportContent = transpileTS(importedPath)
+              const tempImportFile = importedPath.replace(/\.ts$/, '.temp.mjs')
+              fs.writeFileSync(tempImportFile, transpiledImportContent)
+              transpiledFiles.set(importedPath, tempImportFile)
+            }
+          }
+          
+          // Replace imports in the main file to point to temp .mjs files
+          jsContent = jsContent.replace(
+            /from\s+['"](\..+?)(?:\.ts)?['"]/g,
+            (match, importPath) => {
+              let resolvedPath = path.resolve(baseDir, importPath)
+              
+              // Handle .js extension that might be .ts
+              if (resolvedPath.endsWith('.js')) {
+                const tsVersion = resolvedPath.replace(/\.js$/, '.ts')
+                if (transpiledFiles.has(tsVersion)) {
+                  const tempFile = transpiledFiles.get(tsVersion)
+                  const relPath = path.relative(baseDir, tempFile).replace(/\\/g, '/')
+                  return `from './${relPath}'`
+                }
+              }
+              
+              // Try with .ts extension
+              const tsPath = resolvedPath.endsWith('.ts') ? resolvedPath : resolvedPath + '.ts'
+              
+              // If we transpiled this file, use the temp file
+              if (transpiledFiles.has(tsPath)) {
+                const tempFile = transpiledFiles.get(tsPath)
+                // Get relative path from main temp file to this temp file
+                const relPath = path.relative(baseDir, tempFile).replace(/\\/g, '/')
+                return `from './${relPath}'`
+              }
+              
+              // Otherwise, keep the import as-is
+              return match
+            }
+          )
 
           // Create a temporary JS file with .mjs extension to force ES module treatment
           const tempJsFile = configFile.replace('.ts', '.temp.mjs')
           fs.writeFileSync(tempJsFile, jsContent)
+          
+          // Store all temp files for cleanup
+          const allTempFiles = [tempJsFile, ...Array.from(transpiledFiles.values())]
 
           try {
             configModule = await import(tempJsFile)
-            // Clean up temp file
-            fs.unlinkSync(tempJsFile)
+            // Clean up all temp files
+            for (const file of allTempFiles) {
+              if (fs.existsSync(file)) {
+                fs.unlinkSync(file)
+              }
+            }
           } catch (err) {
-            // Clean up temp file even on error
-            if (fs.existsSync(tempJsFile)) {
-              fs.unlinkSync(tempJsFile)
+            // Clean up all temp files even on error
+            for (const file of allTempFiles) {
+              if (fs.existsSync(file)) {
+                fs.unlinkSync(file)
+              }
             }
             throw err
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeceptjs",
-  "version": "4.0.0-beta.12",
+  "version": "4.0.0-beta.13",
   "type": "module",
   "description": "Supercharged End 2 End Testing Framework for NodeJS",
   "keywords": [