virtual-code-owners 8.2.2 → 8.2.4

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022-2024 Sander Verweij
+Copyright (c) 2022-2025 Sander Verweij
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/codeowners/generate.js

@@ -53,19 +53,15 @@ function expandTeamsToUsersString(pUsers, pTeamMap) {
 		.join(" ");
 }
 function expandTeamToUserNames(pUser, pTeamMap) {
-	if (pUser.type === "virtual-team-name") {
-		return stringifyTeamMembers(pTeamMap, pUser.bareName);
-	}
-	return [pUser.raw];
+	return pUser.type === "virtual-team-name"
+		? stringifyTeamMembers(pTeamMap, pUser.bareName)
+		: [pUser.raw];
 }
 function stringifyTeamMembers(pTeamMap, pTeamName) {
 	return (pTeamMap[pTeamName] ?? []).map(userNameToCodeOwner);
 }
 function userNameToCodeOwner(pUserName) {
-	if (isEmailIshUsername(pUserName)) {
-		return pUserName;
-	}
-	return `@${pUserName}`;
+	return isEmailIshUsername(pUserName) ? pUserName : `@${pUserName}`;
 }
 function compareUserNames(pLeftName, pRightName) {
 	return pLeftName.toLowerCase() > pRightName.toLowerCase() ? 1 : -1;

package/dist/utensils.js

@@ -1,4 +1,7 @@
 export function isEmailIshUsername(pUsername) {
-	const lEmailIshUsernameRE = /^.+@.+$/;
-	return Boolean(pUsername.match(lEmailIshUsernameRE));
+	return (
+		!pUsername.startsWith("@") &&
+		!pUsername.endsWith("@") &&
+		pUsername.includes("@")
+	);
 }

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "8.2.2";
+export const VERSION = "8.2.4";

package/dist/virtual-code-owners/parse.js

@@ -62,7 +62,7 @@ function parseSection(pUntreatedLine, pLineNo, pTeamMap) {
 	const lTrimmedLine = pUntreatedLine.trim();
 	const lCommentSplitLine = lTrimmedLine.split(/\s*#/);
 	const lSection = lCommentSplitLine[0]?.match(
-		/^(?<optionalIndicator>\^)?\[(?<name>[^\]]+)\](\[(?<minApprovers>[0-9]+)\])?(?<spaces>\s+)?(?<userNames>.+)?$/,
+		/^(?<optionalIndicator>\^)?\[(?<name>[^\]]+)\](\[(?<minApprovers>\d+)\])?(?<spaces>\s+)?(?<userNames>.+)?$/,
 	);
 	if (!lSection?.groups) {
 		return {
@@ -116,8 +116,5 @@ function getUserNameType(pUserName, pBareName, pTeamMap) {
 	return "invalid";
 }
 function getBareUserName(pUserName) {
-	if (pUserName.startsWith("@")) {
-		return pUserName.slice(1);
-	}
-	return pUserName;
+	return pUserName.startsWith("@") ? pUserName.slice(1) : pUserName;
 }

package/dist/virtual-code-owners/read.js

@@ -23,15 +23,11 @@ export default function readVirtualCodeOwners(
 }
 function reportAnomalies(pFileName, pAnomalies) {
 	return pAnomalies
-		.map((pAnomaly) => {
-			if (pAnomaly.type === "invalid-line") {
-				return `${pFileName}:${pAnomaly.line}:1 invalid line - neither a rule, section heading, comment nor empty: "${pAnomaly.raw}"`;
-			} else {
-				return (
-					`${pFileName}:${pAnomaly.line}:1 invalid user or team name "${pAnomaly.raw}" (#${pAnomaly.userNumberWithinLine} on this line). ` +
-					`It should either start with "@" or be an e-mail address.`
-				);
-			}
-		})
+		.map((pAnomaly) =>
+			pAnomaly.type === "invalid-line"
+				? `${pFileName}:${pAnomaly.line}:1 invalid line - neither a rule, section heading, comment nor empty: "${pAnomaly.raw}"`
+				: `${pFileName}:${pAnomaly.line}:1 invalid user or team name "${pAnomaly.raw}" (#${pAnomaly.userNumberWithinLine} on this line). ` +
+					`It should either start with "@" or be an e-mail address.`,
+		)
 		.join(EOL);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "virtual-code-owners",
-	"version": "8.2.2",
+	"version": "8.2.4",
 	"description": "CODEOWNERS with teams for teams that can't use GitHub teams",
 	"type": "module",
 	"bin": {
@@ -26,7 +26,7 @@
 		"url": "https://github.com/sverweij/virtual-code-owners/issues"
 	},
 	"dependencies": {
-		"yaml": "^2.5.1"
+		"yaml": "^2.7.0"
 	},
 	"engines": {
 		"node": "^18.11.0||>=20.0.0"