@tricoteuses/senat 3.1.20 → 3.1.22

package/lib/src/debats.d.ts

@@ -0,0 +1,38 @@
+export interface DebatAuteurRow {
+    code: string | null;
+    matricule: string | null;
+    nom: string | null;
+    prenom: string | null;
+}
+export interface DebatInterventionRow {
+    analyse: string | null;
+    auteur: DebatAuteurRow | null;
+    auteur_code: string;
+    fonction_intervenant: string | null;
+    id: string | null;
+    url: string | null;
+}
+export interface DebatSectionRow {
+    categorie: string | null;
+    id?: string | null;
+    interventions: DebatInterventionRow[];
+    lecture_id?: string | null;
+    libelle?: string | null;
+    numero?: string | null;
+    objet: string | null;
+    type: string | null;
+    url?: string | null;
+}
+export interface DebatLectureRow {
+    id: string;
+}
+export interface DebatResult {
+    date_seance: string | null;
+    etat_synchronisation: string | null;
+    id: string | null;
+    lectures: DebatLectureRow[];
+    numero: string | null;
+    sections: DebatSectionRow[];
+    sections_divers: DebatSectionRow[];
+    url: string | null;
+}

package/lib/src/debats.js

@@ -0,0 +1 @@
+export {};

package/lib/src/dosleg.d.ts

@@ -0,0 +1,142 @@
+export interface DossierThemeRow {
+    libelle: string;
+}
+export type DossierAuteurRow = {
+    matricule: string | null;
+    nom_usuel: string;
+    ordre: string | null;
+    prenom: string | null;
+    qualite: string | null;
+    role: string | null;
+};
+export type DossierDocumentAnnexeRow = {
+    type_document: string;
+    url: string | null;
+};
+export type DossierTexte = {
+    auteurs?: DossierAuteurRow[] | null;
+    code_adoption?: string | null;
+    code_organisme?: string | null;
+    date?: string | null;
+    id?: string | null;
+    modification?: string | null;
+    numero?: number | string | null;
+    ordre_origine?: string | null;
+    origine?: string | null;
+    session?: number | null;
+    titre?: string | null;
+    type?: string | null;
+    url?: string | null;
+};
+export type DossierRapport = {
+    auteurs?: DossierAuteurRow[] | null;
+    code_organisme?: string | null;
+    date?: string | null;
+    documents_annexes?: DossierDocumentAnnexeRow[] | null;
+    id?: string | null;
+    numero?: number | string | null;
+    session?: number | null;
+    sous_titre?: string | null;
+    titre?: string | null;
+    type?: string | null;
+    url?: string | null;
+};
+export type DossierDateSeance = {
+    date?: string | null;
+};
+export type DossierLectureAssemblee = {
+    assemblee?: string | null;
+    code_organisme?: string | null;
+    date_publication_amendements_commission?: string | null;
+    date_publication_amendements_seance?: string | null;
+    dates_seances?: DossierDateSeance[] | null;
+    libelle_organisme?: string | null;
+    loi_intitule_modifie?: string | null;
+    numero_petite_loi?: number | null;
+    ordre_lecture_assemblee?: string | null;
+    origine_proposition?: string | null;
+    rapports?: DossierRapport[] | null;
+    session?: number | null;
+    textes?: DossierTexte[] | null;
+    url_cr_debats?: string | null;
+    url_petite_loi?: string | null;
+};
+export type DossierLecture = {
+    lectures_assemblee?: DossierLectureAssemblee[] | null;
+    libelle?: string | null;
+    ordre_lecture?: number | string | null;
+    type_lecture?: string | null;
+};
+export interface DossierLegislatifResult {
+    code: string | null;
+    code_dossier_an: string | null;
+    code_nature_dossier: string | null;
+    code_organisme_resolution: string | null;
+    condition_saisine_CoC: string | null;
+    date_decision_CoC: string | null;
+    date_opposition_procedure_acceleree: string | null;
+    date_procedure_acceleree: string | null;
+    date_publication_JO: string | null;
+    date_publication_JO_correctif_1: string | null;
+    date_publication_JO_correctif_2: string | null;
+    date_promulgation: string | null;
+    date_retrait_procedure_acceleree: string | null;
+    date_saisine_CoC: string | null;
+    etat_dossier: string | null;
+    lectures: DossierLecture[];
+    libelle_decision_CoC: string | null;
+    libelle_type_dossier: string | null;
+    mot_cle: string | null;
+    num_decision_CoC: string | null;
+    numero: string | null;
+    numero_JO: string | null;
+    numero_JO_correctif_1: string | null;
+    numero_JO_correctif_2: string | null;
+    signet: string;
+    signet_alternatif: string | null;
+    themes: DossierThemeRow[];
+    titre: string | null;
+    titre_JO: string;
+    titre_court: string | null;
+    titre_long: string | null;
+    titre_long_original: string | null;
+    urgence: string | null;
+    url: string;
+    url_JO: string | null;
+    url_JO_correctif_1: string | null;
+    url_JO_correctif_2: string | null;
+    url_decision_CoC: string | null;
+    url_dossier_assemblee_nationale: string | null;
+    url_dossier_CoC: string | null;
+    url_ordonnance: string | null;
+    url_presentation_articles: string | null;
+}
+export type DossierWithLectures = DossierLegislatifResult & {
+    actes_legislatifs?: ActeLegislatif[] | null;
+    lectures?: DossierLecture[] | null;
+    numero_JO?: string | number | null;
+    signet: string;
+    themes?: DossierThemeRow[] | null;
+    url_JO?: string | null;
+    url_decision_CoC?: string | null;
+    url_dossier_CoC?: string | null;
+};
+export type ActeLegislatif = {
+    adoption?: string;
+    chambre: "AN" | "SN";
+    code_acte: string;
+    code_organisme: string | null;
+    date: string;
+    date_publication_JO?: string | null;
+    id?: string | null;
+    libelle: string;
+    numero?: string | number | null;
+    numero_JO?: string | number | null;
+    session?: number | null;
+    signet_dossier: string;
+    texte_url?: string | null;
+    uid: string;
+    url_legifrance?: string | null;
+};
+export declare function getCodeActeLecture(codeNatureDossier: string, typeLecture: string, assemblee: string): string | null;
+export declare function buildActesLegislatifs(dossier: DossierWithLectures): ActeLegislatif[];

