@tricoteuses/senat 2.9.6 → 2.9.8

package/LICENSE.md

@@ -1,22 +1,22 @@
-# Tricoteuses-Senat
-
-## _Handle French Sénat's open data_
-
-By: Emmanuel Raviart <mailto:emmanuel@raviart.com>
-
-Copyright (C) 2019, 2020, 2021 Emmanuel Raviart
-
-https://git.tricoteuses.fr/logiciels/tricoteuses-senat
-
-> Tricoteuses-Senat 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-Senat 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-Senat
+
+## _Handle French Sénat's open data_
+
+By: Emmanuel Raviart <mailto:emmanuel@raviart.com>
+
+Copyright (C) 2019, 2020, 2021 Emmanuel Raviart
+
+https://git.tricoteuses.fr/logiciels/tricoteuses-senat
+
+> Tricoteuses-Senat 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-Senat 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,116 +1,116 @@
-# Tricoteuses-Senat
-
-## _Retrieve, clean up & handle  French Sénat's open data_
-
-## Requirements
-
-- Node >= 22
-
-## Installation
-
-```bash
-git clone https://git.tricoteuses.fr/logiciels/tricoteuses-senat
-cd tricoteuses-senat/
-```
-
-Create a `.env` file to set PostgreSQL database informations and other configuration variables (you can use `example.env` as a template). Then
-
-```bash
-npm install
-```
-
-### Database creation (not needed if downloading with Docker image)
-
-#### Using Docker
-
-```bash
-docker run --name local-postgres -d -p 5432:5432 -e POSTGRES_PASSWORD=$YOUR_CUSTOM_DB_PASSWORD postgres
-# Default Postgres user is postgres
-# But scripts require an "opendata" role
-docker exec -it local-postgres psql -U postgres -c "CREATE ROLE opendata;"
-```
-
-## Download data
-
-Create a folder where the data will be downloaded and run the following command to download the data and convert it into JSON files.
-
-```bash
-mkdir ../senat-data/
-
-# Available options for optional `categories` parameter : All,  Ameli, Debats, DosLeg, Questions, Sens
-npm run data:download ../senat-data -- [--categories All]
-```
-
-Data from other sources is also available :
-```bash
-# Retrieval of textes and rapports from Sénat's website
-# Available options for optional `formats` parameter : xml, html, pdf
-# Available options for optional `types` parameter : textes, rapports
-npm run data:retrieve_documents ../senat-data -- --fromSession 2022 [--formats xml pdf] [--types textes]
-
-# Retrieval & parsing (textes in xml format only for now)
-npm run data:retrieve_documents ../senat-data -- --fromSession 2022 --parseDocuments
-
-# Parsing only
-npm run data:parse_textes_lois ../senat-data
-
-# Retrieval (& parsing) of agenda from Sénat's website
-npm run data:retrieve_agenda ../senat-data -- --fromSession 2022 [--parseAgenda]
-
-# Retrieval (& parsing) of comptes-rendus des débats from Sénat's website
-npm run data:retrieve_comptes_rendus ../senat-data -- [--parseDebats]
-
-# Retrieval of sénateurs' pictures from Sénat's website
-npm run data:retrieve_senateurs_photos ../senat-data
-```
-
-## Data download using Docker
-
-A Docker image that downloads and converts the data all at once is available. Build it locally or run it from the container registry.
-Use the environment variables `FROM_SESSION` and `CATEGORIES` if needed.
-
-```bash
-docker run --pull always --name tricoteuses-senat -v ../senat-data:/app/senat-data -d git.tricoteuses.fr/logiciels/tricoteuses-senat:latest
-```
-
-Use the environment variable `CATEGORIES` and `FROM_SESSION` if needed.
-
-## Using the data
-
-Once the data is downloaded, you can use loaders to retrieve it.
-To use loaders in your project, you can install the _@tricoteuses/senat_ package, and import the iterator functions that you need.
-
-```bash
-npm install @tricoteuses/senat
-```
-
-```js
-import { iterLoadSenatQuestions } from "@tricoteuses/senat/loaders"
-
-// Pass data directory and legislature as arguments
-for (const { item: question } of iterLoadSenatQuestions("../senat-data", 17)) {
-  console.log(question.id)
-}
-```
-
-## Generation of raw types from SQL schema (for contributors only)
-
-```bash
-npm run data:generate_schemas ../senat-data
-```
-
-## Publishing
-
-To publish a new version of this package onto npm, bump the package version and publish.
-
-```bash
-npm version x.y.z # Bumps version in package.json and creates a new tag x.y.z
-npx tsc
-npm publish
-```
-
-The Docker image will be automatically built during a CI Workflow if you push the tag to the remote repository.
-
-```bash
-git push --tags
-```
+# Tricoteuses-Senat
+
+## _Retrieve, clean up & handle  French Sénat's open data_
+
+## Requirements
+
+- Node >= 22
+
+## Installation
+
+```bash
+git clone https://git.tricoteuses.fr/logiciels/tricoteuses-senat
+cd tricoteuses-senat/
+```
+
+Create a `.env` file to set PostgreSQL database informations and other configuration variables (you can use `example.env` as a template). Then
+
+```bash
+npm install
+```
+
+### Database creation (not needed if downloading with Docker image)
+
+#### Using Docker
+
+```bash
+docker run --name local-postgres -d -p 5432:5432 -e POSTGRES_PASSWORD=$YOUR_CUSTOM_DB_PASSWORD postgres
+# Default Postgres user is postgres
+# But scripts require an "opendata" role
+docker exec -it local-postgres psql -U postgres -c "CREATE ROLE opendata;"
+```
+
+## Download data
+
+Create a folder where the data will be downloaded and run the following command to download the data and convert it into JSON files.
+
+```bash
+mkdir ../senat-data/
+
+# Available options for optional `categories` parameter : All,  Ameli, Debats, DosLeg, Questions, Sens
+npm run data:download ../senat-data -- [--categories All]
+```
+
+Data from other sources is also available :
+```bash
+# Retrieval of textes and rapports from Sénat's website
+# Available options for optional `formats` parameter : xml, html, pdf
+# Available options for optional `types` parameter : textes, rapports
+npm run data:retrieve_documents ../senat-data -- --fromSession 2022 [--formats xml pdf] [--types textes]
+
+# Retrieval & parsing (textes in xml format only for now)
+npm run data:retrieve_documents ../senat-data -- --fromSession 2022 --parseDocuments
+
+# Parsing only
+npm run data:parse_textes_lois ../senat-data
+
+# Retrieval (& parsing) of agenda from Sénat's website
+npm run data:retrieve_agenda ../senat-data -- --fromSession 2022 [--parseAgenda]
+
+# Retrieval (& parsing) of comptes-rendus des débats from Sénat's website
+npm run data:retrieve_comptes_rendus ../senat-data -- [--parseDebats]
+
+# Retrieval of sénateurs' pictures from Sénat's website
+npm run data:retrieve_senateurs_photos ../senat-data
+```
+
+## Data download using Docker
+
+A Docker image that downloads and converts the data all at once is available. Build it locally or run it from the container registry.
+Use the environment variables `FROM_SESSION` and `CATEGORIES` if needed.
+
+```bash
+docker run --pull always --name tricoteuses-senat -v ../senat-data:/app/senat-data -d git.tricoteuses.fr/logiciels/tricoteuses-senat:latest
+```
+
+Use the environment variable `CATEGORIES` and `FROM_SESSION` if needed.
+
+## Using the data
+
+Once the data is downloaded, you can use loaders to retrieve it.
+To use loaders in your project, you can install the _@tricoteuses/senat_ package, and import the iterator functions that you need.
+
+```bash
+npm install @tricoteuses/senat
+```
+
+```js
+import { iterLoadSenatQuestions } from "@tricoteuses/senat/loaders"
+
+// Pass data directory and legislature as arguments
+for (const { item: question } of iterLoadSenatQuestions("../senat-data", 17)) {
+  console.log(question.id)
+}
+```
+
+## Generation of raw types from SQL schema (for contributors only)
+
+```bash
+npm run data:generate_schemas ../senat-data
+```
+
+## Publishing
+
+To publish a new version of this package onto npm, bump the package version and publish.
+
+```bash
+npm version x.y.z # Bumps version in package.json and creates a new tag x.y.z
+npx tsc
+npm publish
+```
+
+The Docker image will be automatically built during a CI Workflow if you push the tag to the remote repository.
+
+```bash
+git push --tags
+```

