use command-line-tool

Author: 75lb

bin/cli.js

@@ -4,6 +4,7 @@ var parse = require('../')
 var commandLineArgs = require('command-line-args')
 var cliOptions = require('../lib/cli-options')
 var ansi = require('ansi-escape-sequences')
+var tool = require('command-line-tool')
 
 var cli = commandLineArgs(parse.cliOptions.concat([
   { name: 'help', alias: 'h', type: Boolean, description: 'Display this usage.' }
@@ -13,24 +14,17 @@ try {
   var usage = cli.getUsage(cliOptions.usage)
   var options = cli.parse()
 } catch (err) {
-  stop(err.message, 1)
+  tool.stop(1, { message: err, usage: usage })
 }
 
 if (options.help) {
-  console.error(usage)
-  process.exit(0)
+  tool.stop(0, { usage: usage })
 }
 
 var parseStream = parse(options)
   .on('error', function (err) {
-    stop(err.stack, 1)
+    tool.stop(1, { message: err })
   })
 parseStream.pipe(process.stdout)
 
 if (!options.src) process.stdin.pipe(parseStream)
-
-function stop (msg, code) {
-  console.error(ansi.format(msg, 'red'))
-  console.error(usage)
-  process.exit(code)
-}

es5/jsdoc-parse.js

@@ -42,19 +42,12 @@ function jsdocParse(options) {
   if (options.html) jsdocOptions.configure = path.resolve(__dirname, 'html-conf.json');
   jsdocOptions.files = options.files;
 
-  var explainStream = jsdoc.createExplainStream(jsdocOptions).once('error', emitError);
-
-  var transformedStream = transform().once('error', emitError);
-
+  var explainStream = jsdoc.createExplainStream(jsdocOptions);
   var outputStream = collectJson(function (data) {
     return applyOptions(data, options);
-  }).once('error', emitError);
-
-  function emitError(err) {
-    outputStream.emit('error', err);
-  }
+  });
 
-  return connect(explainStream, connect(transformedStream, outputStream));
+  return connect(explainStream, transform(), outputStream);
 }
 
 function applyOptions(data, options) {

lib/jsdoc-parse.js

@@ -47,12 +47,8 @@ function jsdocParse (options) {
   if (options.html) jsdocOptions.configure = path.resolve(__dirname, 'html-conf.json')
   jsdocOptions.files = options.files
 
-  const explainStream = jsdoc
-    .createExplainStream(jsdocOptions)
-
-  const outputStream = collectJson(function (data) {
-    return applyOptions(data, options)
-  })
+  const explainStream = jsdoc.createExplainStream(jsdocOptions)
+  const outputStream = collectJson(data => applyOptions(data, options))
 
   return connect(explainStream, transform(), outputStream)
 }

package.json

@@ -29,6 +29,7 @@
     "array-tools": "^2",
     "collect-json": "^1.0.1",
     "command-line-args": "^2.1.4",
+    "command-line-tool": "^0.1.0",
     "core-js": "^2.0.1",
     "feature-detect-es6": "^1.2.0",
     "file-set": "~0.2.1",