refactor(codeowners/generate): slightly de-duplicate

sverweij · May 11, 2024 · b89fc04 · b89fc04
1 parent 07eb6c4
commit b89fc04
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 27 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -29,4 +29,3 @@ admin:
 documentation:
   - changed-files:
       - any-glob-to-any-file: README.md
-
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
       - run: npm test
         if: always() && matrix.node-version != '20.12.2'
       - name: run test & emit results to step summary
-        # code coverage report on 20.x only, as --experimental-test-coverage on node > 20.12.2 
+        # code coverage report on 20.x only, as --experimental-test-coverage on node > 20.12.2
         # is not stable (gives varying results over identical runs)
         if: always() && matrix.node-version == '20.12.2'
         run: |

diff --git a/dist/codeowners/generate.js b/dist/codeowners/generate.js
diff --git a/src/codeowners/generate.ts b/src/codeowners/generate.ts
@@ -38,38 +38,34 @@ function generateLine(
   pTeamMap: ITeamMap,
 ): string {
   if (pCSTLine.type === "rule") {
-    const lUserNames = uniq(
-      pCSTLine.users.flatMap((pUser) => expandTeamToUserNames(pUser, pTeamMap)),
-    )
-      .sort(compareUserNames)
-      .join(" ");
     return (
       pCSTLine.filesPattern +
       pCSTLine.spaces +
-      lUserNames +
+      expandTeamsToUsersString(pCSTLine.users, pTeamMap) +
       (pCSTLine.inlineComment ? ` #${pCSTLine.inlineComment}` : "")
     );
   }
   if (pCSTLine.type === "section") {
-    const lUserNames = uniq(
-      pCSTLine.users.flatMap((pUser) => expandTeamToUserNames(pUser, pTeamMap)),
-    )
-      .sort(compareUserNames)
-      .join(" ");
     return (
       (pCSTLine.optional ? "^" : "") +
       "[" +
       pCSTLine.sectionName +
       "]" +
       (pCSTLine.minApprovers ? `[${pCSTLine.minApprovers}]` : "") +
       pCSTLine.spaces +
-      lUserNames +
+      expandTeamsToUsersString(pCSTLine.users, pTeamMap) +
       (pCSTLine.inlineComment ? ` #${pCSTLine.inlineComment}` : "")
     );
   }
   return pCSTLine.raw;
 }
 
+function expandTeamsToUsersString(pUsers: IUser[], pTeamMap: ITeamMap): string {
+  return uniq(pUsers.flatMap((pUser) => expandTeamToUserNames(pUser, pTeamMap)))
+    .sort(compareUserNames)
+    .join(" ");
+}
+
 function expandTeamToUserNames(pUser: IUser, pTeamMap: ITeamMap): string[] {
   if (pUser.type === "virtual-team-name") {
     return stringifyTeamMembers(pTeamMap, pUser.bareName);

diff --git a/src/virtual-code-owners/parse.ts b/src/virtual-code-owners/parse.ts
@@ -95,7 +95,7 @@ function parseSection(
   if (lSection.groups.minApprovers) {
     lReturnValue.minApprovers = parseInt(
       lSection.groups.minApprovers as string,
-      10
+      10,
     );
   }