package/lib/loaders.d.ts

@@ -10,6 +10,7 @@ export { EnabledDatasets } from "./datasets";
 export declare const AGENDA_FOLDER = "agenda";
 export declare const COMPTES_RENDUS_FOLDER = "seances";
 export declare const DOSLEG_DOSSIERS_FOLDER = "dossiers";
+export declare const SCRUTINS_FOLDER = "scrutins";
 export declare const RAPPORT_FOLDER = "rap";
 export declare const SENS_CIRCONSCRIPTIONS_FOLDER = "circonscriptions";
 export declare const SENS_ORGANISMES_FOLDER = "organismes";

package/lib/loaders.js

@@ -6,6 +6,7 @@ export { EnabledDatasets } from "./datasets";
 export const AGENDA_FOLDER = "agenda";
 export const COMPTES_RENDUS_FOLDER = "seances";
 export const DOSLEG_DOSSIERS_FOLDER = "dossiers";
+export const SCRUTINS_FOLDER = "scrutins";
 export const RAPPORT_FOLDER = "rap";
 export const SENS_CIRCONSCRIPTIONS_FOLDER = "circonscriptions";
 export const SENS_ORGANISMES_FOLDER = "organismes";

package/lib/model/dosleg.d.ts

@@ -1,7 +1,7 @@
 import { InferResult } from "kysely";
