fixed commands

Author: DavertMik

lib/command/definitions.js

@@ -1,10 +1,10 @@
-const fs = require('fs')
-const path = require('path')
+import fs from 'fs'
+import path from 'path'
 
-const { getConfig, getTestRoot } = require('./utils')
-const Codecept = require('../codecept')
-const container = require('../container')
-const output = require('../output')
+import { getConfig, getTestRoot } from './utils.js'
+import Codecept from '../codecept.js'
+import container from '../container.js'
+import output from '../output.js'
 const actingHelpers = [...container.STANDARD_ACTING_HELPERS, 'REST']
 
 /**
@@ -86,11 +86,11 @@ const helperNames = []
 /** @type {Array<string>} */
 const customHelpers = []
 
-module.exports = function (genPath, options) {
+export default async function (genPath, options) {
   const configFile = options.config || genPath
   /** @type {string} */
   const testsPath = getTestRoot(configFile)
-  const config = getConfig(configFile)
+  const config = await getConfig(configFile)
   if (!config) return
 
   /** @type {Object<string, string>} */

lib/command/dryRun.js

@@ -1,18 +1,18 @@
-const { getConfig, getTestRoot } = require('./utils')
-const Config = require('../config')
-const Codecept = require('../codecept')
-const output = require('../output')
-const event = require('../event')
-const store = require('../store')
-const Container = require('../container')
-
-module.exports = async function (test, options) {
+import { getConfig, getTestRoot } from './utils.js'
+import Config from '../config.js'
+import Codecept from '../codecept.js'
+import output from '../output.js'
+import event from '../event.js'
+import store from '../store.js'
+import Container from '../container.js'
+
+export default async function (test, options) {
   if (options.grep) process.env.grep = options.grep
   const configFile = options.config
   let codecept
 
   const testRoot = getTestRoot(configFile)
-  let config = getConfig(configFile)
+  let config = await getConfig(configFile)
   if (options.override) {
     config = Config.append(JSON.parse(options.override))
   }
@@ -35,7 +35,7 @@ module.exports = async function (test, options) {
     store.dryRun = true
 
     if (!options.steps && !options.verbose && !options.debug) {
-      printTests(codecept.testFiles)
+      await printTests(codecept.testFiles)
       return
     }
     event.dispatcher.on(event.all.result, printFooter)
@@ -46,9 +46,9 @@ module.exports = async function (test, options) {
   }
 }
 
-function printTests(files) {
-  const figures = require('figures')
-  const colors = require('chalk')
+async function printTests(files) {
+  const { default: figures } = await import('figures')
+  const { default: colors } = await import('chalk')
 
   output.print(output.styles.debug(`Tests from ${global.codecept_dir}:`))
   output.print()

lib/command/generate.js

@@ -1,12 +1,12 @@
-const colors = require('chalk')
-const fs = require('fs')
-const inquirer = require('inquirer')
-const mkdirp = require('mkdirp')
-const path = require('path')
-const { fileExists, ucfirst, lcfirst, beautify } = require('../utils')
-const output = require('../output')
-const generateDefinitions = require('./definitions')
-const { getConfig, getTestRoot, safeFileWrite, readConfig } = require('./utils')
+import colors from 'chalk'
+import fs from 'fs'
+import inquirer from 'inquirer'
+import mkdirp from 'mkdirp'
+import path from 'path'
+import { fileExists, ucfirst, lcfirst, beautify } from '../utils.js'
+import output from '../output.js'
+import generateDefinitions from './definitions.js'
+import { getConfig, getTestRoot, safeFileWrite, readConfig } from './utils.js'
 
 let extension = 'js'
 
@@ -18,10 +18,10 @@ Scenario('test something', async ({ {{actor}} }) => {
 `
 
 // generates empty test
-module.exports.test = function (genPath) {
+export async function test(genPath) {
   const testsPath = getTestRoot(genPath)
   global.codecept_dir = testsPath
-  const config = getConfig(testsPath)
+  const config = await getConfig(testsPath)
   if (!config) return
 
   output.print('Creating a new test...')
@@ -105,9 +105,9 @@ module.exports = new {{name}}();
 export = {{name}};
 `
 
-module.exports.pageObject = function (genPath, opts) {
+export async function pageObject(genPath, opts) {
   const testsPath = getTestRoot(genPath)
-  const config = getConfig(testsPath)
+  const config = await getConfig(testsPath)
   const kind = opts.T || 'page'
   if (!config) return
 
@@ -225,7 +225,7 @@ class {{name}} extends Helper {
 module.exports = {{name}};
 `
 
-module.exports.helper = function (genPath) {
+export async function helper(genPath) {
   const testsPath = getTestRoot(genPath)
 
   output.print('Creating a new helper')
@@ -267,7 +267,7 @@ helpers: {
 
 const healTemplate = fs.readFileSync(path.join(__dirname, '../template/heal.js'), 'utf8').toString()
 
-module.exports.heal = function (genPath) {
+export async function heal(genPath) {
   const testsPath = getTestRoot(genPath)
 
   let configFile = path.join(testsPath, `codecept.conf.${extension}`)

lib/command/info.js

@@ -1,10 +1,10 @@
-const envinfo = require('envinfo')
+import envinfo from 'envinfo'
 
-const { getConfig, getTestRoot } = require('./utils')
-const Codecept = require('../codecept')
-const outputModule = require('../output')
+import { getConfig, getTestRoot } from './utils.js'
+import Codecept from '../codecept.js'
+import outputModule from '../output.js'
 const output = outputModule.default || outputModule
-const { execSync } = require('child_process')
+import { execSync } from 'child_process'
 
 async function getPlaywrightBrowsers() {
   try {
@@ -41,9 +41,9 @@ async function getOsBrowsers() {
   ].join(', ')
 }
 
-module.exports = async function (path) {
+export default async function (path) {
   const testsPath = getTestRoot(path)
-  const config = getConfig(testsPath)
+  const config = await getConfig(testsPath)
   const codecept = new Codecept(config, {})
   codecept.init(testsPath)
 
@@ -74,7 +74,7 @@ module.exports = async function (path) {
   output.print('***************************************')
 }
 
-module.exports.getMachineInfo = async () => {
+export const getMachineInfo = async () => {
   const info = {
     nodeInfo: await envinfo.helpers.getNodeInfo(),
     osInfo: await envinfo.helpers.getOSInfo(),

lib/command/init.js

@@ -1,17 +1,17 @@
-const colors = require('chalk')
-const fs = require('fs')
-const inquirer = require('inquirer')
-const mkdirp = require('mkdirp')
-const path = require('path')
-const { inspect } = require('util')
-const spawn = require('cross-spawn')
-
-const { print, success, error } = require('../output')
-const { fileExists, beautify, installedLocally } = require('../utils')
-const { getTestRoot } = require('./utils')
-const generateDefinitions = require('./definitions')
-const { test: generateTest } = require('./generate')
-const isLocal = require('../utils').installedLocally()
+import colors from 'chalk'
+import fs from 'fs'
+import inquirer from 'inquirer'
+import mkdirp from 'mkdirp'
+import path from 'path'
+import { inspect } from 'util'
+import spawn from 'cross-spawn'
+
+import { print, success, error } from '../output.js'
+import { fileExists, beautify, installedLocally } from '../utils.js'
+import { getTestRoot } from './utils.js'
+import generateDefinitions from './definitions.js'
+import { test as generateTest } from './generate.js'
+const isLocal = installedLocally()
 
 const defaultConfig = {
   tests: './*_test.js',
@@ -21,10 +21,14 @@ const defaultConfig = {
 }
 
 const helpers = ['Playwright', 'WebDriver', 'Puppeteer', 'REST', 'GraphQL', 'Appium', 'TestCafe']
-const translations = Object.keys(require('../../translations'))
 
-const noTranslation = 'English (no localization)'
-translations.unshift(noTranslation)
+async function getTranslations() {
+  const translationsModule = await import('../../translations/index.js')
+  const translations = Object.keys(translationsModule.default || translationsModule)
+  const noTranslation = 'English (no localization)'
+  translations.unshift(noTranslation)
+  return translations
+}
 
 const packages = []
 let isTypeScript = false
@@ -67,8 +71,9 @@ export = function() {
 }
 `
 
-module.exports = function (initPath) {
+export default async function (initPath) {
   const testsPath = getTestRoot(initPath)
+  const translations = await getTranslations()
 
   print()
   print(`  Welcome to ${colors.magenta.bold('CodeceptJS')} initialization tool`)
@@ -207,9 +212,9 @@ module.exports = function (initPath) {
         fs.writeFileSync(path.join(testsPath, stepFile), extension === 'ts' ? defaultActorTs : defaultActor)
 
         if (isTypeScript) {
-          config.include = _actorTranslation('./steps_file', config.translation)
+          config.include = await _actorTranslation('./steps_file', config.translation, translations)
         } else {
-          config.include = _actorTranslation(stepFile, config.translation)
+          config.include = await _actorTranslation(stepFile, config.translation, translations)
         }
 
         print(`Steps file created at ${stepFile}`)
@@ -390,7 +395,7 @@ function install(dependencies) {
   return true
 }
 
-function _actorTranslation(stepFile, translationSelected) {
+async function _actorTranslation(stepFile, translationSelected, translations) {
   let actor
 
   for (const translationAvailable of translations) {
@@ -399,7 +404,8 @@ function _actorTranslation(stepFile, translationSelected) {
     }
 
     if (translationSelected === translationAvailable) {
-      const nameOfActor = require('../../translations')[translationAvailable].I
+      const translationsModule = await import('../../translations/index.js')
+      const nameOfActor = (translationsModule.default || translationsModule)[translationAvailable].I
 
       actor = {
         [nameOfActor]: stepFile,

lib/command/list.js

@@ -1,13 +1,13 @@
-const { getConfig, getTestRoot } = require('./utils')
-const Codecept = require('../codecept')
-const container = require('../container')
-const { getParamsToString } = require('../parser')
-const { methodsOfObject } = require('../utils')
-const output = require('../output')
+import { getConfig, getTestRoot } from './utils.js'
+import Codecept from '../codecept.js'
+import container from '../container.js'
+import { getParamsToString } from '../parser.js'
+import { methodsOfObject } from '../utils.js'
+import output from '../output.js'
 
-module.exports = function (path) {
+export default async function (path) {
   const testsPath = getTestRoot(path)
-  const config = getConfig(testsPath)
+  const config = await getConfig(testsPath)
   const codecept = new Codecept(config, {})
   codecept.init(testsPath)
 

lib/command/run.js

@@ -1,7 +1,7 @@
-const { getConfig, printError, getTestRoot, createOutputDir } = require('./utils')
-const Config = require('../config')
-const store = require('../store')
-const Codecept = require('../codecept')
+import { getConfig, printError, getTestRoot, createOutputDir } from './utils.js'
+import Config from '../config.js'
+import store from '../store.js'
+import Codecept from '../codecept.js'
 
 module.exports = async function (test, options) {
   // registering options globally to use in config
@@ -16,7 +16,7 @@ module.exports = async function (test, options) {
 
   const configFile = options.config
 
-  let config = getConfig(configFile)
+  let config = await getConfig(configFile)
   if (options.override) {
     config = Config.append(JSON.parse(options.override))
   }
@@ -32,7 +32,7 @@ module.exports = async function (test, options) {
 
     if (options.verbose) {
       global.debugMode = true
-      const { getMachineInfo } = require('./info')
+      const { getMachineInfo } = await import('./info.js')
       await getMachineInfo()
     }