virtual-code-owners 6.1.1 → 6.2.0

package/dist/generate-codeowners.js

@@ -22,7 +22,10 @@ function generateLine(pCSTLine, pTeamMap) {
         const lUserNames = uniq(pCSTLine.users.flatMap((pUser) => expandTeamToUserNames(pUser, pTeamMap)))
             .sort(compareUserNames)
             .join(" ");
-        return pCSTLine.filesPattern + pCSTLine.spaces + lUserNames;
+        return (pCSTLine.filesPattern +
+            pCSTLine.spaces +
+            lUserNames +
+            (pCSTLine.inlineComment ? ` #${pCSTLine.inlineComment}` : ""));
     }
     return pCSTLine.raw;
 }

package/dist/generate-labeler-yml.js

@@ -23,8 +23,7 @@ export default function generateLabelerYml(pCodeOwners, pTeamMap, pGeneratedWarn
 function getPatternsForTeam(pCodeOwners, pTeamName) {
     return (pCodeOwners
         .filter((pLine) => {
-        const isARule = pLine.type === "rule";
-        return (isARule &&
+        return (pLine.type === "rule" &&
             lineContainsTeamName(pLine, pTeamName));
     })
         .map((pLine) => pLine.filesPattern));

package/dist/main.js

@@ -28,7 +28,7 @@ Options:
   --dryRun                             Just validate inputs, don't generate
                                        outputs (default: false)
   -h, --help                           display help for command`;
-export function cli(pArguments = process.argv.slice(2), pOutStream = process.stdout, pErrorStream = process.stderr) {
+export function cli(pArguments = process.argv.slice(2), pOutStream = process.stdout, pErrorStream = process.stderr, pErrorExitCode = 1) {
     try {
         const lOptions = getOptions(pArguments);
         if (lOptions.help) {
@@ -43,7 +43,7 @@ export function cli(pArguments = process.argv.slice(2), pOutStream = process.std
     }
     catch (pError) {
         pErrorStream.write(`${EOL}ERROR: ${pError.message}${EOL}${EOL}`);
-        process.exitCode = 1;
+        process.exitCode = pErrorExitCode;
     }
 }
 function getOptions(pArguments) {

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

@@ -38,14 +38,15 @@ function orderAnomaly(pLeft, pRight) {
 }
 function parseLine(pUntreatedLine, pTeamMap, pLineNo) {
     const lTrimmedLine = pUntreatedLine.trim();
-    const lSplitLine = lTrimmedLine.match(/^(?<filesPattern>[^\s]+)(?<spaces>\s+)(?<userNames>.*)$/);
+    const lCommentSplitLine = lTrimmedLine.split(/\s*#/);
+    const lRule = lCommentSplitLine[0].match(/^(?<filesPattern>[^\s]+)(?<spaces>\s+)(?<userNames>.*)$/);
     if (lTrimmedLine.startsWith("#!")) {
         return { type: "ignorable-comment", line: pLineNo, raw: pUntreatedLine };
     }
     if (lTrimmedLine.startsWith("#")) {
         return { type: "comment", line: pLineNo, raw: pUntreatedLine };
     }
-    if (!lSplitLine?.groups) {
+    if (!lRule?.groups) {
         if (lTrimmedLine === "") {
             return { type: "empty", line: pLineNo, raw: pUntreatedLine };
         }
@@ -54,9 +55,10 @@ function parseLine(pUntreatedLine, pTeamMap, pLineNo) {
     return {
         type: "rule",
         line: pLineNo,
-        filesPattern: lSplitLine.groups.filesPattern,
-        spaces: lSplitLine.groups.spaces,
-        users: parseUsers(lSplitLine.groups.userNames, pTeamMap),
+        filesPattern: lRule.groups.filesPattern,
+        spaces: lRule.groups.spaces,
+        users: parseUsers(lRule.groups.userNames, pTeamMap),
+        inlineComment: lCommentSplitLine[1] ?? "",
         raw: pUntreatedLine,
     };
 }

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "6.1.1";
+export const VERSION = "6.2.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "virtual-code-owners",
-  "version": "6.1.1",
+  "version": "6.2.0",
   "description": "Makes your CODEOWNERS file liveable again",
   "type": "module",
   "exports": {
@@ -48,7 +48,7 @@
     "format": "prettier --log-level warn --write \"**/*.{md,ts,json,yml}\"",
     "prepare": "husky install",
     "scm:stage": "git add .",
-    "test": "NODE_OPTIONS=--no-warnings c8 mocha",
+    "test": "c8 node --no-warnings --loader 'ts-node/esm' --test-reporter ./tools/dot-with-summary.reporter.js --test src/*.test.ts",
     "update-dependencies": "npm run upem:update && npm run upem:install && npm run check",
     "upem-outdated": "npm outdated --json --long | upem --dry-run",
     "upem:install": "npm install",
@@ -69,22 +69,20 @@
     "url": "https://github.com/sverweij/virtual-code-owners/issues"
   },
   "devDependencies": {
-    "@types/mocha": "10.0.1",
-    "@types/node": "20.4.1",
-    "c8": "8.0.0",
-    "dependency-cruiser": "13.1.0",
+    "@types/node": "20.5.8",
+    "c8": "8.0.1",
+    "dependency-cruiser": "13.1.5",
     "husky": "8.0.3",
-    "lint-staged": "13.2.3",
-    "mocha": "10.2.0",
-    "prettier": "3.0.0",
+    "lint-staged": "14.0.1",
+    "prettier": "3.0.3",
     "ts-node": "10.9.1",
-    "typescript": "5.1.6",
+    "typescript": "5.2.2",
     "upem": "8.0.0",
-    "watskeburt": "0.11.6"
+    "watskeburt": "1.0.1"
   },
   "dependencies": {
     "ajv": "8.12.0",
-    "yaml": "2.3.1"
+    "yaml": "2.3.2"
   },
   "engines": {
     "node": "^16.19.0||^18.11.0||>=20.0.0"

package/types/types.d.ts

@@ -15,6 +15,7 @@ export interface IInterestingCSTLine {
   filesPattern: string;
   spaces: string;
   users: IUser[];
+  inlineComment: string;
   raw: string;
 }
 export type UserType =