Merge pull request #30 from smartlyio/simplify-configs

.github/workflows/check-labels.yml

@@ -3,17 +3,17 @@ name: Check Labels
 on:
   pull_request:
     branches:
-    - master
+      - master
     types:
-    - opened
-    - labeled
-    - unlabeled
-    - synchronize
+      - opened
+      - labeled
+      - unlabeled
+      - synchronize
 
 jobs:
   check_labels:
     runs-on: ubuntu-latest
     steps:
-    - uses: smartlyio/check-versioning-action@v5
-      with:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: smartlyio/check-versioning-action@v5
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pull-request.yml

@@ -23,4 +23,4 @@ jobs:
         uses: smartlyio/github-actions@release-action-node-v1
         with:
           dry_run: true
-          token: "${{ secrets.GITHUB_TOKEN }}"
+          token: '${{ secrets.GITHUB_TOKEN }}'

.github/workflows/release.yml

@@ -23,4 +23,4 @@ jobs:
       - name: Release flow
         uses: smartlyio/github-actions@release-action-node-v1
         with:
-          token: "${{ secrets.GITHUB_TOKEN }}"
+          token: '${{ secrets.GITHUB_TOKEN }}'

.prettierignore

@@ -0,0 +1,3 @@
+dist
+node_modules
+package-lock.json

.prettierrc

@@ -1,5 +1,4 @@
 {
-  "parser": "typescript",
   "printWidth": 100,
   "singleQuote": true,
   "trailingComma": "none",

dist/index.js

@@ -37689,10 +37689,10 @@ async function runGit(command) {
             ok(collected.join(''));
         });
         run.on('error', (err) => {
-            fail(`got error from rungit "${err.message}" ${err.stack}
+            fail(new Error(`got error from rungit "${err.message}" ${err.stack}
 
       stderr:
-      ${errors.join('')}`);
+      ${errors.join('')}`, { cause: err }));
         });
     });
 }
@@ -37702,7 +37702,7 @@ async function changedLines(opts) {
     let currentFile = null;
     for (const line of stdout.split('\n')) {
         const fileHeader = line.match(/^\+\+\+ b\/(.*)/);
-        if (fileHeader && fileHeader[1]) {
+        if (fileHeader?.[1]) {
             currentFile = fileHeader[1];
             result[currentFile] = new (lib_default())();
             continue;
@@ -37834,7 +37834,7 @@ async function uncoveredLines(opts) {
 async function run(opts) {
     const file = opts.coverage;
     if (opts.coverageFormat === 'istanbul') {
-        external_node_assert_default()(/\.json$/.test(file), `input file '${file}' must be json coverage file`);
+        external_node_assert_default()(file.endsWith('.json'), `input file '${file}' must be json coverage file`);
     }
     return await uncoveredLines({
         base: opts.base,

eslint.config.js

@@ -4,40 +4,37 @@ import tseslint from 'typescript-eslint';
 export default tseslint.config(
   // Global ignores
   {
-    ignores: ["dist/*", 'eslint.config.js', 'jest.config.js']
+    ignores: ['dist/*']
   },
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
   eslint.configs.recommended,
   ...tseslint.configs.recommendedTypeChecked,
+  ...tseslint.configs.stylisticTypeChecked,
+  ...tseslint.configs.strictTypeChecked,
   {
     languageOptions: {
       parserOptions: {
         project: true,
-        tsconfigRootDir: import.meta.dirname,
-      },
-    },
+        tsconfigRootDir: import.meta.dirname
+      }
+    }
   },
   {
-    files: [
-      '{src,test,test-fixture}/**/*.{ts,tsx,cts,mts}',
-      'test.ts'
-    ],
+    files: ['{src,test,test-fixture}/**/*.{ts,tsx,cts,mts}'],
     rules: {
       '@typescript-eslint/no-unsafe-member-access': 'off',
       '@typescript-eslint/no-unsafe-argument': 'off',
       '@typescript-eslint/no-unsafe-assignment': 'off',
-      '@typescript-eslint/restrict-template-expressions': 'off',
+      '@typescript-eslint/restrict-template-expressions': 'off'
     }
   },
   {
-    files: [
-      'test-fixture/**/*.{ts,tsx,cts,mts}',
-      'test-fixture/jest.config.js',
-      'test.ts'
-    ],
+    files: ['test-fixture/**/*.{ts,tsx,cts,mts,js}'],
     rules: {
       'no-undef': 'off',
       'no-constant-condition': 'off',
       '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-unnecessary-condition': 'off'
     }
-  },
+  }
 );

jest.config.js

@@ -1,9 +1,6 @@
 export default {
-  extensionsToTreatAsEsm: [".ts", ".tsx", ".mts"],
+  extensionsToTreatAsEsm: ['.ts', '.tsx', '.mts'],
   transform: {
-    "^.+\\.m?[tj]sx?$": [
-      "ts-jest",
-      { useESM: true, isolatedModules: true, diagnostics: false },
-    ],
-  },
+    '^.+\\.m?[tj]sx?$': ['ts-jest', { useESM: true, isolatedModules: true, diagnostics: false }]
+  }
 };

package.json

@@ -9,8 +9,8 @@
     "lint": "eslint -c eslint.config.js .",
     "fixture:pack": "rm -f fixture.tgz && rm -rf test-fixture/node_modules && rm -rf test-fixture/coverage && tar czf fixture.tgz test-fixture",
     "fixture:setup": "rm -rf test-fixture && tar xzf fixture.tgz && npm -C test-fixture install && npm -C test-fixture test -c jest.config.js -- --coverage",
-    "format": "prettier --write src",
-    "format:check": "prettier --check src",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
     "clean": "rm -rf dist",
     "prebundle": "npm run clean",
     "bundle": "ncc build src/index.ts --source-map --license licenses.txt --target es2022",

src/covered.ts

@@ -8,12 +8,12 @@ import { default as cobertura } from '@cvrg-report/cobertura-json';
 
 export type CoverageFormat = 'lcov' | 'istanbul' | 'cobertura';
 
-type Opts = {
+interface Opts {
   base: string;
   coverage: string;
   head: string;
   coverageFormat: CoverageFormat;
-};
+}
 
 export type Lines = Range;
 export type Path = string;
@@ -34,20 +34,25 @@ async function runGit(command: string): Promise<string> {
       ok(collected.join(''));
     });
     run.on('error', (err: Error) => {
-      fail(`got error from rungit "${err.message}" ${err.stack}
+      fail(
+        new Error(
+          `got error from rungit "${err.message}" ${err.stack}
 
       stderr:
-      ${errors.join('')}`);
+      ${errors.join('')}`,
+          { cause: err }
+        )
+      );
     });
   });
 }
