tools: simplify HTML generation

PR-URL: #20307 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]>

Author: vsemozhetbyt

Makefile

@@ -603,7 +603,7 @@ tools/doc/node_modules/js-yaml/package.json:
 
 gen-json = tools/doc/generate.js --format=json $< > $@
 gen-html = tools/doc/generate.js --node-version=$(FULLVERSION) --format=html \
- --template=doc/template.html --analytics=$(DOCS_ANALYTICS)$< > $@
+ --analytics=$(DOCS_ANALYTICS)$< > $@
 
 out/doc/api/%.json: doc/api/%.md
 $(call available-node, $(gen-json))

test/doctool/test-doctool-html.js

@@ -10,7 +10,6 @@ try{
 
 constassert=require('assert');
 constfs=require('fs');
-constpath=require('path');
 constfixtures=require('../common/fixtures');
 constprocessIncludes=require('../../tools/doc/preprocess.js');
 consthtml=require('../../tools/doc/html.js');
@@ -107,7 +106,6 @@ testData.forEach((item) =>{
 {
 input: preprocessed,
 filename: 'foo',
-template: path.resolve(__dirname,'../../doc/template.html'),
 nodeVersion: process.version,
 analytics: item.analyticsId,
 },

tools/doc/generate.js

@@ -29,7 +29,6 @@ const fs = require('fs');
 
 constargs=process.argv.slice(2);
 letformat='json';
-lettemplate=null;
 letfilename=null;
 letnodeVersion=null;
 letanalytics=null;
@@ -39,8 +38,6 @@ args.forEach(function(arg){
 filename=arg;
 }elseif(arg.startsWith('--format=')){
 format=arg.replace(/^--format=/,'');
-}elseif(arg.startsWith('--template=')){
-template=arg.replace(/^--template=/,'');
 }elseif(arg.startsWith('--node-version=')){
 nodeVersion=arg.replace(/^--node-version=/,'');
 }elseif(arg.startsWith('--analytics=')){
@@ -71,7 +68,7 @@ function next(er, input){
 break;
 
 case'html':
-require('./html')({ input, filename,template,nodeVersion, analytics },
+require('./html')({ input, filename, nodeVersion, analytics },
 (err,html)=>{
 if(err)throwerr;
 console.log(html);

tools/doc/html.js

@@ -25,7 +25,6 @@ const common = require('./common.js');
 constfs=require('fs');
 constmarked=require('marked');
 constpath=require('path');
-constpreprocess=require('./preprocess.js');
 consttypeParser=require('./type-parser.js');
 
 module.exports=toHTML;
@@ -42,76 +41,36 @@ marked.setOptions({
 renderer: renderer
 });
 
-// TODO(chrisdickinson): never stop vomiting / fix this.
-constgtocPath=path.resolve(path.join(
-__dirname,
-'..',
-'..',
-'doc',
-'api',
-'_toc.md'
-));
-vargtocLoading=null;
-vargtocData=null;
+constdocPath=path.resolve(__dirname,'..','..','doc');
+
+constgtocPath=path.join(docPath,'api','_toc.md');
+constgtocMD=fs.readFileSync(gtocPath,'utf8').replace(/^@\/\/.*$/gm,'');
+constgtocHTML=marked(gtocMD).replace(
+/<ahref="(.*?)"/g,
+(all,href)=>`<a class="nav-${toID(href)}" href="${href}"`
+);
+
+consttemplatePath=path.join(docPath,'template.html');
+consttemplate=fs.readFileSync(templatePath,'utf8');
+
 vardocCreated=null;
 varnodeVersion=null;
 
 /**
- * opts: input, filename, template, nodeVersion.
+ * opts: input, filename, nodeVersion.
  */
 functiontoHTML(opts,cb){
-consttemplate=opts.template;
-
 nodeVersion=opts.nodeVersion||process.version;
 docCreated=opts.input.match(DOC_CREATED_REG_EXP);
 
-if(gtocData){
-returnonGtocLoaded();
-}
-
-if(gtocLoading===null){
-gtocLoading=[onGtocLoaded];
-returnloadGtoc(function(err,data){
-if(err)throwerr;
-gtocData=data;
-gtocLoading.forEach(function(xs){
-xs();
-});
-});
-}
-
-if(gtocLoading){
-returngtocLoading.push(onGtocLoaded);
-}
-
-functiononGtocLoaded(){
-constlexed=marked.lexer(opts.input);
-fs.readFile(template,'utf8',function(er,template){
-if(er)returncb(er);
-render({
-lexed: lexed,
-filename: opts.filename,
-template: template,
-nodeVersion: nodeVersion,
-analytics: opts.analytics,
-},cb);
-});
-}
-}
-
-functionloadGtoc(cb){
-fs.readFile(gtocPath,'utf8',function(err,data){
-if(err)returncb(err);
-
-preprocess(gtocPath,data,function(err,data){
-if(err)returncb(err);
-
-data=marked(data).replace(/<ahref="(.*?)"/gm,function(a,m){
-return`<a class="nav-${toID(m)}" href="${m}"`;
-});
-returncb(null,data);
-});
-});
+constlexed=marked.lexer(opts.input);
+render({
+lexed: lexed,
+filename: opts.filename,
+template: template,
+nodeVersion: nodeVersion,
+analytics: opts.analytics,
+},cb);
 }
 
 functiontoID(filename){
@@ -150,7 +109,7 @@ function render(opts, cb){
 template=template.replace(/__TOC__/g,toc);
 template=template.replace(
 /__GTOC__/g,
-gtocData.replace(`class="nav-${id}`,`class="nav-${id} active`)
+gtocHTML.replace(`class="nav-${id}`,`class="nav-${id} active`)
 );
 
 if(opts.analytics){