Changes before error encountered

Co-authored-by: kobenguyent <7845001+kobenguyent@users.noreply.github.com>

Author: Copilot

lib/container.js

@@ -63,12 +63,21 @@ class Container {
     // create support objects
     container.support = {}
     container.helpers = await createHelpers(config.helpers || {})
-    container.translation = loadTranslation(config.translation || null, config.vocabularies || [])
+    container.translation = await loadTranslation(config.translation || null, config.vocabularies || [])
     container.proxySupport = await createSupportObjects(config.include || {})
     container.plugins = await createPlugins(config.plugins || {}, opts)
     container.result = new Result()
 
-    await createActor(config.include?.I)
+    // Create actor - pass custom I object only if no I is provided in includes
+    // If I is provided in includes, it should remain as a pure support object
+    const customIProvided = config.include && config.include.I
+    const actorConfig = customIProvided ? {} : config.include?.I
+    container.actor = await createActor(actorConfig)
+    
+    // Only set I to actor if no custom I was loaded as a support object
+    if (!customIProvided) {
+      container.support.I = container.actor
+    }
 
     if (opts && opts.ai) ai.enable(config.ai) // enable AI Assistant
     if (config.gherkin) await loadGherkinSteps(config.gherkin.steps || [])
@@ -173,8 +182,9 @@ class Container {
    */
   static clear(newHelpers = {}, newSupport = {}, newPlugins = {}) {
     container.helpers = newHelpers
-    container.translation = loadTranslation()
-    container.proxySupport = createSupportObjects(newSupport)
+    container.translation = Translation.createEmpty()  // Use empty translation to avoid async issues
+    // Handle simple objects synchronously for backward compatibility
+    container.proxySupport = createSupportObjectsSync(newSupport)
     container.plugins = newPlugins
     container.sharedKeys = new Set() // Clear shared keys
     asyncHelperPromise = Promise.resolve()
@@ -306,9 +316,20 @@ async function requireHelperFromModule(helperName, config, HelperClass) {
       HelperClass = mod.default || mod
     } catch (err) {
       if (err.code === 'ERR_MODULE_NOT_FOUND') {
-        throw new Error(`Helper module '${moduleName}' was not found. Make sure you have installed the package correctly.`)
+        // Try adding .js extension for custom helpers (ESM compatibility)
+        if (!moduleName.endsWith('.js') && !moduleName.endsWith('.mjs') && !moduleName.endsWith('.ts')) {
+          try {
+            const mod = await import(moduleName + '.js');
+            HelperClass = mod.default || mod
+          } catch (retryErr) {
+            throw new Error(`Helper module '${moduleName}' was not found. Make sure you have installed the package correctly.`)
+          }
+        } else {
+          throw new Error(`Helper module '${moduleName}' was not found. Make sure you have installed the package correctly.`)
+        }
+      } else {
+        throw err
       }
-      throw err
     }
   }
   return HelperClass
@@ -328,8 +349,8 @@ async function createSupportObjects(config) {
   const supportObjects = {};
   for (const name in config) {
     if (name === 'I') {
-      // Handle I (actor) separately  
-      supportObjects[name] = await createActor(config.I);
+      // Load I as a support object, not as an actor
+      supportObjects[name] = await loadSupportObject(config.I);
       continue;
     }
 
@@ -482,7 +503,7 @@ async function loadSupportObject(modulePath, supportObjectName) {
  * Method collect own property and prototype
  */
 
-function loadTranslation(locale, vocabularies) {
+async function loadTranslation(locale, vocabularies) {
   if (!locale) {
     return Translation.createEmpty()
   }
@@ -495,12 +516,15 @@ function loadTranslation(locale, vocabularies) {
   } else if (fileExists(path.join(global.codecept_dir, locale))) {
     // get from a provided file instead
     translation = Translation.createDefault()
-    translation.loadVocabulary(locale)
+    await translation.loadVocabulary(locale)
   } else {
     translation = Translation.createDefault()
   }
 
-  vocabularies.forEach(v => translation.loadVocabulary(v))
+  // Load vocabularies asynchronously
+  for (const v of vocabularies) {
+    await translation.loadVocabulary(v)
+  }
 
   return translation
 }
@@ -535,3 +559,18 @@ function normalizeAndJoin(basePath, subPath) {
   // Join the paths using POSIX-style
   return path.posix.join(normalizedBase, normalizedSub)
 }
+
+function createSupportObjectsSync(config) {
+  // Synchronous version for simple objects (used by clear method)
+  const supportObjects = {};
+  for (const name in config) {
+    if (typeof config[name] === 'object') {
+      supportObjects[name] = config[name];
+    }
+  }
+  // Store objects in container for access
+  for (const name in supportObjects) {
+    container.support[name] = supportObjects[name];
+  }
+  return supportObjects;
+}

lib/translation.js

@@ -18,7 +18,17 @@ class Translation {
     const filePath = path.join(global.codecept_dir, vocabularyFile);
 
     try {
-      const vocabulary = await import(filePath).then(m => m.default || m);
+      let vocabulary;
+      if (filePath.endsWith('.json')) {
+        // Handle JSON files with fs
+        const fs = await import('fs');
+        const content = fs.readFileSync(filePath, 'utf8');
+        vocabulary = JSON.parse(content);
+      } else {
+        // Handle JS modules
+        const module = await import(filePath);
+        vocabulary = module.default || module;
+      }
       this.vocabulary = merge(this.vocabulary, vocabulary);
     } catch (err) {
       throw new Error(`Can't load vocabulary from ${filePath}; ${err}`);

test/unit/bdd_test.js

@@ -6,7 +6,10 @@ import chai from 'chai'
 import recorder from '../../lib/recorder.js'
 import container from '../../lib/container.js'
 import Config from '../../lib/config.js'
-import { clearSteps, Given, When, Then, And, matchStep } from '../../lib/mocha/bdd.js'
+import { clearSteps, Given, When, Then, And, matchStep, defineParameterType } from '../../lib/mocha/bdd.js'
+import run from '../../lib/mocha/gherkin.js'
+import actor from '../../lib/actor.js'
+import event from '../../lib/event.js'
 
 const { expect } = chai
 const uuidFn = Messages.IdGenerator.uuid()
@@ -17,6 +20,9 @@ const matcher = new Gherkin.GherkinClassicTokenMatcher()
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 global.codecept_dir = path.join(__dirname, '/..')
 
+let printed = []
+let I
+
 class Color {
   constructor(name) {
     this.name = name

test/unit/container_test.js

@@ -12,6 +12,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 describe('Container', () => {
   before(() => {
+    global.codecept_dir = path.join(__dirname, '/..')
     global.inject = container.support
     global.actor = actor
   })
@@ -150,7 +151,7 @@ describe('Container', () => {
   })
 
   describe('#create', () => {
-    it('should create container with helpers', () => {
+    it('should create container with helpers', async () => {
       const config = {
         helpers: {
           MyHelper: {
@@ -159,7 +160,7 @@ describe('Container', () => {
           FileSystem: {},
         },
       }
-      container.create(config)
+      await container.create(config)
       // custom helpers
       expect(container.helpers('MyHelper')).is.ok
       expect(container.helpers('MyHelper').method()).to.eql('hello world')
@@ -196,8 +197,8 @@ describe('Container', () => {
       expect(Object.keys(container.support('I'))).to.include('doSomething')
     })
 
-    it('should load DI includes provided as require paths', () => {
-      container.create({
+    it('should load DI includes provided as require paths', async () => {
+      await container.create({
         include: {
           dummyPage: './data/dummy_page',
         },
@@ -207,7 +208,7 @@ describe('Container', () => {
     })
 
     it('should load DI and inject I into PO', async () => {
-      container.create({
+      await container.create({
         include: {
           dummyPage: './data/dummy_page',
           I: './data/I',
@@ -219,8 +220,8 @@ describe('Container', () => {
       expect(container.support('dummyPage').getI()).to.have.keys('_init', 'doSomething')
     })
 
-    it('should load DI and inject custom I into PO', () => {
-      container.create({
+    it('should load DI and inject custom I into PO', async () => {
+      await container.create({
         include: {
           dummyPage: './data/dummy_page',
           I: './data/I',
@@ -231,8 +232,8 @@ describe('Container', () => {
       expect(container.support('dummyPage')).to.include.keys('openDummyPage')
     })
 
-    it('should load DI includes provided as objects', () => {
-      container.create({
+    it('should load DI includes provided as objects', async () => {
+      await container.create({
         include: {
           dummyPage: {
             openDummyPage: () => 'dummy page opened',
@@ -243,8 +244,8 @@ describe('Container', () => {
       expect(container.support('dummyPage')).to.include.keys('openDummyPage')
     })
 
-    it('should load DI includes provided as objects', () => {
-      container.create({
+    it('should load DI includes provided as objects', async () => {
+      await container.create({
         include: {
           dummyPage: {
             openDummyPage: () => 'dummy page opened',
@@ -257,14 +258,14 @@ describe('Container', () => {
   })
 
   describe('#append', () => {
-    it('should be able to add new helper', () => {
+    it('should be able to add new helper', async () => {
       const config = {
         helpers: {
           FileSystem: {},
         },
       }
-      container.create(config)
-      container.append({
+      await container.create(config)
+      await container.append({
         helpers: {
           AnotherHelper: { method: () => 'executed' },
         },
@@ -276,9 +277,9 @@ describe('Container', () => {
       expect(container.helpers('AnotherHelper').method()).is.eql('executed')
     })
 
-    it('should be able to add new support object', () => {
-      container.create({})
-      container.append({ support: { userPage: { login: '#login' } } })
+    it('should be able to add new support object', async () => {
+      await container.create({})
+      await container.append({ support: { userPage: { login: '#login' } } })
       expect(container.support('I')).is.ok
       expect(container.support('userPage')).is.ok
       expect(container.support('userPage').login).is.eql('#login')