update es5 fallback

Author: 75lb

es5/cli-options.js

@@ -22,7 +22,7 @@ exports.definitions = [{
   name: 'conf',
   type: String,
   typeLabel: '[underline]{file}',
-  description: 'Jsdoc config file.'
+  description: 'Path to a jsdoc configuration file, passed directly to `jsdoc -c`.'
 }, {
   name: 'sort-by',
   type: String,

es5/jsdoc-parse.js

@@ -8,11 +8,11 @@ var util = require('util');
 var a = require('array-tools');
 var o = require('object-tools');
 var fs = require('fs');
-var mfs = require('more-fs');
 var fileSet = require('file-set');
 var Transform = require('stream').Transform;
 var cliOptions = require('./cli-options');
 var os = require('os');
+var tempPath = require('temp-path');
 
 module.exports = jsdocParse;
 jsdocParse.cliOptions = cliOptions.definitions;
@@ -62,7 +62,7 @@ function jsdocParse(options) {
     return output;
   } else {
     var inputStream = new Transform();
-    var inputFilePath = mfs.getTempFilePath() + '.js';
+    var inputFilePath = tempPath();
 
     var buf = new Buffer(0);
     inputStream._transform = function (chunk, enc, done) {
@@ -85,7 +85,7 @@ function jsdocParse(options) {
             done(err);
           }
         }
-        mfs.deleteFile(inputFilePath);
+        fs.unlinkSync(inputFilePath);
       });
     };
     return inputStream;
@@ -113,7 +113,7 @@ function OutputTransform(options) {
 util.inherits(OutputTransform, Transform);
 
 function getJsdocOutput(src, options, done) {
-  var jsdocTemplatePath = path.resolve(__dirname, '..', 'lib');
+  var jsdocTemplatePath = __dirname;
   var jsdocPath = path.resolve(__dirname, '../node_modules/.bin/jsdoc');
 
   if (!fs.existsSync(jsdocPath)) {
@@ -127,9 +127,9 @@ function getJsdocOutput(src, options, done) {
   }
   args = args.concat(src);
 
-  var outputFilePath = os.tmpdir() + '/jsdoc-stdout.json';
+  var outputFilePath = tempPath();
   var outputFile = fs.openSync(outputFilePath, 'w');
-  var outputStderrPath = os.tmpdir() + '/jsdoc-stderr.json';
+  var outputStderrPath = tempPath();
   var outputStderr = fs.openSync(outputStderrPath, 'w');
   var handle = cp.spawn('node', args, { stdio: [process.stdin, outputFile, outputStderr] });
   handle.on('error', done);

es5/publish.js

@@ -6,7 +6,13 @@ var transform = require('./transform');
 
 exports.publish = function (data) {
   var query = { '!undocumented': true, '!kind': /package|file/ };
-  var json = a.where(data().get(), query);
+  var json = data().get().filter(function (i) {
+    if (i.kind === 'class') {
+      return true;
+    } else {
+      return !i.undocumented && !/package|file/.test(i.kind);
+    }
+  });
 
   json = json.map(transform.setIsExportedFlag);
   json = json.map(transform.setCodename);

es5/transform.js

@@ -37,7 +37,12 @@ function setID(identifier) {
     identifier.id = identifier.longname;
   }
   if (identifier.kind === 'constructor') {
-    identifier.id = identifier.longname + '()';
+    if (identifier.scope === 'static') {
+      identifier.id = identifier.longname;
+      delete identifier.scope;
+    } else {
+      identifier.id = identifier.longname + '()';
+    }
   }
   if (identifier.isExported) {
     identifier.id = identifier.longname + '--' + identifier.codeName;
@@ -88,10 +93,26 @@ function createConstructor(class_) {
 
 function insertConstructors(data) {
   var replacements = [];
+  var toDelete = [];
 
   data.forEach(function (identifier, index) {
-    if (identifier.kind === 'class') {
-      replacements.push({ index: index, items: createConstructor(identifier) });
+    if (identifier.kind === 'class' && identifier.scope !== 'static') {
+      var es6constructor = a.findWhere(data, { kind: 'class', scope: 'static', memberof: identifier.longname });
+      if (es6constructor) {
+        if (!(es6constructor.description || es6constructor.params && es6constructor.params.length)) {
+          toDelete.push(es6constructor);
+        }
+        es6constructor.kind = 'constructor';
+        var constructorChildren = a.where(data, { memberof: es6constructor.longname });
+        constructorChildren.forEach(function (i) {
+          i.memberof = identifier.longname;
+        });
+        identifier.description = identifier.classdesc;
+        delete identifier.classdesc;
+        delete identifier.params;
+      } else {
+        replacements.push({ index: index, items: createConstructor(identifier) });
+      }
     }
   });
 
@@ -100,6 +121,10 @@ function insertConstructors(data) {
     data.splice.apply(data, spliceArgs);
   });
 
+  toDelete.forEach(function (d) {
+    data.splice(data.indexOf(d), 1);
+  });
+
   return data;
 }
 
@@ -238,7 +263,7 @@ function sort(object, sortFunction) {
 }
 
 function sortIdentifier(identifier) {
-  var fieldOrder = ['id', 'longname', 'name', 'scope', 'kind', 'isExported', 'classdesc', 'augments', 'inherits', 'inherited', 'overrides', 'mixes', 'description', 'memberof', 'alias', 'params', 'fires', 'examples', 'returns', 'type', 'defaultvalue', 'readonly', 'thisvalue', 'isEnum', 'properties', 'optional', 'nullable', 'variable', 'author', 'deprecated', 'ignore', 'access', 'requires', 'version', 'since', 'licenses', 'license', 'typicalname', 'category', 'see', 'exceptions', 'codeName', 'todoList', 'customTags', 'chainable', 'order'];
+  var fieldOrder = ['id', 'longname', 'name', 'scope', 'kind', 'isExported', 'classdesc', 'augments', 'inherits', 'inherited', 'implements', 'overrides', 'mixes', 'description', 'memberof', 'alias', 'params', 'fires', 'examples', 'returns', 'type', 'defaultvalue', 'readonly', 'thisvalue', 'isEnum', 'properties', 'optional', 'nullable', 'variable', 'author', 'deprecated', 'ignore', 'access', 'requires', 'version', 'since', 'licenses', 'license', 'typicalname', 'category', 'see', 'exceptions', 'codeName', 'todoList', 'customTags', 'chainable', 'meta', 'order'];
   return sort(identifier, function (a, b) {
     if (fieldOrder.indexOf(a) === -1 && fieldOrder.indexOf(b) > -1) {
       return 1;