From 7d5e9f7d4da10bb2c46a2d642a92de0beaa3d8ed Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Thu, 16 Mar 2023 18:31:47 -0700
Subject: [PATCH] fixup! tools,meta: update README and tools to reflect changes
 in TSC charter

---
 README.md                   | 35 +++++++++++++++++++----------------
 tools/find-inactive-tsc.mjs | 16 ++++++++--------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 5db2735cd42064..f8bc7f03c101ec 100644
--- a/README.md
+++ b/README.md
@@ -207,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>Regular members</summary>
-
 #### 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) -
@@ -239,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) -
@@ -251,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>>
 
diff --git a/tools/find-inactive-tsc.mjs b/tools/find-inactive-tsc.mjs
index 4ee2c870dc8fe4..52cba2d2d8f3db 100755
--- a/tools/find-inactive-tsc.mjs
+++ b/tools/find-inactive-tsc.mjs
@@ -104,7 +104,7 @@ async function getVotingRecords(tscMembers, votes) {
   return votingRecords;
 }
 
-async function moveTscToEmeritus(peopleToMove) {
+async function moveVotingToRegular(peopleToMove) {
   const readmeText = readline.createInterface({
     input: fs.createReadStream(new URL('../README.md', import.meta.url)),
     crlfDelay: Infinity,
@@ -133,17 +133,17 @@ async function moveTscToEmeritus(peopleToMove) {
       inTscRegularSection = false;
     }
 
-    const isTsc = inTscVotingSection && line.length;
-    const isTscEmeritus = inTscRegularSection && line.length;
+    const isTscVoting = inTscVotingSection && line.length;
+    const isTscRegular = inTscRegularSection && line.length;
 
     if (line === '#### TSC voting members') {
       inTscVotingSection = true;
     }
-    if (line === '### TSC regular members') {
+    if (line === '#### TSC regular members') {
       inTscRegularSection = true;
     }
 
-    if (isTsc) {
+    if (isTscVoting) {
       if (line.startsWith('* ')) {
         memberFirstLine = line;
         const match = line.match(/^\* \[([^\]]+)/);
@@ -162,7 +162,7 @@ async function moveTscToEmeritus(peopleToMove) {
       }
     }
 
-    if (isTscEmeritus) {
+    if (isTscRegular) {
       if (line.startsWith('* ')) {
         memberFirstLine = line;
       } else if (line.startsWith('  **')) {
@@ -178,7 +178,7 @@ async function moveTscToEmeritus(peopleToMove) {
       }
     }
 
-    if (!isTsc && !isTscEmeritus) {
+    if (!isTscVoting && !isTscRegular) {
       fileContents += `${line}\n`;
     }
   }
@@ -229,7 +229,7 @@ if (inactive.length) {
     // Using console.warn() to avoid messing with find-inactive-tsc which
     // consumes stdout.
     console.warn('Generating new README.md file...');
-    const newReadmeText = await moveTscToEmeritus(inactive);
+    const newReadmeText = await moveVotingToRegular(inactive);
     fs.writeFileSync(new URL('../README.md', import.meta.url), newReadmeText);
   }
 }