tools: use mailmap for find-inactive-collaborators

The current version of find-inactive-collaborators can generate a false
positive if the mailmap entry for a collaborator does not match the
entry in the README. (We should probably lint or otherwise check for
that sort of mismatch but regardless, it is relatively easy to avoid
having find-inactive-collaborators tripped up by it, so let's fix that
too, which is this commit.)
PR-URL: #39432
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: Trott

tools/find-inactive-collaborators.mjs

@@ -22,27 +22,33 @@ async function runGitCommand(cmd, mapFn) {
 consterrorHandler=newPromise(
 (_,reject)=>childProcess.on('error',reject)
 );
-constreturnedSet=newSet();
+letreturnValue=mapFn ? newSet() : '';
 awaitPromise.race([errorHandler,Promise.resolve()]);
+// If no mapFn, return the value. If there is a mapFn, use it to make a Set to
+// return.
 forawait(constlineoflines){
 awaitPromise.race([errorHandler,Promise.resolve()]);
-constval=mapFn(line);
-if(val){
-returnedSet.add(val);
+if(mapFn){
+constval=mapFn(line);
+if(val){
+returnValue.add(val);
+}
+}else{
+returnValue+=line;
 }
 }
-returnPromise.race([errorHandler,Promise.resolve(returnedSet)]);
+returnPromise.race([errorHandler,Promise.resolve(returnValue)]);
 }
 
 // Get all commit authors during the time period.
 constauthors=awaitrunGitCommand(
-`git shortlog -n -s --max-count="${SINCE}" HEAD`,
+`git shortlog -n -s --email --max-count="${SINCE}" HEAD`,
 (line)=>line.trim().split('\t',2)[1]
 );
 
 // Get all commit landers during the time period.
 constlanders=awaitrunGitCommand(
-`git shortlog -n -s -c --max-count="${SINCE}" HEAD`,
+`git shortlog -n -s -c --email --max-count="${SINCE}" HEAD`,
 (line)=>line.trim().split('\t',2)[1]
 );
 
@@ -52,7 +58,7 @@ const approvingReviewers = await runGitCommand(
 (line)=>/^Reviewed-By:([^<]+)/.exec(line)[1].trim()
 );
 
-asyncfunctionretrieveCollaboratorsFromReadme(){
+asyncfunctiongetCollaboratorsFromReadme(){
 constreadmeText=readline.createInterface({
 input: fs.createReadStream(newURL('../README.md',import.meta.url)),
 crlfDelay: Infinity,
@@ -69,14 +75,22 @@ async function retrieveCollaboratorsFromReadme() {
 break;
 }
 if(line.startsWith('**')&&isCollaborator){
-returnedArray.push(line.split('**',2)[1].trim());
+const[,name,email]=/^\*\*([^*]+)\*\*&lt;(.+)&gt;/.exec(line);
+constmailmap=awaitrunGitCommand(
+`git check-mailmap '${name} <${email}>'`
+);
+returnedArray.push({
+ name,
+ email,
+ mailmap,
+});
 }
 }
 returnreturnedArray;
 }
 
 // Get list of current collaborators from README.md.
-constcollaborators=awaitretrieveCollaboratorsFromReadme();
+constcollaborators=awaitgetCollaboratorsFromReadme();
 
 console.log(`In the last ${SINCE} commits:\n`);
 console.log(`* ${authors.size.toLocaleString()} authors have made commits.`);
@@ -85,10 +99,10 @@ console.log(`* ${approvingReviewers.size.toLocaleString()} reviewers have approv
 console.log(`* ${collaborators.length.toLocaleString()} collaborators currently in the project.`);
 
 constinactive=collaborators.filter((collaborator)=>
-!authors.has(collaborator)&&
-!landers.has(collaborator)&&
-!approvingReviewers.has(collaborator)
-);
+!authors.has(collaborator.mailmap)&&
+!landers.has(collaborator.mailmap)&&
+!approvingReviewers.has(collaborator.name)
+).map((collaborator)=>collaborator.name);
 
 if(inactive.length){
 console.log('\nInactive collaborators:\n');