fix: uts

Author: kobenguyent

bin/codecept.js

@@ -5,7 +5,7 @@ import Codecept from '../lib/codecept.js'
 import output from '../lib/output.js'
 const { print, error } = output
 import { printError } from '../lib/command/utils.js'
-import { importModule } from '../lib/utils.js'
+import { resolveImportModulePath } from '../lib/utils.js'
 
 const commandFlags = {
   ai: {
@@ -46,7 +46,8 @@ const errorHandler =
   }
 
 const dynamicImport = async modulePath => {
-  const module = await importModule(modulePath)
+  const resolvedPath = resolveImportModulePath(modulePath)
+  const module = await import(resolvedPath)
   return module.default || module
 }
 

lib/ai.js

@@ -6,7 +6,7 @@ import { removeNonInteractiveElements, minifyHtml, splitByChunks } from './html.
 import { generateText } from 'ai'
 import { fileURLToPath } from 'url'
 import path from 'path'
-import { fileExists, importModule } from './utils.js'
+import { fileExists, resolveImportModulePath } from './utils.js'
 import store from './store.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
@@ -34,7 +34,8 @@ async function loadPrompts() {
     }
 
     try {
-      const module = await importModule(promptPath)
+      const resolvedPath = resolveImportModulePath(promptPath)
+      const module = await import(resolvedPath)
       prompts[name] = module.default || module
       debug(`Loaded prompt ${name} from ${promptPath}`)
     } catch (err) {

lib/codecept.js

@@ -17,7 +17,7 @@ import event from './event.js'
 import runHook from './hooks.js'
 import ActorFactory from './actor.js'
 import output from './output.js'
-import { emptyFolder, importModule } from './utils.js'
+import { emptyFolder, resolveImportModulePath } from './utils.js'
 import { initCodeceptGlobals } from './globals.js'
 import { validateTypeScriptSetup, getTSNodeESMWarning } from './utils/loaderCheck.js'
 import recorder from './recorder.js'
@@ -86,7 +86,8 @@ class Codecept {
           }
         }
         // Use dynamic import for ESM
-        await importModule(modulePath)
+        const resolvedPath = resolveImportModulePath(modulePath)
+        await import(resolvedPath)
       }
     }
   }
@@ -137,7 +138,8 @@ class Codecept {
       ]
 
       for (const modulePath of listenerModules) {
-        const module = await importModule(modulePath)
+        const resolvedPath = resolveImportModulePath(modulePath)
+        const module = await import(resolvedPath)
         runHook(module.default || module)
       }
     }

