Merge pull request #8 from paleite/bugfix/fix-typescript-eslint

Bugfix/fix typescript eslint

Author: paleite

README.md

@@ -1,6 +1,6 @@
 # eslint-plugin-diff
 
-Run ESLint on your changes only
+Run ESLint on your changed lines only. Now with CI support!
 
 ## What problem does it solve?
 

src/Range.test.ts

@@ -1,4 +1,5 @@
 import { Range } from "./Range";
+
 describe("range", () => {
   it("should instantiate with correct parameters", () => {
     const range: Range = new Range(0, 1);

src/__fixtures__/diff.ts

@@ -1,19 +1,19 @@
-export const diff = `diff --git a/fixme.js b/fixme.js
+const diff = `diff --git a/fixme.js b/fixme.js
 index 4886604..83c3014 100644
 --- a/fixme.js
 +++ b/fixme.js
 @@ -1,0 +2,2 @@ if (new Date().getTime()) console.log("curly");
 +if (new Date().getTime()) console.log("curly");
 +if (new Date().getTime()) console.log("curly");`;
 
-export const staged = `diff --git a/fixme.js b/fixme.js
+const staged = `diff --git a/fixme.js b/fixme.js
 index 4886604..3238811 100644
 --- a/fixme.js
 +++ b/fixme.js
 @@ -1,0 +2 @@ if (new Date().getTime()) console.log("curly");
 +if (new Date().getTime()) console.log("curly");`;
 
-export const hunks = `diff --git a/dirty.js b/dirty.js
+const hunks = `diff --git a/dirty.js b/dirty.js
 index 4d2637c..99dc494 100644
 --- a/dirty.js
 +++ b/dirty.js
@@ -35,7 +35,7 @@ index 4d2637c..99dc494 100644
 +if (!myFunc(true == myVar)) (myRes = false), (someotherThing = null);
 +unrelated = true;`;
 
-export const includingOnlyRemovals = `diff --git a/dirty.js b/dirty.js
+const includingOnlyRemovals = `diff --git a/dirty.js b/dirty.js
 index cb3c131..874b8f9 100644
 --- a/dirty.js
 +++ b/dirty.js
@@ -46,11 +46,21 @@ index cb3c131..874b8f9 100644
 -import { b } from "../context/b";
 -import { c } from "../context/c";`;
 
-export const filenamesAB = `a/dirty.js
+const filenamesAB = `a/dirty.js
 b/dirty.js
 `;
 
-export const filenamesA = `a/dirty.js
-`
+const filenamesA = `a/dirty.js
+`;
+
+const diffFileList = "file1\nfile2\nfile3\n";
 
-export const diffFileList = "file1\nfile2\nfile3\n"
+export {
+  diff,
+  staged,
+  hunks,
+  includingOnlyRemovals,
+  filenamesAB,
+  filenamesA,
+  diffFileList,
+};

src/git.ts

@@ -24,7 +24,7 @@ const getDiffForFile = (filePath: string, staged = false): string => {
       "--diff-filter=ACM",
       staged && "--staged",
       "--unified=0",
-      JSON.stringify(process.env.ESLINT_PLUGIN_DIFF_COMMIT) ?? "HEAD",
+      JSON.stringify(process.env.ESLINT_PLUGIN_DIFF_COMMIT ?? "HEAD"),
       "--",
       sanitizeFilePath(filePath),
     ]
@@ -39,7 +39,7 @@ const getDiffForFile = (filePath: string, staged = false): string => {
   return diff;
 };
 
-let diffFileListCache: string[];
+let diffFileListCache: string[] | undefined;
 const getDiffFileList = (staged = false): string[] => {
   if (diffFileListCache === undefined) {
     const command = [
@@ -48,7 +48,7 @@ const getDiffFileList = (staged = false): string[] => {
       "--diff-filter=ACM",
       "--name-only",
       staged && "--staged",
-      JSON.stringify(process.env.ESLINT_PLUGIN_DIFF_COMMIT) ?? "HEAD",
+      JSON.stringify(process.env.ESLINT_PLUGIN_DIFF_COMMIT ?? "HEAD"),
     ]
       .filter(Boolean)
       .join(" ");
@@ -63,6 +63,31 @@ const getDiffFileList = (staged = false): string[] => {
   return diffFileListCache;
 };
 
+let gitFileListCache: string[] | undefined;
+const getGitFileList = (): string[] => {
+  if (gitFileListCache === undefined) {
+    const command = ["git", "ls-files"].filter(Boolean).join(" ");
+
+    gitFileListCache = child_process
+      .execSync(command)
+      .toString()
+      .trim()
+      .split("\n")
+      .map((filePath) => path.resolve(filePath));
+  }
+  return gitFileListCache;
+};
+
+const getIgnorePatterns = (staged = false): string[] => {
+  const changedFiles = getDiffFileList(staged);
+
+  const unchangedFiles = getGitFileList()
+    .filter((x) => !changedFiles.includes(x))
+    .map((x) => path.join("/", path.relative(process.cwd(), x)));
+
+  return unchangedFiles;
+};
+
 const isHunkHeader = (input: string) => {
   const hunkHeaderRE = new RegExp(/^@@ .* @@/g);
   return input.match(hunkHeaderRE);
@@ -98,13 +123,12 @@ const getRangeForChangedLines = (line: string) => {
 
 const removeNullRanges = (r: Range | null): r is Range => r !== null;
 
-const getRangesForDiff = (diff: string): Range[] => {
-  return diff
+const getRangesForDiff = (diff: string): Range[] =>
+  diff
     .split("\n")
     .filter(isHunkHeader)
     .map(getRangeForChangedLines)
     .filter(removeNullRanges);
-};
 
-export { getDiffForFile, getRangesForDiff, getDiffFileList };
+export { getDiffForFile, getIgnorePatterns, getRangesForDiff, getDiffFileList };
 export type { Range };

src/processors.ts

@@ -1,32 +1,38 @@
 import type { Linter } from "eslint";
 import type { Range } from "./git";
-import { getDiffFileList, getDiffForFile, getRangesForDiff } from "./git";
+import {
+  getDiffFileList,
+  getDiffForFile,
+  getIgnorePatterns,
+  getRangesForDiff,
+} from "./git";
 
 const STAGED = true;
 
 const isLineWithinRange = (line: number) => (range: Range) =>
   range.isWithinRange(line);
 
 const diff = {
-  preprocess: (
-    text: string,
-    filename: string
-  ): { text: string; filename: string }[] =>
-    getDiffFileList().includes(filename) ? [{ text, filename }] : [],
-
   postprocess: (
     messages: Linter.LintMessage[][],
     filename: string
-  ): Linter.LintMessage[] =>
-    messages
-      .map((message) =>
-        message.filter(({ line }) =>
-          getRangesForDiff(getDiffForFile(filename)).some(
-            isLineWithinRange(line)
+  ): Linter.LintMessage[] => {
+    const shouldKeepFile = getDiffFileList().includes(filename);
+
+    return shouldKeepFile
+      ? messages
+          .map((message) =>
+            message.filter(({ fatal, line }) => {
+              const shouldKeepLine = getRangesForDiff(
+                getDiffForFile(filename)
+              ).some(isLineWithinRange(line));
+
+              return fatal ?? shouldKeepLine;
+            })
           )
-        )
-      )
-      .reduce((a, b) => a.concat(b), []),
+          .reduce((a, b) => a.concat(b), [])
+      : [];
+  },
 
   supportsAutofix: true,
 };
@@ -39,28 +45,30 @@ const diffConfig = {
       processor: "diff/diff",
     },
   ],
+  ignorePatterns: getIgnorePatterns(),
 };
 
 const staged = {
-  preprocess: (
-    text: string,
-    filename: string
-  ): { text: string; filename: string }[] =>
-    getDiffFileList(STAGED).includes(filename) ? [{ text, filename }] : [],
-
   postprocess: (
     messages: Linter.LintMessage[][],
     filename: string
-  ): Linter.LintMessage[] =>
-    messages
-      .map((message) =>
-        message.filter(({ line }) =>
-          getRangesForDiff(getDiffForFile(filename, STAGED)).some(
-            isLineWithinRange(line)
+  ): Linter.LintMessage[] => {
+    const shouldKeepFile = getDiffFileList().includes(filename);
+
+    return shouldKeepFile
+      ? messages
+          .map((message) =>
+            message.filter(({ fatal, line }) => {
+              const shouldKeepLine = getRangesForDiff(
+                getDiffForFile(filename, STAGED)
+              ).some(isLineWithinRange(line));
+
+              return fatal ?? shouldKeepLine;
+            })
           )
-        )
-      )
-      .reduce((a, b) => a.concat(b), []),
+          .reduce((a, b) => a.concat(b), [])
+      : [];
+  },
 
   supportsAutofix: true,
 };
@@ -73,6 +81,7 @@ const stagedConfig = {
       processor: "diff/staged",
     },
   ],
+  ignorePatterns: getIgnorePatterns(STAGED),
 };
 
 export { diff, diffConfig, staged, stagedConfig };