lint api ok

MTES-MCT · Sep 12, 2024 · da66d4d · da66d4d
1 parent ee2f311
commit da66d4d
Show file tree

Hide file tree

Showing 38 changed files with 146 additions and 172 deletions.
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     ],
     "packages/ui/**/*.css": "prettier --write",
     "packages/api/**/*.{js,ts}": [
-      "eslint --cache --fix --max-warnings=0",
+      "packages/api/node_modules/.bin/eslint --config packages/api/eslint.config.mjs --cache --fix --max-warnings=0",
       "prettier --write"
     ],
     "packages/api/**/*.{graphql,md}": "prettier --write",

diff --git a/packages/api/.eslintignore b/packages/api/.eslintignore
diff --git a/packages/api/eslint.config.mjs b/packages/api/eslint.config.mjs
@@ -0,0 +1,128 @@
+import typescriptEslint from '@typescript-eslint/eslint-plugin'
+import sql from 'eslint-plugin-sql'
+import globals from 'globals'
+import tsParser from '@typescript-eslint/parser'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import js from '@eslint/js'
+import { FlatCompat } from '@eslint/eslintrc'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all,
+})
+
+export default [
+  {
+    ignores: ['api-cache', 'backups', 'coverage', 'dist', 'docs', 'files', 'node_modules', 'sources', '**/*.queries.types.ts'],
+  },
+  ...compat.extends('eslint:recommended', 'plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended', 'standard', 'prettier'),
+  {
+    plugins: {
+      '@typescript-eslint': typescriptEslint,
+      sql,
+    },
+
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        GeoJSON: 'readonly',
+      },
+
+      parser: tsParser,
+      ecmaVersion: 5,
+      sourceType: 'commonjs',
+
+      parserOptions: {
+        project: true,
+      },
+    },
+
+    rules: {
+      camelcase: 0,
+
+      'sql/format': [
+        0,
+        {
+          ignoreExpressions: false,
+          ignoreInline: true,
+          ignoreTagless: true,
+        },
+      ],
+
+      'sql/no-unsafe-query': [
+        2,
+        {
+          allowLiteral: false,
+        },
+      ],
+
+      'newline-before-return': 1,
+      'no-use-before-define': 0,
+      'no-redeclare': 0,
+      'no-return-await': 'error',
+      'default-param-last': 0,
+      'no-unused-vars': 0,
+
+      'no-restricted-syntax': [
+        'error',
+        {
+          message: 'leftJoinRelation is deprecated. Use leftJoinRelated instead.',
+          selector: "Identifier[name='leftJoinRelation']",
+        },
+        {
+          message: 'sort is deprecated. Use toSorted instead.',
+          selector: "Identifier[name='sort']",
+        },
+        {
+          message: "no 'run' call from PgTyped allowed. Use dbQueryAndValidate.",
+          selector: "CallExpression[callee.property.name='run'][arguments.length=2]",
+        },
+      ],
+
+      'no-console': [
+        'error',
+        {
+          allow: ['debug', 'info', 'warn', 'error', 'time', 'timeEnd'],
+        },
+      ],
+
+      '@typescript-eslint/explicit-function-return-type': 0,
+      '@typescript-eslint/explicit-module-boundary-types': 'warn',
+      '@typescript-eslint/no-empty-interface': 0,
+      '@typescript-eslint/no-explicit-any': 0,
+      '@typescript-eslint/no-non-null-assertion': 0,
+      '@typescript-eslint/no-var-requires': 0,
+      '@typescript-eslint/ban-ts-comment': 0,
+
+      '@typescript-eslint/no-unused-vars': 0, // on utilise typescript noUnusedLocals et noUnusedParameters à la place
+
+      '@typescript-eslint/strict-boolean-expressions': 'error',
+      '@typescript-eslint/no-empty-object-type': 0,
+    },
+  },
+  {
+    files: ['src/database/models/*.ts'],
+
+    rules: {
+      '@typescript-eslint/no-unsafe-declaration-merging': 'off',
+    },
+  },
+  {
+    files: ['src/**/*.ts'],
+    ignores: ['src/**/*.queries.ts'],
+
+    rules: {
+      'no-restricted-syntax': [
+        'error',
+        {
+          message: 'dbQueryAndValidate is to be used only in .queries.ts files',
+          selector: "CallExpression[callee.name='dbQueryAndValidate']",
+        },
+      ],
+    },
+  },
+]
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -124,122 +124,5 @@
     "arrowParens": "avoid",
     "trailingComma": "es5",
     "printWidth": 200
