chore(build): met à jour typescript en version 5 (#557)

MTES-MCT · May 11, 2023 · 0fdb11b · 0fdb11b
1 parent 7137e8b
commit 0fdb11b
Show file tree

Hide file tree

Showing 7 changed files with 997 additions and 1,078 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -97,7 +97,6 @@
     "stream-json": "^1.7.5",
     "ts-node": "^10.9.1",
     "tus-node-server": "^0.9.0",
-    "typescript": "^4.9.5",
     "xlsx": "^0.18.5",
     "xstate": "^4.37.0"
   },
@@ -120,8 +119,8 @@
     "eslint-plugin-sql": "^2.3.2",
     "eslint-plugin-tsdoc": "^0.2.1",
     "pg-escape": "^0.2.0",
-    "prettier-eslint": "^15.0.1",
     "supertest": "^6.3.3",
+    "typescript": "^5.0.4",
     "vitest": "^0.29.2"
   },
   "prettier": {

diff --git a/packages/api/src/business/rules/titre-activites-build.ts b/packages/api/src/business/rules/titre-activites-build.ts
@@ -47,7 +47,7 @@ export const titreActiviteSectionsBuild = (
 
     if (!isSubstancesFiscales(s) && s.elements) {
       elements = titreActiviteSectionElementsFormat(s.elements, periodeId, date)
-    } else if (['gra', 'grx'].includes(activiteTypeId) && s.id === 'substancesFiscales') {
+    } else if (['gra', 'grx'].includes(activiteTypeId) && isSubstancesFiscales(s)) {
       const substances = titreEtapePropFind('substances', toCaminoDate(date), titreDemarches, titreTypeId) as SubstanceLegaleId[] | null
 
       if (substances?.length) {

diff --git a/packages/api/src/business/validations/utils/contenu-numbers-check.ts b/packages/api/src/business/validations/utils/contenu-numbers-check.ts
@@ -7,8 +7,12 @@ export const contenuNumbersCheck = (sections: DeepReadonly<Section[]>, contenu:
     if (!section.elements) return errors
 
     return section.elements.reduce((errors, element) => {
-      if (element.type === 'number' && contenu[section.id] && contenu[section.id][element.id] && contenu[section.id][element.id]! < 0) {
-        errors.push(`le champ "${element.id}" ne peut pas avoir une valeur négative`)
+      if (element.type === 'number' && contenu[section.id] && contenu[section.id][element.id]) {
+        const value = contenu[section.id][element.id]
+
+        if (typeof value === 'number' && value < 0) {
+          errors.push(`le champ "${element.id}" ne peut pas avoir une valeur négative`)
+        }
       }
 
       return errors

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -15,7 +15,7 @@
     "@typescript-eslint/parser": "^5.55.0",
     "@vitest/coverage-c8": "^0.29.2",
     "prettier": "^2.8.4",
-    "typescript": "^4.9.5",
+    "typescript": "^5.0.4",
     "vitest": "^0.29.2"
   },
   "prettier": {

diff --git a/packages/common/src/static/activitesTypes.ts b/packages/common/src/static/activitesTypes.ts
@@ -29,9 +29,10 @@ export type ActiviteType<T = ActivitesTypesId> = {
   sections: DeepReadonly<ActiviteSection[]>
 }
 
-export const isSubstancesFiscales = (section: DeepReadonly<ActiviteSection>): section is { id: 'substancesFiscales'; nom: string } => section.id === 'substancesFiscales'
+type SubstancesFiscalesSection = { id: 'substancesFiscales'; nom: string }
+export const isSubstancesFiscales = (section: DeepReadonly<ActiviteSection>): section is DeepReadonly<SubstancesFiscalesSection> => section.id === 'substancesFiscales'
 
-export type ActiviteSection = (Omit<Section, 'elements'> & { elements: ActiviteSectionElement[] }) | { id: 'substancesFiscales'; nom: string }
+export type ActiviteSection = (Omit<Section, 'elements'> & { elements: ActiviteSectionElement[] }) | SubstancesFiscalesSection
 export type ActiviteSectionElement = SectionsElement & { periodeId?: 1 | 2 | 3 | 4 }
 
 export const ActivitesTypes: {

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -74,7 +74,7 @@
     "prettier": "^2.8.4",
     "rollup-plugin-visualizer": "^5.9.0",
     "storybook": "^7.0.8",
-    "typescript": "^4.9.5",
+    "typescript": "^5.0.4",
     "typescript-plugin-css-modules": "^4.2.3",
     "vite": "^4.1.4",
     "vitest": "^0.29.2",