fix regression: passing jsdoc configuration (--conf) now works again

Author: 75lb

es5/jsdoc-parse.js

@@ -39,7 +39,12 @@ function jsdocParse(options) {
   }
 
   var jsdocOptions = {};
-  if (options.html) jsdocOptions.configure = path.resolve(__dirname, 'html-conf.json');
+
+  if (options.html) {
+    jsdocOptions.configure = path.resolve(__dirname, 'html-conf.json');
+  } else {
+    jsdocOptions.configure = options.conf;
+  }
   jsdocOptions.files = options.files;
 
   var explainStream = jsdoc.createExplainStream(jsdocOptions);
@@ -105,7 +110,7 @@ var ParseOptions = (function () {
 
     this.html = false;
 
-    this.conf = null;
+    this.conf = undefined;
 
     this['sort-by'] = ['scope', 'category', 'kind', 'order'];
 

lib/jsdoc-parse.js

@@ -44,7 +44,12 @@ function jsdocParse (options) {
   }
 
   const jsdocOptions = {}
-  if (options.html) jsdocOptions.configure = path.resolve(__dirname, 'html-conf.json')
+
+  if (options.html) {
+    jsdocOptions.configure = path.resolve(__dirname, 'html-conf.json')
+  } else {
+    jsdocOptions.configure = options.conf
+  }
   jsdocOptions.files = options.files
 
   const explainStream = jsdoc.createExplainStream(jsdocOptions)
@@ -157,7 +162,7 @@ class ParseOptions {
      * @type {boolean}
      * @default
      */
-    this.conf = null
+    this.conf = undefined
 
     /**
      * Sort by one of more fields, e.g. `--sort-by kind category`. Pass the special value `none` to remove the default sort order.

test/api.js

@@ -1,6 +1,7 @@
 'use strict'
 var test = require('tape')
 var parse = require('../')
+var fs = require('fs')
 
 test('api: valid json out', function (t) {
   t.plan(1)
@@ -26,3 +27,15 @@ test('api: glob expression', function (t) {
     }
   })
 })
+
+test('api: conf', function (t) {
+  t.plan(1)
+  var stream = parse({ src: 'test/fixture/simple.js', conf: 'test/fixture/conf.json' })
+  stream.on('readable', function () {
+    var chunk = this.read()
+    if (chunk) {
+      var data = JSON.parse(chunk)
+      t.strictEqual(data[0].description, 'A VARIABLE')
+    }
+  })
+})

test/fixture/conf.json

@@ -0,0 +1,3 @@
+{
+  "plugins": [ "plugins/shout" ]
+}

test/fixture/simple.js

@@ -0,0 +1,4 @@
+/**
+ * A variable
+ */
+var one = 1