codeceptjs 4.0.0-beta.5 → 4.0.0-beta.6.esm-aria

package/lib/mocha/gherkin.js

@@ -1,28 +1,31 @@
-const Gherkin = require('@cucumber/gherkin')
-const Messages = require('@cucumber/messages')
-const { Context, Suite } = require('mocha')
-const debug = require('debug')('codeceptjs:bdd')
-
-const { enhanceMochaSuite } = require('./suite')
-const { createTest } = require('./test')
-const { matchStep } = require('./bdd')
-const event = require('../event')
-const { injected, setup, teardown, suiteSetup, suiteTeardown } = require('./asyncWrapper')
-const Step = require('../step')
-const DataTableArgument = require('../data/dataTableArgument')
-const transform = require('../transform')
-
-const uuidFn = Messages.IdGenerator.uuid()
+import Gherkin from '@cucumber/gherkin'
+import { IdGenerator } from '@cucumber/messages'
+import { Context, Suite } from 'mocha'
+import debug from 'debug'
+const debugBdd = debug('codeceptjs:bdd')
+
+import event from '../event.js'
+import { injected, setup, teardown, suiteSetup, suiteTeardown } from './asyncWrapper.js'
+import step from '../step/base.js'
+import MetaStep from '../step/meta.js'
+import DataTableArgument from '../data/dataTableArgument.js'
+import transform from '../transform.js'
+import { enhanceMochaSuite } from './suite.js'
+import { createTest } from './test.js'
+import { matchStep } from './bdd.js'
+
+const uuidFn = IdGenerator.uuid()
 const builder = new Gherkin.AstBuilder(uuidFn)
 const matcher = new Gherkin.GherkinClassicTokenMatcher()
 const parser = new Gherkin.Parser(builder, matcher)
 parser.stopAtFirstError = false
 
