fix: handle importing custom helper nicely (#3691)

* fix: handle importing custom helper nicely * fix: address CR
codeceptjs · Jul 2, 2023 · 49d1cf6 · 49d1cf6
1 parent 4891132
commit 49d1cf6
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/lib/container.js b/lib/container.js
@@ -165,7 +165,16 @@ function createHelpers(config) {
       } else {
         moduleName = `./helper/${helperName}`; // built-in helper
       }
-      const HelperClass = require(moduleName);
+
+      // @ts-ignore
+      let HelperClass;
+      // check if the helper is the built-in, use the require() syntax. 
+      if (moduleName.startsWith('./helper/')) {
+         HelperClass = require(moduleName); }
+        else {
+          // check if the new syntax export default HelperName is used and loads the Helper, otherwise loads the module that used old syntax export = HelperName. 
+          HelperClass =  require(moduleName).default || require(moduleName); }
+
       if (HelperClass._checkRequirements) {
         const requirements = HelperClass._checkRequirements();
         if (requirements) {
@@ -351,8 +360,8 @@ function loadSupportObject(modulePath, supportObjectName) {
       }
     }
     if (typeof obj !== 'function'
-        && Object.getPrototypeOf(obj) !== Object.prototype
-        && !Array.isArray(obj)
+      && Object.getPrototypeOf(obj) !== Object.prototype
+      && !Array.isArray(obj)
     ) {
       const methods = getObjectMethods(obj);
       Object.keys(methods)