tools,meta: update README and tools to reflect changes in TSC charter

Ref: nodejs/TSC#1350
PR-URL: #47126
Refs: nodejs/TSC#1350
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>

Author: Trott

.github/workflows/find-inactive-tsc.yml

@@ -1,4 +1,4 @@
-name: Find inactive TSC members
+name: Find inactive TSC voting members
 
 on:
 schedule:
@@ -38,7 +38,7 @@ jobs:
 with:
 node-version: ${{ env.NODE_VERSION }}
 
- - name: Find inactive TSC members
+ - name: Find inactive TSC voting members
 run: tools/find-inactive-tsc.mjs >> $GITHUB_ENV
 
  - name: Open pull request
@@ -56,6 +56,6 @@ jobs:
  @nodejs/tsc ${{ env.INACTIVE_TSC_HANDLES }}
 
  ${{ env.DETAILS_FOR_COMMIT_BODY }}
-commit-message: 'meta: move one or more TSC members to emeritus'
+commit-message: 'meta: move TSC voting member(s) to regular member(s)'
 labels: meta
-title: 'meta: move one or more TSC members to emeritus'
+title: 'meta: move TSC voting member(s) to regular member(s)'

README.md

@@ -158,6 +158,8 @@ For information about the governance of the Node.js project, see
 
 ### TSC (Technical Steering Committee)
 