-export type DossierLegislatifResult = InferResult<typeof findAllQuery>[0];
+export type DossierLegislatifResult = InferResult<typeof findAllDossiersQuery>[0];
 export type AuteurResult = InferResult<typeof findAuteursQuery>[0];
-declare const findAllQuery: import("kysely").SelectQueryBuilder<{
+declare const findAllDossiersQuery: import("kysely").SelectQueryBuilder<{
     ses: import("../raw_types/dosleg").Ses;
     qua: import("../raw_types/dosleg").Qua;
     lecture: import("../raw_types/dosleg").Lecture;
@@ -121,7 +121,7 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     numero_JO: string | null;
     url_JO: string | null;
 }>;
-export declare function findAll(): AsyncIterableIterator<{
+export declare function findAllDossiers(): AsyncIterableIterator<{
     url: string;
     signet: string;
     titre: string;
@@ -187,6 +187,32 @@ export declare function findAll(): AsyncIterableIterator<{
     numero_JO: string | null;
     url_JO: string | null;
 }>;
+export declare function findAllScrutins(): AsyncIterableIterator<{
+    session: string;
+    numero: string;
+    date_scrutin: string;
+    date_scrutin_effective: string;
+    votes: {
+        matricule_votant: string;
+        matricule_delegant: string | null;
+        position: string | null;
+        statut_votant: string | null;
+        titre_votant: string | null;
+    }[];
+    lecture_id: string | null;
+    intitule: string | null;
+    note: string | null;
+    nombre_majorite: string | null;
+    nombre_majorite_seance: string | null;
+    nombre_votants: string | null;
+    nombre_votants_seance: string | null;
+    nombre_suffrages: string | null;
+    nombre_suffrages_seance: string | null;
+    nombre_contre: string | null;
+    nombre_contre_seance: string | null;
+    nombre_pour: string | null;
+    nombre_pour_seance: string | null;
+}>;
 export declare function findSenatTexteUrls(sessions?: number[]): AsyncIterableIterator<{
     session: string | null | undefined;
     url: string;

package/lib/model/dosleg.js

@@ -135,7 +135,47 @@ function themes(loiId) {
         "the.thelib as libelle",
     ]));
 }
-const findAllQuery = dbDosleg
+function votes(scrutinNum) {
+    return jsonArrayFrom(dbDosleg
+        .selectFrom("votsen")
+        .leftJoin("titsen", "titsen.titsencod", "votsen.titsencod")
+        .leftJoin("stavot", "stavot.stavotidt", "votsen.stavotidt")
+        .leftJoin("posvot", "posvot.posvotcod", "votsen.posvotcod")
+        .where("votsen.scrnum", "=", scrutinNum)
+        .select([
+        "votsen.senmat as matricule_votant",
+        "votsen.senmatdel as matricule_delegant",
+        "posvot.posvotlib as position",
+        "stavot.stavotlib as statut_votant",
+        "titsen.titsenlib as titre_votant",
+    ]));
+}
+const findAllScrutinsQuery = dbDosleg
+    .selectFrom("scr")
+    .leftJoin("date_seance", "scr.code", "date_seance.code")
+    .leftJoin("lecture", "date_seance.lecidt", "lecture.lecidt")
+    .select(({ eb, ref, val }) => [
+    "scr.sesann as session",
+    "scr.scrnum as numero",
+    "date_seance.lecidt as lecture_id",
+    toDateString(ref("scr.scrdat")).as("date_scrutin"),
+    toDateString(ref("scr.scrdateff")).as("date_scrutin_effective"),
+    "scr.scrint as intitule",
+    "scr.scrbaspag as note",
+    "scr.scrmaj as nombre_majorite",
+    "scr.scrmajsea as nombre_majorite_seance",
+    "scr.scrvot as nombre_votants",
+    "scr.scrvotsea as nombre_votants_seance",
+    "scr.scrsuf as nombre_suffrages",
+    "scr.scrsufsea as nombre_suffrages_seance",
+    "scr.scrcon as nombre_contre",
+    "scr.scrconsea as nombre_contre_seance",
+    "scr.scrpou as nombre_pour",
+    "scr.scrpousea as nombre_pour_seance",
+    votes(ref("scr.scrnum")).as("votes"),
+])
+    .$narrowType();
+const findAllDossiersQuery = dbDosleg
     .selectFrom("loi")
     .leftJoin("typloi", "typloi.typloicod", "loi.typloicod")
     .leftJoin("etaloi", "etaloi.etaloicod", "loi.etaloicod")
@@ -169,8 +209,11 @@ const findAllQuery = dbDosleg
     themes(ref("loi.loicod")).as("themes"),
 ])
     .$narrowType();