-  },
-  "eslintConfig": {
-    "globals": {
-      "GeoJSON": "readonly"
-    },
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-      "project": true
-    },
-    "overrides": [
-      {
-        "files": [
-          "src/database/models/*.ts"
-        ],
-        "rules": {
-          "@typescript-eslint/no-unsafe-declaration-merging": "off"
-        }
-      },
-      {
-        "files": [
-          "src/**/*.ts"
-        ],
-        "excludedFiles": [
-          "src/**/*.queries.ts"
-        ],
-        "rules": {
-          "no-restricted-syntax": [
-            "error",
-            {
-              "message": "dbQueryAndValidate is to be used only in .queries.ts files",
-              "selector": "CallExpression[callee.name='dbQueryAndValidate']"
-            }
-          ]
-        }
-      }
-    ],
-    "extends": [
-      "eslint:recommended",
-      "plugin:@typescript-eslint/eslint-recommended",
-      "plugin:@typescript-eslint/recommended",
-      "standard",
-      "prettier"
-    ],
-    "env": {
-      "node": true
-    },
-    "plugins": [
-      "@typescript-eslint",
-      "sql"
-    ],
-    "rules": {
-      "camelcase": 0,
-      "sql/format": [
-        0,
-        {
-          "ignoreExpressions": false,
-          "ignoreInline": true,
-          "ignoreTagless": true
-        }
-      ],
-      "sql/no-unsafe-query": [
-        2,
-        {
-          "allowLiteral": false
-        }
-      ],
-      "newline-before-return": 1,
-      "no-use-before-define": 0,
-      "no-redeclare": 0,
-      "no-return-await": "error",
-      "default-param-last": 0,
-      "no-unused-vars": 0,
-      "no-restricted-syntax": [
-        "error",
-        {
-          "message": "leftJoinRelation is deprecated. Use leftJoinRelated instead.",
-          "selector": "Identifier[name='leftJoinRelation']"
-        },
-        {
-          "message": "sort is deprecated. Use toSorted instead.",
-          "selector": "Identifier[name='sort']"
-        },
-        {
-          "message": "no 'run' call from PgTyped allowed. Use dbQueryAndValidate.",
-          "selector": "CallExpression[callee.property.name='run'][arguments.length=2]"
-        }
-      ],
-      "no-console": [
-        "error",
-        {
-          "allow": [
-            "debug",
-            "info",
-            "warn",
-            "error",
-            "time",
-            "timeEnd"
-          ]
-        }
-      ],
-      "@typescript-eslint/explicit-function-return-type": 0,
-      "@typescript-eslint/explicit-module-boundary-types": "warn",
-      "@typescript-eslint/no-empty-interface": 0,
-      "@typescript-eslint/no-explicit-any": 0,
-      "@typescript-eslint/no-non-null-assertion": 0,
-      "@typescript-eslint/no-var-requires": 0,
-      "@typescript-eslint/ban-ts-comment": 0,
-      "@typescript-eslint/no-unused-vars": [
-        "error",
-        {
-          "argsIgnorePattern": "^_",
-          "varsIgnorePattern": "^_"
-        }
-      ],
-      "@typescript-eslint/strict-boolean-expressions": "error",
-      "@typescript-eslint/no-empty-object-type": 0
-    }
   }
 }
