@tricoteuses/assemblee 2.5.2 → 2.5.3

package/LICENSE.md

@@ -1,28 +1,28 @@
-# Tricoteuses-Assemblee
-
-## _Retrieve, clean up & handle French Assemblée nationale's open data_
-
-By:
-* Henry Boisgibault <mailto:h.boisgibault@gmail.com>
-* Loïc Dachary <mailto:loic@dachary.org>
-* Emmanuel Raviart <mailto:emmanuel@raviart.com>
-
-Copyright:
-* © 2019, 2020, 2021 Loïc Dachary & Emmanuel Raviart
-* © 2022 Emmanuel Raviart
-* © 2023 Henry Boisgibault & Emmanuel Raviart
-
-https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee
-
-> Tricoteuses-Assemblee is free software; you can redistribute it and/or modify
-> it under the terms of the GNU Affero General Public License as
-> published by the Free Software Foundation, either version 3 of the
-> License, or (at your option) any later version.
->
-> Tricoteuses-Assemblee is distributed in the hope that it will be useful,
-> but WITHOUT ANY WARRANTY; without even the implied warranty of
-> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-> GNU Affero General Public License for more details.
->
-> You should have received a copy of the GNU Affero General Public License
-> along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Tricoteuses-Assemblee
+
+## _Retrieve, clean up & handle French Assemblée nationale's open data_
+
+By:
+* Henry Boisgibault <mailto:h.boisgibault@gmail.com>
+* Loïc Dachary <mailto:loic@dachary.org>
+* Emmanuel Raviart <mailto:emmanuel@raviart.com>
+
+Copyright:
+* © 2019, 2020, 2021 Loïc Dachary & Emmanuel Raviart
+* © 2022 Emmanuel Raviart
+* © 2023 Henry Boisgibault & Emmanuel Raviart
+
+https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee
+
+> Tricoteuses-Assemblee is free software; you can redistribute it and/or modify
+> it under the terms of the GNU Affero General Public License as
+> published by the Free Software Foundation, either version 3 of the
+> License, or (at your option) any later version.
+>
+> Tricoteuses-Assemblee is distributed in the hope that it will be useful,
+> but WITHOUT ANY WARRANTY; without even the implied warranty of
+> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+> GNU Affero General Public License for more details.
+>
+> You should have received a copy of the GNU Affero General Public License
+> along with this program. If not, see <http://www.gnu.org/licenses/>.

package/README.md