package/lib/src/dosleg.js

@@ -0,0 +1,193 @@
+export function getCodeActeLecture(codeNatureDossier, typeLecture, assemblee) {
+    const codeAssemblee = assemblee === "Sénat" ? "SN" : assemblee === "Assemblée nationale" ? "AN" : null;
+    if (typeLecture === "Commission mixte paritaire") {
+        return "CMP";
+    }
+    if (!codeAssemblee) {
+        return null;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Première lecture") {
+        return `${codeAssemblee}1`;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Deuxième lecture") {
+        return `${codeAssemblee}2`;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Troisième lecture") {
+        return `${codeAssemblee}3`;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Quatrième lecture") {
+        return `${codeAssemblee}4`;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Nouvelle lecture") {
+        return `${codeAssemblee}NLEC`;
+    }
+    if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Lecture définitive") {
+        return `${codeAssemblee}LDEF`;
+    }
+    if (["ppr"].includes(codeNatureDossier) && typeLecture === "Première lecture") {
+        return `${codeAssemblee}LUNI`;
+    }
+    return null;
+}
+function getDateSortValue(value) {
+    if (!value) {
+        return Number.POSITIVE_INFINITY;
+    }
+    const timestamp = new Date(value).getTime();
+    return Number.isNaN(timestamp) ? Number.POSITIVE_INFINITY : timestamp;
+}
+function compareByDate(left, right) {
+    return getDateSortValue(left.date) - getDateSortValue(right.date);
+}
+function getPhasePrefix(lecture, assemblee) {
+    if (assemblee !== "Sénat")
+        return null;
+    const typeLibelle = (lecture.type_lecture || "").toLowerCase();
+    if (typeLibelle.includes("cmp") || typeLibelle.includes("mixte"))
+        return "CMP";
+    if (typeLibelle.includes("nouvelle lecture"))
+        return "SNNLEC";
+    if (typeLibelle.includes("définitive"))
+        return "SNLDEF";
+    if (typeLibelle.includes("unique"))
+        return "SNLUNI";
+    if (lecture.ordre_lecture) {
+        return `SN${lecture.ordre_lecture}`;
+    }
+    if (typeLibelle.includes("première"))
+        return "SN1";
+    if (typeLibelle.includes("deuxième") || typeLibelle.includes("seconde"))
+        return "SN2";
+    return "SN1";
+}
+export function buildActesLegislatifs(dossier) {
+    const actes = [];
+    const loiSignet = dossier.signet;
+    const lectures = dossier.lectures ?? [];
+    for (const lecture of lectures) {
+        const lecturesAssemblee = lecture.lectures_assemblee ?? [];
+        for (const lecAss of lecturesAssemblee) {
+            if (lecAss.assemblee !== "Sénat")
+                continue;
+            const phasePrefix = getPhasePrefix(lecture, lecAss.assemblee);
+            if (!phasePrefix)
+                continue;
+            const textes = lecAss.textes ?? [];
+            const textesTries = [...textes].sort(compareByDate);
+            const depotTexte = textesTries.find((t) => (t.origine || "").toLowerCase().includes("déposé") ||
+                (t.origine || "").toLowerCase().includes("transmis") ||
+                t.ordre_origine === "0");
+            if (depotTexte && depotTexte.date) {
+                actes.push({
+                    code_acte: `${phasePrefix}-DEPOT`,
+                    date: depotTexte.date,
+                    libelle: `Dépôt du texte n°${depotTexte.numero}`,
+                    id: depotTexte.id,
+                    numero: depotTexte.numero,
+                    uid: `${loiSignet}-${phasePrefix}-DEPOT`,
+                    session: lecAss.session,
+                    chambre: "SN",
+                    signet_dossier: loiSignet,
+                    texte_url: depotTexte.url,
+                    code_organisme: null,
+                });
+            }
+            const rapports = lecAss.rapports ?? [];
+            for (const rap of rapports) {
+                if (rap.date) {
+                    actes.push({
+                        code_acte: `${phasePrefix}-COM-FOND`,
+                        date: rap.date,
+                        libelle: `Rapport n°${rap.numero} de la commission`,
+                        id: rap.id,
+                        numero: rap.numero,
+                        code_organisme: rap.code_organisme ?? null,
+                        uid: `${loiSignet}-${phasePrefix}-COM`,
+                        session: lecAss.session,
+                        chambre: "SN",
+                        signet_dossier: loiSignet,
+                        texte_url: rap.url,
+                    });
+                }
+            }
+            const datesSeances = lecAss.dates_seances ?? [];
+            if (datesSeances.length > 0) {
+                datesSeances.sort(compareByDate);
+                const premiereSeance = datesSeances[0];
+                if (premiereSeance && premiereSeance.date) {
+                    actes.push({
+                        code_acte: `${phasePrefix}-DEBATS-SEANCE`,
+                        date: premiereSeance.date,
+                        libelle: "Discussion en séance publique",
+                        id: null,
+                        uid: `${loiSignet}-${phasePrefix}-DEBATS-SEANCE`,
+                        session: lecAss.session,
+                        chambre: "SN",
+                        signet_dossier: loiSignet,
+                        code_organisme: null,
+                    });
+                }
+            }
+            const texteFinal = [...textesTries].reverse().find((t) => {
+                const origine = (t.origine || "").toLowerCase();
+                return (origine.includes("adopté") ||
+                    origine.includes("rejeté") ||
+                    origine.includes("devenu résolution") ||
+                    t.code_adoption === "O");
+            });
+            if (texteFinal && texteFinal.date) {
+                const origine = (texteFinal.origine || "").toLowerCase();
+                let libelleStatut = "Adopté";
+                if (origine.includes("rejeté")) {
+                    libelleStatut = "Rejeté";
+                }
+                else if (origine.includes("devenue résolution")) {
+                    libelleStatut = "Adopté";
+                }
+                actes.push({
+                    code_acte: `${phasePrefix}-DEBATS-DEC`,
+                    date: texteFinal.date,
+                    libelle: `${libelleStatut === "Adopté" ? "Adoption" : "Rejet"} (Texte n°${texteFinal.numero})`,
+                    id: texteFinal.id,
+                    numero: texteFinal.numero,
+                    adoption: libelleStatut,
+                    uid: `${loiSignet}-DEC-${texteFinal.numero}`,
+                    session: lecAss.session,
+                    chambre: "SN",
+                    signet_dossier: loiSignet,
+                    texte_url: texteFinal.url,
+                    code_organisme: null,
+                });
+            }
+        }
+    }
+    if (dossier.date_decision_CoC) {
+        actes.push({
+            code_acte: "CC",
+            date: dossier.date_decision_CoC,
+            libelle: "Décision du Conseil constitutionnel",
+            id: dossier.url_decision_CoC,
+            uid: `${loiSignet}-CC`,
+            chambre: "AN",
+            signet_dossier: loiSignet,
+            code_organisme: null,
+            texte_url: dossier.url_decision_CoC || dossier.url_dossier_CoC,
+        });
+    }
+    if (dossier.date_promulgation) {
+        actes.push({
+            code_acte: "PROM",
+            date: dossier.date_promulgation,
+            libelle: "Promulgation de la loi",
+            date_publication_JO: dossier.date_publication_JO,
+            numero_JO: dossier.numero_JO,
+            url_legifrance: dossier.url_JO,
+            id: dossier.url_JO,
+            uid: `${loiSignet}-PROM`,
+            chambre: "AN",
+            signet_dossier: loiSignet,
+            code_organisme: null,
+        });
+    }
+    return actes.sort(compareByDate);
+}