diff --git a/packages/api/src/api/graphql/resolvers/_titre-activite.ts b/packages/api/src/api/graphql/resolvers/_titre-activite.ts
@@ -30,7 +30,6 @@ export const productionCheck = (activiteTypeId: string, contenu: IContenu | null
     // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
     return !!contenu?.renseignements?.orExtrait
   } else if (activiteTypeId === 'wrp') {
-    // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
     const production = contenu?.renseignementsProduction
 
     // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions

diff --git a/packages/api/src/api/rest/titre-demande.ts b/packages/api/src/api/rest/titre-demande.ts
@@ -40,7 +40,6 @@ export const titreDemandeCreer: RestNewPostCall<'/rest/titres'> = (
   pool: Pool,
   user: DeepReadonly<UserNotNull>,
   titreDemande: DeepReadonly<TitreDemande>,
-  // eslint-disable-next-line @typescript-eslint/ban-types
   _params: {}
 ): Effect.Effect<TitreDemandeOutput, CaminoApiError<TitreDemandeCreerErrors>> => {
   return Effect.Do.pipe(

diff --git a/packages/api/src/business/matrices.test.ts b/packages/api/src/business/matrices.test.ts
@@ -2,7 +2,7 @@ import { getRawLines, rawMatriceValidator } from './matrices'
 import { describe, expect, test } from 'vitest'
 import { BodyMatrice } from '../tools/matrices/tests-creation'
 import { z } from 'zod'
-const matricesProd = require('./matrices.cas.json')
+const matricesProd = require('./matrices.cas.json') // eslint-disable-line
 
 describe('matrices', () => {
   const rawMatricesValidator = z.array(rawMatriceValidator)

diff --git a/packages/api/src/business/processes/titres-etapes-heritage-contenu-update.ts b/packages/api/src/business/processes/titres-etapes-heritage-contenu-update.ts
@@ -1,4 +1,3 @@
-/* eslint-disable sql/no-unsafe-query */
 import { titreEtapeUpdate } from '../../database/queries/titres-etapes'
 import { titreEtapeHeritageContenuFind } from '../utils/titre-etape-heritage-contenu-find'
 import { titreEtapesSortAscByOrdre, titreEtapesSortDescByOrdre } from '../utils/titre-etapes-sort'

diff --git a/packages/api/src/business/rules-demarches/arm/oct.machine.test.ts b/packages/api/src/business/rules-demarches/arm/oct.machine.test.ts
@@ -4,7 +4,7 @@ import { EtapeTypeEtapeStatutValidPair, EtapesTypesEtapesStatuts as ETES } from
 import { Etape } from '../machine-common'
 import { toCaminoDate } from 'camino-common/src/date'
 import { describe, expect, test } from 'vitest'
-const etapesProd = require('./2019-10-31-oct.cas.json')
+const etapesProd = require('./2019-10-31-oct.cas.json') // eslint-disable-line
 
 describe('vérifie l’arbre d’octroi d’ARM', () => {
   const armOctMachine = new ArmOctMachine()

diff --git a/packages/api/src/business/rules-demarches/arm/oct.machine.ts b/packages/api/src/business/rules-demarches/arm/oct.machine.ts
@@ -261,7 +261,7 @@ export class ArmOctMachine extends CaminoMachine<OctARMContext, XStateEvent> {
       }
       default:
         // related to https://github.com/microsoft/TypeScript/issues/46497  https://github.com/microsoft/TypeScript/issues/40803 :(
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
         // @ts-ignore
         return [{ type: event }]
     }

diff --git a/packages/api/src/business/rules-demarches/arm/ren-pro.machine.test.ts b/packages/api/src/business/rules-demarches/arm/ren-pro.machine.test.ts
@@ -3,7 +3,7 @@ import { ArmRenProMachine } from './ren-pro.machine'
 import { interpretMachine, setDateAndOrderAndInterpretMachine } from '../machine-test-helper'
 import { DemarchesStatutsIds } from 'camino-common/src/static/demarchesStatuts'
 import { EtapesTypesEtapesStatuts as ETES } from 'camino-common/src/static/etapesTypesEtapesStatuts'
-const etapesProd = require('./2019-10-31-ren-pro.cas.json')
+const etapesProd = require('./2019-10-31-ren-pro.cas.json') // eslint-disable-line
 
 describe('vérifie l’arbre de renonciation et de prolongation d’ARM', () => {
   const armRenProMachine = new ArmRenProMachine()

diff --git a/packages/api/src/business/rules-demarches/axm/oct.machine.test.ts b/packages/api/src/business/rules-demarches/axm/oct.machine.test.ts
@@ -4,7 +4,7 @@ import { EtapesTypesEtapesStatuts as ETES } from 'camino-common/src/static/etape
 import { ADMINISTRATION_IDS } from 'camino-common/src/static/administrations'
 import { toCaminoDate } from 'camino-common/src/date'
 import { describe, expect, test } from 'vitest'
-const etapesProd = require('./2020-09-30-oct.cas.json')
+const etapesProd = require('./2020-09-30-oct.cas.json') // eslint-disable-line
 
 describe('vérifie l’arbre d’octroi d’AXM', () => {
   const axmOctMachine = new AxmOctMachine()

diff --git a/packages/api/src/business/rules-demarches/axm/oct.machine.ts b/packages/api/src/business/rules-demarches/axm/oct.machine.ts
@@ -163,7 +163,7 @@ export class AxmOctMachine extends CaminoMachine<AxmContext, AXMOctXStateEvent>
         return [{ type: event, date }]
       default:
         // related to https://github.com/microsoft/TypeScript/issues/46497  https://github.com/microsoft/TypeScript/issues/40803 :(
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
         // @ts-ignore
         return [{ type: event }]
     }

diff --git a/packages/api/src/business/rules-demarches/axm/pro.machine.test.ts b/packages/api/src/business/rules-demarches/axm/pro.machine.test.ts
@@ -4,7 +4,7 @@ import { describe, expect, test } from 'vitest'
 
 import { EtapesTypesEtapesStatuts as ETES } from 'camino-common/src/static/etapesTypesEtapesStatuts'
 
-const etapesProd = require('./2000-01-01-pro.cas.json')
+const etapesProd = require('./2000-01-01-pro.cas.json') // eslint-disable-line
 
 describe('vérifie l’arbre de prolongation d’AXM', () => {
   const axmProMachine = new AxmProMachine()

diff --git a/packages/api/src/business/rules-demarches/axm/pro.machine.ts b/packages/api/src/business/rules-demarches/axm/pro.machine.ts
@@ -134,7 +134,7 @@ export class AxmProMachine extends CaminoMachine<AxmProContext, AXMProXStateEven
         return [{ type: event, date }]
       default:
         // related to https://github.com/microsoft/TypeScript/issues/46497  https://github.com/microsoft/TypeScript/issues/40803 :(
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
         // @ts-ignore
         return [{ type: event }]
     }

diff --git a/packages/api/src/business/rules-demarches/prm/oct.machine.test.ts b/packages/api/src/business/rules-demarches/prm/oct.machine.test.ts
@@ -3,7 +3,7 @@ import { PrmOctMachine } from './oct.machine'
 import { EtapesTypesEtapesStatuts as ETES } from 'camino-common/src/static/etapesTypesEtapesStatuts'
 import { describe, expect, test } from 'vitest'
 import { PAYS_IDS } from 'camino-common/src/static/pays'
-const etapesProd = require('./2019-10-31-oct.cas.json')
+const etapesProd = require('./2019-10-31-oct.cas.json') // eslint-disable-line
 
 describe('vérifie l’arbre d’octroi de PRM', () => {
   const prmOctMachine = new PrmOctMachine()

diff --git a/packages/api/src/business/rules-demarches/prm/oct.machine.ts b/packages/api/src/business/rules-demarches/prm/oct.machine.ts
@@ -158,7 +158,7 @@ export class PrmOctMachine extends CaminoMachine<PrmOctContext, XStateEvent> {
         ]
       default:
         // related to https://github.com/microsoft/TypeScript/issues/46497  https://github.com/microsoft/TypeScript/issues/40803 :(
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
         // @ts-ignore
         return [{ type: event }]
     }

diff --git a/packages/api/src/business/rules-demarches/procedure-simplifiee/ps.machine.test.ts b/packages/api/src/business/rules-demarches/procedure-simplifiee/ps.machine.test.ts
@@ -5,7 +5,7 @@ import { describe, expect, test } from 'vitest'
 import { DemarchesStatutsIds } from 'camino-common/src/static/demarchesStatuts'
 import { ProcedureSimplifieeMachine } from './ps.machine'
 
-const etapesProdProceduresHistoriques = require('../pxg-arg-cxr-inr-prr-pxr-cxf-prf-pxf/1717-01-09-amo-ces-con-dec-dep-exp-exs-fus-mut-oct-pr1-pr2-pre-pro-prr-ren-res-ret-vct-vut.cas.json')
+const etapesProdProceduresHistoriques = require('../pxg-arg-cxr-inr-prr-pxr-cxf-prf-pxf/1717-01-09-amo-ces-con-dec-dep-exp-exs-fus-mut-oct-pr1-pr2-pre-pro-prr-ren-res-ret-vct-vut.cas.json') // eslint-disable-line
 const psMachine = new ProcedureSimplifieeMachine()
 
 describe('vérifie l’arbre des procédures historiques et simplifiées', () => {