Merge pull request #16 from maks-rafalko/feature/semi

Use semicolons in prettier and eslint

Author: maks-rafalko

.eslintrc.json

@@ -44,9 +44,10 @@
       "@typescript-eslint/require-array-sort-compare": "error",
       "@typescript-eslint/restrict-plus-operands": "error",
       "semi": "off",
-      "@typescript-eslint/semi": ["error", "never"],
+      "@typescript-eslint/semi": ["error", "always"],
       "@typescript-eslint/type-annotation-spacing": "error",
-      "@typescript-eslint/unbound-method": "error"
+      "@typescript-eslint/unbound-method": "error",
+      "prettier/prettier": ["error", { "semi": true }]
     },
     "env": {
       "node": true,

.prettierrc.json

@@ -2,7 +2,7 @@
   "printWidth": 80,
   "tabWidth": 2,
   "useTabs": false,
-  "semi": false,
+  "semi": true,
   "singleQuote": true,
   "trailingComma": "none",
   "bracketSpacing": false,

__tests__/main.test.ts

@@ -1,24 +1,24 @@
-import {expect, test} from '@jest/globals'
+import {expect, test} from '@jest/globals';
 
 import {
   getTouchedSourceFilesRequireTests,
   getTouchedTestFiles,
   File
-} from '../src/fileFilters'
+} from '../src/fileFilters';
 
 test('getTouchedSourceFilesRequireTests should filter out files by file extensions', () => {
   const files: File[] = [
     {filename: 'README.md'},
     {filename: 'foo.php'},
     {filename: 'bar.ts'}
-  ]
-  const extensions = ['.php']
+  ];
+  const extensions = ['.php'];
 
-  const filteredFiles = getTouchedSourceFilesRequireTests(files, extensions)
+  const filteredFiles = getTouchedSourceFilesRequireTests(files, extensions);
 
-  expect(filteredFiles.length).toBe(1)
-  expect(filteredFiles[0].filename).toBe('foo.php')
-})
+  expect(filteredFiles.length).toBe(1);
+  expect(filteredFiles[0].filename).toBe('foo.php');
+});
 
 test('getTouchedTestFiles should return test files from the list of different files', () => {
   const files: File[] = [
@@ -30,57 +30,61 @@ test('getTouchedTestFiles should return test files from the list of different fi
     {filename: 'a/test/bar3.ts'},
     {filename: 'a/tests/bar4.ts'},
     {filename: 'test_test.ts'}
-  ]
+  ];
 
-  const filteredFilesTestDir = getTouchedTestFiles(files, 'lib/tests', '')
-  expect(filteredFilesTestDir.length).toBe(2)
-  expect(filteredFilesTestDir[0].filename).toBe('lib/tests/bar1.ts')
-  expect(filteredFilesTestDir[1].filename).toBe('lib/tests/foo1.ts')
+  const filteredFilesTestDir = getTouchedTestFiles(files, 'lib/tests', '');
+  expect(filteredFilesTestDir.length).toBe(2);
+  expect(filteredFilesTestDir[0].filename).toBe('lib/tests/bar1.ts');
+  expect(filteredFilesTestDir[1].filename).toBe('lib/tests/foo1.ts');
 
   const filteredFilesTestPatternSimple = getTouchedTestFiles(
     files,
     '',
     '*_test.ts'
-  )
-  expect(filteredFilesTestPatternSimple.length).toBe(1)
-  expect(filteredFilesTestPatternSimple[0].filename).toBe('test_test.ts')
+  );
+  expect(filteredFilesTestPatternSimple.length).toBe(1);
+  expect(filteredFilesTestPatternSimple[0].filename).toBe('test_test.ts');
 
   const filteredFilesTestPatternSubdir = getTouchedTestFiles(
     files,
     '',
     '*/test/*.ts'
-  )
-  expect(filteredFilesTestPatternSubdir.length).toBe(1)
-  expect(filteredFilesTestPatternSubdir[0].filename).toBe('a/test/bar3.ts')
+  );
+  expect(filteredFilesTestPatternSubdir.length).toBe(1);
+  expect(filteredFilesTestPatternSubdir[0].filename).toBe('a/test/bar3.ts');
 
   const filteredFilesTestPatternAllInTests = getTouchedTestFiles(
     files,
     '',
     '**/tests/*.ts'
-  )
-  expect(filteredFilesTestPatternAllInTests.length).toBe(3)
+  );
+  expect(filteredFilesTestPatternAllInTests.length).toBe(3);
   expect(filteredFilesTestPatternAllInTests[0].filename).toBe(
     'lib/tests/bar1.ts'
-  )
+  );
   expect(filteredFilesTestPatternAllInTests[1].filename).toBe(
     'lib/tests/foo1.ts'
-  )
-  expect(filteredFilesTestPatternAllInTests[2].filename).toBe('a/tests/bar4.ts')
+  );
+  expect(filteredFilesTestPatternAllInTests[2].filename).toBe(
+    'a/tests/bar4.ts'
+  );
 
   const filteredFilesTestBothDirAndPattern = getTouchedTestFiles(
     files,
     'lib/testsxxx',
     '**/tests/*.ts'
-  )
-  expect(filteredFilesTestBothDirAndPattern.length).toBe(4)
+  );
+  expect(filteredFilesTestBothDirAndPattern.length).toBe(4);
   expect(filteredFilesTestBothDirAndPattern[0].filename).toBe(
     'lib/testsxxx/bar2.ts'
-  )
+  );
   expect(filteredFilesTestBothDirAndPattern[1].filename).toBe(
     'lib/tests/bar1.ts'
-  )
+  );
   expect(filteredFilesTestBothDirAndPattern[2].filename).toBe(
     'lib/tests/foo1.ts'
-  )
-  expect(filteredFilesTestBothDirAndPattern[3].filename).toBe('a/tests/bar4.ts')
-})
+  );
+  expect(filteredFilesTestBothDirAndPattern[3].filename).toBe(
+    'a/tests/bar4.ts'
+  );
+});