lib/config.js

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 import { createRequire } from 'module'
-import { fileExists, isFile, deepMerge, deepClone, importModule } from './utils.js'
+import { fileExists, isFile, deepMerge, deepClone, resolveImportModulePath } from './utils.js'
 import { transpileTypeScript, cleanupTempFiles, fixErrorStack } from './utils/typescript.js'
 
 const defaultConfig = {
@@ -242,7 +242,8 @@ async function loadConfigFile(configFile) {
           allTempFiles = result.allTempFiles
           fileMapping = result.fileMapping
 
-          configModule = await importModule(tempFile)
+          const resolvedPath = resolveImportModulePath(tempFile)
+          configModule = await import(resolvedPath)
           cleanupTempFiles(allTempFiles)
         } catch (err) {
           transpileError = err
@@ -258,7 +259,8 @@ async function loadConfigFile(configFile) {
         }
       } else {
         // Try ESM import first for JS files
-        configModule = await importModule(configFile)
+        const resolvedPath = resolveImportModulePath(configFile)
+        configModule = await import(resolvedPath)
       }
     } catch (importError) {
       try {

lib/container.js

@@ -12,7 +12,7 @@ import {
   isAsyncFunction,
   installedLocally,
   deepMerge,
-  importModule,
+  resolveImportModulePath,
 } from './utils.js'
 import { transpileTypeScript, cleanupTempFiles, fixErrorStack } from './utils/typescript.js'
 import Translation from './translation.js'
@@ -443,7 +443,8 @@ async function requireHelperFromModule(helperName, config, HelperClass) {
       // For built-in helpers, use direct relative import with .js extension
       const helperPath = `${moduleName}.js`
 
-      const mod = await importModule(helperPath)
+      const resolvedPath = resolveImportModulePath(helperPath)
+      const mod = await import(resolvedPath)
       HelperClass = mod.default || mod
     } catch (err) {
       throw err
@@ -481,7 +482,8 @@ async function requireHelperFromModule(helperName, config, HelperClass) {
     // check if the new syntax export default HelperName is used and loads the Helper, otherwise loads the module that used old syntax export = HelperName.
     try {
       // Try dynamic import for both CommonJS and ESM modules
-      const mod = await importModule(importPath)
+      const resolvedPath = resolveImportModulePath(importPath)
+      const mod = await import(resolvedPath)
 
       if (!mod && !mod.default) {
         throw new Error(`Helper module '${moduleName}' was not found. Make sure you have installed the package correctly.`)
@@ -693,7 +695,8 @@ async function loadPluginAsync(modulePath, config) {
   let pluginMod
   try {
     // Try dynamic import first (works for both ESM and CJS)
-    pluginMod = await importModule(modulePath)
+    const resolvedPath = resolveImportModulePath(modulePath)
+    pluginMod = await import(resolvedPath)
   } catch (err) {
     throw new Error(`Could not load plugin from '${modulePath}': ${err.message}`)
   }
@@ -900,7 +903,8 @@ async function loadSupportObject(modulePath, supportObjectName) {
 
     let obj
     try {
-      obj = await importModule(importPath)
+      const resolvedPath = resolveImportModulePath(importPath)
+      obj = await import(resolvedPath)
     } catch (importError) {
       if (fileMapping) {
         fixErrorStack(importError, fileMapping)

lib/helper/ApiDataFactory.js

@@ -2,7 +2,7 @@ import path from 'path'
 import Helper from '@codeceptjs/helper'
 import REST from './REST.js'
 import store from '../store.js'
-import { importModule } from '../utils.js'
+import { resolveImportModulePath } from '../utils.js'
 
 /**
  * Helper for managing remote data using REST API.
@@ -329,7 +329,8 @@ class ApiDataFactory extends Helper {
         modulePath = path.join(store.codeceptDir, modulePath)
       }
       // check if the new syntax `export default new Factory()` is used and loads the builder, otherwise loads the module that used old syntax `module.exports = new Factory()`.
-      const module = await importModule(modulePath)
+      const resolvedPath = resolveImportModulePath(modulePath)
+      const module = await import(resolvedPath)
       const builder = module.default || module
       return builder.build(data, options)
     } catch (err) {

lib/rerun.js

@@ -5,7 +5,7 @@ import event from './event.js'
 import BaseCodecept from './codecept.js'
 import output from './output.js'
 import { createRequire } from 'module'
-import { importModule } from './utils.js'
+import { resolveImportModulePath } from './utils.js'
 
 const require = createRequire(import.meta.url)
 
@@ -52,7 +52,8 @@ class CodeceptRerunner extends BaseCodecept {
 
             // Force reload the module by using a cache-busting query parameter
             const fileUrl = `${fsPath.resolve(file)}?t=${Date.now()}`
-            await importModule(fileUrl)
+            const resolvedPath = resolveImportModulePath(fileUrl)
+            await import(resolvedPath)
           } catch (e) {
             console.error(`Error loading test file ${file}:`, e)
           }

lib/utils.js

@@ -39,18 +39,11 @@ export const isAsyncFunction = function (fn) {
   return fn[Symbol.toStringTag] === 'AsyncFunction'
 }
 
-/**
- * Dynamically imports a module.
- * On Windows, absolute paths are converted to file URLs.
- * @param {string} modulePath - The path to the module.
- * @param {Object} [options] - Import options.
- * @returns {Promise<any>} The imported module.
- */
-export const importModule = async function (modulePath, options) {
-  if (typeof modulePath === 'string' && path.isAbsolute(modulePath)) {
-    return import(pathToFileURL(modulePath).href, options)
+export const resolveImportModulePath = function (modulePath) {
+  if (isWindows() && modulePath === "string" && path.isAbsolute(modulePath)) {
+    return pathToFileURL(modulePath).href
   }
-  return import(modulePath, options)
+  return modulePath
 }
 
 export const fileExists = function (filePath) {

test/unit/container_test.js

@@ -9,7 +9,7 @@ import FileSystem from '../../lib/helper/FileSystem.js'
 import actor from '../../lib/actor.js'
 import container from '../../lib/container.js'
 import Translation from '../../lib/translation.js'
-import { isWindows } from '../../lib/utils.js'
+import { resolveImportModulePath } from '../../lib/utils.js'
 
 describe('Container', () => {
   before(() => {
@@ -185,12 +185,8 @@ describe('Container', () => {
         },
       })
 
-      const resolvedImportPath =
-        isWindows() && typeof '../data/dummy_page.js' === 'string' && path.isAbsolute('../data/dummy_page.js')
-          ? pathToFileURL('../data/dummy_page.js').href
-          : '../data/dummy_page.js'
-
-      const dummyPage = await import(resolvedImportPath)
+      const resolvedPath = resolveImportModulePath('../data/dummy_page.js')
+      const dummyPage = await import(resolvedPath)
       expect(container.support('dummyPage').toString()).is.eql((dummyPage.default || dummyPage).toString())
     })
 

test/unit/utils_test.js

@@ -6,7 +6,7 @@ import sinon from 'sinon'
 import * as utils from '../../lib/utils.js'
 import store from '../../lib/store.js'
 import playwright from 'playwright'
-import { isWindows } from '../../lib/utils.js'
+import { isWindows, resolveImportModulePath } from '../../lib/utils.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -353,7 +353,8 @@ describe('utils', () => {
     })
 
     it('should import a module', async () => {
-      const module = await utils.importModule(path.join(__dirname, '../../lib/output.js'))
+      const resolvedPath = utils.resolveImportModulePath(path.join(__dirname, '../../lib/output.js'))
+      const module = await import(resolvedPath)
       expect(module.default).to.be.ok
     })
 
@@ -364,15 +365,8 @@ describe('utils', () => {
       // Use an absolute path that exists
       const absolutePath = path.resolve(__dirname, '../../lib/output.js')
 
-      const module = await utils.importModule(absolutePath)
-      expect(module.default).to.be.ok
-    })
-
-    it('should import a relative module', async () => {
-      // Relative to lib/utils.js where importModule is defined
-      // lib/utils.js is in lib/
-      // we want to import lib/output.js
-      const module = await utils.importModule('./output.js')
+      const resolvedPath = utils.resolveImportModulePath(absolutePath)
+      const module = await import(resolvedPath)
       expect(module.default).to.be.ok
     })
   })