refactor: simplifies parseRule

sverweij · Jun 4, 2024 · 5591cee · 5591cee
1 parent 1ace5d2
commit 5591cee
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 60 deletions.
diff --git a/dist/virtual-code-owners/parse.js b/dist/virtual-code-owners/parse.js
diff --git a/src/team-map/virtual-teams.schema.ts b/src/team-map/virtual-teams.schema.ts
diff --git a/src/virtual-code-owners/parse.ts b/src/virtual-code-owners/parse.ts
@@ -48,12 +48,12 @@ function parseLine(
   if (lTrimmedLine.startsWith("#")) {
     return { type: "comment", line: pLineNo, raw: pUntreatedLine };
   }
-  if (lTrimmedLine.startsWith("[") || lTrimmedLine.startsWith("^[")) {
-    return parseSection(pUntreatedLine, pLineNo, pTeamMap);
-  }
   if (lTrimmedLine === "") {
     return { type: "empty", line: pLineNo, raw: pUntreatedLine };
   }
+  if (lTrimmedLine.startsWith("[") || lTrimmedLine.startsWith("^[")) {
+    return parseSection(pUntreatedLine, pLineNo, pTeamMap);
+  }
 
   return parseRule(pUntreatedLine, pLineNo, pTeamMap);
 }
@@ -65,37 +65,24 @@ function parseRule(
 ): IVirtualCodeOwnerLine {
   const lTrimmedLine = pUntreatedLine.trim();
   const lCommentSplitLine = lTrimmedLine.split(/\s*#/);
-  const lRuleWithoutUsernames = lCommentSplitLine[0]?.match(
-    /^(?<filesPattern>[^\s]+)(?<spaces>\s*)$/,
-  );
   const lRule = lCommentSplitLine[0]?.match(
-    /^(?<filesPattern>[^\s]+)(?<spaces>\s+)(?<userNames>.+)$/,
+    /^(?<filesPattern>[^\s]+)(?<spaces>\s+)?(?<userNames>.+)?$/,
   );
 
-  if (lRuleWithoutUsernames?.groups && STATE.currentSection) {
-    return {
-      type: "rule",
-      line: pLineNo,
-      raw: pUntreatedLine,
-
-      filesPattern: lRuleWithoutUsernames.groups.filesPattern as string,
-      spaces: lRuleWithoutUsernames.groups.spaces as string,
-      users: [],
-      inheritedUsers: STATE.inheritedUsers,
-      currentSection: STATE.currentSection,
-      inlineComment: lCommentSplitLine[1] ?? "",
-    };
-  }
+  const ruleIsValid =
+    lRule?.groups &&
+    (lRule.groups.userNames || STATE.inheritedUsers.length > 0);
 
-  if (lRule?.groups) {
+  if (ruleIsValid) {
     let lReturnValue: IRuleCSTLine = {
       type: "rule",
       line: pLineNo,
       raw: pUntreatedLine,
 
+      // @ts-expect-error 18048 - ruleIsValid ensures that groups is not null
       filesPattern: lRule.groups.filesPattern as string,
-      spaces: lRule.groups.spaces as string,
-      users: parseUsers(lRule.groups.userNames as string, pTeamMap),
+      spaces: lRule.groups?.spaces ?? "",
+      users: parseUsers(lRule.groups?.userNames ?? "", pTeamMap),
       inlineComment: lCommentSplitLine[1] ?? "",
     };
     if (STATE.currentSection) {