src/fileFilters.ts

@@ -1,38 +1,38 @@
-import {minimatch} from 'minimatch'
+import {minimatch} from 'minimatch';
 
 export type File = {
-  filename: string
-}
+  filename: string;
+};
 
 export function getTouchedSourceFilesRequireTests(
   files: File[],
   fileExtensions: string[]
 ): File[] {
   return files.filter(file => {
     return fileExtensions.find((fileExtension: string) => {
-      return file.filename.endsWith(fileExtension)
-    })
-  })
+      return file.filename.endsWith(fileExtension);
+    });
+  });
 }
 
 export function getTouchedTestFiles(
   files: File[],
   testDir: string,
   testPattern: string
 ): File[] {
-  let filtered: File[] = []
+  let filtered: File[] = [];
 
   if (testDir) {
     filtered = files.filter(file => {
-      return file.filename.startsWith(`${testDir}/`)
-    })
+      return file.filename.startsWith(`${testDir}/`);
+    });
   }
   if (testPattern) {
     filtered = filtered.concat(
       files.filter(file => {
-        return minimatch(file.filename, testPattern)
+        return minimatch(file.filename, testPattern);
       })
-    )
+    );
   }
-  return filtered
+  return filtered;
 }

src/main.ts

@@ -1,23 +1,23 @@
-import * as core from '@actions/core'
-import * as github from '@actions/github'
+import * as core from '@actions/core';
+import * as github from '@actions/github';
 import {
   getTouchedSourceFilesRequireTests,
   getTouchedTestFiles
-} from './fileFilters'
+} from './fileFilters';
 
 function getFileExtensions(): string[] {
-  const fileExtensionsInput = core.getInput('fileExtensions')
+  const fileExtensionsInput = core.getInput('fileExtensions');
 
   if (fileExtensionsInput === '') {
-    return ['.php', '.ts', '.js', '.c', '.cs', '.cpp', '.rb', '.java']
+    return ['.php', '.ts', '.js', '.c', '.cs', '.cpp', '.rb', '.java'];
   }
 
-  return fileExtensionsInput.split(',')
+  return fileExtensionsInput.split(',');
 }
 
 async function run(): Promise<void> {
   try {
-    const {context} = github
+    const {context} = github;
 
     const config = {
       comment:
@@ -26,24 +26,24 @@ async function run(): Promise<void> {
       fileExtensions: getFileExtensions(),
       testDir: core.getInput('testDir') || 'tests',
       testPattern: core.getInput('testPattern') || ''
-    }
+    };
 
     if (context.payload.pull_request == null) {
       core.debug(
         'This action is supposed to be run on pull_request event only.'
-      )
+      );
     }
 
-    const githubToken: string = core.getInput('GITHUB_TOKEN')
+    const githubToken: string = core.getInput('GITHUB_TOKEN');
 
-    const octokit = github.getOctokit(githubToken)
-    const issue = context.issue
+    const octokit = github.getOctokit(githubToken);
+    const issue = context.issue;
 
-    const pullRequestNumber = context.payload.pull_request?.number
+    const pullRequestNumber = context.payload.pull_request?.number;
 
     if (pullRequestNumber === undefined) {
-      core.debug('Could not get pull request number from context, exiting')
-      return
+      core.debug('Could not get pull request number from context, exiting');
+      return;
     }
 
     const allFiles = await octokit.paginate(
@@ -54,27 +54,27 @@ async function run(): Promise<void> {
         pull_number: pullRequestNumber
       },
       res => res.data
-    )
+    );
 
     const sourceFilesRequireTests = getTouchedSourceFilesRequireTests(
       allFiles,
       config.fileExtensions
-    )
+    );
 
     if (sourceFilesRequireTests.length === 0) {
-      core.debug('No source files require tests, exiting')
-      return
+      core.debug('No source files require tests, exiting');
+      return;
     }
 
     const testFiles = getTouchedTestFiles(
       allFiles,
       config.testDir,
       config.testPattern
-    )
+    );
 
     if (testFiles.length !== 0) {
-      core.debug('Test files were touched, exiting')
-      return
+      core.debug('Test files were touched, exiting');
+      return;
     }
 
     octokit.rest.pulls.createReview({
@@ -83,10 +83,10 @@ async function run(): Promise<void> {
       pull_number: pullRequestNumber,
       repo: issue.repo,
       owner: issue.owner
-    })
+    });
   } catch (error) {
-    if (error instanceof Error) core.setFailed(error.message)
+    if (error instanceof Error) core.setFailed(error.message);
   }
 }
 
-run()
+run();