minor refactor

Author: 75lb

bin/cli.js

@@ -2,7 +2,6 @@
 import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'
 import jsdoc2md from 'jsdoc-to-markdown'
-import omit from 'lodash.omit'
 import assert from 'assert'
 import fs from 'fs'
 import loadConfig from 'config-master'
@@ -33,7 +32,8 @@ if (options.help) {
 
   /* jsdoc2md --config */
   if (options.config) {
-    console.log(JSON.stringify(omit(options, 'config'), null, '  '))
+    delete options.config
+    console.log(JSON.stringify(options, null, '  '))
     process.exit(0)
   }
 

dist/index.cjs

@@ -111,8 +111,9 @@ class JsdocToMarkdown {
    * @returns {Promise}
    * @category async
    */
-  clear () {
-    return jsdocApi.cache.clear().then(() => dmd.cache.clear())
+  async clear () {
+    await jsdocApi.cache.clear();
+    await dmd.cache.clear();
   }
 
   /**
@@ -121,23 +122,19 @@ class JsdocToMarkdown {
    * @returns {object}
    * @category async
    */
-  getNamepaths (options) {
-    return this.getTemplateData(options)
-      .then(data => {
-        const namepaths = {};
-        const kinds = [
-          'module', 'class', 'constructor', 'mixin', 'member',
-          'namespace', 'constant', 'function', 'event', 'typedef', 'external'
-        ];
-        kinds.forEach(kind => {
-          namepaths[kind] = data
-            .filter(identifier => {
-              return identifier.kind === kind
-            })
-            .map(identifier => identifier.longname);
-        });
-        return namepaths
-      })
+  async getNamepaths (options) {
+    const data = await this.getTemplateData(options);
+    const namepaths = {};
+    const kinds = [
+      'module', 'class', 'constructor', 'mixin', 'member',
+      'namespace', 'constant', 'function', 'event', 'typedef', 'external'
+    ];
+    for (const kind of kinds) {
+      namepaths[kind] = data
+        .filter(identifier => identifier.kind === kind)
+        .map(identifier => identifier.longname);
+    }
+    return namepaths
   }
 }
 

index.js

@@ -90,8 +90,9 @@ class JsdocToMarkdown {
    * @returns {Promise}
    * @category async
    */
-  clear () {
-    return jsdocApi.cache.clear().then(() => dmd.cache.clear())
+  async clear () {
+    await jsdocApi.cache.clear()
+    await dmd.cache.clear()
   }
 
   /**
@@ -100,23 +101,19 @@ class JsdocToMarkdown {
    * @returns {object}
    * @category async
    */
-  getNamepaths (options) {
-    return this.getTemplateData(options)
-      .then(data => {
-        const namepaths = {}
-        const kinds = [
-          'module', 'class', 'constructor', 'mixin', 'member',
-          'namespace', 'constant', 'function', 'event', 'typedef', 'external'
-        ]
-        kinds.forEach(kind => {
-          namepaths[kind] = data
-            .filter(identifier => {
-              return identifier.kind === kind
-            })
-            .map(identifier => identifier.longname)
-        })
-        return namepaths
-      })
+  async getNamepaths (options) {
+    const data = await this.getTemplateData(options)
+    const namepaths = {}
+    const kinds = [
+      'module', 'class', 'constructor', 'mixin', 'member',
+      'namespace', 'constant', 'function', 'event', 'typedef', 'external'
+    ]
+    for (const kind of kinds) {
+      namepaths[kind] = data
+        .filter(identifier => identifier.kind === kind)
+        .map(identifier => identifier.longname)
+    }
+    return namepaths
   }
 }
 

package-lock.json

@@ -39,7 +39,7 @@
     "command-line-args": "^6.0.0",
     "command-line-usage": "^7.0.3",
     "config-master": "^3.1.0",
-    "dmd": "next",
+    "dmd": "^7.0.0",
     "jsdoc-api": "^9.3.0",
     "jsdoc-parse": "^6.2.3",
     "walk-back": "^5.1.1"