remove stream interface

Author: 75lb

es5/jsdoc-parse.js

@@ -1,12 +1,6 @@
 'use strict';
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-var a = require('array-tools');
+var sortArray = require('sort-array');
 var fileSet = require('file-set');
 var Transform = require('stream').Transform;
 var transform = require('./transform');
@@ -15,66 +9,23 @@ var assert = require('assert');
 var connect = require('stream-connect');
 var fs = require('fs');
 
-module.exports = jsdocParse;
-
-function jsdocParse(options) {
-  options = new ParseOptions(options);
-  var jsdocInput = undefined;
-  try {
-    var _ret = function () {
-      options.validate();
-
-      var outputStream = collectJson(function (data) {
-        return applyOptions(data, options);
-      });
-      var transformStream = connect(transform(), outputStream);
-
-      if (options.src && options.files.length) {
-        jsdocInput = concatJsonFileArrays(options.files);
-        process.nextTick(function () {
-          transformStream.end(JSON.stringify(jsdocInput));
-        });
-      }
-      return {
-        v: transformStream
-      };
-    }();
+exports.parse = parse;
+exports.getStats = getStats;
 
-    if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
-  } catch (err) {
-    var _ret2 = function () {
-      var output = new Transform();
-      process.nextTick(function () {
-        output.emit('error', err);
-      });
-      return {
-        v: output
-      };
-    }();
+function parse(jsdocExplainOutput, options) {
+  var data = transform(jsdocExplainOutput);
 
-    if ((typeof _ret2 === 'undefined' ? 'undefined' : _typeof(_ret2)) === "object") return _ret2.v;
-  }
-}
-
-function concatJsonFileArrays(files) {
-  return files.reduce(function (prev, curr) {
-    var fileContent = fs.readFileSync(curr, 'utf8');
-    try {
-      var data = JSON.parse(fileContent);
-      return prev.concat(data);
-    } catch (err) {
-      err.message += ' input: ' + fileContent;
-      throw err;
-    }
-  }, []);
+  return data;
 }
 
 function applyOptions(data, options) {
   if (options.stats) {
     return JSON.stringify(getStats(data), null, '  ') + '\n';
   } else {
     data = data.filter(function (item) {
-      var parent = a.findWhere(data, { id: item.memberof }) || {};
+      var parent = data.find(function (d) {
+        return d.id === item.memberof;
+      }) || {};
       if (item.ignore || parent.ignore) {
         return false;
       } else if (!options.private && item.access === 'private' || parent.access === 'private') {
@@ -111,40 +62,6 @@ function sort(array, sortBy) {
   if (!sortBy) {
     return array;
   } else {
-    return a.sortBy(array, sortBy, order);
+    return sortArray(array, sortBy, order);
   }
-}
-
-var ParseOptions = function () {
-  function ParseOptions(options) {
-    _classCallCheck(this, ParseOptions);
-
-    this.src = null;
-
-    this.private = false;
-
-    this.stats;
-
-    this.html = false;
-
-    this['sort-by'] = ['scope', 'category', 'kind', 'order'];
-
-    Object.assign(this, options);
-    if (this.src) {
-      this.fileSet = fileSet(this.src);
-      this.files = this.fileSet.files;
-    }
-  }
-
-  _createClass(ParseOptions, [{
-    key: 'validate',
-    value: function validate() {
-      if (this.src) {
-        assert.ok(this.fileSet.files.length, 'Please specify valid input files.');
-        assert.ok(!(this.fileSet.notExisting && this.fileSet.notExisting.length), 'These files do not exist: ' + this.fileSet.notExisting.join(', '));
-      }
-    }
-  }]);
-
-  return ParseOptions;
-}();
+}

es5/transform.js

@@ -3,59 +3,56 @@
 var o = require('object-tools');
 var a = require('array-tools');
 var testValue = require('test-value');
-var collectJson = require('collect-json');
 
 module.exports = transform;
 
-function transform() {
-  return collectJson(function (data) {
-    data = fixConstructorMemberLongnames(data);
+function transform(data) {
+  data = fixConstructorMemberLongnames(data);
 
-    var json = data.filter(function (i) {
-      return !i.undocumented && !/package|file/.test(i.kind);
-    });
+  var json = data.filter(function (i) {
+    return !i.undocumented && !/package|file/.test(i.kind);
+  });
 
-    json = json.map(setIsExportedFlag);
-    json = json.map(setCodename);
-    json = insertConstructors(json);
-
-    json = json.map(function (doclet) {
-      doclet = setID(doclet);
-      doclet = setParentID(doclet);
-
-      doclet = removeQuotes(doclet);
-      doclet = cleanProperties(doclet);
-      doclet = buildTodoList(doclet);
-      doclet = extractTypicalName(doclet);
-      doclet = extractCategory(doclet);
-      doclet = extractChainable(doclet);
-      doclet = extractCustomTags(doclet);
-      doclet = setTypedefScope(doclet);
-      doclet = renameThisProperty(doclet);
-      doclet = removeMemberofFromModule(doclet);
-      doclet = convertIsEnumFlagToKind(doclet);
-      return doclet;
-    });
+  json = json.map(setIsExportedFlag);
+  json = json.map(setCodename);
+  json = insertConstructors(json);
+
+  json = json.map(function (doclet) {
+    doclet = setID(doclet);
+    doclet = setParentID(doclet);
+
+    doclet = removeQuotes(doclet);
+    doclet = cleanProperties(doclet);
+    doclet = buildTodoList(doclet);
+    doclet = extractTypicalName(doclet);
+    doclet = extractCategory(doclet);
+    doclet = extractChainable(doclet);
+    doclet = extractCustomTags(doclet);
+    doclet = setTypedefScope(doclet);
+    doclet = renameThisProperty(doclet);
+    doclet = removeMemberofFromModule(doclet);
+    doclet = convertIsEnumFlagToKind(doclet);
+    return doclet;
+  });
 
-    var exported = a.where(json, { isExported: true });
-    var newIDs = a.pluck(exported, 'id');
+  var exported = a.where(json, { isExported: true });
+  var newIDs = a.pluck(exported, 'id');
 
-    newIDs.forEach(function (newID) {
-      update(json, { isExported: undefined, '!kind': 'module' }, function (doclet) {
-        return updateIDReferences(doclet, newID);
-      });
+  newIDs.forEach(function (newID) {
+    update(json, { isExported: undefined, '!kind': 'module' }, function (doclet) {
+      return updateIDReferences(doclet, newID);
     });
+  });
 
-    json = removeEnumChildren(json);
-    json = json.map(removeUnwanted);
-    json = json.map(sortIdentifier);
-
-    json.forEach(function (doclet, index) {
-      doclet.order = index;
-    });
+  json = removeEnumChildren(json);
+  json = json.map(removeUnwanted);
+  json = json.map(sortIdentifier);
 
-    return JSON.stringify(json, null, '  ');
+  json.forEach(function (doclet, index) {
+    doclet.order = index;
   });
+
+  return json;
 }
 
 function setID(doclet) {

index.js

@@ -4,5 +4,6 @@ if (detect.all('class', 'arrowFunction', 'let', 'const', 'newArrayFeatures')) {
   module.exports = require('./lib/jsdoc-parse')
 } else {
   require('core-js/es6/object')
+  require('core-js/es6/array')
   module.exports = require('./es5/jsdoc-parse')
 }