-module.exports = (text, file) => {
+const gherkinParser = (text, file) => {
   const ast = parser.parse(text)
   let currentLanguage
 
   if (ast.feature) {
+    // Ensure translations are loaded before trying to access them
     currentLanguage = getTranslation(ast.feature.language)
   }
 
@@ -39,14 +42,20 @@ module.exports = (text, file) => {
   suite.file = file
   suite.timeout(0)
 
-  suite.beforeEach('codeceptjs.before', () => setup(suite))
-  suite.afterEach('codeceptjs.after', () => teardown(suite))
-  suite.beforeAll('codeceptjs.beforeSuite', () => suiteSetup(suite))
-  suite.afterAll('codeceptjs.afterSuite', () => suiteTeardown(suite))
+  suite.beforeEach('codeceptjs.before', function () {
+    // In Mocha, 'this' refers to the current test in beforeEach/afterEach hooks
+    setup(this)(() => {})
+  })
+  suite.afterEach('codeceptjs.after', function () {
+    // In Mocha, 'this' refers to the current test in beforeEach/afterEach hooks
+    teardown(this)(() => {})
+  })
+  suite.beforeAll('codeceptjs.beforeSuite', suiteSetup(suite))
+  suite.afterAll('codeceptjs.afterSuite', suiteTeardown(suite))
 
   const runSteps = async steps => {
     for (const step of steps) {
-      const metaStep = new Step.MetaStep(null, step.text)
+      const metaStep = new MetaStep(null, step.text)
       metaStep.actor = step.keyword.trim()
       let helperStep
       const setMetaStep = step => {
@@ -107,7 +116,7 @@ module.exports = (text, file) => {
       )
       continue
     }
-    if (child.scenario && (currentLanguage ? currentLanguage.contexts.ScenarioOutline === child.scenario.keyword : child.scenario.keyword === 'Scenario Outline')) {
+    if (child.scenario && (currentLanguage ? currentLanguage.contexts.ScenarioOutline.includes(child.scenario.keyword) : child.scenario.keyword === 'Scenario Outline')) {
       for (const examples of child.scenario.examples) {
         const fields = examples.tableHeader.cells.map(c => c.value)
         for (const example of examples.tableBody) {
@@ -184,16 +193,39 @@ function addExampleInTable(exampleSteps, placeholders) {
   return steps
 }
 
+// Import translations at module level to avoid async in parser
+let translations = null
+async function loadTranslations() {
+  if (!translations) {
+    // Import container to ensure it's initialized
+    const Container = await import('../container.js')
+    await Container.default.started()
+
+    // Now load translations
+    const translationsModule = await import('../../translations/index.js')
+    translations = translationsModule.default || translationsModule
+  }
+  return translations
+}
+
 function getTranslation(language) {
-  const translations = Object.keys(require('../../translations'))
+  if (!translations) {
+    // Translations not loaded yet, return null (will use default)
+    return null
+  }
 
-  for (const availableTranslation of translations) {
+  const translationKeys = Object.keys(translations)
+  for (const availableTranslation of translationKeys) {
     if (!language) {
       break
     }
 
     if (availableTranslation.includes(language)) {
-      return require('../../translations')[availableTranslation]
+      return translations[availableTranslation]
     }
   }
+  return null
 }
+
+export { loadTranslations }
+export default gherkinParser

package/lib/mocha/hooks.js

@@ -1,5 +1,5 @@
-const event = require('../event')
-const { serializeError } = require('../utils')
+import event from '../event.js'
+import { serializeError } from '../utils.js'
 // const { serializeTest } = require('./test')
 
 /**
@@ -102,7 +102,16 @@ class HookConfig {
   }
 }
 
-module.exports = {
+export {
+  BeforeHook,
+  AfterHook,
+  BeforeSuiteHook,
+  AfterSuiteHook,
+  fireHook,
+  HookConfig,
+}
+
+export default {
   BeforeHook,
   AfterHook,
   BeforeSuiteHook,

package/lib/mocha/index.js

@@ -1,8 +1,17 @@
-const Suite = require('mocha/lib/suite')
-const Test = require('mocha/lib/test')
-const { BeforeHook, AfterHook, BeforeSuiteHook, AfterSuiteHook } = require('./hooks')
+import Suite from 'mocha/lib/suite.js'
+import Test from 'mocha/lib/test.js'
+import { BeforeHook, AfterHook, BeforeSuiteHook, AfterSuiteHook } from './hooks.js'
 
-module.exports = {
+export {
+  Suite,
+  Test,
+  BeforeHook,
+  AfterHook,
+  BeforeSuiteHook,
+  AfterSuiteHook,
+}
+
+export default {
   Suite,
   Test,
   BeforeHook,

package/lib/mocha/inject.js

@@ -1,13 +1,30 @@
-const parser = require('../parser')
+import { getParams } from '../parser.js'
+
+const getInjectedArguments = async (fn, test, suite) => {
+  const containerModule = await import('../container.js')
+  const container = containerModule.default || containerModule
 
-const getInjectedArguments = (fn, test) => {
-  const container = require('../container')
   const testArgs = {}
-  const params = parser.getParams(fn) || []
+  const params = getParams(fn) || []
   const objects = container.support()
 
   for (const key of params) {
     testArgs[key] = {}
+
+    // Handle special built-in objects first
+    if (key === 'suite') {
+      if (test) {
+        testArgs[key] = test.parent || test
+      } else if (suite) {
+        testArgs[key] = suite
+      }
+      continue
+    }
+    if (key === 'test') {
+      testArgs[key] = test
+      continue
+    }
+
     if (test && test.inject && test.inject[key]) {
       // @FIX: need fix got inject
       testArgs[key] = test.inject[key]
@@ -26,4 +43,4 @@ const getInjectedArguments = (fn, test) => {
   return testArgs
 }
 
-module.exports.getInjectedArguments = getInjectedArguments
+export { getInjectedArguments }

package/lib/mocha/scenarioConfig.js

@@ -1,4 +1,4 @@
-const { isAsyncFunction } = require('../utils')
+import { isAsyncFunction } from '../utils.js'
 
 /** @class */
 class ScenarioConfig {
@@ -135,4 +135,4 @@ class ScenarioConfig {
   }
 }
 
-module.exports = ScenarioConfig
+export default ScenarioConfig

package/lib/mocha/suite.js

@@ -1,4 +1,4 @@
-const MochaSuite = require('mocha/lib/suite')
+import MochaSuite from 'mocha/lib/suite.js'
 /**
  * @typedef {import('mocha')} Mocha
  */
@@ -74,7 +74,14 @@ function deserializeSuite(suite) {
   return suite
 }
 
-module.exports = {
+export {
+  createSuite,
+  enhanceMochaSuite,
+  serializeSuite,
+  deserializeSuite,
+}
+
+export default {
   createSuite,
   enhanceMochaSuite,
   serializeSuite,

package/lib/mocha/test.js

@@ -1,9 +1,9 @@
-const Test = require('mocha/lib/test')
-const Suite = require('mocha/lib/suite')
-const { test: testWrapper } = require('./asyncWrapper')
-const { enhanceMochaSuite, createSuite } = require('./suite')
-const { genTestId, serializeError, clearString, relativeDir } = require('../utils')
-const Step = require('../step/base')
+import Test from 'mocha/lib/test.js'
+import Suite from 'mocha/lib/suite.js'
+import { genTestId, serializeError, clearString, relativeDir } from '../utils.js'
+import Step from '../step/base.js'
+import { enhanceMochaSuite } from './suite.js'
+import { test as testWrapper } from './asyncWrapper.js'
 /**
  * Factory function to create enhanced tests
  * @param {string} title - Test title
@@ -47,6 +47,7 @@ function enhanceMochaTest(test) {
    */
   test.addToSuite = function (suite) {
     enhanceMochaSuite(suite)
+    // Get testWrapper from asyncWrapper module
     suite.addTest(testWrapper(this))
     if (test.file && !suite.file) suite.file = test.file
     test.tags = [...(test.tags || []), ...(suite.tags || [])]
@@ -77,12 +78,6 @@ function deserializeTest(test) {
   test.parent = Object.assign(new Suite(test.parent?.title || 'Suite'), test.parent)
   enhanceMochaSuite(test.parent)
   if (test.steps) test.steps = test.steps.map(step => Object.assign(new Step(step.title), step))
-
-  // Restore the custom fullTitle function to maintain consistency with original test
-  if (test.parent) {
-    test.fullTitle = () => `${test.parent.title}: ${test.title}`
-  }
-
   return test
 }
 
@@ -171,7 +166,9 @@ function testToFileName(test, { suffix = '', unique = false } = {}) {
   return fileName
 }
 
-module.exports = {
+export { createTest, testToFileName, enhanceMochaTest, serializeTest, deserializeTest, cloneTest }
+
+export default {
   createTest,
   testToFileName,
   enhanceMochaTest,

package/lib/mocha/ui.js

@@ -1,15 +1,22 @@
-const escapeRe = require('escape-string-regexp')
-const { test, setup, teardown, suiteSetup, suiteTeardown, injected } = require('./asyncWrapper')
-const ScenarioConfig = require('./scenarioConfig')
-const FeatureConfig = require('./featureConfig')
-const addDataContext = require('../data/context')
-const { createTest } = require('./test')
-const { createSuite } = require('./suite')
-const { HookConfig, AfterSuiteHook, AfterHook, BeforeSuiteHook, BeforeHook } = require('./hooks')
+import escapeRe from 'escape-string-regexp'
+import { test, setup, teardown, suiteSetup, suiteTeardown, injected } from './asyncWrapper.js'
+import ScenarioConfig from './scenarioConfig.js'
+import FeatureConfig from './featureConfig.js'
+import addDataContext from '../data/context.js'
+import { createTest } from './test.js'
+import { createSuite } from './suite.js'
+import { HookConfig, AfterSuiteHook, AfterHook, BeforeSuiteHook, BeforeHook } from './hooks.js'
+import { initMochaGlobals } from '../globals.js'
+import common from 'mocha/lib/interfaces/common.js'
+import container from '../container.js'
 
 const setContextTranslation = context => {
-  const container = require('../container')
-  const contexts = container.translation().value('contexts')
+  // Try global container first, then local container instance
+  const containerToUse = global.container || container
+  if (!containerToUse) return
+
+  const translation = containerToUse.translation?.() || containerToUse.translation
+  const contexts = translation?.value?.('contexts')
 
   if (contexts) {
     for (const key of Object.keys(contexts)) {
@@ -34,7 +41,7 @@ const setContextTranslation = context => {
  * @param {Mocha.Suite} suite Root suite.
  * @ignore
  */
-module.exports = function (suite) {
+export default function (suite) {
   const suites = [suite]
   suite.timeout(0)
   let afterAllHooks
@@ -43,7 +50,7 @@ module.exports = function (suite) {
   let afterEachHooksAreLoaded
 
   suite.on('pre-require', (context, file, mocha) => {
-    const common = require('mocha/lib/interfaces/common')(suites, context, mocha)
+    const cmn = common(suites, context, mocha)
 
     const addScenario = function (title, opts = {}, fn) {
       const suite = suites[0]
@@ -65,8 +72,8 @@ module.exports = function (suite) {
 
     // create dispatcher
 
-    context.BeforeAll = common.before
-    context.AfterAll = common.after
+    context.BeforeAll = cmn.before
+    context.AfterAll = cmn.after
 
     context.run = mocha.options.delay && common.runWithSuite(suite)
     /**
@@ -94,28 +101,15 @@ module.exports = function (suite) {
 
       suite.file = file
       suites.unshift(suite)
-      suite.beforeEach('codeceptjs.before', () => setup(suite))
-      afterEachHooks.push(['finalize codeceptjs', () => teardown(suite)])
+      suite.beforeEach('codeceptjs.before', setup(suite))
+      afterEachHooks.push(['finalize codeceptjs', teardown(suite)])
 
-      suite.beforeAll('codeceptjs.beforeSuite', () => suiteSetup(suite))
-      afterAllHooks.push(['codeceptjs.afterSuite', () => suiteTeardown(suite)])
+      suite.beforeAll('codeceptjs.beforeSuite', suiteSetup(suite))
+      afterAllHooks.push(['codeceptjs.afterSuite', suiteTeardown(suite)])
 
       return new FeatureConfig(suite)
     }
 
-    /**
-     * Exclusive test suite - runs only this feature.
-     * @global
-     * @kind constant
-     * @type {CodeceptJS.IFeature}
-     */
-    context.Feature.only = function (title, opts) {
-      const reString = `^${escapeRe(`${title}:`)}`
-      mocha.grep(new RegExp(reString))
-      process.env.FEATURE_ONLY = true
-      return context.Feature(title, opts)
-    }
-
     /**
      * Pending test suite.
      * @global
@@ -208,6 +202,9 @@ module.exports = function (suite) {
 
     setContextTranslation(context)
 
+    // Initialize all globals
+    initMochaGlobals(context)
+
     addDataContext(context)
   })
 

package/lib/output.js

@@ -1,6 +1,6 @@
-const colors = require('chalk')
-const figures = require('figures')
-const { maskSensitiveData } = require('invisi-data')
+import colors from 'chalk'
+import figures from 'figures'
+import { maskSensitiveData } from 'invisi-data'
 
 const styles = {
   error: colors.bgRed.white.bold,
@@ -21,7 +21,7 @@ let newline = true
  * @alias output
  * @namespace
  */
-module.exports = {
+const output = {
   colors,
   styles,
   print,
@@ -61,7 +61,7 @@ module.exports = {
   debug(msg) {
     const _msg = isMaskedData() ? maskSensitiveData(msg) : msg
     if (outputLevel >= 2) {
-      print(' '.repeat(this.stepShift), styles.debug(`${figures.pointerSmall} ${_msg}`))
+      print(' '.repeat(output.stepShift), styles.debug(`${figures.pointerSmall} ${_msg}`))
     }
   },
 
@@ -72,7 +72,7 @@ module.exports = {
   log(msg) {
     const _msg = isMaskedData() ? maskSensitiveData(msg) : msg
     if (outputLevel >= 3) {
-      print(' '.repeat(this.stepShift), styles.log(truncate(`   ${_msg}`, this.spaceShift)))
+      print(' '.repeat(output.stepShift), styles.log(truncate(`   ${_msg}`, output.stepShift)))
     }
   },
 
@@ -98,7 +98,7 @@ module.exports = {
    * @param {string} msg
    */
   plugin(pluginName, msg = '') {
-    this.debug(`<${pluginName}> ${msg}`)
+    output.debug(`<${pluginName}> ${msg}`)
   },
 
   /**
@@ -118,14 +118,14 @@ module.exports = {
     let stepLine = step.toCliStyled ? step.toCliStyled() : step.toString()
     if (step.metaStep && outputLevel >= 1) {
       // this.stepShift += 2;
-      stepLine = colors.dim(truncate(stepLine, this.spaceShift))
+      stepLine = colors.dim(truncate(stepLine, output.stepShift))
     }
     if (step.comment) {
       stepLine += colors.grey(step.comment.split('\n').join('\n' + ' '.repeat(4)))
     }
 
     const _stepLine = isMaskedData() ? maskSensitiveData(stepLine) : stepLine
-    print(' '.repeat(this.stepShift), truncate(_stepLine, this.spaceShift))
+    print(' '.repeat(output.stepShift), truncate(_stepLine, output.stepShift))
   },
 
   /** @namespace */
@@ -282,3 +282,5 @@ function truncate(msg, gap = 0) {
 function isMaskedData() {
   return global.maskSensitiveData === true || false
 }
+
+export default output

package/lib/parser.js

@@ -1,74 +1,74 @@
-function _interopDefault(ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex.default : ex; }
-const acorn = require('acorn');
-const parser = _interopDefault(require('parse-function'))({ parse: acorn.parse, ecmaVersion: 11, plugins: ['objectRestSpread'] });
-const { error } = require('./output');
+function _interopDefault(ex) {
+  return ex && typeof ex === 'object' && 'default' in ex ? ex.default : ex
+}
+import * as acorn from 'acorn'
+import parseFunctionModule from 'parse-function'
+const parseFunction = _interopDefault(parseFunctionModule)
+const parser = parseFunction({ parse: acorn.parse, ecmaVersion: 11, plugins: ['objectRestSpread'] })
+import output from './output.js'
 
-parser.use(destructuredArgs);
+parser.use(destructuredArgs)
 
-module.exports.getParamsToString = function (fn) {
-  const newFn = fn.toString().replace(/^async/, 'async function');
-  return getParams(newFn).join(', ');
-};
+export const getParamsToString = function (fn) {
+  const newFn = fn.toString().replace(/^async/, 'async function')
+  return getParams(newFn).join(', ')
+}
 
 function getParams(fn) {
-  if (fn.isSinonProxy) return [];
+  if (fn.isSinonProxy) return []
   try {
-    const reflected = parser.parse(fn);
+    const reflected = parser.parse(fn)
     if (reflected.args.length > 1 || reflected.args[0] === 'I') {
-      error('Error: old CodeceptJS v2 format detected. Upgrade your project to the new format -> https://bit.ly/codecept3Up');
+      output.error('Error: old CodeceptJS v2 format detected. Upgrade your project to the new format -> https://bit.ly/codecept3Up')
     }
-    if (reflected.destructuredArgs.length > 0) reflected.args = [...reflected.destructuredArgs];
-    const params = reflected.args.map((p) => {
-      const def = reflected.defaults[p];
+    if (reflected.destructuredArgs.length > 0) reflected.args = [...reflected.destructuredArgs]
+    const params = reflected.args.map(p => {
+      const def = reflected.defaults[p]
       if (def) {
-        return `${p}=${def}`;
+        return `${p}=${def}`
       }
-      return p;
-    });
-    return params;
+      return p
+    })
+    return params
   } catch (err) {
-    console.log(`Error in ${fn.toString()}`);
-    error(err);
+    console.log(`Error in ${fn.toString()}`)
+    output.error(err)
   }
 }
 
-module.exports.getParams = getParams;
+export { getParams }
 
 function destructuredArgs() {
   return (node, result) => {
-    result.destructuredArgs = result.destructuredArgs || [];
+    result.destructuredArgs = result.destructuredArgs || []
 
     if (node.type === 'ObjectExpression' && node.properties.length > 0) {
-      node.properties.forEach((prop) => {
+      node.properties.forEach(prop => {
         if (prop.value && prop.value.params.length > 0) {
-          result.destructuredArgs = parseDestructuredArgs(prop.value);
+          result.destructuredArgs = parseDestructuredArgs(prop.value)
         }
-      });
+      })
 
-      return result;
+      return result
     }
 
-    if (!Array.isArray(node.params)) return result;
-    result.destructuredArgs = parseDestructuredArgs(node);
+    if (!Array.isArray(node.params)) return result
+    result.destructuredArgs = parseDestructuredArgs(node)
 
-    return result;
-  };
+    return result
+  }
 }
 
 function parseDestructuredArgs(node) {
-  const destructuredArgs = [];
-  node.params.forEach((param) => {
-    if (
-      param.type === 'ObjectPattern'
-        && param.properties
-        && param.properties.length > 0
-    ) {
-      param.properties.forEach((prop) => {
-        const { name } = prop.value;
-        destructuredArgs.push(name);
-      });
+  const destructuredArgs = []
+  node.params.forEach(param => {
+    if (param.type === 'ObjectPattern' && param.properties && param.properties.length > 0) {
+      param.properties.forEach(prop => {
+        const { name } = prop.value
+        destructuredArgs.push(name)
+      })
     }
-  });
+  })
 
-  return destructuredArgs;
+  return destructuredArgs
 }

package/lib/pause.js

@@ -1,16 +1,16 @@
-const colors = require('chalk')
-const readline = require('readline')
-const ora = require('ora-classic')
-const debug = require('debug')('codeceptjs:pause')
-
-const container = require('./container')
-const history = require('./history')
-const store = require('./store')
-const aiAssistant = require('./ai')
-const recorder = require('./recorder')
-const event = require('./event')
-const output = require('./output')
-const { methodsOfObject, searchWithFusejs } = require('./utils')
+import colors from 'chalk'
+import readline from 'readline'
+import ora from 'ora-classic'
+import debugModule from 'debug'
+const debug = debugModule('codeceptjs:pause')
+import container from './container.js'
+import history from './history.js'
+import store from './store.js'
+import aiAssistant from './ai.js'
+import recorder from './recorder.js'
+import event from './event.js'
+import output from './output.js'
+import { methodsOfObject, searchWithFusejs } from './utils.js'
 
 // npm install colors
 let rl
@@ -234,6 +234,5 @@ function registerVariable(name, value) {
   registeredVariables[name] = value
 }
 
-module.exports = pause
-
-module.exports.registerVariable = registerVariable
+export default pause
+export { registerVariable }