-export function findAll() {
-    return findAllQuery.stream();
+export function findAllDossiers() {
+    return findAllDossiersQuery.stream();
+}
+export function findAllScrutins() {
+    return findAllScrutinsQuery.stream();
 }
 export function findSenatTexteUrls(sessions = []) {
     const sessionsStr = sessions.map(session => String(session));

package/lib/model/index.d.ts

@@ -1,5 +1,5 @@
 export { findAll as findAllAmendements } from "./ameli";
 export { findAll as findAllDebats } from "./debats";
-export { findAll as findAllLois, findAuteur, findAuteurs, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
+export { findAllDossiers, findAllScrutins, findAuteur, findAuteurs, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
 export { findAll as findAllQuestions } from "./questions";
 export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";

package/lib/model/index.js

@@ -1,5 +1,5 @@
 export { findAll as findAllAmendements } from "./ameli";
 export { findAll as findAllDebats } from "./debats";
-export { findAll as findAllLois, findAuteur, findAuteurs, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
+export { findAllDossiers, findAllScrutins, findAuteur, findAuteurs, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
 export { findAll as findAllQuestions } from "./questions";
 export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";

package/lib/model/sens.d.ts

@@ -13,6 +13,7 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     stavot: import("../raw_types/sens").Stavot;
     typorg: import("../raw_types/sens").Typorg;
     typurl: import("../raw_types/sens").Typurl;
+    votes: import("../raw_types/sens").Votes;
     sen: import("../raw_types/sens").Sen;
     acr: import("../raw_types/sens").Acr;
     activite: import("../raw_types/sens").Activite;
@@ -295,7 +296,6 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     validation_profil: import("../raw_types/sens").ValidationProfil;
     vercand: import("../raw_types/sens").Vercand;
     verres: import("../raw_types/sens").Verres;
-    votes: import("../raw_types/sens").Votes;
     zongeo: import("../raw_types/sens").Zongeo;
 }, "sen" | "com" | "etasen" | "grppol" | "pcs" | "pcs24" | "pcs42" | "pcs8", {
     matricule: string;
@@ -391,6 +391,7 @@ declare const findAllCirconscriptionsQuery: import("kysely").SelectQueryBuilder<
     stavot: import("../raw_types/sens").Stavot;
     typorg: import("../raw_types/sens").Typorg;
     typurl: import("../raw_types/sens").Typurl;
+    votes: import("../raw_types/sens").Votes;
     sen: import("../raw_types/sens").Sen;
     acr: import("../raw_types/sens").Acr;
     activite: import("../raw_types/sens").Activite;
@@ -673,7 +674,6 @@ declare const findAllCirconscriptionsQuery: import("kysely").SelectQueryBuilder<
     validation_profil: import("../raw_types/sens").ValidationProfil;
     vercand: import("../raw_types/sens").Vercand;
     verres: import("../raw_types/sens").Verres;
-    votes: import("../raw_types/sens").Votes;
     zongeo: import("../raw_types/sens").Zongeo;
 }, "dpt" | "reg", {
     date_debut: string;
@@ -698,6 +698,7 @@ declare const findAllOrganismesQuery: import("kysely").SelectQueryBuilder<{
     stavot: import("../raw_types/sens").Stavot;
     typorg: import("kysely").Nullable<import("../raw_types/sens").Typorg>;
     typurl: import("../raw_types/sens").Typurl;
+    votes: import("../raw_types/sens").Votes;
     sen: import("../raw_types/sens").Sen;
     acr: import("../raw_types/sens").Acr;
     activite: import("../raw_types/sens").Activite;
@@ -980,7 +981,6 @@ declare const findAllOrganismesQuery: import("kysely").SelectQueryBuilder<{
     validation_profil: import("../raw_types/sens").ValidationProfil;
     vercand: import("../raw_types/sens").Vercand;
     verres: import("../raw_types/sens").Verres;
-    votes: import("../raw_types/sens").Votes;
     zongeo: import("../raw_types/sens").Zongeo;
     all_organismes: {
         orgcod: string;

package/lib/scripts/convert_data.js

@@ -3,8 +3,8 @@ import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import path from "path";
 import { datasets, EnabledDatasets, getEnabledDatasets } from "../datasets";
-import { DATA_ORIGINAL_FOLDER, DOCUMENT_METADATA_FILE, DOSLEG_DOSSIERS_FOLDER, RAPPORT_FOLDER, SENS_CIRCONSCRIPTIONS_FOLDER, SENS_ORGANISMES_FOLDER, SENS_SENATEURS_FOLDER, TEXTE_FOLDER, } from "../loaders";
-import { findAllAmendements, findAllCirconscriptions, findAllDebats, findAllLois, findAllOrganismes, findAllQuestions, findAllSens, findAuteurs, findSenatRapportUrls, findSenatTexteUrls, } from "../model";
+import { DATA_ORIGINAL_FOLDER, DOCUMENT_METADATA_FILE, DOSLEG_DOSSIERS_FOLDER, SCRUTINS_FOLDER, RAPPORT_FOLDER, SENS_CIRCONSCRIPTIONS_FOLDER, SENS_ORGANISMES_FOLDER, SENS_SENATEURS_FOLDER, TEXTE_FOLDER, } from "../loaders";
+import { findAllAmendements, findAllCirconscriptions, findAllDebats, findAllDossiers, findAllScrutins, findAllOrganismes, findAllQuestions, findAllSens, findAuteurs, findSenatRapportUrls, findSenatTexteUrls, } from "../model";
 import { UNDEFINED_SESSION } from "../types/sessions";
 import { getSessionFromDate, getSessionFromSignet } from "./datautil";
 import { commonOptions } from "./shared/cli_helpers";
@@ -28,6 +28,7 @@ async function convertData() {
     }
     if (enabledDatasets & EnabledDatasets.DosLeg) {
         await convertDatasetDosLeg(dataDir);
+        await convertDatasetScrutins(dataDir);
     }
     if (enabledDatasets & EnabledDatasets.Questions) {
         await convertDatasetQuestions(dataDir);
@@ -105,7 +106,7 @@ async function convertDatasetDosLeg(dataDir) {
     const dossiersReorganizedDir = path.join(doslegReorganizedRootDir, DOSLEG_DOSSIERS_FOLDER);
     ensureAndClearDir(doslegReorganizedRootDir);
     ensureAndClearDir(dossiersReorganizedDir);
-    for await (const loi of findAllLois()) {
+    for await (const loi of findAllDossiers()) {
         if (options["verbose"]) {
             console.log(`Converting ${loi.signet} file…`);
         }
@@ -113,14 +114,35 @@ async function convertDatasetDosLeg(dataDir) {
         const session = getSessionFromSignet(loi.signet) || UNDEFINED_SESSION;
         loiReorganizedDir = path.join(dossiersReorganizedDir, String(session));
         fs.ensureDirSync(loiReorganizedDir);
-        const loiFileName = `${loi.signet}.json`;
-        fs.writeJSONSync(path.join(loiReorganizedDir, loiFileName), loi, {
+        const scrutinFileName = `${loi.signet}.json`;
+        fs.writeJSONSync(path.join(loiReorganizedDir, scrutinFileName), loi, {
             spaces: 2,
         });
     }
     await convertTexteUrls(dataDir);
     await convertRapportUrls(dataDir);
 }
+async function convertDatasetScrutins(dataDir) {
+    const dataset = datasets.dosleg;
+    if (!options["silent"]) {
+        console.log(`Converting database ${dataset.database} scrutins data into files…`);
+    }
+    const scrutinsReorganizedDir = path.join(dataDir, SCRUTINS_FOLDER);
+    ensureAndClearDir(scrutinsReorganizedDir);
+    for await (const scrutin of findAllScrutins()) {
+        if (options["verbose"]) {
+            console.log(`Converting ${scrutin.numero} file…`);
+        }
+        let scrutinReorganizedDir = path.join(scrutinsReorganizedDir, String(UNDEFINED_SESSION));
+        const session = scrutin.session || UNDEFINED_SESSION;
+        scrutinReorganizedDir = path.join(scrutinsReorganizedDir, String(session));
+        fs.ensureDirSync(scrutinReorganizedDir);
+        const scrutinFileName = `${scrutin.numero}.json`;
+        fs.writeJSONSync(path.join(scrutinReorganizedDir, scrutinFileName), scrutin, {
+            spaces: 2,
+        });
+    }
+}
 async function convertDatasetQuestions(dataDir) {
     const dataset = datasets.questions;
     if (!options["silent"]) {

package/lib/types/compte_rendu.d.ts

@@ -1,9 +1,9 @@
 export interface CompteRendu {
-    uid?: string;
-    seanceRef?: string;
-    sessionRef?: string;
-    metadonnees?: Metadonnees;
-    contenu?: Contenu;
+    uid: string;
+    seanceRef: string;
+    sessionRef: string;
+    metadonnees: Metadonnees;
+    contenu: Contenu;
 }
 export interface Metadonnees {
     dateSeance: string;
@@ -23,11 +23,18 @@ export interface Metadonnees {
     sommaire: Sommaire;
 }
 export interface Contenu {
-    quantiemes: {
-        journee: string;
-        session: string;
-    };
-    point: Point[];
+    quantiemes: Quantiemes;
+    ouvertureSeance?: Point[] | Point;
+    point: Point[] | Point;
+    finSeance?: FinSeance;
+    paragraphe?: Point[];
+}
+export interface FinSeance {
+    point: Point;
+}
+export interface Quantiemes {
+    journee: string;
+    session: string;
 }
 export interface Point {
     ordre_absolu_seance: string;

package/package.json

@@ -1,96 +1,97 @@
-{
-  "name": "@tricoteuses/senat",
-  "version": "2.9.6",
-  "description": "Handle French Sénat's open data",
-  "keywords": [
-    "France",
-    "open data",
-    "Parliament",
-    "Sénat"
-  ],
-  "author": "Emmanuel Raviart <emmanuel@raviart.com>",
-  "bugs": {
-    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat/issues"
-  },
-  "homepage": "https://tricoteuses.fr/",
-  "license": "AGPL-3.0-or-later",
-  "repository": {
-    "type": "git",
-    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat.git"
-  },
-  "type": "module",
-  "engines": {
-    "node": ">=22"
-  },
-  "files": [
-    "lib"
-  ],
-  "exports": {
-    ".": {
-      "import": "./lib/index.js",
-      "types": "./lib/index.d.ts"
-    },
-    "./loaders": {
-      "import": "./lib/loaders.js",
-      "types": "./lib/loaders.d.ts"
-    },
-    "./package.json": "./package.json"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "build": "tsc",
-    "build:types": "tsc --emitDeclarationOnly",
-    "data:convert_data": "tsx src/scripts/convert_data.ts",
-    "data:download": "tsx src/scripts/data-download.ts",
-    "data:generate_schemas": "tsx src/scripts/retrieve_open_data.ts --schema",
-    "data:retrieve_agenda": "cross-env TZ='Etc/UTC' tsx src/scripts/retrieve_agenda.ts",
-    "data:retrieve_comptes_rendus": "tsx src/scripts/retrieve_comptes_rendus.ts",
-    "data:retrieve_documents": "tsx src/scripts/retrieve_documents.ts",
-    "data:retrieve_open_data": "tsx src/scripts/retrieve_open_data.ts --all",
-    "data:retrieve_senateurs_photos": "tsx src/scripts/retrieve_senateurs_photos.ts --fetch",
-    "data:retrieve_videos": "tsx src/scripts/retrieve_videos.ts",
-    "data:parse_textes_lois": "tsx src/scripts/parse_textes.ts",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm run build",
-    "prettier": "prettier --write 'src/**/*.ts' 'tests/**/*.test.ts'",
-    "type-check": "tsc --noEmit",
-    "type-check:watch": "npm run type-check -- --watch"
-  },
-  "dependencies": {
-    "@biryani/core": "^0.2.1",
-    "cheerio": "^1.1.2",
-    "command-line-args": "^5.1.1",
-    "dotenv": "^8.2.0",
-    "fs-extra": "^9.1.0",
-    "jsdom": "^26.0.0",
-    "kysely": "^0.27.4",
-    "luxon": "^3.5.0",
-    "node-stream-zip": "^1.8.2",
-    "pg": "^8.13.1",
-    "pg-cursor": "^2.12.1",
-    "slug": "^11.0.0",
-    "tsx": "^4.19.4",
-    "windows-1252": "^1.0.0"
-  },
-  "devDependencies": {
-    "@typed-code/schemats": "^5.0.1",
-    "@types/command-line-args": "^5.0.0",
-    "@types/fs-extra": "^9.0.7",
-    "@types/jsdom": "^21.1.7",
-    "@types/luxon": "^3.4.2",
-    "@types/node": "^20.17.6",
-    "@types/pg": "^8.11.10",
-    "@types/pg-cursor": "^2.7.2",
-    "@types/slug": "^5.0.9",
-    "@typescript-eslint/eslint-plugin": "^8.13.0",
-    "@typescript-eslint/parser": "^8.13.0",
-    "cross-env": "^10.0.0",
-    "eslint": "^8.57.1",
-    "kysely-codegen": "^0.18.0",
-    "prettier": "^3.5.3",
-    "tslib": "^2.1.0",
-    "typescript": "^5.8.3"
-  }
-}
+{
+  "name": "@tricoteuses/senat",
+  "version": "2.9.8",
+  "description": "Handle French Sénat's open data",
+  "keywords": [
+    "France",
+    "open data",
+    "Parliament",
+    "Sénat"
+  ],
+  "author": "Emmanuel Raviart <emmanuel@raviart.com>",
+  "bugs": {
+    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat/issues"
+  },
+  "homepage": "https://tricoteuses.fr/",
+  "license": "AGPL-3.0-or-later",
+  "repository": {
+    "type": "git",
+    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat.git"
+  },
+  "type": "module",
+  "engines": {
+    "node": ">=22"
+  },
+  "files": [
+    "lib"
+  ],
+  "exports": {
+    ".": {
+      "import": "./lib/index.js",
+      "types": "./lib/index.d.ts"
+    },
+    "./loaders": {
+      "import": "./lib/loaders.js",
+      "types": "./lib/loaders.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsc",
+    "build:types": "tsc --emitDeclarationOnly",
+    "data:convert_data": "tsx src/scripts/convert_data.ts",
+    "data:download": "tsx src/scripts/data-download.ts",
+    "data:generate_schemas": "tsx src/scripts/retrieve_open_data.ts --schema",
+    "data:retrieve_agenda": "cross-env TZ='Etc/UTC' tsx src/scripts/retrieve_agenda.ts",
+    "data:retrieve_comptes_rendus": "tsx src/scripts/retrieve_comptes_rendus.ts",
+    "data:retrieve_documents": "tsx src/scripts/retrieve_documents.ts",
+    "data:retrieve_open_data": "tsx src/scripts/retrieve_open_data.ts --all",
+    "data:retrieve_senateurs_photos": "tsx src/scripts/retrieve_senateurs_photos.ts --fetch",
+    "data:retrieve_videos": "tsx src/scripts/retrieve_videos.ts",
+    "data:parse_textes_lois": "tsx src/scripts/parse_textes.ts",
+    "prepare": "npm run build",
+    "prepublishOnly": "npm run build",
+    "prettier": "prettier --write 'src/**/*.ts' 'tests/**/*.test.ts'",
+    "type-check": "tsc --noEmit",
+    "type-check:watch": "npm run type-check -- --watch"
+  },
+  "dependencies": {
+    "@biryani/core": "^0.2.1",
+    "cheerio": "^1.1.2",
+    "command-line-args": "^5.1.1",
+    "dotenv": "^8.2.0",
+    "fs-extra": "^9.1.0",
+    "jsdom": "^26.0.0",
+    "kysely": "^0.27.4",
+    "luxon": "^3.5.0",
+    "node-stream-zip": "^1.8.2",
+    "pg": "^8.13.1",
+    "pg-cursor": "^2.12.1",
+    "slug": "^11.0.0",
+    "tsx": "^4.19.4",
+    "windows-1252": "^1.0.0"
+  },
+  "devDependencies": {
+    "@typed-code/schemats": "^5.0.1",
+    "@types/cheerio": "^1.0.0",
+    "@types/command-line-args": "^5.0.0",
+    "@types/fs-extra": "^9.0.7",
+    "@types/jsdom": "^21.1.7",
+    "@types/luxon": "^3.4.2",
+    "@types/node": "^20.17.6",
+    "@types/pg": "^8.11.10",
+    "@types/pg-cursor": "^2.7.2",
+    "@types/slug": "^5.0.9",
+    "@typescript-eslint/eslint-plugin": "^8.13.0",
+    "@typescript-eslint/parser": "^8.13.0",
+    "cross-env": "^10.0.0",
+    "eslint": "^8.57.1",
+    "kysely-codegen": "^0.18.0",
+    "prettier": "^3.5.3",
+    "tslib": "^2.1.0",
+    "typescript": "^5.8.3"
+  }
+}

package/lib/validators/senat.js

@@ -1,24 +0,0 @@
-"use strict";
-// import { validateNonEmptyTrimmedString } from "@biryani/core"
-// const acteurUidRegExp = /^PA\d+$/
-// const organeUidRegExp = /^PO\d+$/
-// export function validateSenateurUid(input: any): [any, any] {
-//   const [value, error] = validateNonEmptyTrimmedString(input)
-//   if (error !== null) {
-//     return [value, error]
-//   }
-//   if (!acteurUidRegExp.test(value)) {
-//     return [value, 'Invalid "acteur" unique ID']
-//   }
-//   return [value, null]
-// }
-// export function validateOrganeUid(input: any): [any, any] {
-//   const [value, error] = validateNonEmptyTrimmedString(input)
-//   if (error !== null) {
-//     return [value, error]
-//   }
-//   if (!organeUidRegExp.test(value)) {
-//     return [value, 'Invalid "organe" unique ID']
-//   }
-//   return [value, null]
-// }