@tricoteuses/senat 3.1.10 → 3.1.12

package/lib/src/raw_types_schemats/sens.js

@@ -0,0 +1,2 @@
+/* tslint:disable */
+export {};

package/lib/src/rich_types/dosleg.d.ts

@@ -19,51 +19,124 @@ export type DossierDocumentAnnexeRow = {
 };
 export type DossierTexte = {
     auteurs?: DossierAuteurRow[] | null;
+    avis_conseil_etat?: string | null;
     code_adoption?: string | null;
     code_organisme?: string | null;
     date?: string | null;
+    date_rejet_discussion_immediate?: string | null;
+    date_seance_rattachement?: string | null;
     id?: string | null;
+    libelle_url_2?: string | null;
+    libelle_url_3?: string | null;
+    libelle_url_4?: string | null;
     modification?: string | null;
     numero?: number | string | null;
+    numero_bis?: string | null;
     ordre_origine?: string | null;
     origine?: string | null;
+    prix?: string | null;
+    reserve_commission_speciale?: string | null;
     session?: number | null;
     titre?: string | null;
     type?: string | null;
     url?: string | null;
+    url_2?: string | null;
+    url_3?: string | null;
+    url_4?: string | null;
+    url_cnen?: string | null;
 };
 export type DossierRapport = {
+    annexe?: number | null;
     auteurs?: DossierAuteurRow[] | null;
+    bleu_budgetaire?: string | null;
     code_organisme?: string | null;
     date?: string | null;
+    date_seance_rattachement?: string | null;
+    depot_only?: string | null;
     documents_annexes?: DossierDocumentAnnexeRow[] | null;
+    fascicule?: number | null;
+    format_publication?: string | null;
     id?: string | null;
+    libelle_url_2?: string | null;
+    libelle_url_3?: string | null;
+    libelle_url_4?: string | null;
     numero?: number | string | null;
+    numero_assemblee_nationale?: string | null;
+    numero_bis?: string | null;
+    ordre_rapport?: string | null;
+    prix?: string | null;
+    resume?: string | null;
     session?: number | null;
     sous_titre?: string | null;
     titre?: string | null;
+    titre_court?: string | null;
+    tome?: number | null;
     type?: string | null;
     url?: string | null;
+    url_2?: string | null;
+    url_3?: string | null;
+    url_4?: string | null;
+    volume?: number | null;
 };
 export type DossierDateSeance = {
+    code?: string | null;
     date?: string | null;
+    statut?: string | null;
+};
+export type DossierReunionCommission = {
+    date: string | null;
+    titre: string | null;
+    url_compte_rendu: string | null;
+};
+export type DossierCommissionSaisie = {
+    code_organisme: string | null;
+    deleguee_au_fond: string | null;
+    libelle_organisme: string | null;
+    reunions?: DossierReunionCommission[] | null;
+    type_saisine: "avis" | "fond";
 };
 export type DossierLectureAssemblee = {
+    alias_ppre?: string | null;
     assemblee?: string | null;
     code_organisme?: string | null;
+    complement_numero_petite_loi?: string | null;
+    complement_numero_petite_loi_2?: string | null;
+    complement_numero_petite_loi_3?: string | null;
+    date_liasse_amendements_adoptes_commission?: string | null;
+    date_liasse_amendements_adoptes_seance?: string | null;
     date_publication_amendements_commission?: string | null;
     date_publication_amendements_seance?: string | null;
     dates_seances?: DossierDateSeance[] | null;
+    commissions_saisies?: DossierCommissionSaisie[] | null;
+    depot_only?: string | null;
     libelle_organisme?: string | null;
+    libelle_ppre?: string | null;
     loi_intitule_modifie?: string | null;
+    note_petite_loi?: string | null;
+    note_petite_loi_2?: string | null;
+    note_petite_loi_3?: string | null;
+    numero_liasse_amendements_adoptes_commission?: string | null;
+    numero_liasse_amendements_adoptes_seance?: string | null;
     numero_petite_loi?: number | null;
+    numero_petite_loi_commission?: number | null;
+    numero_texte_amende_commission?: string | null;
+    numero_texte_amende_seance?: string | null;
     ordre_lecture_assemblee?: string | null;
     origine_proposition?: string | null;
     rapports?: DossierRapport[] | null;
+    reunion_commission_ppre?: string | null;
     session?: number | null;
+    session_liasse_amendements_adoptes_commission?: number | null;
+    session_liasse_amendements_adoptes_seance?: number | null;
+    session_ppre?: string | null;
+    session_texte_amende_commission?: number | null;
+    session_texte_amende_seance?: number | null;
     textes?: DossierTexte[] | null;
     url_cr_debats?: string | null;
     url_petite_loi?: string | null;
+    url_petite_loi_2?: string | null;
+    url_petite_loi_3?: string | null;
+    url_petite_loi_commission?: string | null;
 };
 export type DossierLecture = {
     lectures_assemblee?: DossierLectureAssemblee[] | null;
@@ -138,6 +211,7 @@ export type ActeLegislatif = {
     numero_JO?: string | number | null;
     session?: number | null;
     signet_dossier: string;
+    rapport_url?: string | null;
     texte_url?: string | null;
     uid: string;
     url_legifrance?: string | null;

package/lib/src/rich_types/dosleg.js

@@ -105,21 +105,39 @@ export function buildActesLegislatifs(dossier) {
                 });
             }
             const rapports = lecAss.rapports ?? [];