@@ -1,152 +1,152 @@
-# Tricoteuses-Assemblee
-
-## _Retrieve, clean up & handle French Assemblée nationale's open data_
-
-_Tricoteuses Légifrance_ is free and open source software.
-
-- [software repository](https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee)
-- [GNU Affero General Public License version 3 or greater](https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee/-/tree/master/LICENSE.md)
-
-## documentation
-
-- [Architecture](doc/architecture.md)
-- [TypeScript API](doc/api/)
-  - Main interfaces:
-    - [Acteur : personne physique élue ou nommée dans des organes](doc/api/README/interfaces/Acteur.md)
-    - [Amendement](doc/api/README/interfaces/Amendement.md)
-    - [CompteRendu : compte-rendu d'un débat parlementaire](doc/api/README/interfaces/CompteRendu.md)
-    - [Document : texte d'un projet de loi, d'une proposition de loi, d'un rapport, etc](doc/api/README/interfaces/Document.md)
-    - [DossierParlementaire : Dossier de suivi d'un projet ou d'une proposition de loi, d'une résolution, etc](doc/api/README/interfaces/DossierParlementaire.md)
-    - [Organe : commission, groupe politique, groupe d'étude, groupe d'amitié, etc](doc/api/README/interfaces/Organe.md)
-    - [Question : question au Gouvernement](doc/api/README/interfaces/Question.md)
-    - [Reunion : séance publique, réunion de commission, de groupe d'étude, etc](doc/api/README/interfaces/Reunion.md)
-    - [Scrutin : vote de chaque député lors d'un scrutin public](doc/api/README/interfaces/Scrutin.md)
-- [JSON Schemas](src/schemas)
-
-## Requirements
-
-- Node >= 18
-
-## Installation
-
-```bash
-git clone https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee
-cd tricoteuses-assemblee/
-```
-
-```bash
-npm install
-```
-
-## Download and clean data
-
-### Basic usage
-
-Create a directory to store the data, then run the following command to download, reorganize and clean the data.
-```bash
-mkdir ../assemblee-data/
-npm run data:download ../assemblee-data
-```
-
-### Available Commands
-
-- `npm run data:download <dir>`: Download, reorganize, and clean data
-- `npm run data:retrieve_open_data <dir>`: Download raw data files.
-- `npm run data:reorganize_data <dir>`: Reorganize raw files by entity.
-- `npm run data:clean_data <dir>`: Clean and validate reorganized files.
-- `npm run data:retrieve_deputes_photos <dir>`: Retrieval of députés' pictures from Assemblée nationale's website
-- `npm run data:retrieve_senateurs_photos <dir>`: Retrieval of sénateurs' pictures from Assemblée nationale's website
-- `npm run data:retrieve_documents <dir>`: Retrieval of legislative documents from Assemblée nationale's website
-- `npm run data:retrieve_pending_amendements <dir>`: Retrieval of pending amendments from Assemblée nationale's website (waiting to be processed by Assemblée services)
-
-
-_Notes_:
-
-- Reorganized files (generated by the _data:reorganize_data_ command) are also available in [Tricoteuses / Data / Données brutes de l'Assemblée](https://git.en-root.org/tricoteuses/data/assemblee-brut). They are updated on a regular basis.
-- Split & cleaned files (generated by the _data:clean_data_ command) are also available in [Tricoteuses / Data / Données nettoyées de l'Assemblée](https://git.en-root.org/tricoteuses/data/assemblee-nettoye) with the `_nettoye` suffix. They are updated on a regular basis.
-
-### Filtering Options
-
-Downloading and cleaning all the data is long and takes up a lot of disk space. It is possible to choose the type of data that you want to retrieve to reduce the load.
-
-Examples:
-
-```bash
-# Only download amendments
-npm run data:download ../assemblee-data -- -k Amendements
-
-# Only process 16th and 17th legislatures
-npm run data:download ../assemblee-data -- -l 16 -l 17
-```
-
-### Common Options
-
-- `--categories` or `-k <name>`: Filter by dataset categories (Available options : `ActeursEtOrganes`, `Agendas`, `Amendements`, `DossiersLegislatifs`, `Photos`, `Scrutins`, `Questions`, `ComptesRendusSeances`)
-
-- `--legislature` or `-l <number>`: Specify one or more legislatures to process (e.g., `-l 15 -l 16`)
-- `--dataDir <path>` (Mandatory): Path to the working directory where all data is stored (required)
-- `--silent` or `-s`: Disable logging
-- `--verbose` or `-v`: Enable verbose logging
-- `--fetch` or `-f`: Force re-download of data even if already present
-- `--commit` or `-c`: Automatically commit cleaned data
-- `--pull` or `-p`: Pull repositories before starting
-- `--clone` or `-C <url>`: Clone Git repositories from a remote group or organization
-- `--remote` or `-r <name>`: Push commits to specified Git remote(s)
-
-If you use such options, use them in all subsequent commands too (_data:regorganize_data_ and _data:clean_data_).
-
-### Options for Cleaning Data
-
-- `--dataset` or `-d <name>`: Clean a specific dataset only
-- `--no-reset-after-commit`: Skip Git reset after committing (useful to preserve local changes)
-- `--no-validate` or `-V`: Skip schema validation during cleaning
-- `--fetchDocuments` : Specify to retrieve documents
-- `--parseDocuments`: Specify to parse documents into cleaned json
-- `--fetchVideos`: Retrieve videos
-
-### Options for Retrieving Documents
-
-- `--full` or `-f`: Retrieve all documents, even those already downloaded
-- `--document-type` or `-T <type>`: Restrict to specific document types (e.g., `PION`)
-
-
-## Download using Docker
-
-A Docker image that downloads and cleans the data all at once is available. Build it locally or run it from the container registry.
-Use the environment variables `LEGISLATURE` and `CATEGORIES` if needed.
-
-```bash
-docker run --pull always --name tricoteuses-assemblee -v ../assemblee-data:/app/assemblee-data -e LEGISLATURE=17 -d git.tricoteuses.fr/logiciels/tricoteuses-assemblee:latest
-```
-
-## Using the data
-
-Once the data is downloaded and cleaned, you can use loaders to retrieve it.
-To use loaders in your project, you can install the _@tricoteuses/assemblee_ package, and import the iterator functions that you need.
-
-```bash
-npm install @tricoteuses/assemblee
-```
-
-```js
-import {
-  iterLoadAssembleeActeurs,
-  iterLoadAssembleeOrganes,
-  iterLoadAssembleeReunions,
-  iterLoadAssembleeScrutins,
-  iterLoadAssembleeDocuments,
-  iterLoadAssembleeDossiersParlementaires,
-  iterLoadAssembleeAmendements,
-  iterLoadAssembleeQuestions,
-  iterLoadAssembleeComptesRendus,
-} from "@tricoteuses/assemblee/loaders";
-
-// Pass data directory and legislature as arguments
-for (const { acteur } of iterLoadAssembleeActeurs("../assemblee-data", 17)) {
-  console.log(acteur.uid)
-}
-```
-
-## Generating schemas and documentation (for contributors only)
-
-View instructions [here](https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee/-/blob/master/src/types)
+# Tricoteuses-Assemblee
+
+## _Retrieve, clean up & handle French Assemblée nationale's open data_
+
+_Tricoteuses Légifrance_ is free and open source software.
+
+- [software repository](https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee)
+- [GNU Affero General Public License version 3 or greater](https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee/-/tree/master/LICENSE.md)
+
+## documentation
+
+- [Architecture](doc/architecture.md)
+- [TypeScript API](doc/api/)
+  - Main interfaces:
+    - [Acteur : personne physique élue ou nommée dans des organes](doc/api/README/interfaces/Acteur.md)
+    - [Amendement](doc/api/README/interfaces/Amendement.md)
+    - [CompteRendu : compte-rendu d'un débat parlementaire](doc/api/README/interfaces/CompteRendu.md)
+    - [Document : texte d'un projet de loi, d'une proposition de loi, d'un rapport, etc](doc/api/README/interfaces/Document.md)
+    - [DossierParlementaire : Dossier de suivi d'un projet ou d'une proposition de loi, d'une résolution, etc](doc/api/README/interfaces/DossierParlementaire.md)
+    - [Organe : commission, groupe politique, groupe d'étude, groupe d'amitié, etc](doc/api/README/interfaces/Organe.md)
+    - [Question : question au Gouvernement](doc/api/README/interfaces/Question.md)
+    - [Reunion : séance publique, réunion de commission, de groupe d'étude, etc](doc/api/README/interfaces/Reunion.md)
+    - [Scrutin : vote de chaque député lors d'un scrutin public](doc/api/README/interfaces/Scrutin.md)
+- [JSON Schemas](src/schemas)
+
+## Requirements
+
+- Node >= 18
+
+## Installation
+
+```bash
+git clone https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee
+cd tricoteuses-assemblee/
+```
+
+```bash
+npm install
+```
+
+## Download and clean data
+
+### Basic usage
+
+Create a directory to store the data, then run the following command to download, reorganize and clean the data.
+```bash
+mkdir ../assemblee-data/
+npm run data:download ../assemblee-data
+```
+
+### Available Commands
+
+- `npm run data:download <dir>`: Download, reorganize, and clean data
+- `npm run data:retrieve_open_data <dir>`: Download raw data files.
+- `npm run data:reorganize_data <dir>`: Reorganize raw files by entity.
+- `npm run data:clean_data <dir>`: Clean and validate reorganized files.
+- `npm run data:retrieve_deputes_photos <dir>`: Retrieval of députés' pictures from Assemblée nationale's website
+- `npm run data:retrieve_senateurs_photos <dir>`: Retrieval of sénateurs' pictures from Assemblée nationale's website
+- `npm run data:retrieve_documents <dir>`: Retrieval of legislative documents from Assemblée nationale's website
+- `npm run data:retrieve_pending_amendements <dir>`: Retrieval of pending amendments from Assemblée nationale's website (waiting to be processed by Assemblée services)
+
+
+_Notes_:
+
+- Reorganized files (generated by the _data:reorganize_data_ command) are also available in [Tricoteuses / Data / Données brutes de l'Assemblée](https://git.en-root.org/tricoteuses/data/assemblee-brut). They are updated on a regular basis.
+- Split & cleaned files (generated by the _data:clean_data_ command) are also available in [Tricoteuses / Data / Données nettoyées de l'Assemblée](https://git.en-root.org/tricoteuses/data/assemblee-nettoye) with the `_nettoye` suffix. They are updated on a regular basis.
+
+### Filtering Options
+
+Downloading and cleaning all the data is long and takes up a lot of disk space. It is possible to choose the type of data that you want to retrieve to reduce the load.
+
+Examples:
+
+```bash
+# Only download amendments
+npm run data:download ../assemblee-data -- -k Amendements
+
+# Only process 16th and 17th legislatures
+npm run data:download ../assemblee-data -- -l 16 -l 17
+```
+
+### Common Options
+
+- `--categories` or `-k <name>`: Filter by dataset categories (Available options : `ActeursEtOrganes`, `Agendas`, `Amendements`, `DossiersLegislatifs`, `Photos`, `Scrutins`, `Questions`, `ComptesRendusSeances`)
+
+- `--legislature` or `-l <number>`: Specify one or more legislatures to process (e.g., `-l 15 -l 16`)
+- `--dataDir <path>` (Mandatory): Path to the working directory where all data is stored (required)
+- `--silent` or `-s`: Disable logging
+- `--verbose` or `-v`: Enable verbose logging
+- `--fetch` or `-f`: Force re-download of data even if already present
+- `--commit` or `-c`: Automatically commit cleaned data
+- `--pull` or `-p`: Pull repositories before starting
+- `--clone` or `-C <url>`: Clone Git repositories from a remote group or organization
+- `--remote` or `-r <name>`: Push commits to specified Git remote(s)
+
+If you use such options, use them in all subsequent commands too (_data:regorganize_data_ and _data:clean_data_).
+
+### Options for Cleaning Data
+
+- `--dataset` or `-d <name>`: Clean a specific dataset only
+- `--no-reset-after-commit`: Skip Git reset after committing (useful to preserve local changes)
+- `--no-validate` or `-V`: Skip schema validation during cleaning
+- `--fetchDocuments` : Specify to retrieve documents
+- `--parseDocuments`: Specify to parse documents into cleaned json
+- `--fetchVideos`: Retrieve videos
+
+### Options for Retrieving Documents
+
+- `--full` or `-f`: Retrieve all documents, even those already downloaded
+- `--document-type` or `-T <type>`: Restrict to specific document types (e.g., `PION`)
+
+
+## Download using Docker
+
+A Docker image that downloads and cleans the data all at once is available. Build it locally or run it from the container registry.
+Use the environment variables `LEGISLATURE` and `CATEGORIES` if needed.
+
+```bash
+docker run --pull always --name tricoteuses-assemblee -v ../assemblee-data:/app/assemblee-data -e LEGISLATURE=17 -d git.tricoteuses.fr/logiciels/tricoteuses-assemblee:latest
+```
+
+## Using the data
+
+Once the data is downloaded and cleaned, you can use loaders to retrieve it.
+To use loaders in your project, you can install the _@tricoteuses/assemblee_ package, and import the iterator functions that you need.
+
+```bash
+npm install @tricoteuses/assemblee
+```
+
+```js
+import {
+  iterLoadAssembleeActeurs,
+  iterLoadAssembleeOrganes,
+  iterLoadAssembleeReunions,
+  iterLoadAssembleeScrutins,
+  iterLoadAssembleeDocuments,
+  iterLoadAssembleeDossiersParlementaires,
+  iterLoadAssembleeAmendements,
+  iterLoadAssembleeQuestions,
+  iterLoadAssembleeComptesRendus,
+} from "@tricoteuses/assemblee/loaders";
+
+// Pass data directory and legislature as arguments
+for (const { acteur } of iterLoadAssembleeActeurs("../assemblee-data", 17)) {
+  console.log(acteur.uid)
+}
+```
+
+## Generating schemas and documentation (for contributors only)
+
+View instructions [here](https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee/-/blob/master/src/types)

package/lib/loaders.js

@@ -752,18 +752,25 @@ function* z(t, s, e, r, l, d = "json", { enriched: _ = !1, log: j = !1, noValida
         _ ? "_enrichi" : "_nettoye"
       )
     );
-    for (const D of P(x, l)) {
-      if (!D[D.length - 1].endsWith(".json"))
+    for (const V of P(x, l)) {
+      if (!V[V.length - 1].endsWith(".json"))
         continue;
-      const X = i.join(x, ...D);
-      j && console.log(`Loading file: ${X}…`);
-      let V = n.readFileSync(X, { encoding: "utf8" });
-      const $ = y ? JSON.parse(V) : r(V);
-      F.has($.uid) || (F.add($.uid), yield {
+      const D = i.join(x, ...V);
+      j && console.log(`Loading file: ${D}…`);
+      let $ = n.readFileSync(D, { encoding: "utf8" }), X;
+      try {
+        X = y ? JSON.parse($) : r($);
+      } catch (p) {
+        console.warn(
+          `[iterLoadAssembleeItems] skipped invalid JSON: ${D} (${p.message})`
+        );
+        continue;
+      }
+      F.has(X.uid) || (F.add(X.uid), yield {
         datasetLegislature: v.legislature,
-        filePath: X,
-        item: $
-      }, V = null);
+        filePath: D,
+        item: X
+      }, $ = null);
     }
   }
   F.clear();
@@ -1019,7 +1026,7 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
         v[f.uid] === void 0 && (v[f.uid] = f);
       }
     }
-  const b = {}, x = {}, D = {}, O = {};
+  const b = {}, x = {}, V = {}, O = {};
   if (s & I.DossiersLegislatifs)
     for (const o of A.dossiersLegislatifs) {
       if (o.ignoreForWeb || e !== a.All && o.legislature !== a.All && e !== o.legislature)
@@ -1046,10 +1053,10 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
         const S = n.readFileSync(g, {
           encoding: "utf8"
         }), f = R.toDossierParlementaire(S), L = f.titreDossier;
-        L.senatChemin && x[L.senatChemin] === void 0 && (x[L.senatChemin] = f), L.titreChemin && D[L.titreChemin] === void 0 && (D[L.titreChemin] = f), O[f.uid] === void 0 && (O[f.uid] = f);
+        L.senatChemin && x[L.senatChemin] === void 0 && (x[L.senatChemin] = f), L.titreChemin && V[L.titreChemin] === void 0 && (V[L.titreChemin] = f), O[f.uid] === void 0 && (O[f.uid] = f);
       }
     }
-  let X = {};
+  let D = {};
   if (s & I.Photos) {
     {
       const o = i.join(
@@ -1061,7 +1068,7 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
       if (n.existsSync(o)) {
         l && console.log(`Loading file: ${o}`);
         const m = n.readFileSync(o, { encoding: "utf8" });
-        Object.assign(X, JSON.parse(m));
+        Object.assign(D, JSON.parse(m));
       } else l && console.log(`Ignoring missing file: ${o}`);
     }
     {
@@ -1073,11 +1080,11 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
       if (n.existsSync(o)) {
         l && console.log(`Loading file: ${o}`);
         const m = n.readFileSync(o, { encoding: "utf8" });
-        Object.assign(X, JSON.parse(m));
+        Object.assign(D, JSON.parse(m));
       } else l && console.log(`Ignoring missing file: ${o}`);
     }
   }
-  const V = {};
+  const $ = {};
   if (s & I.Scrutins)
     for (const o of A.scrutins) {
       if (o.ignoreForWeb || e !== a.All && o.legislature !== a.All && e !== o.legislature)
@@ -1094,10 +1101,10 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
         const S = n.readFileSync(g, {
           encoding: "utf8"
         }), f = Z.toScrutin(S);
-        V[f.uid] === void 0 && (V[f.uid] = f);
+        $[f.uid] === void 0 && ($[f.uid] = f);
       }
     }
-  const $ = {};
+  const X = {};
   if (s & I.Questions)
     for (const o of A.questions) {
       if (o.ignoreForWeb || e !== a.All && o.legislature !== a.All && e !== o.legislature)
@@ -1114,7 +1121,7 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
         const S = n.readFileSync(g, {
           encoding: "utf8"
         }), f = B.toQuestion(S);
-        $[f.uid] === void 0 && ($[f.uid] = f);
+        X[f.uid] === void 0 && (X[f.uid] = f);
       }
     }
   const p = {};
@@ -1142,15 +1149,15 @@ function ve(t, s, e, { enriched: r = !1, log: l = !1 } = {}) {
     amendementByUid: v,
     documentByUid: b,
     dossierParlementaireBySenatChemin: x,
-    dossierParlementaireByTitreChemin: D,
+    dossierParlementaireByTitreChemin: V,
     dossierParlementaireByUid: O,
     organeByUid: _,
-    photoByUid: X,
+    photoByUid: D,
     reunionByUid: j,
     reunionsByDay: y,
     reunionsByDossierUid: F,
-    scrutinByUid: V,
-    questionByUid: $,
+    scrutinByUid: $,
+    questionByUid: X,
     compteRenduByUid: p
   };
 }
@@ -1211,7 +1218,7 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
         for (const g of c.amendements)
           F[g.uid] === void 0 && (F[g.uid] = g);
     }
-  const v = {}, b = {}, x = {}, D = {};
+  const v = {}, b = {}, x = {}, V = {};
   if (s & I.DossiersLegislatifs)
     for (const p of A.dossiersLegislatifs) {
       if (p.ignoreForWeb || e !== a.All && p.legislature !== a.All && e !== p.legislature)
@@ -1226,7 +1233,7 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
         v[c.uid] === void 0 && (v[c.uid] = c);
       for (const c of u.dossiersParlementaires) {
         const g = c.titreDossier;
-        g.senatChemin && b[g.senatChemin] === void 0 && (b[g.senatChemin] = c), g.titreChemin && x[g.titreChemin] === void 0 && (x[g.titreChemin] = c), D[c.uid] === void 0 && (D[c.uid] = c);
+        g.senatChemin && b[g.senatChemin] === void 0 && (b[g.senatChemin] = c), g.titreChemin && x[g.titreChemin] === void 0 && (x[g.titreChemin] = c), V[c.uid] === void 0 && (V[c.uid] = c);
       }
     }
   const O = {};
@@ -1258,7 +1265,7 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
       } else r && console.log(`Ignoring missing file: ${o}`);
     }
   }
-  const X = {};
+  const D = {};
   if (s & I.Scrutins)
     for (const p of A.scrutins) {
       if (p.ignoreForWeb || e !== a.All && p.legislature !== a.All && e !== p.legislature)
@@ -1270,9 +1277,9 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
       r && console.log(`Loading file: ${o}`);
       const m = n.readFileSync(o, { encoding: "utf8" }), u = Z.toScrutins(m);
       for (const c of u.scrutins)
-        X[c.uid] === void 0 && (X[c.uid] = c);
+        D[c.uid] === void 0 && (D[c.uid] = c);
     }
-  const V = {};
+  const $ = {};
   if (s & I.Questions)
     for (const p of A.questions) {
       if (p.ignoreForWeb || e !== a.All && p.legislature !== a.All && e !== p.legislature)
@@ -1284,9 +1291,9 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
       r && console.log(`Loading file: ${o}`);
       const m = n.readFileSync(o, { encoding: "utf8" }), u = B.toQuestions(m);
       for (const c of u.questions)
-        V[c.uid] === void 0 && (V[c.uid] = c);
+        $[c.uid] === void 0 && ($[c.uid] = c);
     }
-  const $ = {};
+  const X = {};
   if (s & I.ComptesRendusSeances)
     for (const p of A.comptesRendusSeances) {
       if (p.ignoreForWeb || e !== a.All && p.legislature !== a.All && e !== p.legislature)
@@ -1298,7 +1305,7 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
       r && console.log(`Loading file: ${o}`);
       const m = n.readFileSync(o, { encoding: "utf8" }), u = J.toComptesRendus(m);
       for (const c of u.comptesRendus)
-        $[c.uid] === void 0 && ($[c.uid] = c);
+        X[c.uid] === void 0 && (X[c.uid] = c);
     }
   return {
     acteurByUid: l,
@@ -1306,15 +1313,15 @@ function Ie(t, s, e, { log: r = !1 } = {}) {
     documentByUid: v,
     dossierParlementaireBySenatChemin: b,
     dossierParlementaireByTitreChemin: x,
-    dossierParlementaireByUid: D,
+    dossierParlementaireByUid: V,
     organeByUid: d,
     photoByUid: O,
     reunionByUid: _,
     reunionsByDay: j,
     reunionsByDossierUid: y,
-    scrutinByUid: X,
-    questionByUid: V,
-    compteRenduByUid: $
+    scrutinByUid: D,
+    questionByUid: $,
+    compteRenduByUid: X
   };
 }
 function be(t, s, e) {

package/lib/schemas/compte_rendu_commission/CompteRenduCommission.json

@@ -1,63 +1,63 @@
-{
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "CompteRenduCommission",
-    "description": "Compte-rendu d'une réunion en commission d'examen d'un texte de loi",
-    "type": "object",
-    "properties": {
-        "reunionRef": {
-            "description": "Référence vers la réunion",
-            "type": "string"
-        },
-        "interventions": {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "description": "Prise de parole d'un orateur",
-                "properties": {
-                    "acteurRef": {
-                        "description": "Référence à l'acteur",
-                        "type": "string"
-                    },
-                    "nomActeur": {
-                        "description": "Nom de l'orateur",
-                        "type": "string"
-                    },
-                    "groupe": {
-                        "description": "Groupe parlementaire de l'orateur",
-                        "type": "string"
-                    },
-                    "amendementRef": {
-                        "description": "Amendement relatif à la prise de parole",
-                        "type": "string"
-                    }
-                },
-                "required": [
-                    "nomActeur"
-                ]
-            }
-        },
-        "scrutins": {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "description": "Prise de parole d'un orateur",
-                "properties": {
-                    "amendementRef": {
-                        "description": "Référence à l'amendement",
-                        "type": "string"
-                    },
-                    "resultat": {
-                        "description": "Résultat du scrutin",
-                        "type": "string"
-                    }
-                },
-                "required": [
-                    "amendementRef"
-                ]
-            }
-        }
-    },
-    "required": [
-        "interventions"
-    ]
-}
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "CompteRenduCommission",
+    "description": "Compte-rendu d'une réunion en commission d'examen d'un texte de loi",
+    "type": "object",
+    "properties": {
+        "reunionRef": {
+            "description": "Référence vers la réunion",
+            "type": "string"
+        },
+        "interventions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "description": "Prise de parole d'un orateur",
+                "properties": {
+                    "acteurRef": {
+                        "description": "Référence à l'acteur",
+                        "type": "string"
+                    },
+                    "nomActeur": {
+                        "description": "Nom de l'orateur",
+                        "type": "string"
+                    },
+                    "groupe": {
+                        "description": "Groupe parlementaire de l'orateur",
+                        "type": "string"
+                    },
+                    "amendementRef": {
+                        "description": "Amendement relatif à la prise de parole",
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "nomActeur"
+                ]
+            }
+        },
+        "scrutins": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "description": "Prise de parole d'un orateur",
+                "properties": {
+                    "amendementRef": {
+                        "description": "Référence à l'amendement",
+                        "type": "string"
+                    },
+                    "resultat": {
+                        "description": "Résultat du scrutin",
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "amendementRef"
+                ]
+            }
+        }
+    },
+    "required": [
+        "interventions"
+    ]
+}

package/lib/schemas/debats.json

@@ -689,7 +689,7 @@
       }
     },
     "transform": {
-      "$comment": "(\r\n  val: any,\r\n  typ: any,\r\n  getProps: any,\r\n  key: any = \"\",\r\n  parent: any = \"\") => any",
+      "$comment": "(\n  val: any,\n  typ: any,\n  getProps: any,\n  key: any = \"\",\n  parent: any = \"\") => any",
       "type": "object",
       "properties": {
         "namedArgs": {

package/package.json

@@ -1,126 +1,126 @@
-{
-  "name": "@tricoteuses/assemblee",
-  "version": "2.5.2",
-  "description": "Retrieve, clean up & handle French Assemblée nationale's open data",
-  "keywords": [
-    "Assemblée nationale",
-    "France",
-    "open data",
-    "Parliament"
-  ],
-  "author": "Emmanuel Raviart <emmanuel@raviart.com>",
-  "contributors": [
-    "Henry Boisgibault <h.boisgibault@gmail.com>",
-    "Loïc Dachary <loic@dachary.org>"
-  ],
-  "bugs": {
-    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee/issues"
-  },
-  "homepage": "https://tricoteuses.fr/",
-  "license": "AGPL-3.0-or-later",
-  "repository": {
-    "type": "git",
-    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee.git"
-  },
-  "type": "module",
-  "engines": {
-    "node": ">=20.0.0"
-  },
-  "files": [
-    "lib"
-  ],
-  "exports": {
-    ".": {
-      "typedoc": "./src/index.ts",
-      "import": "./lib/index.js",
-      "types": "./lib/index.d.ts"
-    },
-    "./cleaners": {
-      "typedoc": "./src/cleaners/index.ts",
-      "import": "./lib/cleaners.js",
-      "types": "./lib/cleaners/index.d.ts"
-    },
-    "./git": {
-      "typedoc": "./src/git.ts",
-      "import": "./lib/git.js",
-      "types": "./lib/git.d.ts"
-    },
-    "./loaders": {
-      "typedoc": "./src/loaders.ts",
-      "import": "./lib/loaders.js",
-      "types": "./lib/loaders.d.ts"
-    },
-    "./parsers": {
-      "typedoc": "./src/parsers/index.ts",
-      "import": "./lib/parsers.js",
-      "types": "./lib/parsers/index.d.ts"
-    },
-    "./package.json": "./package.json"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "build": "vite build && npm run build:doc:api && npm run build:json-schemas && npm run prettier",
-    "build:doc:api": "typedoc --plugin typedoc-plugin-markdown --out ./doc/api --readme none",
-    "build:json-schemas": "tsx src/scripts/generate-json-schemas.ts && tsx src/scripts/copy-schemas.ts",
-    "clean": "rimraf lib",
-    "data:clean_data": "tsx src/scripts/clean_reorganized_data.ts --no-validate",
-    "data:download": "tsx src/scripts/data-download.ts",
-    "data:reorganize_data": "tsx src/scripts/reorganize_data.ts --no-validate-raw",
-    "data:retrieve_deputes_photos": "tsx src/scripts/retrieve_deputes_photos.ts --fetch",
-    "data:retrieve_documents": "tsx src/scripts/retrieve_documents.ts",
-    "data:retrieve_open_data": "tsx src/scripts/retrieve_open_data.ts --fetch",
-    "data:retrieve_pending_amendements": "tsx src/scripts/retrieve_pending_amendments.ts --incremental",
-    "data:retrieve_senateurs_photos": "tsx src/scripts/retrieve_senateurs_photos.ts --fetch",
-    "lint": "eslint .",
-    "prepare": "npm run build",
-    "prettier": "prettier --write \"src/**/*.ts\"",
-    "test:iter_load": "tsx src/scripts/test_iter_load.ts",
-    "type-check": "tsc --noEmit",
-    "type-check:watch": "npm run type-check -- --watch"
-  },
-  "dependencies": {
-    "cheerio": "^1.1.0",
-    "command-line-args": "^6.0.1",
-    "command-line-usage": "^7.0.3",
-    "date-fns": "^4.1.0",
-    "deep-equal": "^2.2.3",
-    "deep-object-diff": "^1.1.0",
-    "fast-xml-parser": "^5.0.8",
-    "front-matter": "^4.0.2",
-    "fs-extra": "^11.2.0",
-    "glob": "^11.0.0",
-    "js-yaml": "^4.0.0",
-    "node-html-parser": "^7.0.1",
-    "node-stream-zip": "^1.11.6",
-    "p-limit": "^7.2.0",
-    "sharp": "^0.34.2"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.27.0",
-    "@types/command-line-args": "^5.2.3",
-    "@types/command-line-usage": "^5.0.4",
-    "@types/deep-equal": "^1.0.4",
-    "@types/fs-extra": "^11.0.4",
-    "@types/js-yaml": "^4.0.0",
-    "@types/node": "^22.7.6",
-    "@types/temp": "^0.9.0",
-    "@types/unzipper": "^0.10.3",
-    "ajv": "^8.0.4",
-    "eslint": "^9.27.0",
-    "globals": "^16.1.0",
-    "prettier": "^3.5.3",
-    "rimraf": "^6.0.1",
-    "temp": "^0.9.1",
-    "ts-json-schema-generator": "^2.4.0",
-    "tslib": "^2.0.2",
-    "tsx": "^4.0.0",
-    "typedoc": "^0.28.5",
-    "typedoc-plugin-markdown": "^4.6.4",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.1",
-    "vite": "^7.0.4",
-    "vite-plugin-dts": "^4.5.4"
-  }
-}
+{
+  "name": "@tricoteuses/assemblee",
+  "version": "2.5.3",
+  "description": "Retrieve, clean up & handle French Assemblée nationale's open data",
+  "keywords": [
+    "Assemblée nationale",
+    "France",
+    "open data",
+    "Parliament"
+  ],
+  "author": "Emmanuel Raviart <emmanuel@raviart.com>",
+  "contributors": [
+    "Henry Boisgibault <h.boisgibault@gmail.com>",
+    "Loïc Dachary <loic@dachary.org>"
+  ],
+  "bugs": {
+    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee/issues"
+  },
+  "homepage": "https://tricoteuses.fr/",
+  "license": "AGPL-3.0-or-later",
+  "repository": {
+    "type": "git",
+    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-assemblee.git"
+  },
+  "type": "module",
+  "engines": {
+    "node": ">=20.0.0"
+  },
+  "files": [
+    "lib"
+  ],
+  "exports": {
+    ".": {
+      "typedoc": "./src/index.ts",
+      "import": "./lib/index.js",
+      "types": "./lib/index.d.ts"
+    },
+    "./cleaners": {
+      "typedoc": "./src/cleaners/index.ts",
+      "import": "./lib/cleaners.js",
+      "types": "./lib/cleaners/index.d.ts"
+    },
+    "./git": {
+      "typedoc": "./src/git.ts",
+      "import": "./lib/git.js",
+      "types": "./lib/git.d.ts"
+    },
+    "./loaders": {
+      "typedoc": "./src/loaders.ts",
+      "import": "./lib/loaders.js",
+      "types": "./lib/loaders.d.ts"
+    },
+    "./parsers": {
+      "typedoc": "./src/parsers/index.ts",
+      "import": "./lib/parsers.js",
+      "types": "./lib/parsers/index.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "vite build && npm run build:doc:api && npm run build:json-schemas && npm run prettier",
+    "build:doc:api": "typedoc --plugin typedoc-plugin-markdown --out ./doc/api --readme none",
+    "build:json-schemas": "tsx src/scripts/generate-json-schemas.ts && tsx src/scripts/copy-schemas.ts",
+    "clean": "rimraf lib",
+    "data:clean_data": "tsx src/scripts/clean_reorganized_data.ts --no-validate",
+    "data:download": "tsx src/scripts/data-download.ts",
+    "data:reorganize_data": "tsx src/scripts/reorganize_data.ts --no-validate-raw",
+    "data:retrieve_deputes_photos": "tsx src/scripts/retrieve_deputes_photos.ts --fetch",
+    "data:retrieve_documents": "tsx src/scripts/retrieve_documents.ts",
+    "data:retrieve_open_data": "tsx src/scripts/retrieve_open_data.ts --fetch",
+    "data:retrieve_pending_amendements": "tsx src/scripts/retrieve_pending_amendments.ts --incremental",
+    "data:retrieve_senateurs_photos": "tsx src/scripts/retrieve_senateurs_photos.ts --fetch",
+    "lint": "eslint .",
+    "prepare": "npm run build",
+    "prettier": "prettier --write \"src/**/*.ts\"",
+    "test:iter_load": "tsx src/scripts/test_iter_load.ts",
+    "type-check": "tsc --noEmit",
+    "type-check:watch": "npm run type-check -- --watch"
+  },
+  "dependencies": {
+    "cheerio": "^1.1.0",
+    "command-line-args": "^6.0.1",
+    "command-line-usage": "^7.0.3",
+    "date-fns": "^4.1.0",
+    "deep-equal": "^2.2.3",
+    "deep-object-diff": "^1.1.0",
+    "fast-xml-parser": "^5.0.8",
+    "front-matter": "^4.0.2",
+    "fs-extra": "^11.2.0",
+    "glob": "^11.0.0",
+    "js-yaml": "^4.0.0",
+    "node-html-parser": "^7.0.1",
+    "node-stream-zip": "^1.11.6",
+    "p-limit": "^7.2.0",
+    "sharp": "^0.34.2"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.27.0",
+    "@types/command-line-args": "^5.2.3",
+    "@types/command-line-usage": "^5.0.4",
+    "@types/deep-equal": "^1.0.4",
+    "@types/fs-extra": "^11.0.4",
+    "@types/js-yaml": "^4.0.0",
+    "@types/node": "^22.7.6",
+    "@types/temp": "^0.9.0",
+    "@types/unzipper": "^0.10.3",
+    "ajv": "^8.0.4",
+    "eslint": "^9.27.0",
+    "globals": "^16.1.0",
+    "prettier": "^3.5.3",
+    "rimraf": "^6.0.1",
+    "temp": "^0.9.1",
+    "ts-json-schema-generator": "^2.4.0",
+    "tslib": "^2.0.2",
+    "tsx": "^4.0.0",
+    "typedoc": "^0.28.5",
+    "typedoc-plugin-markdown": "^4.6.4",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.32.1",
+    "vite": "^7.0.4",
+    "vite-plugin-dts": "^4.5.4"
+  }
+}