Merge branch 'mbehzad-allow-options.source-to-be-an-string-array-as-well'

Author: 75lb

lib/explain.js

@@ -15,7 +15,10 @@ class Explain extends JsdocCommand {
   }
 
   async _runJsdoc () {
-    const cmd = `node ${this.jsdocPath} ${toSpawnArgs(this.jsdocOptions).join(' ')} -X ${arrayify(this.options.source ? this.tempFile.path : this.inputFileSet.files).join(' ')}`
+    // console.log('SKDJKLAHS', this.options, this.tempFileSet?.files, this.inputFileSet.files)
+    const cmd = this.options.source.length
+      ? `node ${this.jsdocPath} ${toSpawnArgs(this.jsdocOptions).join(' ')} -X ${this.tempFileSet.files.join(' ')}`
+      : `node ${this.jsdocPath} ${toSpawnArgs(this.jsdocOptions).join(' ')} -X ${this.inputFileSet.files.join(' ')}`
 
     let jsdocOutput = { stdout: '', stderr: '' }
     try {

lib/jsdoc-command.js

@@ -16,10 +16,10 @@ class JsdocCommand {
       'Must set at least one of .files, .source or .configure'
     )
     options.files = arrayify(options.files)
+    options.source = arrayify(options.source)
 
     this.cache = cache
-    this.tempFile = null
-    if (options.source) this.tempFile = new TempFile(options.source)
+    this.tempFiles = []
 
     const jsdocOptions = Object.assign({}, options)
     delete jsdocOptions.files
@@ -43,12 +43,21 @@ class JsdocCommand {
   async execute () {
     this.inputFileSet = new FileSet()
     await this.inputFileSet.add(this.options.files)
+
+    if (this.options.source.length) {
+      this.tempFiles = this.options.source.map(source => new TempFile(source))
+      this.tempFileSet = new FileSet()
+      await this.tempFileSet.add(this.tempFiles.map(t => t.path))
+    }
+
     let result
     try {
       result = await this.getOutput()
     } finally {
-      if (this.tempFile) {
-        this.tempFile.delete()
+      if (this.tempFiles) {
+        for (const tempFile of this.tempFiles) {
+          tempFile.delete()
+        }
       }
     }
     return result

lib/render.js

@@ -6,7 +6,7 @@ class Render extends JsdocCommand {
   async getOutput () {
     return new Promise((resolve, reject) => {
       const jsdocArgs = toSpawnArgs(this.jsdocOptions)
-        .concat(this.options.source ? this.tempFile.path : this.options.files)
+        .concat(this.options.source.length ? this.tempFiles.map(t => t.path) : this.options.files)
 
       jsdocArgs.unshift(this.jsdocPath)
       const handle = spawn('node', jsdocArgs, { stdio: 'inherit' })

test/render.js

@@ -25,4 +25,34 @@ test.set('.render({ source, destination })', async function () {
   })
 })
 
+test.set('.render({ source[], destination })', async function () {
+  Fixture.createTmpFolder('tmp/renderSource')
+  const sources = [
+    `import Foo from "foo"
+     /**
+      * FooPrime is some child class
+      * @class
+      * @param {Object} - an input
+      * @extends Foo
+      */
+     function FooPrime() {}
+     export default FooPrime
+  `,
+    `import Foo from "foo"
+    /**
+     * FooSecond is some other child class
+     * @class
+     * @param {Object} - an input
+     * @extends Foo
+     */
+    function FooSecond() {}
+    export default FooSecond
+  `]
+  await jsdoc.render({ source: sources, destination: 'tmp/renderSource/out' })
+  a.doesNotThrow(function () {
+    statSync('./tmp/renderSource/out/FooPrime.html')
+    statSync('./tmp/renderSource/out/FooSecond.html')
+  })
+})
+
 export { test, only, skip }