Merge pull request #49 from unexpectedjs/require-via-evaldown

Send the require option directly to evaldown and allow a config file.
unexpectedjs · Aug 23, 2020 · 031fcd5 · 031fcd5
2 parents 8d01ea7 + 875cd3a
commit 031fcd5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/index.js b/index.js
@@ -90,19 +90,6 @@ function addTypeToIndex(typeIndex, type) {
 }
 
 module.exports = async function generate(options) {
-  if (options.require) {
-    var moduleNames = options.require;
-    if (!Array.isArray(moduleNames)) {
-      moduleNames = [moduleNames];
-    }
-    moduleNames.forEach(function(moduleName) {
-      if (/^[./]/.test(moduleName)) {
-        moduleName = path.resolve(process.cwd(), moduleName);
-      }
-      require(moduleName);
-    });
-  }
-
   var localExpect = createExpect(options);
 
   function sortTypesByHierarchy(assertionsByType) {
@@ -141,7 +128,17 @@ module.exports = async function generate(options) {
   var output = options.output || 'site-build';
   var tmpOutput = path.join(os.tmpdir(), 'udsg', String(process.pid));
 
+  var config;
+  try {
+    config = require(path.join(cwd, options.config));
+  } catch (e) {
+    config = null;
+  }
+  options = { ...config, ...options };
+  options = { ...options, ...(await Evaldown.decodeOptions(cwd, options)) };
+
   const statsObject = await new Evaldown({
+    ...options,
     commentMarker: 'unexpected-markdown',
     outputFormat: 'inlined',
     sourcePath: documentation,

diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "autoprefixer": "9.8.6",
     "debug": "4.1.0",
     "ejs": "2.5.6",
-    "evaldown": "^1.0.0",
+    "evaldown": "^1.4.0",
     "gh-pages": "2.0.1",
     "glob": "7.1.6",
     "lodash": "4.17.19",