tools: restore change of signatures to opts hashes

These signatures were originally converted to opts hashes in #3888. That change was misinterpreted as the intrinsic cause of a test failure and reverted in #6680. PR-URL: #6690 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Robert Jefe Lindstaedt <[email protected]>

Author: jmm

test/doctool/test-doctool-html.js

@@ -61,14 +61,22 @@ testData.forEach(function(item){
 
 fs.readFile(item.file,'utf8',common.mustCall(function(err,input){
 assert.ifError(err);
-html(input,'foo','doc/template.html',
+html(
+{
+input: input,
+filename: 'foo',
+template: 'doc/template.html',
+nodeVersion: process.version,
+},
+
 common.mustCall(function(err,output){
 assert.ifError(err);
 
 constactual=output.replace(/\s/g,'');
 // Assert that the input stripped of all whitespace contains the
 // expected list
 assert.notEqual(actual.indexOf(expected),-1);
-}));
+})
+);
 }));
 });

tools/doc/generate.js

@@ -48,11 +48,19 @@ function next(er, input){
 break;
 
 case'html':
-require('./html.js')(input,inputFile,template,nodeVersion,
+require('./html.js')(
+{
+input: input,
+filename: inputFile,
+template: template,
+nodeVersion: nodeVersion,
+},
+
 function(er,html){
 if(er)thrower;
 console.log(html);
-});
+}
+);
 break;
 
 default:

tools/doc/html.js

@@ -30,12 +30,12 @@ var gtocPath = path.resolve(path.join(
 vargtocLoading=null;
 vargtocData=null;
 
-functiontoHTML(input,filename,template,nodeVersion,cb){
-if(typeofnodeVersion==='function'){
-cb=nodeVersion;
-nodeVersion=null;
-}
-nodeVersion=nodeVersion||process.version;
+/**
+* opts: input, filename, template, nodeVersion.
+*/
+functiontoHTML(opts,cb){
+vartemplate=opts.template;
+varnodeVersion=opts.nodeVersion||process.version;
 
 if(gtocData){
 returnonGtocLoaded();
@@ -57,10 +57,15 @@ function toHTML(input, filename, template, nodeVersion, cb){
 }
 
 functiononGtocLoaded(){
-varlexed=marked.lexer(input);
+varlexed=marked.lexer(opts.input);
 fs.readFile(template,'utf8',function(er,template){
 if(er)returncb(er);
-render(lexed,filename,template,nodeVersion,cb);
+render({
+lexed: lexed,
+filename: opts.filename,
+template: template,
+nodeVersion: nodeVersion,
+},cb);
 });
 }
 }
@@ -87,13 +92,14 @@ function toID(filename){
 .replace(/-+/g,'-');
 }
 
-functionrender(lexed,filename,template,nodeVersion,cb){
-if(typeofnodeVersion==='function'){
-cb=nodeVersion;
-nodeVersion=null;
-}
-
-nodeVersion=nodeVersion||process.version;
+/**
+ * opts: lexed, filename, template, nodeVersion.
+ */
+functionrender(opts,cb){
+varlexed=opts.lexed;
+varfilename=opts.filename;
+vartemplate=opts.template;
+varnodeVersion=opts.nodeVersion||process.version;
 
 // get the section
 varsection=getSection(lexed);