-            for (const rap of rapports) {
-                if (rap.date) {
-                    const codeActeCommission = getCommissionCodeActe(phasePrefix, rap.type);
+            const commissionsSaisies = lecAss.commissions_saisies ?? [];
+            for (const commission of commissionsSaisies) {
+                const isAvis = commission.type_saisine === "avis";
+                const commissionCodeActe = isAvis
+                    ? commission.deleguee_au_fond === "O"
+                        ? `${phasePrefix}-COM-CAE-DEC`
+                        : `${phasePrefix}-COM-AVIS`
+                    : `${phasePrefix}-COM-FOND`;
+                const commissionRaps = rapports.filter((r) => r.code_organisme === commission.code_organisme);
+                const firstRapDate = commissionRaps.find((r) => r.date)?.date;
+                const firstReunionDate = commission.reunions?.find((r) => r.date)?.date;
+                const acteDate = firstRapDate ?? firstReunionDate;
+                if (acteDate) {
+                    const rap = commissionRaps.find((r) => r.date);
                     actes.push({
-                        code_acte: codeActeCommission,
-                        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`,
+                        code_acte: commissionCodeActe,
+                        date: acteDate,
+                        libelle: isAvis
+                            ? rap
+                                ? `Avis n°${rap.numero} de la commission`
+                                : "Travaux de la commission saisie pour avis"
+                            : rap
+                                ? `Rapport n°${rap.numero} de la commission`
+                                : "Travaux de la commission saisie au fond",
+                        id: rap?.id ?? null,
+                        numero: rap?.numero ?? null,
+                        code_organisme: commission.code_organisme ?? null,
+                        uid: `${loiSignet}-${phasePrefix}-COM-${commission.code_organisme ?? ""}`,
                         session: lecAss.session,
                         chambre: "SN",
                         signet_dossier: loiSignet,
-                        texte_url: rap.url,
+                        rapport_url: rap?.url ?? null,
+                        texte_url: depotTexte?.url ?? null,
                     });
                 }
             }
@@ -128,6 +146,7 @@ export function buildActesLegislatifs(dossier) {
                 datesSeances.sort(compareByDate);
                 const premiereSeance = datesSeances[0];
                 if (premiereSeance && premiereSeance.date) {
+                    const texteAvantSeance = textesTries.find((t) => (t.origine || "").toLowerCase().includes("de la commission"));
                     actes.push({
                         code_acte: `${phasePrefix}-DEBATS-SEANCE`,
                         date: premiereSeance.date,
@@ -138,11 +157,14 @@ export function buildActesLegislatifs(dossier) {
                         chambre: "SN",
                         signet_dossier: loiSignet,
                         code_organisme: null,
+                        texte_url: texteAvantSeance?.url ?? null,
                     });
                 }
             }
             const texteFinal = [...textesTries].reverse().find((t) => {
                 const origine = (t.origine || "").toLowerCase();
+                if (origine.includes("de la commission"))
+                    return false;
                 return (origine.includes("adopté") ||
                     origine.includes("rejeté") ||
                     origine.includes("devenu résolution") ||
@@ -157,9 +179,7 @@ export function buildActesLegislatifs(dossier) {
                 else if (origine.includes("devenue résolution")) {
                     libelleStatut = "Adopté";
                 }
-                // "devenu résolution du Sénat" : adoptée en commission sans séance publique (art. 73 quinquies RSN)
-                // On utilise COM-CAE-DEC plutôt que DEBATS-DEC pour refléter l'absence de séance plénière
-                const codeActeDecision = (texteFinal.origine || "").toLowerCase().includes("devenu résolution")
+                const codeActeDecision = origine.includes("devenu résolution")
                     ? `${phasePrefix}-COM-CAE-DEC`
                     : `${phasePrefix}-DEBATS-DEC`;
                 actes.push({

package/lib/src/scripts/debug_dosleg_query.d.ts

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+/**
+ * Debug script to check the DosLeg query compilation
+ * Helps identify the "column undefined" error
+ */
+export {};

package/lib/src/scripts/debug_dosleg_query.js

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+/**
+ * Debug script to check the DosLeg query compilation
+ * Helps identify the "column undefined" error
+ */
+import { db } from "../server/databases_postgres.js";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { sql } from "kysely";
+async function debugDoslegQuery() {
+    console.log("=== Debugging DosLeg Query ===\n");
+    try {
+        // Build the same query as findAllDossiers but capture SQL
+        const query = db
+            .withSchema("senat")
+            .selectFrom("dosleg_loi as loi")
+            .leftJoin("dosleg_typloi as typloi", "typloi.typloicod", "loi.typloicod")
+            .leftJoin("dosleg_etaloi as etaloi", "etaloi.etaloicod", "loi.etaloicod")
+            .leftJoin("dosleg_deccoc as deccoc", "deccoc.deccoccod", "loi.deccoccod")
+            .select((eb) => [
+            sql `rtrim(${eb.ref("loi.loicod")})`.as("code"),
+            "loi.numero as numero",
+            "loi.signet as signet",
+        ]);
+        const compiled = query.compile();
+        console.log("✓ Query compiled successfully (basic columns)\n");
+        console.log("SQL:", compiled.sql);
+        console.log("\n");
+        // Try with simple lectures first
+        const queryWithLectures = db
+            .withSchema("senat")
+            .selectFrom("dosleg_loi as loi")
+            .select((eb) => [
+            "loi.signet as signet",
+            jsonArrayFrom(eb.withSchema("senat").selectFrom("dosleg_lecture as lecture").select(["lecture.lecidt as id"])).as("lectures"),
+        ]);
+        const compiledWithLectures = queryWithLectures.compile();
+        console.log("✓ Query with simple lectures compiled successfully\n");
+        console.log("SQL:", compiledWithLectures.sql);
+        console.log("\n");
+        console.log("✅ Basic query structures seem valid");
+        console.log("\nThe issue is likely in one of the nested subqueries with cross-references.");
+        console.log("Try running findAllDossiers with the verbose flag to see exactly where it fails.");
+    }
+    catch (error) {
+        console.error("❌ Error during query compilation:");
+        console.error(error instanceof Error ? error.message : String(error));
+        process.exit(1);
+    }
+}
+debugDoslegQuery().catch(console.error);

package/lib/src/scripts/retrieve_agenda.js

@@ -10,7 +10,7 @@ import { ID_DATE_FORMAT } from "./datautil.js";
 import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
 import { fetchWithRetry } from "./shared/util.js";
 import { buildReunionsByBucket } from "../utils/reunion_parsing.js";
-import { buildSenatDossierIndex } from "../utils/reunion_odj_building.js";
+import { buildSenatDossierIndex, buildDoslegReunionIndex } from "../utils/reunion_odj_building.js";
 const optionsDefinitions = [
     ...commonOptions,
     {
@@ -47,8 +47,8 @@ async function retrieveAgendas(options, sessions) {
     if (options["parseAgenda"]) {
         fs.ensureDirSync(transformedAgendaDir);
     }
-    let dossierIndex = {};
-    dossierIndex = buildSenatDossierIndex(options);
+    const dossierIndex = buildSenatDossierIndex(options);
+    const doslegReunionIndex = buildDoslegReunionIndex(options);
     for (const session of sessions) {
         const originalAgendaSessionDir = path.join(originalAgendaDir, `${session}`);
         fs.ensureDirSync(originalAgendaSessionDir);
@@ -68,7 +68,7 @@ async function retrieveAgendas(options, sessions) {
             try {
                 await downloadAgenda(agendaName, agendaPath);
                 if (options["parseAgenda"]) {
-                    await parseAgenda(transformedAgendaSessionDir, agendaFileName, agendaPath, dossierIndex);
+                    await parseAgenda(transformedAgendaSessionDir, agendaFileName, agendaPath, dossierIndex, doslegReunionIndex);
                 }
             }
             catch (error) {
@@ -104,7 +104,7 @@ function writeGroupsAsFiles(dir, groups) {
         fs.writeJSONSync(outPath, g, { spaces: 2 });
     }
 }
-async function parseAgenda(transformedAgendaSessionDir, agendaFileName, agendaPath, dossierBySenatUrl) {
+async function parseAgenda(transformedAgendaSessionDir, agendaFileName, agendaPath, dossierBySenatUrl, doslegReunionIndex) {
     if (!options["silent"])
         console.log(`Parsing Agenda ${agendaPath}…`);
     const parsedAgendaEvents = await parseAgendaFromFile(agendaPath);
@@ -112,7 +112,7 @@ async function parseAgenda(transformedAgendaSessionDir, agendaFileName, agendaPa
         return;
     const flatPath = path.join(transformedAgendaSessionDir, `${agendaFileName}.json`);
     fs.writeJSONSync(flatPath, parsedAgendaEvents, { spaces: 2 });
-    const byBucket = buildReunionsByBucket(parsedAgendaEvents, dossierBySenatUrl);
+    const byBucket = buildReunionsByBucket(parsedAgendaEvents, dossierBySenatUrl, doslegReunionIndex);
     // SP
     if (byBucket.IDS.length > 0) {
         writeGroupsAsFiles(transformedAgendaSessionDir, byBucket.IDS);

package/lib/src/server/dosleg.js

@@ -87,6 +87,31 @@ export async function* findAllDossiers() {
                 "lecass.debatsurl as url_cr_debats",
                 sql `to_char(lecass.lecassamecomdat, 'YYYY-MM-DD')`.as("date_publication_amendements_commission"),
                 sql `to_char(lecass.lecassamedat, 'YYYY-MM-DD')`.as("date_publication_amendements_seance"),
+                "lecass.ptlnumcpl as complement_numero_petite_loi",
+                "lecass.ptlnot as note_petite_loi",
+                "lecass.ptlurl2 as url_petite_loi_2",
+                "lecass.ptlnot2 as note_petite_loi_2",
+                "lecass.ptlurl3 as url_petite_loi_3",
+                "lecass.ptlnot3 as note_petite_loi_3",
+                "lecass.ptlnumcpl2 as complement_numero_petite_loi_2",
+                "lecass.ptlnumcpl3 as complement_numero_petite_loi_3",
+                "lecass.libppr as libelle_ppre",
+                "lecass.sesppr as session_ppre",
+                "lecass.aliasppr as alias_ppre",
+                "lecass.ptlurlcom as url_petite_loi_commission",
+                "lecass.ptlnumcom as numero_petite_loi_commission",
+                "lecass.lecassame as numero_texte_amende_seance",
+                sql `lecass.lecassameses::int`.as("session_texte_amende_seance"),
+                "lecass.lecassamecom as numero_texte_amende_commission",
+                sql `lecass.lecassamesescom::int`.as("session_texte_amende_commission"),
+                "lecass.reucom as reunion_commission_ppre",
+                "lecass.depot_only as depot_only",
+                "lecass.lecassameado as numero_liasse_amendements_adoptes_seance",
+                sql `to_char(lecass.lecassameadodat, 'YYYY-MM-DD')`.as("date_liasse_amendements_adoptes_seance"),
+                sql `lecass.lecassameadoses::int`.as("session_liasse_amendements_adoptes_seance"),
+                "lecass.lecassamecomado as numero_liasse_amendements_adoptes_commission",
+                sql `to_char(lecass.lecassamecomadodat, 'YYYY-MM-DD')`.as("date_liasse_amendements_adoptes_commission"),
+                sql `lecass.lecassamecomadoses::int`.as("session_liasse_amendements_adoptes_commission"),
                 // Textes
                 jsonArrayFrom(eb3
                     .withSchema("senat")
@@ -118,6 +143,19 @@ export async function* findAllDossiers() {
                     sql `rtrim(typtxt.typtxtlib)`.as("type"),
                     sql `to_char(texte.txtoritxtdat, 'YYYY-MM-DD')`.as("date"),
                     sql `texte.sesann::int`.as("session"),
+                    "texte.url2 as url_2",
+                    "texte.url2txt as libelle_url_2",
+                    "texte.url3 as url_3",
+                    "texte.url3txt as libelle_url_3",
+                    "texte.url4 as url_4",
+                    "texte.url4txt as libelle_url_4",
+                    "texte.numerobis as numero_bis",
+                    "texte.texace as avis_conseil_etat",
+                    "texte.url_cnen as url_cnen",
+                    "texte.reserve_comspe as reserve_commission_speciale",
+                    sql `to_char(texte.datrejet_disc_immediate, 'YYYY-MM-DD')`.as("date_rejet_discussion_immediate"),
+                    sql `to_char(texte.texdatsea, 'YYYY-MM-DD')`.as("date_seance_rattachement"),
+                    "texte.prix as prix",
                     // Auteurs du texte
                     jsonArrayFrom(eb4
                         .withSchema("senat")
@@ -168,6 +206,26 @@ export async function* findAllDossiers() {
                     sql `rtrim(rtrim(rap.rapsoustit))`.as("sous_titre"),
                     sql `to_char(rap.date_depot, 'YYYY-MM-DD')`.as("date"),
                     sql `rap.sesann::int`.as("session"),
+                    "rap.raptom as tome",
+                    "rap.rapfac as fascicule",
+                    "rap.rapann as annexe",
+                    "rap.rapvol as volume",
+                    "rap.raptitcou as titre_court",
+                    "rap.url2 as url_2",
+                    "rap.url2txt as libelle_url_2",
+                    "rap.url3 as url_3",
+                    "rap.url3txt as libelle_url_3",
+                    "rap.url4 as url_4",
+                    "rap.url4txt as libelle_url_4",
+                    "rap.prix as prix",
+                    "rap.rapnuman as numero_assemblee_nationale",
+                    "rap.numerobis as numero_bis",
+                    sql `to_char(rap.rapdatsea, 'YYYY-MM-DD')`.as("date_seance_rattachement"),
+                    "rap.depot_only as depot_only",
+                    "rap.rapres as resume",
+                    "rap.forpubcod as code_format_publication",
+                    "rap.blecod as code_bleu_budgetaire",
+                    "lecassrap.lecassrapord as ordre_rapport",
                     // Auteurs du rapport
                     jsonArrayFrom(eb4
                         .withSchema("senat")
@@ -197,14 +255,54 @@ export async function* findAllDossiers() {
                 jsonArrayFrom(eb3
                     .withSchema("senat")
                     .selectFrom("dosleg_date_seance as date_seance")
-                    .select([sql `to_char(date_seance.date_s, 'YYYY-MM-DD')`.as("date")])
+                    .select([
+                    "date_seance.code as code",
+                    sql `to_char(date_seance.date_s, 'YYYY-MM-DD')`.as("date"),
+                    "date_seance.statut as statut",
+                ])
                     .whereRef("date_seance.lecidt", "=", "lecass.lecassidt")).as("dates_seances"),
+                // Commissions saisies (source : ameli.sai)
+                // Fusionnées avec la commission au fond (lecass.orgcod) en post-traitement
+                jsonArrayFrom(eb3
+                    .withSchema("senat")
+                    .selectFrom("ameli_sai as sai")
+                    .innerJoin("ameli_txt_ameli as txt_a", "txt_a.id", "sai.txtid")
+                    .innerJoin("ameli_com_ameli as com_a", "com_a.entid", "sai.comid")
+                    .innerJoin("ameli_ses as ses_a", "ses_a.id", "sai.sesid")
+                    .select([
+                    sql `rtrim(com_a.lib)`.as("code_organisme"),
+                    sql `rtrim(com_a.lil)`.as("libelle_organisme"),
+                    sql `case when sai.saityp = 'A' then 'avis' else 'fond' end`.as("type_saisine"),
+                    sql `sai.isdelegfond`.as("deleguee_au_fond"),
+                ])
+                    .where("sai.saityp", "in", ["A", "F"])
+                    .where("txt_a.doslegsignet", "is not", null)
+                    // correlated sub-query references outer tables not in FROM clause
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    .where(sql `txt_a.doslegsignet = loi.signet`)
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    .where(sql `ses_a.ann = lecass.sesann`)
+                    .groupBy(["com_a.lib", "com_a.lil", "sai.saityp", "sai.isdelegfond"])).as("commissions_saisies_ameli"),
+                // Réunions de commission (source : dosleg_aud)
+                jsonArrayFrom(eb3
+                    .withSchema("senat")
+                    .selectFrom("dosleg_aud as aud")
+                    .innerJoin("dosleg_org as org_a", "org_a.orgcod", "aud.orgcod")
+                    .select([
+                    sql `rtrim(aud.orgcod)`.as("code_organisme"),
+                    sql `rtrim(org_a.orgnom)`.as("libelle_organisme"),
+                    sql `to_char(aud.auddat, 'YYYY-MM-DD')`.as("date"),
+                    sql `rtrim(aud.audtit)`.as("titre"),
+                    sql `case when aud.audurl like 'http%' then rtrim(aud.audurl) else 'https://www.senat.fr/' || rtrim(aud.audurl) end`.as("url_compte_rendu"),
+                ])
+                    .whereRef("aud.lecassidt", "=", "lecass.lecassidt")
+                    .orderBy("aud.auddat", "asc")).as("reunions_commission"),
             ])
                 .whereRef("lecass.lecidt", "=", "lecture.lecidt")
                 .orderBy("lecass.ordreass", "asc")).as("lectures_assemblee"),
         ])
             .whereRef("lecture.loicod", "=", "loi.loicod")
-            .orderBy("typlec.typlecord", "asc")).as("lectures"),
+            .orderBy(sql `COALESCE(typlec.typlecord::int, 9999)`, "asc")).as("lectures"),
         // Thèmes
         jsonArrayFrom(eb
             .withSchema("senat")
@@ -221,8 +319,77 @@ export async function* findAllDossiers() {
         yield {
             ...row,
             signet: row.signet,
-            lectures: row.lectures ?? [],
+            lectures: mergeCommissionsSaisies(row.lectures ?? []),
             themes: row.themes ?? [],
         };
     }
 }
+function mergeCommissionsSaisies(lectures) {
+    return lectures.map((lecture) => {
+        const { lectures_assemblee, ...restLecture } = lecture;
+        if (!lectures_assemblee) {
+            return { ...restLecture, lectures_assemblee: undefined };
+        }
+        return {
+            ...restLecture,
+            lectures_assemblee: lectures_assemblee.map((lecAss) => {
+                const { commissions_saisies_ameli, reunions_commission, ...restLecAss } = lecAss;
+                const commissionsSaisies = [];
+                const hasFondFromAmeli = commissions_saisies_ameli?.some((c) => c.type_saisine === "fond");
+                if (!hasFondFromAmeli) {
+                    const fondOrg = lecAss.code_organisme;
+                    if (fondOrg) {
+                        commissionsSaisies.push({
+                            code_organisme: fondOrg,
+                            libelle_organisme: lecAss.libelle_organisme ?? null,
+                            type_saisine: "fond",
+                            deleguee_au_fond: null,
+                        });
+                    }
+                }
+                if (commissions_saisies_ameli) {
+                    for (const c of commissions_saisies_ameli) {
+                        if (c.type_saisine === "fond" && !hasFondFromAmeli) {
+                            continue;
+                        }
+                        commissionsSaisies.push({
+                            code_organisme: c.code_organisme,
+                            libelle_organisme: c.libelle_organisme,
+                            type_saisine: c.type_saisine,
+                            deleguee_au_fond: c.deleguee_au_fond,
+                        });
+                    }
+                }
+                const knownOrgs = new Set(commissionsSaisies.map((c) => c.code_organisme));
+                if (reunions_commission) {
+                    const audOrgs = [...new Set(reunions_commission.map((r) => r.code_organisme))];
+                    for (const audOrg of audOrgs) {
+                        if (audOrg && !knownOrgs.has(audOrg)) {
+                            const audLibelle = reunions_commission.find((r) => r.code_organisme === audOrg)?.libelle_organisme;
+                            commissionsSaisies.push({
+                                code_organisme: audOrg,
+                                libelle_organisme: audLibelle ?? null,
+                                type_saisine: "avis",
+                                deleguee_au_fond: null,
+                            });
+                            knownOrgs.add(audOrg);
+                        }
+                    }
+                }
+                for (const commission of commissionsSaisies) {
+                    commission.reunions = reunions_commission
+                        ?.filter((r) => r.code_organisme === commission.code_organisme)
+                        .map(({ date, titre, url_compte_rendu }) => ({
+                        date,
+                        titre,
+                        url_compte_rendu,
+                    })) ?? null;
+                }
+                return {
+                    ...restLecAss,
+                    commissions_saisies: commissionsSaisies,
+                };
+            }),
+        };
+    });
+}

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

@@ -0,0 +1,45 @@
+export interface AgendaEvent {
+    id: string;
+    type: string | null;
+    date: string;
+    startTime: string | null;
+    endTime: string | null;
+    timeOriginal: string | null;
+    titre: string;
+    organe: string | null;
+    objet: string | null;
+    lieu: string | null;
+    captationVideo: boolean;
+    urlDossierSenat: string | null;
+    quantieme: string | null;
+}
+export type TimeSlot = "MATIN" | "APRES-MIDI" | "SOIR" | "UNKNOWN";
+export interface Reunion {
+    uid: string;
+    chambre: "SN";
+    date: string;
+    startTime: string | null;
+    endTime: string | null;
+    captationVideo: boolean;
+    titre: string;
+    type: string;
+    organe?: string;
+    objet?: string;
+    lieu?: string;
+    events: AgendaEvent[];
+    compteRenduRefUid?: string;
+    transcriptionRef?: string;
+    urlVideo?: string;
+    urlPageVideo?: string;
+    timecodeDebutVideo?: number;
+    timecodeFinVideo?: number;
+    odj?: ReunionOdj;
+}
+export interface ReunionOdjPoint {
+    objet: string | null;
+    dossierLegislatifRef: string | null;
+    codeEtape: string | null;
+}
+export interface ReunionOdj {
+    pointsOdj: ReunionOdjPoint[];
+}

package/lib/src/types/agenda.js

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

package/lib/src/types/ameli.d.ts

@@ -0,0 +1,5 @@
+import { TxtAmeli } from "../raw_types/ameli.js";
+import { Sub } from "../raw_types/ameli.js";
+export interface TxtAmeliCustom extends TxtAmeli {
+    subids?: Sub["id"][];
+}

package/lib/src/types/ameli.js

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