+#### TSC voting members
+
 <!--lint disable prohibited-strings-->
 
 *[aduh95](https://github.com/aduh95) -
@@ -205,28 +207,39 @@ For information about the governance of the Node.js project, see
 *[Trott](https://github.com/Trott) -
 **Rich Trott** <<rtrott@gmail.com>> (he/him)
 
-<details>
-
-<summary>Emeriti</summary>
-
-### TSC emeriti
+#### TSC regular members
 
 *[addaleax](https://github.com/addaleax) -
 **Anna Henningsen** <<anna@addaleax.net>> (she/her)
 *[bnoordhuis](https://github.com/bnoordhuis) -
 **Ben Noordhuis** <<info@bnoordhuis.nl>>
-*[chrisdickinson](https://github.com/chrisdickinson) -
-**Chris Dickinson** <<christopher.s.dickinson@gmail.com>>
 *[codebytere](https://github.com/codebytere) -
 **Shelley Vohr** <<shelley.vohr@gmail.com>> (she/her)
 *[danbev](https://github.com/danbev) -
 **Daniel Bevenius** <<daniel.bevenius@gmail.com>> (he/him)
+*[gabrielschulhof](https://github.com/gabrielschulhof) -
+**Gabriel Schulhof** <<gabrielschulhof@gmail.com>>
+*[mscdex](https://github.com/mscdex) -
+**Brian White** <<mscdex@mscdex.net>>
+*[MylesBorins](https://github.com/MylesBorins) -
+**Myles Borins** <<myles.borins@gmail.com>> (he/him)
+*[rvagg](https://github.com/rvagg) -
+**Rod Vagg** <<r@va.gg>>
+*[TimothyGu](https://github.com/TimothyGu) -
+**Tiancheng "Timothy" Gu** <<timothygu99@gmail.com>> (he/him)
+
+<details>
+
+<summary>TSC emeriti members</summary>
+
+#### TSC emeriti members
+
+*[chrisdickinson](https://github.com/chrisdickinson) -
+**Chris Dickinson** <<christopher.s.dickinson@gmail.com>>
 *[evanlucas](https://github.com/evanlucas) -
 **Evan Lucas** <<evanlucas@me.com>> (he/him)
 *[Fishrock123](https://github.com/Fishrock123) -
 **Jeremiah Senkpiel** <<fishrock123@rocketmail.com>> (he/they)
-*[gabrielschulhof](https://github.com/gabrielschulhof) -
-**Gabriel Schulhof** <<gabrielschulhof@gmail.com>>
 *[gibfahn](https://github.com/gibfahn) -
 **Gibson Fahnestock** <<gibfahn@gmail.com>> (he/him)
 *[indutny](https://github.com/indutny) -
@@ -237,10 +250,6 @@ For information about the governance of the Node.js project, see
 **Josh Gavant** <<josh.gavant@outlook.com>>
 *[mmarchini](https://github.com/mmarchini) -
 **Mary Marchini** <<oss@mmarchini.me>> (she/her)
-*[mscdex](https://github.com/mscdex) -
-**Brian White** <<mscdex@mscdex.net>>
-*[MylesBorins](https://github.com/MylesBorins) -
-**Myles Borins** <<myles.borins@gmail.com>> (he/him)
 *[nebrius](https://github.com/nebrius) -
 **Bryan Hughes** <<bryan@nebri.us>>
 *[ofrobots](https://github.com/ofrobots) -
@@ -249,16 +258,12 @@ For information about the governance of the Node.js project, see
 **Alexis Campailla** <<orangemocha@nodejs.org>>
 *[piscisaureus](https://github.com/piscisaureus) -
 **Bert Belder** <<bertbelder@gmail.com>>
-*[rvagg](https://github.com/rvagg) -
-**Rod Vagg** <<r@va.gg>>
 *[sam-github](https://github.com/sam-github) -
 **Sam Roberts** <<vieuxtech@gmail.com>>
 *[shigeki](https://github.com/shigeki) -
 **Shigeki Ohtsu** <<ohtsu@ohtsu.org>> (he/him)
 *[thefourtheye](https://github.com/thefourtheye) -
 **Sakthipriyan Vairamani** <<thechargingvolcano@gmail.com>> (he/him)
-*[TimothyGu](https://github.com/TimothyGu) -
-**Tiancheng "Timothy" Gu** <<timothygu99@gmail.com>> (he/him)
 *[trevnorris](https://github.com/trevnorris) -
 **Trevor Norris** <<trev.norris@gmail.com>>
 

tools/find-inactive-tsc.mjs

@@ -1,12 +1,10 @@
 #!/usr/bin/env node
 
-// Identify inactive TSC members.
+// Identify inactive TSC voting members.
 
 // From the TSC Charter:
-// A TSC member is automatically removed from the TSC if, during a 3-month
-// period, all of the following are true:
-// * They attend fewer than 25% of the regularly scheduled meetings.
-// * They do not participate in any TSC votes.
+// A TSC voting member is automatically converted to a TSC regular member if
+// they do not participate in three consecutive TSC votes.
 
 importcpfrom'node:child_process';
 importfsfrom'node:fs';
@@ -20,9 +18,8 @@ const args = parseArgs({
 });
 
 constverbose=args.values.verbose;
-constSINCE=args.positionals[0]||'3 months ago';
 
-asyncfunctionrunGitCommand(cmd,options={}){
+asyncfunctionrunShellCommand(cmd,options={}){
 constchildProcess=cp.spawn('/bin/sh',['-c',cmd],{
 cwd: options.cwd??newURL('..',import.meta.url),
 encoding: 'utf8',
@@ -34,17 +31,14 @@ async function runGitCommand(cmd, options = {}) {
 consterrorHandler=newPromise(
 (_,reject)=>childProcess.on('error',reject),
 );
-letreturnValue=options.mapFn ? newSet() : '';
+letreturnValue=options.returnAsArray ? [] : '';
 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()]);
-if(options.mapFn){
-constval=options.mapFn(line);
-if(val){
-returnValue.add(val);
-}
+if(options.returnAsArray){
+returnValue.push(line);
 }else{
 returnValue+=line;
 }
@@ -60,6 +54,13 @@ async function getTscFromReadme() {
 constreturnedArray=[];
 letfoundTscHeading=false;
 forawait(constlineofreadmeText){
+// Until three votes have passed from March 16, 2023, we will need this.
+// After that point, we can use this for setting `foundTscHeading` below
+// and remove this.
+if(line==='#### TSC voting members'){
+continue;
+}
+
 // If we've found the TSC heading already, stop processing at the next
 // heading.
 if(foundTscHeading&&line.startsWith('#')){
@@ -84,36 +85,6 @@ async function getTscFromReadme() {
 returnreturnedArray;
 }
 
-asyncfunctiongetAttendance(tscMembers,meetings){
-constattendance={};
-for(constmemberoftscMembers){
-attendance[member]=0;
-}
-for(constmeetingofmeetings){
-// Get the file contents.
-constmeetingFile=
-awaitfs.promises.readFile(path.join('.tmp',meeting),'utf8');
-// Extract the attendee list.
-conststartMarker='## Present';
-conststart=meetingFile.indexOf(startMarker)+startMarker.length;
-constend=meetingFile.indexOf('## Agenda');
-meetingFile.substring(start,end).trim().split('\n')
-.map((line)=>{
-constmatch=line.match(/@(\S+)/);
-if(match){
-returnmatch[1];
-}
-// Using `console.warn` so that stdout output is not generated.
-// The stdout output is consumed in find-inactive-tsc.yml.
-console.warn(`Attendee entry does not contain GitHub handle: ${line}`);
-return'';
-})
-.filter((handle)=>tscMembers.includes(handle))
-.forEach((handle)=>{attendance[handle]++;});
-}
-returnattendance;
-}
-
 asyncfunctiongetVotingRecords(tscMembers,votes){
 constvotingRecords={};
 for(constmemberoftscMembers){
@@ -122,7 +93,7 @@ async function getVotingRecords(tscMembers, votes) {
 for(constvoteofvotes){
 // Get the vote data.
 constvoteData=JSON.parse(
-awaitfs.promises.readFile(path.join('.tmp',vote),'utf8'),
+awaitfs.promises.readFile(path.join('.tmp/votes',vote),'utf8'),
 );
 for(constmemberinvoteData.votes){
 if(tscMembers.includes(member)){
@@ -133,22 +104,22 @@ async function getVotingRecords(tscMembers, votes) {
 returnvotingRecords;
 }
 
-asyncfunctionmoveTscToEmeritus(peopleToMove){
+asyncfunctionmoveVotingToRegular(peopleToMove){
 constreadmeText=readline.createInterface({
 input: fs.createReadStream(newURL('../README.md',import.meta.url)),
 crlfDelay: Infinity,
 });
 letfileContents='';
-letinTscSection=false;
-letinTscEmeritusSection=false;
+letinTscVotingSection=false;
+letinTscRegularSection=false;
 letmemberFirstLine='';
 consttextToMove=[];
 letmoveToInactive=false;
 forawait(constlineofreadmeText){
-// If we've been processing TSC emeriti and we reach the end of
+// If we've been processing TSC regular members and we reach the end of
 // the list, print out the remaining entries to be moved because they come
 // alphabetically after the last item.
-if(inTscEmeritusSection&&line===''&&
+if(inTscRegularSection&&line===''&&
 fileContents.endsWith('>\n')){
 while(textToMove.length){
 fileContents+=textToMove.pop();
@@ -158,21 +129,21 @@ async function moveTscToEmeritus(peopleToMove) {
 // If we've found the TSC heading already, stop processing at the
 // next heading.
 if(line.startsWith('#')){
-inTscSection=false;
-inTscEmeritusSection=false;
+inTscVotingSection=false;
+inTscRegularSection=false;
 }
 
-constisTsc=inTscSection&&line.length;
-constisTscEmeritus=inTscEmeritusSection&&line.length;
+constisTscVoting=inTscVotingSection&&line.length;
+constisTscRegular=inTscRegularSection&&line.length;
 
-if(line==='### TSC (Technical Steering Committee)'){
-inTscSection=true;
+if(line==='#### TSC voting members'){
+inTscVotingSection=true;
 }
-if(line==='### TSC emeriti'){
-inTscEmeritusSection=true;
+if(line==='#### TSC regular members'){
+inTscRegularSection=true;
 }
 
-if(isTsc){
+if(isTscVoting){
 if(line.startsWith('* ')){
 memberFirstLine=line;
 constmatch=line.match(/^\*\[([^\]]+)/);
@@ -191,7 +162,7 @@ async function moveTscToEmeritus(peopleToMove) {
 }
 }
 
-if(isTscEmeritus){
+if(isTscRegular){
 if(line.startsWith('* ')){
 memberFirstLine=line;
 }elseif(line.startsWith(' **')){
@@ -207,79 +178,62 @@ async function moveTscToEmeritus(peopleToMove) {
 }
 }
 
-if(!isTsc&&!isTscEmeritus){
+if(!isTscVoting&&!isTscRegular){
 fileContents+=`${line}\n`;
 }
 }
 
 returnfileContents;
 }
 
-// Get current TSC members, then get TSC members at start of period. Only check
-// TSC members who are on both lists. This way, we don't flag someone who has
-// only been on the TSC for a week and therefore hasn't attended any meetings.
+// Get current TSC voting members, then get TSC voting members at start of
+// period. Only check TSC voting members who are on both lists. This way, we
+// don't flag someone who hasn't been on the TSC long enough to have missed 3
+// consecutive votes.
 consttscMembersAtEnd=awaitgetTscFromReadme();
 
-conststartCommit=awaitrunGitCommand(`git rev-list -1 --before '${SINCE}' HEAD`);
-awaitrunGitCommand(`git checkout ${startCommit} -- README.md`);
-consttscMembersAtStart=awaitgetTscFromReadme();
-awaitrunGitCommand('git reset HEAD README.md');
-awaitrunGitCommand('git checkout -- README.md');
-
-consttscMembers=tscMembersAtEnd.filter(
-(memberAtEnd)=>tscMembersAtStart.includes(memberAtEnd),
-);
-
-// Get all meetings since SINCE.
+// Get the last three votes.
 // Assumes that the TSC repo is cloned in the .tmp dir.
-constmeetings=awaitrunGitCommand(
-`git whatchanged --since '${SINCE}' --name-only --pretty=format: meetings`,
-{cwd: '.tmp',mapFn: (line)=>line},
+constvotes=awaitrunShellCommand(
+'ls *.json | sort -rn | head -3',
+{cwd: '.tmp/votes',returnAsArray: true},
 );
 
-// Get TSC meeting attendance.
-constattendance=awaitgetAttendance(tscMembers,meetings);
-constlightAttendance=tscMembers.filter(
-(member)=>attendance[member]<meetings.size*0.25,
-);
+// Reverse the votes list so the oldest of the three votes is first.
+votes.reverse();
 
-// Get all votes since SINCE.
-// Assumes that the TSC repo is cloned in the .tmp dir.
-constvotes=awaitrunGitCommand(
-`git whatchanged --since '${SINCE}' --name-only --pretty=format: votes/*.json`,
-{cwd: '.tmp',mapFn: (line)=>line},
+conststartCommit=awaitrunShellCommand(`git rev-list -1 --before '${votes[0]}' HEAD`);
+awaitrunShellCommand(`git checkout ${startCommit} -- README.md`);
+consttscMembersAtStart=awaitgetTscFromReadme();
+awaitrunShellCommand('git reset HEAD README.md');
+awaitrunShellCommand('git checkout -- README.md');
+
+consttscMembers=tscMembersAtEnd.filter(
+(memberAtEnd)=>tscMembersAtStart.includes(memberAtEnd),
 );
 
 // Check voting record.
 constvotingRecords=awaitgetVotingRecords(tscMembers,votes);
-constnoVotes=tscMembers.filter(
+constinactive=tscMembers.filter(
 (member)=>votingRecords[member]===0,
 );
 
-constinactive=lightAttendance.filter((member)=>noVotes.includes(member));
-
 if(inactive.length){
 // The stdout output is consumed in find-inactive-tsc.yml. If format of output
 // changes, find-inactive-tsc.yml may need to be updated.
 console.log(`INACTIVE_TSC_HANDLES=${inactive.map((entry)=>'@'+entry).join(' ')}`);
-constcommitDetails=inactive.map((entry)=>{
-letdetails=`Since ${SINCE}, `;
-details+=`${entry} attended ${attendance[entry]} out of ${meetings.size} meetings`;
-details+=` and voted in ${votingRecords[entry]} of ${votes.size} votes.`;
-returndetails;
-});
-console.log(`DETAILS_FOR_COMMIT_BODY=${commitDetails.join(' ')}`);
+constcommitDetails=`${inactive.join(' ')} did not participate in three consecutive TSC votes: ${votes.join(' ')}`;
+console.log(`DETAILS_FOR_COMMIT_BODY=${commitDetails}`);
 
 if(process.env.GITHUB_ACTIONS){
 // Using console.warn() to avoid messing with find-inactive-tsc which
 // consumes stdout.
 console.warn('Generating new README.md file...');
-constnewReadmeText=awaitmoveTscToEmeritus(inactive);
+constnewReadmeText=awaitmoveVotingToRegular(inactive);
 fs.writeFileSync(newURL('../README.md',import.meta.url),newReadmeText);
 }
 }
 
 if(verbose){
-console.log(attendance);
 console.log(votingRecords);
 }