diff --git a/lib/jsdoc/util/dumper.js b/lib/jsdoc/util/dumper.js index 515c9729..a408b5bd 100644 --- a/lib/jsdoc/util/dumper.js +++ b/lib/jsdoc/util/dumper.js @@ -2,7 +2,7 @@ * Recursively print out all names and values in a data structure. * @module jsdoc/util/dumper */ -const util = require('util'); +const _ = require('underscore'); const OBJECT_WALKER_KEY = 'hasBeenSeenByWalkerDumper'; const SET_DEFINED = (typeof Set !== 'undefined'); @@ -95,13 +95,13 @@ class ObjectWalker { return newArray; }); } - else if ( util.isRegExp(o) ) { + else if ( _.isRegExp(o) ) { result = ``; } - else if ( util.isDate(o) ) { + else if ( _.isDate(o) ) { result = ``; } - else if ( util.isError(o) ) { + else if ( _.isError(o) ) { result = { message: o.message }; } else if ( this.isFunction(o) ) { diff --git a/plugins/eventDumper.js b/plugins/eventDumper.js index 45e59008..e04ff167 100644 --- a/plugins/eventDumper.js +++ b/plugins/eventDumper.js @@ -7,7 +7,6 @@ const _ = require('underscore'); const doop = require('jsdoc/util/doop'); const dump = require('jsdoc/util/dumper').dump; const env = require('jsdoc/env'); -const util = require('util'); const conf = env.conf.eventDumper || {}; @@ -68,7 +67,7 @@ function cleanse(e) { Object.keys(e).forEach(prop => { // by default, don't stringify properties that contain an array of functions - if (!conf.includeFunctions && util.isArray(e[prop]) && e[prop][0] && + if (!conf.includeFunctions && _.isArray(e[prop]) && e[prop][0] && String(typeof e[prop][0]) === 'function') { result[prop] = `function[${e[prop].length}]`; }