Merge pull request #58 from BoolJS/develop

Allow importing ESM modules

Author: pandres95

.mocharc.yml

@@ -0,0 +1,9 @@
+colors: true
+diff: true
+timeout: 10000
+slow: 1000
+spec:
+  - test/**/*.js
+package: package.json
+recursive: true
+exit: true

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Mocha Tests",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "internalConsoleOptions": "openOnSessionStart",
+            "skipFiles": [
+                "<node_internals>/**"
+            ]
+        }
+    ]
+}

lib/api/configurations/index.js

@@ -17,7 +17,7 @@ exports.readFiles = async function (instance, route, files) {
                 'The file name format is invalid');
         } else {
             instance.getComponents().configuration
-                .set(info.name, await new Reader().readStatic(info.ext, filename));
+                .set(info.name, await Reader.readStatic(info.ext, filename));
         }
     }
 

lib/readers/defaults/javascript.js

@@ -10,11 +10,35 @@ const { Error } = require('@booljs/api');
  */
 
 module.exports = async function (route) {
-    const imported = require(route);
+    try {
+        const imported = require(route);
 
-    if (imported !== undefined) {
-        return imported;
-    }
+        if (imported !== undefined) {
+            return imported;
+        }
+
+        throw new Error(0, 'EMODNOTFOUND', 'The required module wasn\'t found');
+    } catch (error) {
+        if (error.code === 'ERR_REQUIRE_ESM') {
+            return importEsmModule(route);
+        }
 
-    throw new Error(0, 'EMODNOTFOUND', 'The required module wasn\'t found');
+        throw error;
+    }
 };
+
+/**
+ * @private
+ * @description ESM reader for bool.js
+ * @param {String route} - The file's route
+ * @returns {Promise<Object>}
+ */
+async function importEsmModule (route) {
+    const imported = await import(route);
+
+    if (imported.default) {
+        return imported.default;
+    }
+
+    return imported;
+}

lib/readers/defaults/yaml.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const YAML = require('yaml');
+
+/**
+ * @private
+ * @description JSON reader for bool.js
+ * @param {String} route - The file's route
+ * @returns {Promise}
+ */
+module.exports = async function (route) {
+    return YAML.parse(route);
+};

lib/readers/index.js

@@ -8,6 +8,7 @@
  */
 module.exports = class Readers {
     static staticReaders = {
+        '.yaml': require('./defaults/yaml'),
         '.json': require('./defaults/json'),
         '.cson': require('./defaults/cson')
     };