package/lib/src/git.d.ts

@@ -1,6 +1,7 @@
 export declare function initRepo(repositoryDir: string): void;
 export declare function commit(repositoryDir: string, message: string): boolean;
 export declare function commitAndPush(repositoryDir: string, message: string, remotes?: string[]): number;
+export declare function pull(repositoryDir: string, remote?: string, branch?: string): boolean;
 export declare function resetAndPull(gitDir: string): boolean;
 export declare function clone(gitGroupUrl: string | undefined, gitName: string, workingDir: string): void;
 export declare function run(repositoryDir: string, args: string, verbose?: boolean): string;

package/lib/src/git.js

@@ -5,6 +5,15 @@ const MAXBUFFER = 50 * 1024 * 1024;
 const GIT_LOCK_RETRY_DELAY_MS = 1000;
 const GIT_LOCK_RETRY_COUNT = 5;
 const GIT_LOCK_STALE_AFTER_MS = 2 * 60 * 1000;
+function asExecSyncError(error) {
+    return error;
+}
+function outputToString(output) {
+    if (output == null) {
+        return "";
+    }
+    return Buffer.isBuffer(output) ? output.toString("utf-8") : output;
+}
 function sleep(ms) {
     Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
 }
@@ -12,7 +21,7 @@ function getIndexLockPath(repositoryDir) {
     return path.join(repositoryDir, ".git", "index.lock");
 }
 function isIndexLockError(error) {
-    const stderr = String(error?.stderr || "");
+    const stderr = error instanceof Error ? outputToString(asExecSyncError(error).stderr) : "";
     return /index\.lock': File exists\./.test(stderr);
 }
 function removeStaleIndexLock(repositoryDir) {
@@ -81,9 +90,9 @@ export function commit(repositoryDir, message) {
         });
         return true;
     }
