Infer diff range for CI-mode

Author: paleite

package.json

@@ -35,8 +35,12 @@
     "postinstall": "husky install",
     "prepublishOnly": "pinst --disable"
   },
+  "dependencies": {
+    "env-ci": "^5.0.2"
+  },
   "devDependencies": {
     "@tsconfig/node10": "^1.0.7",
+    "@types/env-ci": "^3.1.0",
     "@types/eslint": "^7.2.6",
     "@types/jest": "^26.0.20",
     "@types/node": "^14.14.31",

src/git.ts

@@ -15,12 +15,16 @@ const getCachedDiff = (filePath: string, staged: boolean) =>
   diffCache.get(diffCacheKey(filePath, staged));
 
 const diffCache = new Map<string, string>();
-const getDiffForFile = (filePath: string, staged = false): string => {
+const getDiffForFile = (
+  filePath: string,
+  staged = false,
+  changesBetween = "HEAD"
+): string => {
   let diff = getCachedDiff(filePath, staged);
   if (diff === undefined) {
     const result = child_process
       .execSync(
-        `git diff --diff-filter=ACM --unified=0 HEAD ${
+        `git diff --diff-filter=ACM --unified=0 ${changesBetween} ${
           staged ? " --staged" : ""
         } -- ${sanitizeFilePath(filePath)}`
       )
@@ -33,11 +37,11 @@ const getDiffForFile = (filePath: string, staged = false): string => {
 };
 
 let diffFileListCache: string[];
-const getDiffFileList = (staged = false): string[] => {
+const getDiffFileList = (staged = false, changesBetween = "HEAD"): string[] => {
   if (diffFileListCache === undefined) {
     diffFileListCache = child_process
       .execSync(
-        `git diff --diff-filter=ACM HEAD --name-only ${
+        `git diff --diff-filter=ACM ${changesBetween} --name-only ${
           staged ? "--staged" : ""
         }`
       )

src/processors.ts

@@ -1,9 +1,22 @@
-import type { Range } from "./git";
-import { getDiffForFile, getRangesForDiff, getDiffFileList } from "./git";
+import { default as envCi } from "env-ci";
 import type { Linter } from "eslint";
+import type { Range } from "./git";
+import { getDiffFileList, getDiffForFile, getRangesForDiff } from "./git";
 
 const STAGED = true;
 
+const changesBetween = (): string => {
+  const { branch, commit } = envCi();
+
+  if (!branch) {
+    throw Error("Couldn't find branch");
+  } else if (!commit) {
+    throw Error("Couldn't find commit");
+  }
+
+  return `${branch}..${commit}`;
+};
+
 const isLineWithinRange = (line: number) => (range: Range) =>
   range.isWithinRange(line);
 
@@ -61,6 +74,7 @@ const staged = {
         )
       )
     ),
+
   supportsAutofix: true,
 };
 
@@ -74,4 +88,40 @@ const stagedConfig = {
   ],
 };
 
-export { diff, diffConfig, staged, stagedConfig };
+const ci = {
+  preprocess: (
+    text: string,
+    filename: string
+  ): { text: string; filename: string }[] =>
+    getDiffFileList(false, changesBetween()).includes(filename)
+      ? [{ text, filename }]
+      : [],
+
+  postprocess: (
+    messages: Linter.LintMessage[][],
+    filename: string
+  ): Linter.LintMessage[] =>
+    ([] as Linter.LintMessage[]).concat(
+      ...messages.map((message) =>
+        message.filter(({ line }) =>
+          getRangesForDiff(
+            getDiffForFile(filename, false, changesBetween())
+          ).some(isLineWithinRange(line))
+        )
+      )
+    ),
+
+  supportsAutofix: true,
+};
+
+const ciConfig = {
+  plugins: ["diff"],
+  overrides: [
+    {
+      files: ["*"],
+      processor: "diff/ci",
+    },
+  ],
+};
+
+export { diff, diffConfig, staged, stagedConfig, ci, ciConfig };

yarn.lock

@@ -607,6 +607,11 @@
     "@types/node" "*"
     "@types/responselike" "*"
 
+"@types/env-ci@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/env-ci/-/env-ci-3.1.0.tgz#8b8b388641c641fa4eb51862cbb018db013aeb68"
+  integrity sha512-oJTxA/GmZavFFr6wtuFcmOUH4Lfj0RU9icnYBzp8gXDj7p8rCr5XRR2W6VzYOoCuEJusQsRUjSMr+3xOJ1S6yw==
+
 "@types/eslint@^7.2.6":
   version "7.2.6"
   resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c"
@@ -1832,6 +1837,14 @@ enquirer@^2.3.5, enquirer@^2.3.6:
   dependencies:
     ansi-colors "^4.1.1"
 
+env-ci@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/env-ci/-/env-ci-5.0.2.tgz#48b6687f8af8cdf5e31b8fcf2987553d085249d9"
+  integrity sha512-Xc41mKvjouTXD3Oy9AqySz1IeyvJvHZ20Twf5ZLYbNpPPIuCnL/qHCmNlD01LoNy0JTunw9HPYVptD19Ac7Mbw==
+  dependencies:
+    execa "^4.0.0"
+    java-properties "^1.0.0"
+
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -3182,6 +3195,11 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
+java-properties@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-1.0.2.tgz#ccd1fa73907438a5b5c38982269d0e771fe78211"
+  integrity sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ==
+
 jest-changed-files@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"