⬆️ nosgestesclimat model

Author: paulsouche

.github/workflows/pull-request.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@main
       - uses: actions/setup-node@main
         with:
-          node-version: 20
+          node-version: 22
       - name: 'Install packages'
         run: yarn
 

.github/workflows/spike-load-tests.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 22
 
       - name: Install dependencies with Yarn
         uses: borales/actions-yarn@v4

.nvmrc

@@ -1 +1 @@
-20
+22

package.json

@@ -4,7 +4,7 @@
   "description": "The server part of the website nosgestesclimat.fr",
   "main": "./dist/index.js",
   "engines": {
-    "node": "20"
+    "node": ">=22"
   },
   "scripts": {
     "prebuild": "yarn clean",
@@ -27,7 +27,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@incubateur-ademe/nosgestesclimat": "^3.3.4",
+    "@incubateur-ademe/nosgestesclimat": "^3.4.3",
     "@prisma/client": "^6.0.0",
     "@publicodes/tools": "^1.2.5",
     "@sentry/node": "^8.26.0",

src/helpers/simulation/computeResults.ts

@@ -1,13 +1,14 @@
 import type { DottedName } from '@incubateur-ademe/nosgestesclimat'
 import rules from '@incubateur-ademe/nosgestesclimat/public/co2-model.FR-lang.fr.json'
-import type { ParsedRules } from 'publicodes'
 import { carbonMetric, waterMetric } from '../../constants/ngc'
 import { engine } from '../../constants/publicode'
 import type { Metric, Situation } from '../../types/types'
 import { getSubcategories } from '../publicodes/getSubcategories'
 import { safeEvaluate } from '../publicodes/safeEvaluate'
 import { safeGetSituation } from '../situation/safeGetSituation'
 
+type ParsedRules = ReturnType<(typeof engine)['getParsedRules']>
+
 const everyRules = new Set<DottedName>(Object.keys(rules) as DottedName[])
 
 const categories = [
@@ -18,10 +19,7 @@ const categories = [
   'services sociétaux',
 ] as const
 
-const computeMetricResults = (
-  metric: Metric,
-  parsedRules: ParsedRules<DottedName>
-) => ({
+const computeMetricResults = (metric: Metric, parsedRules: ParsedRules) => ({
   bilan: Number(
     safeEvaluate({ engine, expr: 'bilan', metric })?.nodeValue ?? 0
   ),

yarn.lock

@@ -972,10 +972,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
-"@incubateur-ademe/nosgestesclimat@^3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@incubateur-ademe/nosgestesclimat/-/nosgestesclimat-3.3.4.tgz#16b93cb534407ef510d48120791fd0a2cc2d9ae5"
-  integrity sha512-VdQuG+TP9D0cZVipPHgW/J7boa36rFad62fzgSdMBz5895O9kWlNtmlEGHcQOv2joIDxUZxWWDSlJp73/m+JfQ==
+"@incubateur-ademe/nosgestesclimat@^3.4.3":
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/@incubateur-ademe/nosgestesclimat/-/nosgestesclimat-3.4.3.tgz#5046ea33495b0c916873c5e5a21bb3f85cde9ca1"
+  integrity sha512-G7PNzDKqGFFR2//trr5P1Zw1UPue3rOJSkBLNdcJTIpjQIMt7fsntny8fleqv/d3cznBeJ3hQjM4qVZxZXU8lA==
 
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"