-    catch (childProcess) {
-        if (childProcess.stdout === null ||
-            !/nothing to commit|rien à valider/.test(childProcess.stdout)) {
+    catch (error) {
+        const childProcess = asExecSyncError(error);
+        if (childProcess.stdout === null || !/nothing to commit|rien à valider/.test(outputToString(childProcess.stdout))) {
             console.error(childProcess.output);
             throw childProcess;
         }
@@ -102,10 +111,11 @@ export function commitAndPush(repositoryDir, message, remotes) {
                     stdio: ["ignore", "ignore", "pipe"],
                 });
             }
-            catch (childProcess) {
+            catch (error) {
+                const childProcess = asExecSyncError(error);
                 // Don't stop when push fails.
                 console.error(childProcess.output);
-                exitCode = childProcess.status;
+                exitCode = childProcess.status ?? 1;
             }
         }
     }
@@ -115,6 +125,27 @@ export function commitAndPush(repositoryDir, message, remotes) {
     }
     return exitCode;
 }
+export function pull(repositoryDir, remote = "origin", branch = "master") {
+    initRepo(repositoryDir);
+    const statusOutput = execSync("git status --porcelain", {
+        cwd: repositoryDir,
+        env: process.env,
+        encoding: "utf-8",
+        stdio: ["ignore", "pipe", "pipe"],
+        maxBuffer: MAXBUFFER,
+    }).trim();
+    if (statusOutput.length > 0) {
+        return false;
+    }
+    execSync(`git pull --rebase ${remote} ${branch}`, {
+        cwd: repositoryDir,
+        env: process.env,
+        encoding: "utf-8",
+        stdio: ["ignore", "ignore", "pipe"],
+        maxBuffer: MAXBUFFER,
+    });
+    return true;
+}
 export function resetAndPull(gitDir) {
     execSync("git reset --hard origin/master", {
         cwd: gitDir,
@@ -154,9 +185,11 @@ export function run(repositoryDir, args, verbose) {
             console.log(output);
         return output;
     }
-    catch (childProcess) {
-        for (const output of ["stdout", "stderr"])
-            console.error(`${output}: ${childProcess[output]}`);
+    catch (error) {
+        const childProcess = asExecSyncError(error);
+        for (const output of ["stdout", "stderr"]) {
+            console.error(`${output}: ${outputToString(childProcess[output])}`);
+        }
         throw childProcess;
     }
 }
@@ -175,8 +208,9 @@ export function test(repositoryDir, args, verbose) {
             console.log(output);
         return true;
     }
-    catch (childProcess) {
-        if (childProcess.status != 0)
+    catch (error) {
+        const childProcess = asExecSyncError(error);
+        if (childProcess.status !== 0)
             return false;
         throw childProcess;
     }

package/lib/src/loaders.d.ts

@@ -1,15 +1,15 @@
-import { AmendementResult } from "./model/ameli";
-import { DebatResult } from "./model/debats";
-import { DossierLegislatifResult } from "./model/dosleg";
-import { QuestionResult } from "./model/questions";
-import { ScrutinResult } from "./model/scrutins";
-import { CirconscriptionResult, OrganismeResult, SenateurResult } from "./model/sens";
-import { Reunion } from "./types/agenda";
-import { FlatTexte, DocumentMetadata } from "./types/texte";
-import { CompteRendu } from "./types/compte_rendu";
-import { DocumentResult } from "./model/documents";
-export { EnabledDatasets } from "./datasets";
-export type { DocumentResult } from "./model/documents";
+import { AmendementResult } from "./model/ameli.js";
+import { DebatResult } from "./model/debats.js";
+import { DossierLegislatifResult } from "./model/dosleg.js";
+import { QuestionResult } from "./model/questions.js";
+import { ScrutinResult } from "./model/scrutins.js";
+import { CirconscriptionResult, OrganismeResult, SenateurResult } from "./model/sens.js";
+import { Reunion } from "./rich_types/agenda.js";
+import { FlatTexte, DocumentMetadata } from "./rich_types/texte.js";
+import { CompteRendu } from "./rich_types/compte_rendu.js";
+import { DocumentResult } from "./model/documents.js";
+export { EnabledDatasets } from "./datasets.js";
+export type { DocumentResult } from "./model/documents.js";
 export declare const AGENDA_FOLDER = "agenda";
 export declare const COMPTES_RENDUS_FOLDER = "seances";
 export declare const COMMISSION_FOLDER = "commissions";

package/lib/src/loaders.js

@@ -1,10 +1,10 @@
 import fsex from "fs-extra";
 import fs from "fs";
 import path from "path";
-import * as git from "./git";
-import { datasets } from "./datasets";
-import { UNDEFINED_SESSION } from "./types/sessions";
-export { EnabledDatasets } from "./datasets";
+import * as git from "./git.js";
+import { datasets } from "./datasets.js";
+import { UNDEFINED_SESSION } from "./rich_types/sessions.js";
+export { EnabledDatasets } from "./datasets.js";
 export const AGENDA_FOLDER = "agenda";
 export const COMPTES_RENDUS_FOLDER = "seances";
 export const COMMISSION_FOLDER = "commissions";
@@ -69,7 +69,8 @@ function* iterLoadSenatItems(dataDir, dataName, legislatureOrSession, subDir, {
             const itemJson = fs.readFileSync(filePath, { encoding: "utf8" });
             item = JSON.parse(itemJson);
         }
-        catch (err) {
+        catch (error) {
+            const err = error;
             console.warn(`[iterLoadSenatItems] skipped invalid JSON: ${filePath} (${err.message})`);
             continue;
         }
@@ -180,6 +181,9 @@ export function* iterLoadSenatTextes(dataDir, session, options = {}) {
         const texteItem = iterItem;
         const texte = texteItem.item;
         const texteId = texte["id"];
+        if (!texteId) {
+            continue;
+        }
         const { item: texteContent } = loadSenatTexteContent(dataDir, texte["session"], texteId);
         if (texteContent) {
             texteItem.item = { ...texteContent, ...texteItem.item };
@@ -222,9 +226,11 @@ export function* iterLoadSenatAgendas(dataDir, session) {
         const gr = raw;
         if (!gr.uid || !gr.date || !gr.titre)
             continue;
-        if (!Array.isArray(gr.events))
-            gr.events = [];
-        yield { item: gr };
+        const reunion = {
+            ...gr,
+            events: Array.isArray(gr.events) ? gr.events : [],
+        };
+        yield { item: reunion };
     }
 }
 export function* iterLoadSenatCirconscriptions(dataDir, options = {}) {

package/lib/src/model/agenda.d.ts

@@ -1,4 +1,4 @@
-import { AgendaEvent } from "../types/agenda";
+import { AgendaEvent } from "../rich_types/agenda.js";
 export declare function getStartAndEndTimes(timeStr: string | null | undefined, dateISO: string): {
     startTime: string | null;
     endTime: string | null;

package/lib/src/model/agenda.js

@@ -1,7 +1,7 @@
 import { JSDOM } from "jsdom";
 import { DateTime } from "luxon";
 import path from "path";
-import { ID_DATE_FORMAT, STANDARD_DATE_FORMAT } from "../scripts/datautil";
+import { ID_DATE_FORMAT, STANDARD_DATE_FORMAT } from "../scripts/datautil.js";
 const FR_TZ = "Europe/Paris";
 function eventIsSeance(eventElement) {
     return eventElement.classList.contains("evt-seance");
@@ -113,7 +113,7 @@ function transformAgenda(document, fileName) {
         const { startTime, endTime } = getStartAndEndTimes(timeOriginal, date);
         const titre = eventElement.querySelector(".titre")?.textContent?.trim() || "";
         const organe = eventElement.querySelector(".organe")?.textContent?.trim() || null;
-        const objet = eventElement.querySelector(".objet")?.textContent?.trim()?.replace(/^- /, "") || null;
+        const objet = eventElement.querySelector(".objet")?.textContent?.trim()?.replace(/^- /, "") || null;
         const lieu = eventElement.querySelector(".lieu")?.textContent || null;
         const videoElement = eventElement.querySelector(".video");
         const urlDossierSenat = getUrlDossierSenat(eventElement.querySelectorAll(".lien a"));
@@ -142,7 +142,7 @@ export async function parseAgendaFromFile(htmlFilePath) {
         return transformAgenda(document, fileName);
     }
     catch (error) {
-        console.error(`Could not parse texte with error ${error}`);
+        console.error(`Could not parse texte with error ${error.message}`);
     }
     return null;
 }