-async function changedLines(opts: Opts): Promise<Record<Path, Lines>> {
+async function changedLines(opts: Opts): Promise<Record<Path, Lines | undefined>> {
   const stdout = await runGit(`git diff -w -U0 ${opts.base}...${opts.head}`);
-  const result: Record<Path, Lines> = {};
+  const result: Record<Path, Lines | undefined> = {};
   let currentFile: Path | null = null;
   for (const line of stdout.split('\n')) {
     const fileHeader = line.match(/^\+\+\+ b\/(.*)/);
-    if (fileHeader && fileHeader[1]) {
+    if (fileHeader?.[1]) {
       currentFile = fileHeader[1];
       result[currentFile] = new Range();
       continue;
@@ -71,8 +76,8 @@ async function changedLines(opts: Opts): Promise<Record<Path, Lines>> {
 }
 
 export function uncovered(args: {
-  coverage: Record<Path, Hits>;
-  changes: Record<Path, Lines>;
+  coverage: Record<Path, Hits | undefined>;
+  changes: Record<Path, Lines | undefined>;
 }): Result {
   const result: Record<Path, Lines> = {};
   let coveredChanges = 0;
@@ -119,11 +124,11 @@ export function uncovered(args: {
   };
 }
 
-type Hits = Array<{
+type Hits = {
   hits: number;
   start: number;
   end: number;
-}>;
+}[];
 async function coveredLines(opts: Opts): Promise<Record<Path, Hits>> {
   switch (opts.coverageFormat) {
     case 'lcov':
@@ -190,7 +195,11 @@ async function coberturaCoveredLines(opts: Opts): Promise<Record<Path, Hits>> {
   );
 }
 
-export type Result = { covered: number; total: number; uncoveredLines: Record<Path, Range> };
+export interface Result {
+  covered: number;
+  total: number;
+  uncoveredLines: Record<Path, Range>;
+}
 async function uncoveredLines(opts: Opts): Promise<Result> {
   const coverage = await coveredLines(opts);
   const changes = await changedLines(opts);
@@ -200,7 +209,7 @@ async function uncoveredLines(opts: Opts): Promise<Result> {
 export async function run(opts: Opts): Promise<Result> {
   const file = opts.coverage;
   if (opts.coverageFormat === 'istanbul') {
-    assert(/\.json$/.test(file), `input file '${file}' must be json coverage file`);
+    assert(file.endsWith('.json'), `input file '${file}' must be json coverage file`);
   }
 
   return await uncoveredLines({

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "strict": true,
-    "declaration": true,
+    "declaration": false,
     "sourceMap": true,
     "module": "ESNext",
     "lib": ["es2023"],
@@ -11,6 +11,5 @@
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "outDir": "dist"
-  },
-  "include": ["src/**/*", "test/**/*", "test-fixture/**/*"],
+  }
 }