tools: modernize and optimize doc/addon-verify.js

Modernize: * Replace `var` with `const` / `let`. * Replace common functions with arrow functions. * Use destructuring. * Use `String.prototype.padStart()`, `String.prototype.endsWith()`. Optimize: * Reduce function calls. * Reduce intermediate variables. * Cache retrieved object properties. * Move RegExp declaration out of a cycle. * Simplify RegExps. * Replace RegExp with string when string suffices. * Remove conditions that cannot be false. * Replace for..in with `Object.keys().forEach()`. Also, eliminate needlessly complicated function chains: * `ondone` callback only checks errors; * if there is an error, it is called once and throws, then script exits; * if there are no errors, it is noop; * so there is no need to wrap it into `once()` function * and there is no need to call it without errors; * we can eliminate it and replace with `throw` where an error occurs; * we can also replace `onprogress` callback with `console.log` in place; * at last, we can eliminate `waiting` counter and `once()` utility. The new script produces results identical to the old ones. PR-URL: #20188 Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: James M Snell <[email protected]>

Author: vsemozhetbyt

tools/doc/addon-verify.js

@@ -1,68 +1,52 @@
 'use strict';
 
-constfs=require('fs');
-constpath=require('path');
-constmarked=require('marked');
+const{ mkdir, readFileSync, writeFile }=require('fs');
+const{ resolve }=require('path');
+const{ lexer }=require('marked');
 
-constrootDir=path.resolve(__dirname,'..','..');
-constdoc=path.resolve(rootDir,'doc','api','addons.md');
-constverifyDir=path.resolve(rootDir,'test','addons');
+constrootDir=resolve(__dirname,'..','..');
+constdoc=resolve(rootDir,'doc','api','addons.md');
+constverifyDir=resolve(rootDir,'test','addons');
 
-constcontents=fs.readFileSync(doc).toString();
-
-consttokens=marked.lexer(contents);
+consttokens=lexer(readFileSync(doc,'utf8'));
+constaddons={};
 letid=0;
-
 letcurrentHeader;
-constaddons={};
-tokens.forEach((token)=>{
-if(token.type==='heading'&&token.text){
-currentHeader=token.text;
-addons[currentHeader]={
-files: {}
-};
+
+constvalidNames=/^\/\/\s+(.*\.(?:cc|h|js))[\r\n]/;
+tokens.forEach(({ type, text })=>{
+if(type==='heading'){
+currentHeader=text;
+addons[currentHeader]={files: {}};
 }
-if(token.type==='code'){
-varmatch=token.text.match(/^\/\/\s+(.*\.(?:cc|h|js))[\r\n]/);
+if(type==='code'){
+constmatch=text.match(validNames);
 if(match!==null){
-addons[currentHeader].files[match[1]]=token.text;
+addons[currentHeader].files[match[1]]=text;
 }
 }
 });
-for(varheaderinaddons){
-verifyFiles(addons[header].files,
-header,
-console.log.bind(null,'wrote'),
-function(err){if(err)throwerr;});
-}
 
-functiononce(fn){
-varonce=false;
-returnfunction(){
-if(once)
-return;
-once=true;
-fn.apply(this,arguments);
-};
-}
+Object.keys(addons).forEach((header)=>{
+verifyFiles(addons[header].files,header);
+});
+
+functionverifyFiles(files,blockName){
+constfileNames=Object.keys(files);
 
-functionverifyFiles(files,blockName,onprogress,ondone){
 // Must have a .cc and a .js to be a valid test.
-if(!Object.keys(files).some((name)=>/\.cc$/.test(name))||
-!Object.keys(files).some((name)=>/\.js$/.test(name))){
+if(!fileNames.some((name)=>name.endsWith('.cc'))||
+!fileNames.some((name)=>name.endsWith('.js'))){
 return;
 }
 
-blockName=blockName
-.toLowerCase()
-.replace(/\s/g,'_')
-.replace(/[^a-z\d_]/g,'');
-constdir=path.resolve(
+blockName=blockName.toLowerCase().replace(/\s/g,'_').replace(/\W/g,'');
+constdir=resolve(
 verifyDir,
-`${(++id<10 ? '0' : '')+id}_${blockName}`
+`${String(++id).padStart(2,'0')}_${blockName}`
 );
 
-files=Object.keys(files).map(function(name){
+files=fileNames.map((name)=>{
 if(name==='test.js'){
 files[name]=`'use strict'
 const common = require('../../common');
@@ -73,42 +57,34 @@ ${files[name].replace(
 `;
 }
 return{
-path: path.resolve(dir,name),
+path: resolve(dir,name),
 name: name,
 content: files[name]
 };
 });
 
 files.push({
-path: path.resolve(dir,'binding.gyp'),
+path: resolve(dir,'binding.gyp'),
 content: JSON.stringify({
 targets: [
 {
 target_name: 'addon',
 defines: ['V8_DEPRECATION_WARNINGS=1'],
-sources: files.map(function(file){
-returnfile.name;
-})
+sources: files.map(({ name })=>name)
 }
 ]
 })
 });
 
-fs.mkdir(dir,function(){
+mkdir(dir,()=>{
 // Ignore errors.
 
-constdone=once(ondone);
-varwaiting=files.length;
-files.forEach(function(file){
-fs.writeFile(file.path,file.content,function(err){
+files.forEach(({ path, content })=>{
+writeFile(path,content,(err)=>{
 if(err)
-returndone(err);
-
-if(onprogress)
-onprogress(file.path);
+throwerr;
 
-if(--waiting===0)
-done();
+console.log(`Wrote ${path}`);
 });
 });
 });